mirror of
https://github.com/FranLMSP/rmg-001.git
synced 2024-09-20 10:10:50 +00:00
Enum most opcode parameters (CB prefix remaining)
This commit is contained in:
parent
9bf80459a7
commit
f62926a869
576
src/cpu.rs
576
src/cpu.rs
@ -10,12 +10,13 @@ pub enum Register {
|
||||
H(u8),
|
||||
L(u8),
|
||||
// This registers are just the same as above but combined to get a 16 bits register
|
||||
AF(u16),
|
||||
BC(u16),
|
||||
DE(u16),
|
||||
HL(u16),
|
||||
|
||||
SP(u16),
|
||||
PC(u16),
|
||||
SP(u16), // Stack pointer
|
||||
PC(u16), // Program counter
|
||||
}
|
||||
|
||||
pub enum FlagRegister {
|
||||
@ -50,7 +51,7 @@ impl Registers {
|
||||
h: 0,
|
||||
l: 0,
|
||||
sp: 0,
|
||||
pc: 0,
|
||||
pc: 0x100, // On power up, the Gamebou executes the instruction at hex 100
|
||||
}
|
||||
}
|
||||
|
||||
@ -64,6 +65,7 @@ impl Registers {
|
||||
Register::F(_) => self.f as u16,
|
||||
Register::H(_) => self.h as u16,
|
||||
Register::L(_) => self.l as u16,
|
||||
Register::AF(_) => self.get_af(),
|
||||
Register::BC(_) => self.get_bc(),
|
||||
Register::DE(_) => self.get_de(),
|
||||
Register::HL(_) => self.get_hl(),
|
||||
@ -82,6 +84,7 @@ impl Registers {
|
||||
Register::F(val) => self.f = val,
|
||||
Register::H(val) => self.h = val,
|
||||
Register::L(val) => self.l = val,
|
||||
Register::AF(val) => self.set_af(val),
|
||||
Register::BC(val) => self.set_bc(val),
|
||||
Register::DE(val) => self.set_de(val),
|
||||
Register::HL(val) => self.set_hl(val),
|
||||
@ -108,6 +111,10 @@ impl Registers {
|
||||
}
|
||||
}
|
||||
|
||||
fn get_af(&self) -> u16 {
|
||||
((self.a as u16) << 8) | (self.f as u16)
|
||||
}
|
||||
|
||||
fn get_bc(&self) -> u16 {
|
||||
((self.b as u16) << 8) | (self.c as u16)
|
||||
}
|
||||
@ -120,6 +127,12 @@ impl Registers {
|
||||
((self.h as u16) << 8) | (self.l as u16)
|
||||
}
|
||||
|
||||
fn set_af(&mut self, val: u16) {
|
||||
let bytes = val.to_be_bytes();
|
||||
self.a = bytes[0];
|
||||
self.f = bytes[1];
|
||||
}
|
||||
|
||||
fn set_bc(&mut self, val: u16) {
|
||||
let bytes = val.to_be_bytes();
|
||||
self.b = bytes[0];
|
||||
@ -139,23 +152,63 @@ impl Registers {
|
||||
}
|
||||
}
|
||||
|
||||
pub enum OpcodeParameter {
|
||||
Register(Register),
|
||||
Register_U8(Register),
|
||||
Register_U16(Register),
|
||||
Register_I8(Register),
|
||||
Register_I16(Register),
|
||||
U8_Register(Register),
|
||||
U16_Register(Register),
|
||||
I8_Register(Register),
|
||||
I16_Register(Register),
|
||||
Register_16BitAddress(Register),
|
||||
Register_Register(Register, Register),
|
||||
|
||||
Register_RegisterDecrement(Register, Register),
|
||||
RegisterDecrement_Register(Register, Register),
|
||||
|
||||
Register_RegisterIncrement(Register, Register),
|
||||
RegisterIncrement_Register(Register, Register),
|
||||
|
||||
Register_FF00plusRegister(Register, Register),
|
||||
FF00plusRegister_Register(Register, Register),
|
||||
Register_FF00plusU8(Register),
|
||||
FF00plusU8_Register(Register),
|
||||
|
||||
Register_RegisterPlusI8(Register, Register),
|
||||
|
||||
U8(u16),
|
||||
I8(u16),
|
||||
U16(u16),
|
||||
I16(u16),
|
||||
FlagRegisterReset(FlagRegister),
|
||||
FlagRegisterSet(FlagRegister),
|
||||
FlagRegisterReset_U16(FlagRegister, u16),
|
||||
FlagRegisterSet_U16(FlagRegister, u16),
|
||||
FlagRegisterReset_I16(FlagRegister, u16),
|
||||
FlagRegisterSet_I16(FlagRegister, u16),
|
||||
|
||||
NoParam,
|
||||
}
|
||||
|
||||
pub enum CpuOpcode {
|
||||
LD,
|
||||
LDD,
|
||||
LDI,
|
||||
LDHL,
|
||||
PUSH,
|
||||
POP,
|
||||
ADC,
|
||||
SUB,
|
||||
SBC,
|
||||
AND,
|
||||
OR,
|
||||
XOR,
|
||||
CP,
|
||||
ADD,
|
||||
INC,
|
||||
DEC,
|
||||
LD(OpcodeParameter),
|
||||
LDD(OpcodeParameter),
|
||||
LDI(OpcodeParameter),
|
||||
LDHL(OpcodeParameter),
|
||||
PUSH(Register),
|
||||
POP(Register),
|
||||
ADD(OpcodeParameter),
|
||||
ADC(OpcodeParameter),
|
||||
SUB(OpcodeParameter),
|
||||
SBC(OpcodeParameter),
|
||||
AND(OpcodeParameter),
|
||||
OR(OpcodeParameter),
|
||||
XOR(OpcodeParameter),
|
||||
CP(OpcodeParameter),
|
||||
INC(Register),
|
||||
DEC(Register),
|
||||
SWAP,
|
||||
DAA,
|
||||
CPL,
|
||||
@ -180,12 +233,13 @@ pub enum CpuOpcode {
|
||||
BIT,
|
||||
SET,
|
||||
RES,
|
||||
JP,
|
||||
JR,
|
||||
CALL,
|
||||
RST,
|
||||
RET,
|
||||
JP(OpcodeParameter),
|
||||
JR(OpcodeParameter),
|
||||
CALL(OpcodeParameter),
|
||||
RST(u16),
|
||||
RET(OpcodeParameter),
|
||||
RETI,
|
||||
PREFIX_CB,
|
||||
IllegalInstruction,
|
||||
}
|
||||
|
||||
@ -197,207 +251,207 @@ pub struct CPU {
|
||||
impl CPU {
|
||||
pub fn parse_opcode(opcode: u8) -> CpuOpcode {
|
||||
match opcode {
|
||||
0x06 => CpuOpcode::LD,
|
||||
0x0E => CpuOpcode::LD,
|
||||
0x16 => CpuOpcode::LD,
|
||||
0x1E => CpuOpcode::LD,
|
||||
0x26 => CpuOpcode::LD,
|
||||
0x2E => CpuOpcode::LD,
|
||||
0x7F => CpuOpcode::LD,
|
||||
0x78 => CpuOpcode::LD,
|
||||
0x79 => CpuOpcode::LD,
|
||||
0x7A => CpuOpcode::LD,
|
||||
0x7B => CpuOpcode::LD,
|
||||
0x7C => CpuOpcode::LD,
|
||||
0x7D => CpuOpcode::LD,
|
||||
0x7E => CpuOpcode::LD,
|
||||
0x40 => CpuOpcode::LD,
|
||||
0x41 => CpuOpcode::LD,
|
||||
0x42 => CpuOpcode::LD,
|
||||
0x43 => CpuOpcode::LD,
|
||||
0x44 => CpuOpcode::LD,
|
||||
0x45 => CpuOpcode::LD,
|
||||
0x46 => CpuOpcode::LD,
|
||||
0x48 => CpuOpcode::LD,
|
||||
0x49 => CpuOpcode::LD,
|
||||
0x4A => CpuOpcode::LD,
|
||||
0x4B => CpuOpcode::LD,
|
||||
0x4C => CpuOpcode::LD,
|
||||
0x4D => CpuOpcode::LD,
|
||||
0x4E => CpuOpcode::LD,
|
||||
0x50 => CpuOpcode::LD,
|
||||
0x51 => CpuOpcode::LD,
|
||||
0x52 => CpuOpcode::LD,
|
||||
0x53 => CpuOpcode::LD,
|
||||
0x54 => CpuOpcode::LD,
|
||||
0x55 => CpuOpcode::LD,
|
||||
0x56 => CpuOpcode::LD,
|
||||
0x58 => CpuOpcode::LD,
|
||||
0x59 => CpuOpcode::LD,
|
||||
0x5A => CpuOpcode::LD,
|
||||
0x5B => CpuOpcode::LD,
|
||||
0x5C => CpuOpcode::LD,
|
||||
0x5D => CpuOpcode::LD,
|
||||
0x5E => CpuOpcode::LD,
|
||||
0x60 => CpuOpcode::LD,
|
||||
0x61 => CpuOpcode::LD,
|
||||
0x62 => CpuOpcode::LD,
|
||||
0x63 => CpuOpcode::LD,
|
||||
0x64 => CpuOpcode::LD,
|
||||
0x65 => CpuOpcode::LD,
|
||||
0x66 => CpuOpcode::LD,
|
||||
0x68 => CpuOpcode::LD,
|
||||
0x69 => CpuOpcode::LD,
|
||||
0x6A => CpuOpcode::LD,
|
||||
0x6B => CpuOpcode::LD,
|
||||
0x6C => CpuOpcode::LD,
|
||||
0x6D => CpuOpcode::LD,
|
||||
0x6E => CpuOpcode::LD,
|
||||
0x70 => CpuOpcode::LD,
|
||||
0x71 => CpuOpcode::LD,
|
||||
0x72 => CpuOpcode::LD,
|
||||
0x73 => CpuOpcode::LD,
|
||||
0x74 => CpuOpcode::LD,
|
||||
0x75 => CpuOpcode::LD,
|
||||
0x36 => CpuOpcode::LD,
|
||||
0x0A => CpuOpcode::LD,
|
||||
0x1A => CpuOpcode::LD,
|
||||
0xFA => CpuOpcode::LD,
|
||||
0x3E => CpuOpcode::LD,
|
||||
0x47 => CpuOpcode::LD,
|
||||
0x4F => CpuOpcode::LD,
|
||||
0x57 => CpuOpcode::LD,
|
||||
0x5F => CpuOpcode::LD,
|
||||
0x67 => CpuOpcode::LD,
|
||||
0x6F => CpuOpcode::LD,
|
||||
0x02 => CpuOpcode::LD,
|
||||
0x12 => CpuOpcode::LD,
|
||||
0x77 => CpuOpcode::LD,
|
||||
0xEA => CpuOpcode::LD,
|
||||
0xF2 => CpuOpcode::LD,
|
||||
0xE2 => CpuOpcode::LD,
|
||||
0x3A => CpuOpcode::LD,
|
||||
0x32 => CpuOpcode::LDD,
|
||||
0x2A => CpuOpcode::LDI,
|
||||
0x22 => CpuOpcode::LDI,
|
||||
0xE0 => CpuOpcode::LD,
|
||||
0xF0 => CpuOpcode::LD,
|
||||
0x01 => CpuOpcode::LD,
|
||||
0x11 => CpuOpcode::LD,
|
||||
0x21 => CpuOpcode::LD,
|
||||
0x31 => CpuOpcode::LD,
|
||||
0xF9 => CpuOpcode::LD,
|
||||
0xF8 => CpuOpcode::LDHL,
|
||||
0x08 => CpuOpcode::LD,
|
||||
0xF5 => CpuOpcode::PUSH,
|
||||
0xC5 => CpuOpcode::PUSH,
|
||||
0xD5 => CpuOpcode::PUSH,
|
||||
0xE5 => CpuOpcode::PUSH,
|
||||
0xF1 => CpuOpcode::POP,
|
||||
0xC1 => CpuOpcode::POP,
|
||||
0xD1 => CpuOpcode::POP,
|
||||
0xE1 => CpuOpcode::POP,
|
||||
0x87 => CpuOpcode::ADD,
|
||||
0x80 => CpuOpcode::ADD,
|
||||
0x81 => CpuOpcode::ADD,
|
||||
0x82 => CpuOpcode::ADD,
|
||||
0x83 => CpuOpcode::ADD,
|
||||
0x84 => CpuOpcode::ADD,
|
||||
0x85 => CpuOpcode::ADD,
|
||||
0x86 => CpuOpcode::ADD,
|
||||
0xC6 => CpuOpcode::ADD,
|
||||
0x8F => CpuOpcode::ADC,
|
||||
0x88 => CpuOpcode::ADC,
|
||||
0x89 => CpuOpcode::ADC,
|
||||
0x8A => CpuOpcode::ADC,
|
||||
0x8B => CpuOpcode::ADC,
|
||||
0x8C => CpuOpcode::ADC,
|
||||
0x8D => CpuOpcode::ADC,
|
||||
0x8E => CpuOpcode::ADC,
|
||||
0xCE => CpuOpcode::ADC,
|
||||
0x97 => CpuOpcode::SUB,
|
||||
0x90 => CpuOpcode::SUB,
|
||||
0x91 => CpuOpcode::SUB,
|
||||
0x92 => CpuOpcode::SUB,
|
||||
0x93 => CpuOpcode::SUB,
|
||||
0x94 => CpuOpcode::SUB,
|
||||
0x95 => CpuOpcode::SUB,
|
||||
0x96 => CpuOpcode::SUB,
|
||||
0xD6 => CpuOpcode::SUB,
|
||||
0x9F => CpuOpcode::SBC,
|
||||
0x98 => CpuOpcode::SBC,
|
||||
0x99 => CpuOpcode::SBC,
|
||||
0x9A => CpuOpcode::SBC,
|
||||
0x9B => CpuOpcode::SBC,
|
||||
0x9C => CpuOpcode::SBC,
|
||||
0x9D => CpuOpcode::SBC,
|
||||
0x9E => CpuOpcode::SBC,
|
||||
0xA7 => CpuOpcode::AND,
|
||||
0xA0 => CpuOpcode::AND,
|
||||
0xA1 => CpuOpcode::AND,
|
||||
0xA2 => CpuOpcode::AND,
|
||||
0xA3 => CpuOpcode::AND,
|
||||
0xA4 => CpuOpcode::AND,
|
||||
0xA5 => CpuOpcode::AND,
|
||||
0xA6 => CpuOpcode::AND,
|
||||
0xE6 => CpuOpcode::AND,
|
||||
0xB7 => CpuOpcode::OR,
|
||||
0xB0 => CpuOpcode::OR,
|
||||
0xB1 => CpuOpcode::OR,
|
||||
0xB2 => CpuOpcode::OR,
|
||||
0xB3 => CpuOpcode::OR,
|
||||
0xB4 => CpuOpcode::OR,
|
||||
0xB5 => CpuOpcode::OR,
|
||||
0xB6 => CpuOpcode::OR,
|
||||
0xF6 => CpuOpcode::OR,
|
||||
0xAF => CpuOpcode::XOR,
|
||||
0xA8 => CpuOpcode::XOR,
|
||||
0xA9 => CpuOpcode::XOR,
|
||||
0xAA => CpuOpcode::XOR,
|
||||
0xAB => CpuOpcode::XOR,
|
||||
0xAC => CpuOpcode::XOR,
|
||||
0xAD => CpuOpcode::XOR,
|
||||
0xAE => CpuOpcode::XOR,
|
||||
0xEE => CpuOpcode::XOR,
|
||||
0xBF => CpuOpcode::CP,
|
||||
0xB8 => CpuOpcode::CP,
|
||||
0xB9 => CpuOpcode::CP,
|
||||
0xBA => CpuOpcode::CP,
|
||||
0xBB => CpuOpcode::CP,
|
||||
0xBC => CpuOpcode::CP,
|
||||
0xBD => CpuOpcode::CP,
|
||||
0xBE => CpuOpcode::CP,
|
||||
0xFE => CpuOpcode::CP,
|
||||
0x3C => CpuOpcode::INC,
|
||||
0x04 => CpuOpcode::INC,
|
||||
0x0C => CpuOpcode::INC,
|
||||
0x14 => CpuOpcode::INC,
|
||||
0x1C => CpuOpcode::INC,
|
||||
0x24 => CpuOpcode::INC,
|
||||
0x2C => CpuOpcode::INC,
|
||||
0x34 => CpuOpcode::INC,
|
||||
0x3D => CpuOpcode::DEC,
|
||||
0x05 => CpuOpcode::DEC,
|
||||
0x0D => CpuOpcode::DEC,
|
||||
0x15 => CpuOpcode::DEC,
|
||||
0x1D => CpuOpcode::DEC,
|
||||
0x25 => CpuOpcode::DEC,
|
||||
0x2D => CpuOpcode::DEC,
|
||||
0x35 => CpuOpcode::DEC,
|
||||
0x09 => CpuOpcode::ADD,
|
||||
0x19 => CpuOpcode::ADD,
|
||||
0x29 => CpuOpcode::ADD,
|
||||
0x39 => CpuOpcode::ADD,
|
||||
0xE8 => CpuOpcode::ADD,
|
||||
0x03 => CpuOpcode::INC,
|
||||
0x13 => CpuOpcode::INC,
|
||||
0x23 => CpuOpcode::INC,
|
||||
0x33 => CpuOpcode::INC,
|
||||
0x0B => CpuOpcode::DEC,
|
||||
0x1B => CpuOpcode::DEC,
|
||||
0x2B => CpuOpcode::DEC,
|
||||
0x3B => CpuOpcode::DEC,
|
||||
0xCB => CpuOpcode::SWAP,
|
||||
0x06 => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::B(0))),
|
||||
0x0E => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::C(0))),
|
||||
0x16 => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::D(0))),
|
||||
0x1E => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::E(0))),
|
||||
0x26 => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::H(0))),
|
||||
0x2E => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::L(0))),
|
||||
0x7F => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0x78 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0x79 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0x7A => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0x7B => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0x7C => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0x7D => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0x7E => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0x40 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::B(0))),
|
||||
0x41 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::C(0))),
|
||||
0x42 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::D(0))),
|
||||
0x43 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::E(0))),
|
||||
0x44 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::H(0))),
|
||||
0x45 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::L(0))),
|
||||
0x46 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::HL(0))),
|
||||
0x48 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::B(0))),
|
||||
0x49 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::C(0))),
|
||||
0x4A => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::D(0))),
|
||||
0x4B => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::E(0))),
|
||||
0x4C => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::H(0))),
|
||||
0x4D => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::L(0))),
|
||||
0x4E => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::HL(0))),
|
||||
0x50 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::B(0))),
|
||||
0x51 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::C(0))),
|
||||
0x52 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::D(0))),
|
||||
0x53 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::E(0))),
|
||||
0x54 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::H(0))),
|
||||
0x55 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::L(0))),
|
||||
0x56 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::HL(0))),
|
||||
0x58 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::B(0))),
|
||||
0x59 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::C(0))),
|
||||
0x5A => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::D(0))),
|
||||
0x5B => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::E(0))),
|
||||
0x5C => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::H(0))),
|
||||
0x5D => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::L(0))),
|
||||
0x5E => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::HL(0))),
|
||||
0x60 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::B(0))),
|
||||
0x61 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::C(0))),
|
||||
0x62 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::D(0))),
|
||||
0x63 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::E(0))),
|
||||
0x64 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::H(0))),
|
||||
0x65 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::L(0))),
|
||||
0x66 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::HL(0))),
|
||||
0x68 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::B(0))),
|
||||
0x69 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::C(0))),
|
||||
0x6A => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::D(0))),
|
||||
0x6B => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::E(0))),
|
||||
0x6C => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::H(0))),
|
||||
0x6D => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::L(0))),
|
||||
0x6E => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::HL(0))),
|
||||
0x70 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::B(0))),
|
||||
0x71 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::C(0))),
|
||||
0x72 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::D(0))),
|
||||
0x73 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::E(0))),
|
||||
0x74 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::H(0))),
|
||||
0x75 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::L(0))),
|
||||
0x36 => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::HL(0))),
|
||||
0x0A => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::BC(0))),
|
||||
0x1A => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::A(0), Register::DE(0))),
|
||||
0xFA => CpuOpcode::LD(OpcodeParameter::Register_U8(Register::A(0))), // Receives 16 bit value, but lower bit is ignored
|
||||
0x3E => CpuOpcode::LD(OpcodeParameter::Register_U16(Register::A(0))),
|
||||
0x47 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::B(0), Register::A(0))),
|
||||
0x4F => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::C(0), Register::A(0))),
|
||||
0x57 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::D(0), Register::A(0))),
|
||||
0x5F => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::E(0), Register::A(0))),
|
||||
0x67 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::H(0), Register::A(0))),
|
||||
0x6F => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::L(0), Register::A(0))),
|
||||
0x02 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::BC(0), Register::A(0))),
|
||||
0x12 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::DE(0), Register::A(0))),
|
||||
0x77 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::HL(0), Register::A(0))),
|
||||
0xEA => CpuOpcode::LD(OpcodeParameter::U16_Register(Register::A(0))),
|
||||
0xF2 => CpuOpcode::LD(OpcodeParameter::Register_FF00plusRegister(Register::A(0), Register::C(0))),
|
||||
0xE2 => CpuOpcode::LD(OpcodeParameter::FF00plusRegister_Register(Register::A(0), Register::C(0))),
|
||||
0x3A => CpuOpcode::LDD(OpcodeParameter::Register_RegisterDecrement(Register::A(0), Register::HL(0))),
|
||||
0x32 => CpuOpcode::LDD(OpcodeParameter::RegisterDecrement_Register(Register::HL(0), Register::A(0))),
|
||||
0x2A => CpuOpcode::LDI(OpcodeParameter::Register_RegisterIncrement(Register::A(0), Register::HL(0))),
|
||||
0x22 => CpuOpcode::LDI(OpcodeParameter::RegisterIncrement_Register(Register::HL(0), Register::A(0))),
|
||||
0xE0 => CpuOpcode::LD(OpcodeParameter::FF00plusU8_Register(Register::A(0))),
|
||||
0xF0 => CpuOpcode::LD(OpcodeParameter::Register_FF00plusU8(Register::A(0))),
|
||||
0x01 => CpuOpcode::LD(OpcodeParameter::Register_U16(Register::BC(0))),
|
||||
0x11 => CpuOpcode::LD(OpcodeParameter::Register_U16(Register::DE(0))),
|
||||
0x21 => CpuOpcode::LD(OpcodeParameter::Register_U16(Register::HL(0))),
|
||||
0x31 => CpuOpcode::LD(OpcodeParameter::Register_U16(Register::SP(0))),
|
||||
0xF9 => CpuOpcode::LD(OpcodeParameter::Register_Register(Register::SP(0), Register::HL(0))),
|
||||
0xF8 => CpuOpcode::LD(OpcodeParameter::Register_RegisterPlusI8(Register::HL(0), Register::SP(0))),
|
||||
0x08 => CpuOpcode::LD(OpcodeParameter::U16_Register(Register::SP(0))),
|
||||
0xC5 => CpuOpcode::PUSH(Register::BC(0)),
|
||||
0xD5 => CpuOpcode::PUSH(Register::DE(0)),
|
||||
0xE5 => CpuOpcode::PUSH(Register::HL(0)),
|
||||
0xF5 => CpuOpcode::PUSH(Register::AF(0)),
|
||||
0xC1 => CpuOpcode::POP(Register::BC(0)),
|
||||
0xD1 => CpuOpcode::POP(Register::DE(0)),
|
||||
0xE1 => CpuOpcode::POP(Register::HL(0)),
|
||||
0xF1 => CpuOpcode::POP(Register::AF(0)),
|
||||
0x87 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0x80 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0x81 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0x82 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0x83 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0x84 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0x85 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0x86 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xC6 => CpuOpcode::ADD(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0x8F => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0x88 => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0x89 => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0x8A => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0x8B => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0x8C => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0x8D => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0x8E => CpuOpcode::ADC(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xCE => CpuOpcode::ADC(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0x97 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0x90 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0x91 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0x92 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0x93 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0x94 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0x95 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0x96 => CpuOpcode::SUB(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xD6 => CpuOpcode::SUB(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0x9F => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0x98 => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0x99 => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0x9A => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0x9B => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0x9C => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0x9D => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0x9E => CpuOpcode::SBC(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xDE => CpuOpcode::SBC(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0xA7 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0xA0 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0xA1 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0xA2 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0xA3 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0xA4 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0xA5 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0xA6 => CpuOpcode::AND(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xE6 => CpuOpcode::AND(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0xB7 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0xB0 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0xB1 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0xB2 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0xB3 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0xB4 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0xB5 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0xB6 => CpuOpcode::OR(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xF6 => CpuOpcode::OR(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0xAF => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0xA8 => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0xA9 => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0xAA => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0xAB => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0xAC => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0xAD => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0xAE => CpuOpcode::XOR(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xEE => CpuOpcode::XOR(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0xBF => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::A(0))),
|
||||
0xB8 => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::B(0))),
|
||||
0xB9 => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::C(0))),
|
||||
0xBA => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::D(0))),
|
||||
0xBB => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::E(0))),
|
||||
0xBC => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::H(0))),
|
||||
0xBD => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::L(0))),
|
||||
0xBE => CpuOpcode::CP(OpcodeParameter::Register_Register(Register::A(0), Register::HL(0))),
|
||||
0xFE => CpuOpcode::CP(OpcodeParameter::Register_U8(Register::A(0))),
|
||||
0x3C => CpuOpcode::INC(Register::A(0)),
|
||||
0x04 => CpuOpcode::INC(Register::B(0)),
|
||||
0x0C => CpuOpcode::INC(Register::C(0)),
|
||||
0x14 => CpuOpcode::INC(Register::D(0)),
|
||||
0x1C => CpuOpcode::INC(Register::E(0)),
|
||||
0x24 => CpuOpcode::INC(Register::H(0)),
|
||||
0x2C => CpuOpcode::INC(Register::L(0)),
|
||||
0x34 => CpuOpcode::INC(Register::HL(0)),
|
||||
0x3D => CpuOpcode::DEC(Register::A(0)),
|
||||
0x05 => CpuOpcode::DEC(Register::B(0)),
|
||||
0x0D => CpuOpcode::DEC(Register::C(0)),
|
||||
0x15 => CpuOpcode::DEC(Register::D(0)),
|
||||
0x1D => CpuOpcode::DEC(Register::E(0)),
|
||||
0x25 => CpuOpcode::DEC(Register::H(0)),
|
||||
0x2D => CpuOpcode::DEC(Register::L(0)),
|
||||
0x35 => CpuOpcode::DEC(Register::HL(0)),
|
||||
0x09 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::HL(0), Register::BC(0))),
|
||||
0x19 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::HL(0), Register::DE(0))),
|
||||
0x29 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::HL(0), Register::HL(0))),
|
||||
0x39 => CpuOpcode::ADD(OpcodeParameter::Register_Register(Register::HL(0), Register::SP(0))),
|
||||
0xE8 => CpuOpcode::ADD(OpcodeParameter::Register_I8(Register::HL(0))),
|
||||
0x03 => CpuOpcode::INC(Register::BC(0)),
|
||||
0x13 => CpuOpcode::INC(Register::DE(0)),
|
||||
0x23 => CpuOpcode::INC(Register::HL(0)),
|
||||
0x33 => CpuOpcode::INC(Register::SP(0)),
|
||||
0x0B => CpuOpcode::DEC(Register::BC(0)),
|
||||
0x1B => CpuOpcode::DEC(Register::DE(0)),
|
||||
0x2B => CpuOpcode::DEC(Register::HL(0)),
|
||||
0x3B => CpuOpcode::DEC(Register::SP(0)),
|
||||
0x27 => CpuOpcode::DAA,
|
||||
0x2F => CpuOpcode::CPL,
|
||||
0x3F => CpuOpcode::CCF,
|
||||
@ -406,6 +460,8 @@ impl CPU {
|
||||
0x07 => CpuOpcode::RLCA,
|
||||
0x0F => CpuOpcode::RRCA,
|
||||
0x1F => CpuOpcode::RRA,
|
||||
0xCB => CpuOpcode::PREFIX_CB,
|
||||
//0xCB => CpuOpcode::SWAP,
|
||||
//0xCB => CpuOpcode::RLC,
|
||||
//0xCB => CpuOpcode::RL,
|
||||
//0xCB => CpuOpcode::RRC,
|
||||
@ -416,35 +472,35 @@ impl CPU {
|
||||
//0xCB => CpuOpcode::BIT,
|
||||
//0xCB => CpuOpcode::SET,
|
||||
//0xCB => CpuOpcode::RES,
|
||||
0xC3 => CpuOpcode::JP,
|
||||
0xC2 => CpuOpcode::JP,
|
||||
0xCA => CpuOpcode::JP,
|
||||
0xD2 => CpuOpcode::JP,
|
||||
0xDA => CpuOpcode::JP,
|
||||
0xE9 => CpuOpcode::JP,
|
||||
0x18 => CpuOpcode::JR,
|
||||
0x20 => CpuOpcode::JR,
|
||||
0x28 => CpuOpcode::JR,
|
||||
0x30 => CpuOpcode::JR,
|
||||
0x38 => CpuOpcode::JR,
|
||||
0xCD => CpuOpcode::CALL,
|
||||
0xC4 => CpuOpcode::CALL,
|
||||
0xCC => CpuOpcode::CALL,
|
||||
0xD4 => CpuOpcode::CALL,
|
||||
0xDC => CpuOpcode::CALL,
|
||||
0xC7 => CpuOpcode::RST,
|
||||
0xCF => CpuOpcode::RST,
|
||||
0xD7 => CpuOpcode::RST,
|
||||
0xDF => CpuOpcode::RST,
|
||||
0xE7 => CpuOpcode::RST,
|
||||
0xEF => CpuOpcode::RST,
|
||||
0xF7 => CpuOpcode::RST,
|
||||
0xFF => CpuOpcode::RST,
|
||||
0xC9 => CpuOpcode::RET,
|
||||
0xC0 => CpuOpcode::RET,
|
||||
0xC8 => CpuOpcode::RET,
|
||||
0xD0 => CpuOpcode::RET,
|
||||
0xD8 => CpuOpcode::RET,
|
||||
0xC3 => CpuOpcode::JP(OpcodeParameter::U16(0)),
|
||||
0xC2 => CpuOpcode::JP(OpcodeParameter::FlagRegisterReset_U16(FlagRegister::Zero(true), 0)),
|
||||
0xCA => CpuOpcode::JP(OpcodeParameter::FlagRegisterSet_U16(FlagRegister::Zero(true), 0)),
|
||||
0xD2 => CpuOpcode::JP(OpcodeParameter::FlagRegisterReset_U16(FlagRegister::Carry(true), 0)),
|
||||
0xDA => CpuOpcode::JP(OpcodeParameter::FlagRegisterSet_U16(FlagRegister::Carry(true), 0)),
|
||||
0xE9 => CpuOpcode::JP(OpcodeParameter::Register(Register::HL(0))),
|
||||
0x18 => CpuOpcode::JR(OpcodeParameter::I8(0)),
|
||||
0x20 => CpuOpcode::JR(OpcodeParameter::FlagRegisterReset_I16(FlagRegister::Zero(true), 0)),
|
||||
0x28 => CpuOpcode::JR(OpcodeParameter::FlagRegisterSet_I16(FlagRegister::Zero(true), 0)),
|
||||
0x30 => CpuOpcode::JR(OpcodeParameter::FlagRegisterReset_U16(FlagRegister::Carry(true), 0)),
|
||||
0x38 => CpuOpcode::JR(OpcodeParameter::FlagRegisterSet_U16(FlagRegister::Carry(true), 0)),
|
||||
0xCD => CpuOpcode::CALL(OpcodeParameter::U16(0)),
|
||||
0xC4 => CpuOpcode::CALL(OpcodeParameter::FlagRegisterReset_U16(FlagRegister::Zero(true), 0)),
|
||||
0xCC => CpuOpcode::CALL(OpcodeParameter::FlagRegisterSet_U16(FlagRegister::Zero(true), 0)),
|
||||
0xD4 => CpuOpcode::CALL(OpcodeParameter::FlagRegisterReset_U16(FlagRegister::Carry(true), 0)),
|
||||
0xDC => CpuOpcode::CALL(OpcodeParameter::FlagRegisterSet_U16(FlagRegister::Carry(true), 0)),
|
||||
0xC7 => CpuOpcode::RST(0x0000),
|
||||
0xCF => CpuOpcode::RST(0x0008),
|
||||
0xD7 => CpuOpcode::RST(0x0010),
|
||||
0xDF => CpuOpcode::RST(0x0018),
|
||||
0xE7 => CpuOpcode::RST(0x0020),
|
||||
0xEF => CpuOpcode::RST(0x0028),
|
||||
0xF7 => CpuOpcode::RST(0x0030),
|
||||
0xFF => CpuOpcode::RST(0x0038),
|
||||
0xC9 => CpuOpcode::RET(OpcodeParameter::NoParam),
|
||||
0xC0 => CpuOpcode::RET(OpcodeParameter::FlagRegisterReset(FlagRegister::Zero(true))),
|
||||
0xC8 => CpuOpcode::RET(OpcodeParameter::FlagRegisterSet(FlagRegister::Zero(true))),
|
||||
0xD0 => CpuOpcode::RET(OpcodeParameter::FlagRegisterReset(FlagRegister::Carry(true))),
|
||||
0xD8 => CpuOpcode::RET(OpcodeParameter::FlagRegisterSet(FlagRegister::Carry(true))),
|
||||
0xD9 => CpuOpcode::RETI,
|
||||
0xF3 => CpuOpcode::DI,
|
||||
0xFB => CpuOpcode::EI,
|
||||
@ -483,17 +539,29 @@ mod tests {
|
||||
|
||||
// Test 16 bit setters and getters
|
||||
let mut registers = Registers::new();
|
||||
registers.set(Register::A(0b01010101));
|
||||
registers.set(Register::F(0b11111111));
|
||||
assert_eq!(registers.get(Register::AF(0)), 0b0101010111111111);
|
||||
registers.set(Register::AF(0b1111111101010101));
|
||||
assert_eq!(registers.get(Register::AF(0)), 0b1111111101010101);
|
||||
|
||||
registers.set(Register::B(0b01010101));
|
||||
registers.set(Register::C(0b11111111));
|
||||
assert_eq!(registers.get(Register::BC(0)), 0b0101010111111111);
|
||||
registers.set(Register::BC(0b1111111101010101));
|
||||
assert_eq!(registers.get(Register::BC(0)), 0b1111111101010101);
|
||||
|
||||
registers.set(Register::D(0b01010101));
|
||||
registers.set(Register::E(0b11111111));
|
||||
assert_eq!(registers.get(Register::DE(0)), 0b0101010111111111);
|
||||
registers.set(Register::DE(0b1111111101010101));
|
||||
assert_eq!(registers.get(Register::DE(0)), 0b1111111101010101);
|
||||
|
||||
registers.set(Register::H(0b01010101));
|
||||
registers.set(Register::L(0b11111111));
|
||||
assert_eq!(registers.get(Register::HL(0)), 0b0101010111111111);
|
||||
registers.set(Register::HL(0b1111111101010101));
|
||||
assert_eq!(registers.get(Register::HL(0)), 0b1111111101010101);
|
||||
|
||||
registers.set(Register::SP(0b0101010111111111));
|
||||
assert_eq!(registers.get(Register::SP(0)), 0b0101010111111111);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user