paoda
/
gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: Implement imm byte versions of alu opcodes

This commit is contained in:
Rekai Nyangadzayi Musuka 2020-09-07 20:50:33 -05:00
parent 70a959fa32
commit f193132c5e
1 changed files with 84 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/instruction.rs
View File

@ -293,7 +293,16 @@ impl Instruction {
cpu.set_register_pair(RegisterPair::SP, sum); cpu.set_register_pair(RegisterPair::SP, sum);
Cycles(16) Cycles(16)
} }
_ => unimplemented!(), (MATHTarget::Register(InstrRegister::A), MATHTarget::ImmediateByte(n)) => {
// ADD A, n | Add n to register A
let mut flags: Flags = cpu.register(Register::Flag).into();
let sum = Self::add_u8s(cpu.register(Register::A), n, &mut flags);
cpu.set_register(Register::A, sum);
cpu.set_register(Register::Flag, flags.into());
Cycles(8)
}
_ => unreachable!(),
}, },
Instruction::INC(Registers::Word(pair)) => { Instruction::INC(Registers::Word(pair)) => {
// INC rp[p] | Increment Register Pair // INC rp[p] | Increment Register Pair
@ -512,7 +521,16 @@ impl Instruction {
cpu.set_register(Register::A, sum); cpu.set_register(Register::A, sum);
cycles cycles
} }
_ => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let value = n + (flags.c as u8);
let sum = Self::add_u8s(cpu.register(Register::A), value, &mut flags);
cpu.set_register(Register::Flag, flags.into());
cpu.set_register(Register::A, sum);
Cycles(8)
}
_ => unreachable!(),
}, },
Instruction::SUB(target) => match target { Instruction::SUB(target) => match target {
MATHTarget::Register(reg) => { MATHTarget::Register(reg) => {
@ -546,7 +564,14 @@ impl Instruction {
cpu.set_register(Register::A, diff); cpu.set_register(Register::A, diff);
cycles cycles
} }
MATHTarget::ImmediateByte(byte) => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let diff = Self::sub_u8s(cpu.register(Register::A), n, &mut flags);
cpu.set_register(Register::Flag, flags.into());
cpu.set_register(Register::A, diff);
Cycles(8)
}
_ => unreachable!(), _ => unreachable!(),
}, },
Instruction::SBC(target) => match target { Instruction::SBC(target) => match target {
@ -583,7 +608,16 @@ impl Instruction {
cpu.set_register(Register::Flag, flags.into()); cpu.set_register(Register::Flag, flags.into());
cycles cycles
} }
_ => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let value = n + (flags.c as u8);
let diff = Self::sub_u8s(cpu.register(Register::A), value, &mut flags);
cpu.set_register(Register::Flag, flags.into());
cpu.set_register(Register::A, diff);
Cycles(8)
}
_ => unreachable!(),
}, },
Instruction::AND(target) => match target { Instruction::AND(target) => match target {
MATHTarget::Register(reg) => { MATHTarget::Register(reg) => {
@ -622,7 +656,19 @@ impl Instruction {
cpu.set_register(Register::A, result); cpu.set_register(Register::A, result);
cycles cycles
} }
MATHTarget::ImmediateByte(byte) => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let result = cpu.register(Register::A) & n;
flags.z = result == 0;
flags.n = false;
flags.h = true;
flags.c = false;
cpu.set_register(Register::Flag, flags.into());
cpu.set_register(Register::A, result);
Cycles(8)
}
_ => unreachable!(), _ => unreachable!(),
}, },
Instruction::XOR(target) => match target { Instruction::XOR(target) => match target {
@ -662,7 +708,19 @@ impl Instruction {
cpu.set_register(Register::A, result); cpu.set_register(Register::A, result);
cycles cycles
} }
MATHTarget::ImmediateByte(byte) => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let result = cpu.register(Register::A) ^ n;
flags.z = result == 0;
flags.n = false;
flags.h = false;
flags.c = false;
cpu.set_register(Register::Flag, flags.into());
cpu.set_register(Register::A, result);
Cycles(8)
}
_ => unreachable!(), _ => unreachable!(),
}, },
Instruction::OR(target) => match target { Instruction::OR(target) => match target {
@ -702,7 +760,19 @@ impl Instruction {
cpu.set_register(Register::A, result); cpu.set_register(Register::A, result);
cycles cycles
} }
MATHTarget::ImmediateByte(byte) => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let result = cpu.register(Register::A) | n;
flags.z = result == 0;
flags.n = false;
flags.h = false;
flags.c = false;
cpu.set_register(Register::Flag, flags.into());
cpu.set_register(Register::A, result);
Cycles(8)
}
_ => unreachable!(), _ => unreachable!(),
}, },
Instruction::CP(target) => match target { Instruction::CP(target) => match target {
@ -735,7 +805,13 @@ impl Instruction {
cpu.set_register(Register::Flag, flags.into()); cpu.set_register(Register::Flag, flags.into());
cycles cycles
} }
MATHTarget::ImmediateByte(byte) => unimplemented!(), MATHTarget::ImmediateByte(n) => {
let mut flags: Flags = cpu.register(Register::Flag).into();
let _ = Self::sub_u8s(cpu.register(Register::A), n, &mut flags);
cpu.set_register(Register::Flag, flags.into());
Cycles(8)
}
_ => unreachable!(), _ => unreachable!(),
}, },
Instruction::RET(cond) => { Instruction::RET(cond) => {