mirror of https://github.com/mre/mos6502.git
Add just a bit of extra annotation to the Instruction chart
This commit is contained in:
Johannes Muenzel
parent
0b2c805a96
commit
e4c998ddfd
|
|
@ -0,0 +1,170 @@
|
|||
// Copyright (C) 2014 The 6502-rs Developers
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions
|
||||
// are met:
|
||||
// 1. Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// 2. Redistributions in binary form must reproduce the above copyright
|
||||
// notice, this list of conditions and the following disclaimer in the
|
||||
// documentation and/or other materials provided with the distribution.
|
||||
// 3. Neither the names of the copyright holders nor the names of any
|
||||
// contributors may be used to endorse or promote products derived from this
|
||||
// software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// Abbreviations
|
||||
//
|
||||
// General
|
||||
//
|
||||
// M | `Memory location`
|
||||
//
|
||||
// Registers
|
||||
//
|
||||
// A | accumulator
|
||||
// X | general purpose register
|
||||
// Y | general purpose register
|
||||
// NV-BDIZC | processor status flags -- see ProcessorStatus bitflags
|
||||
// SP | stack pointer
|
||||
// PC | program counter
|
||||
//
|
||||
|
||||
pub bitflags! {
|
||||
flags ProcessorStatus: u8 {
|
||||
static N = 0b10000000, // Negative -- sometimes called S for "sign"
|
||||
static V = 0b01000000, // oVerflow
|
||||
static B = 0b00010000, // Brk
|
||||
static D = 0b00001000, // Decimal mode active?
|
||||
static I = 0b00000100, // Irq disabled?
|
||||
static Z = 0b00000010, // Zero
|
||||
static C = 0b00000001, // Carry
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub struct Machine {
|
||||
pub A : u8,
|
||||
pub X : u8,
|
||||
pub Y : u8,
|
||||
pub P : ProcessorStatus,
|
||||
pub SP : u8,
|
||||
pub PC : u16,
|
||||
}
|
||||
|
||||
impl Machine {
|
||||
pub fn new() -> Machine {
|
||||
Machine {
|
||||
A: 0,
|
||||
X: 0,
|
||||
Y: 0,
|
||||
SP: 0,
|
||||
P: ProcessorStatus::empty(),
|
||||
PC: 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct StackPointer(u8);
|
||||
|
||||
pub static STACK_POINTER_IN_MEMORY_LO : u16 = 0x0100;
|
||||
pub static STACK_POINTER_IN_MEMORY_HI : u16 = 0x01FF;
|
||||
|
||||
pub struct MemoryAddr(u16);
|
||||
|
||||
pub fn stack_pointer_to_addr(StackPointer(x) : StackPointer) -> MemoryAddr
|
||||
{
|
||||
MemoryAddr(x as u16 + STACK_POINTER_IN_MEMORY_HI)
|
||||
}
|
||||
|
||||
#[deriving(Show)]
|
||||
pub enum Instruction
|
||||
// i/o vars should be listed as follows:
|
||||
// NV BDIZC A X Y SP PC M
|
||||
//
|
||||
// | outputs | inputs
|
||||
{ ADC // ADd with Carry................ | NV ...ZC A = A + M + C
|
||||
, AND // logical AND (bitwise)......... | N. ...Z. A = A && M
|
||||
, ASL // Arithmetic Shift Left......... | N. ...ZC A = M << 1
|
||||
, BCC // Branch if Carry Clear......... | .. ..... PC = !C
|
||||
, BCS // Branch if Carry Set........... | .. ..... PC = C
|
||||
, BEQ // Branch if Equal (to zero?).... | .. ..... PC = Z
|
||||
, BIT // BIT test...................... | NV ...Z. = A & M
|
||||
, BMI // Branch if Minus............... | .. ..... PC = N
|
||||
, BNE // Branch if Not Equal........... | .. ..... PC = !Z
|
||||
, BPL // Branch if Positive............ | .. ..... PC = Z
|
||||
, BRK // BReaK......................... | .. .....
|
||||
, BVC // Branch if oVerflow Clear...... | .. .....
|
||||
, BVS // Branch if oVerflow Set........ | .. .....
|
||||
, CLC // CLear Carry flag.............. | .. .....
|
||||
, CLD // Clear Decimal Mode............ | .. .....
|
||||
, CLI // Clear Interrupt Disable....... | .. .....
|
||||
, CLV // Clear oVerflow flag........... | .. .....
|
||||
, CMP // Compare....................... | .. .....
|
||||
, CPX // Compare X register............ | .. .....
|
||||
, CPY // Compare Y register............ | .. .....
|
||||
, DEC // DECrement memory.............. | .. .....
|
||||
, DEX // DEcrement X register.......... | .. .....
|
||||
, DEY // DEcrement Y register.......... | .. .....
|
||||
, EOR // Exclusive OR.................. | .. .....
|
||||
, INC // INCrement memory.............. | .. .....
|
||||
, INX // INcrement X register.......... | .. .....
|
||||
, INY // INcrement Y register.......... | .. .....
|
||||
, JMP // JuMP.......................... | .. .....
|
||||
, JSR // Jump to SubRoutine............ | .. .....
|
||||
, LDA // LoaD Accumulator.............. | .. .....
|
||||
, LDX // LoaD X register............... | .. .....
|
||||
, LDY // LoaD Y register............... | .. .....
|
||||
, LSR // Logical Shift Right........... | .. .....
|
||||
, NOP // No OPeration.................. | .. .....
|
||||
, ORA // inclusive OR.................. | .. .....
|
||||
, PHA // PusH Accumulator.............. | .. .....
|
||||
, PHP // PusH Processor status......... | .. .....
|
||||
, PLA // PuLl Accumulator.............. | .. .....
|
||||
, PLP // PuLl Processor status......... | .. .....
|
||||
, ROL // ROtate Left................... | .. .....
|
||||
, ROR // ROtate Right.................. | .. .....
|
||||
, RTI // ReTurn from Interrupt......... | .. .....
|
||||
, RTS // ReTurn from Subroutine........ | .. .....
|
||||
, SBC // SuBtract with Carry........... | .. .....
|
||||
, SEC // SEt Carry flag................ | .. .....
|
||||
, SED // SEt Decimal flag.............. | .. .....
|
||||
, SEI // SEt Interrupt disable......... | .. .....
|
||||
, STA // STore Accumulator............. | .. .....
|
||||
, STX // STore X register.............. | .. .....
|
||||
, STY // STore Y register.............. | .. .....
|
||||
, TAX // Transfer Accumulator to X..... | .. .....
|
||||
, TAY // Transfer Accumulator to Y..... | .. .....
|
||||
, TSX // Transfer Stack pointer to X... | .. .....
|
||||
, TXA // Transfer X to Accumulator..... | .. .....
|
||||
, TXS // Transfer X to Stack pointer... | .. .....
|
||||
, TYA // Transfer Y to Accumulator..... | .. .....
|
||||
}
|
||||
|
||||
pub enum AddressingMode {
|
||||
Immediate,
|
||||
Absolute,
|
||||
ZeroPage,
|
||||
Implied,
|
||||
IndirectAbsolute,
|
||||
AbsoluteIndexedX,
|
||||
AbsoluteIndexedY,
|
||||
ZeroPageIndexedX,
|
||||
ZeroageIndexedY,
|
||||
IndexedIndirect,
|
||||
IndirectIndexed,
|
||||
Relative,
|
||||
Accumulator,
|
||||
}
|
||||
|
||||
|
|
@ -25,5 +25,5 @@
|
|||
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
pub mod machine;
|
||||
pub mod defs;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,164 +0,0 @@
|
|||
// Copyright (C) 2014 The 6502-rs Developers
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions
|
||||
// are met:
|
||||
// 1. Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// 2. Redistributions in binary form must reproduce the above copyright
|
||||
// notice, this list of conditions and the following disclaimer in the
|
||||
// documentation and/or other materials provided with the distribution.
|
||||
// 3. Neither the names of the copyright holders nor the names of any
|
||||
// contributors may be used to endorse or promote products derived from this
|
||||
// software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
||||
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
// POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// Abbreviations
|
||||
//
|
||||
// Registers
|
||||
//
|
||||
// A accumulator
|
||||
// X general purpose register
|
||||
// Y general purpose register
|
||||
// SP stack pointer
|
||||
// NV-BDIZC processor status flags -- see ProcessorStatus bitflags
|
||||
// PC program counter
|
||||
//
|
||||
// M stands for `Memory location`
|
||||
|
||||
pub bitflags! {
|
||||
flags ProcessorStatus: u8 {
|
||||
static N = 0b10000000, // Negative
|
||||
static V = 0b01000000, // oVerflow
|
||||
static B = 0b00010000, // Brk
|
||||
static D = 0b00001000, // Decimal mode active?
|
||||
static I = 0b00000100, // Irq disabled?
|
||||
static Z = 0b00000010, // Zero
|
||||
static C = 0b00000001, // Carry
|
||||
}
|
||||
}
|
||||
|
||||
#[allow(non_snake_case)]
|
||||
pub struct Machine {
|
||||
pub A : u8,
|
||||
pub X : u8,
|
||||
pub Y : u8,
|
||||
pub SP : u8,
|
||||
pub P : ProcessorStatus,
|
||||
pub PC : u16,
|
||||
}
|
||||
|
||||
impl Machine {
|
||||
pub fn new() -> Machine {
|
||||
Machine {
|
||||
A: 0,
|
||||
X: 0,
|
||||
Y: 0,
|
||||
SP: 0,
|
||||
P: ProcessorStatus::empty(),
|
||||
PC: 0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct StackPointer(u8);
|
||||
|
||||
pub static STACK_POINTER_IN_MEMORY_LO : u16 = 0x0100;
|
||||
pub static STACK_POINTER_IN_MEMORY_HI : u16 = 0x01FF;
|
||||
|
||||
pub struct MemoryAddr(u16);
|
||||
|
||||
pub fn stack_pointer_to_addr(StackPointer(x) : StackPointer) -> MemoryAddr
|
||||
{
|
||||
MemoryAddr(x as u16 + STACK_POINTER_IN_MEMORY_HI)
|
||||
}
|
||||
|
||||
#[deriving(Show)]
|
||||
pub enum Instruction
|
||||
// out in
|
||||
{ ADC // ADd with Carry................ A,Z,C,N = A + M + C
|
||||
, AND // logical AND................... A,Z,N = A && M
|
||||
, ASL // Arithmetic Shift Left......... A,Z,C,N = M << 1
|
||||
, BCC // Branch if Carry Clear......... _ <-
|
||||
, BCS // Branch if Carry Set...........
|
||||
, BEQ // Branch if Equal...............
|
||||
, BIT // BIT test...................... a &
|
||||
, BMI // Branch if Minus...............
|
||||
, BNE // Branch if Not Equal...........
|
||||
, BPL // Branch if Positive............
|
||||
, BRK // BReaK.........................
|
||||
, BVC // Branch if oVerflow Clear......
|
||||
, BVS // Branch if oVerflow Set........
|
||||
, CLC // CLear Carry flag..............
|
||||
, CLD // Clear Decimal Mode............
|
||||
, CLI // Clear Interrupt Disable.......
|
||||
, CLV // Clear oVerflow flag...........
|
||||
, CMP // Compare.......................
|
||||
, CPX // Compare X register............
|
||||
, CPY // Compare Y register............
|
||||
, DEC // DECrement memory..............
|
||||
, DEX // DEcrement X register..........
|
||||
, DEY // DEcrement Y register..........
|
||||
, EOR // Exclusive OR..................
|
||||
, INC // INCrement memory..............
|
||||
, INX // INcrement X register..........
|
||||
, INY // INcrement Y register..........
|
||||
, JMP // JuMP..........................
|
||||
, JSR // Jump to SubRoutine............
|
||||
, LDA // LoaD Accumulator..............
|
||||
, LDX // LoaD X register...............
|
||||
, LDY // LoaD Y register...............
|
||||
, LSR // Logical Shift Right...........
|
||||
, NOP // No OPeration..................
|
||||
, ORA // inclusive OR..................
|
||||
, PHA // PusH Accumulator..............
|
||||
, PHP // PusH Processor status.........
|
||||
, PLA // PuLl Accumulator..............
|
||||
, PLP // PuLl Processor status.........
|
||||
, ROL // ROtate Left...................
|
||||
, ROR // ROtate Right..................
|
||||
, RTI // ReTurn from Interrupt.........
|
||||
, RTS // ReTurn from Subroutine........
|
||||
, SBC // SuBtract with Carry...........
|
||||
, SEC // SEt Carry flag................
|
||||
, SED // SEt Decimal flag..............
|
||||
, SEI // SEt Interrupt disable.........
|
||||
, STA // STore Accumulator.............
|
||||
, STX // STore X register..............
|
||||
, STY // STore Y register..............
|
||||
, TAX // Transfer Accumulator to X.....
|
||||
, TAY // Transfer Accumulator to Y.....
|
||||
, TSX // Transfer Stack pointer to X...
|
||||
, TXA // Transfer X to Accumulator.....
|
||||
, TXS // Transfer X to Stack pointer...
|
||||
, TYA // Transfer Y to Accumulator.....
|
||||
}
|
||||
|
||||
pub enum AddressingMode {
|
||||
Immediate,
|
||||
Absolute,
|
||||
ZeroPage,
|
||||
Implied,
|
||||
IndirectAbsolute,
|
||||
AbsoluteIndexedX,
|
||||
AbsoluteIndexedY,
|
||||
ZeroPageIndexedX,
|
||||
ZeroageIndexedY,
|
||||
IndexedIndirect,
|
||||
IndirectIndexed,
|
||||
Relative,
|
||||
Accumulator,
|
||||
}
|
||||
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
extern crate machine6502;
|
||||
|
||||
use machine6502::machine::Machine;
|
||||
use machine6502::defs::Machine;
|
||||
|
||||
fn main() {
|
||||
let _q = Machine::new();
|
||||
|
|
|
|||
Loading…
Reference in New Issue