ignore stop instructions and can now pass cpu_instrs test rom 100%

jonathanballs · Sep 17, 2024 · 486331c · 486331c
1 parent 08d5daf
commit 486331c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/cpu/mod.rs b/src/cpu/mod.rs
@@ -128,7 +128,12 @@ impl CPU {
                     self.ime = true;
                 }
             }
-            Instruction::Halt => length = 0,
+            Instruction::Halt => {
+                if mmu.ie & mmu.read_byte(0xFF0F) == 0 {
+                    length = 0
+                }
+            }
+            Instruction::Stop => {}
 
             // Unhandled instructions
             _ => {
@@ -151,7 +156,7 @@ impl CPU {
         mmu.timer.do_cycles(cycles);
 
         // Handle interrupts
-        if (self.ime && !just_set_ei) || matches!(instruction, Instruction::Halt) {
+        if self.ime && !just_set_ei {
             let return_pc = if matches!(instruction, Instruction::Halt) {
                 self.registers.pc + 1
             } else {