diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs index 118f584593fbe627c3b5ca2a4acecfcc8c18407e..77da12f84c8c8038630cbc2dc3c14140c9e95c33 100644 --- a/examples/sdl/src/main.rs +++ b/examples/sdl/src/main.rs @@ -6,7 +6,7 @@ fn main() { for _ in 0..40000 { game_boy.clock(); - if game_boy.cpu().pc() >= 0x0023 { + if game_boy.cpu().pc() >= 0x0032 { break; } } diff --git a/src/cpu.rs b/src/cpu.rs index 2433f1079da111305d99d30c1e09f5f29a7e60c3..439b378326d178198f58df6e9f6fecc9036951ee 100644 --- a/src/cpu.rs +++ b/src/cpu.rs @@ -31,7 +31,7 @@ pub const INSTRUCTIONS: [(fn(&mut Cpu), u8, &'static str); 256] = [ (nop, 4, "NOP"), (nop, 4, "NOP"), (nop, 4, "NOP"), - (nop, 4, "NOP"), + (ld_a_mde, 8, "LD A, [DE]"), (nop, 4, "NOP"), (nop, 4, "NOP"), (nop, 4, "NOP"), @@ -736,6 +736,11 @@ fn ld_de_u16(cpu: &mut Cpu) { cpu.set_de(word); } +fn ld_a_mde(cpu: &mut Cpu) { + let byte = cpu.mmu.read(cpu.de()); + cpu.a = byte; +} + fn jr_nz_i8(cpu: &mut Cpu) { let byte = cpu.read_u8() as i8;