From c5abd45321670a0cabe327c7e244d3f8bb3e4624 Mon Sep 17 00:00:00 2001
From: OpenSauce <lawleycobhc@gmail.com>
Date: Mon, 10 Feb 2025 22:10:35 +0000
Subject: [PATCH 1/2] Expand on CPU slightly, add in some debugging

---
 src/emulator/cpu.rs | 43 +++++++++++++++++++++++++++++++++++++++----
 src/emulator/mod.rs |  4 ++--
 src/main.rs         |  2 +-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/emulator/cpu.rs b/src/emulator/cpu.rs
index 0364804..67d07a9 100644
--- a/src/emulator/cpu.rs
+++ b/src/emulator/cpu.rs
@@ -1,4 +1,6 @@
 use core::panic;
+use std::collections::HashMap;
+use std::fmt;
 
 use crate::emulator::flags::FlagsRegister;
 use crate::emulator::mmu::Mmu;
@@ -8,6 +10,9 @@ pub struct Cpu {
     registers: Registers,
     pc: u16,
     sp: u16,
+    success: i32,
+    fail: i32,
+    running: HashMap<Instruction, i32>,
 }
 
 impl Cpu {
@@ -16,18 +21,41 @@ impl Cpu {
             registers: Registers::new(),
             pc: 0x100,
             sp: 0xFFFE,
+            success: 0,
+            fail: 0,
+            running: HashMap::new(),
         }
     }
 
-    pub fn step(&mut self, mmu: &mut Mmu, _ppu: &mut Ppu) {
+    pub fn step(&mut self, looping: bool, mmu: &mut Mmu, _ppu: &mut Ppu) {
         let op_code = mmu.read_byte(self.pc);
-        self.pc = self.pc.wrapping_add(1);
+        if looping {
+            self.pc = self.pc.wrapping_add(1);
+        } else {
+            if self.pc == 0xFFFF {
+                println!("Running: {:?}", self.running);
+                println!("Success: {}, fail {}", self.success, self.fail);
+                return;
+            }
+            self.pc += 1;
+        }
 
         let instruction = match Instruction::from_byte(op_code) {
             Some(instruction) => instruction,
-            None => return,
+            None => {
+                println!("Unknown instruction: {:X}", op_code);
+                self.fail += 1;
+                return;
+            }
         };
 
+        self.success += 1;
+        println!("Executing instruction: {:?}", instruction);
+
+        self.running
+            .entry(instruction.clone())
+            .and_modify(|count| *count += 1)
+            .or_insert(1);
         self.execute_instruction(mmu, instruction);
     }
 
@@ -63,9 +91,12 @@ impl Cpu {
                     self.registers.a = new_value;
                 }
                 ArithmaticTarget::HL => {
-                    panic!("Add HL Not implemented");
+                    println!("Add HL Not implemented");
                 }
             },
+            Instruction::JPNZ() => {
+                println!("JPNZ Not implemented");
+            }
             Instruction::Nop() => (),
         }
     }
@@ -83,9 +114,11 @@ impl Cpu {
     }
 }
 
+#[derive(Debug, PartialEq, Hash, Eq, Clone)]
 enum Instruction {
     Add(ArithmaticTarget),
     Nop(),
+    JPNZ(),
 }
 
 impl Instruction {
@@ -100,11 +133,13 @@ impl Instruction {
             0x85 => Some(Instruction::Add(ArithmaticTarget::L)),
             0x86 => Some(Instruction::Add(ArithmaticTarget::HL)),
             0x87 => Some(Instruction::Add(ArithmaticTarget::A)),
+            0xC3 => Some(Instruction::JPNZ()),
             _ => None,
         }
     }
 }
 
+#[derive(Debug, PartialEq, Hash, Eq, Clone)]
 enum ArithmaticTarget {
     A,
     B,
diff --git a/src/emulator/mod.rs b/src/emulator/mod.rs
index c792edf..74b421b 100644
--- a/src/emulator/mod.rs
+++ b/src/emulator/mod.rs
@@ -37,9 +37,9 @@ impl Emulator {
         Ok(())
     }
 
-    pub fn run(&mut self) {
+    pub fn run(&mut self, looping: bool) {
         loop {
-            self.cpu.step(&mut self.mmu, &mut self.ppu);
+            self.cpu.step(looping, &mut self.mmu, &mut self.ppu);
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index a5de368..04c6787 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,6 +18,6 @@ fn main() -> Result<()> {
     let mut gameboy = emulator::Emulator::new();
     gameboy.load_rom(rom_path).context("Failed to load ROM")?;
 
-    gameboy.run();
+    gameboy.run(false);
     Ok(())
 }

From eb562a0c1a6eb91688b3aa5a648e203c72976104 Mon Sep 17 00:00:00 2001
From: OpenSauce <lawleycobhc@gmail.com>
Date: Mon, 10 Feb 2025 22:13:20 +0000
Subject: [PATCH 2/2] Please Clippy

---
 src/emulator/cpu.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/emulator/cpu.rs b/src/emulator/cpu.rs
index 67d07a9..56992a8 100644
--- a/src/emulator/cpu.rs
+++ b/src/emulator/cpu.rs
@@ -1,6 +1,4 @@
-use core::panic;
 use std::collections::HashMap;
-use std::fmt;
 
 use crate::emulator::flags::FlagsRegister;
 use crate::emulator::mmu::Mmu;
@@ -94,7 +92,7 @@ impl Cpu {
                     println!("Add HL Not implemented");
                 }
             },
-            Instruction::JPNZ() => {
+            Instruction::Jpnz() => {
                 println!("JPNZ Not implemented");
             }
             Instruction::Nop() => (),
@@ -118,7 +116,7 @@ impl Cpu {
 enum Instruction {
     Add(ArithmaticTarget),
     Nop(),
-    JPNZ(),
+    Jpnz(),
 }
 
 impl Instruction {
@@ -133,7 +131,7 @@ impl Instruction {
             0x85 => Some(Instruction::Add(ArithmaticTarget::L)),
             0x86 => Some(Instruction::Add(ArithmaticTarget::HL)),
             0x87 => Some(Instruction::Add(ArithmaticTarget::A)),
-            0xC3 => Some(Instruction::JPNZ()),
+            0xC3 => Some(Instruction::Jpnz()),
             _ => None,
         }
     }