Fix unit tests

fpt-cli/src/main.rs

@@ -96,7 +96,7 @@ fn debug(args: Run) -> Result<()> {
                         if gameboy.paused() {
                             break;
                         }
-                        gameboy.instruction();
+                        gameboy.step();
                     }
                 }
             }
@@ -151,7 +151,7 @@ fn run(gb_config: GameboyConfig, args: Run) -> Result<()> {
         if args.debug.unwrap_or(false) {
             println!("{:#02X}: {:?}", gameboy.cpu().pc(), gameboy.cpu().decode());
         }
-        gameboy.instruction();
+        gameboy.step();
     }
 }
 

fpt/src/debugger.rs

@@ -10,7 +10,7 @@ pub struct Debugger {
 impl Debugger {
     pub fn new() -> Self {
         Self {
-            breakpoints: vec![Breakpoint::new(0, true)],
+            breakpoints: Vec::new(),
             watchpoints: Vec::new(),
             paused: false,
         }

fpt/src/lib.rs

@@ -111,14 +111,21 @@ impl Gameboy {
         &mut self.ppu
     }
 
-    pub fn instruction(&mut self) -> u32 {
+    pub fn step(&mut self) -> u32 {
         //let cycles = self.cpu.instruction() as u32;
         self.cpu.t_cycle();
         // TODO: care for double speed mode (need to run half as much dots)
         self.ppu.step(1);
         1
     }
 
+    pub fn instruction(&mut self) -> u32 {
+        let cycles = self.cpu.instruction() as u32;
+        // TODO: care for double speed mode (need to run half as much dots)
+        self.ppu.step(cycles);
+        cycles 
+    }
+
     pub fn debug_cmd(&mut self, cmd: &DebugCmd) -> Option<DebugEvent> {
         self.cpu_mut().receive_command(cmd)
     }