From 842e67080796670163862e1ac8cbebceb7f1c815 Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Tue, 19 Jan 2021 02:05:04 -0600
Subject: [PATCH] fix: replace MathTarget::HL and ::SP with already-existing
 enums

---
 src/cpu.rs         | 11 ++++++-----
 src/instruction.rs | 14 +++++---------
 src/main.rs        |  2 +-
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/cpu.rs b/src/cpu.rs
index 09cbbb7..37f94ba 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -74,12 +74,13 @@ impl Cpu {
     pub fn step(&mut self) -> Cycles {
         let opcode = self.fetch();
         let instr = self.decode(opcode);
-        let cycles = self.execute(instr);
 
-        // println!(
-        //     "Addr: {:#06X} | Opcode: {:#04X} | Instr: {:X?}",
-        //     self.reg.pc, opcode, instr
-        // );
+        println!(
+            "Addr: {:#06X} | Opcode: {:#04X} | Instr: {:X?}",
+            self.reg.pc, opcode, instr
+        );
+
+        let cycles = self.execute(instr);
 
         self.bus.step(cycles);
 
diff --git a/src/instruction.rs b/src/instruction.rs
index 00ce7ea..49f890e 100644
--- a/src/instruction.rs
+++ b/src/instruction.rs
@@ -63,8 +63,6 @@ pub enum Registers {
 
 #[derive(Copy, Clone)]
 pub enum MATHTarget {
-    HL,
-    SP,
     Register(InstrRegister),
     RegisterPair(RegisterPair),
     ImmediateByte(u8),
@@ -1649,11 +1647,11 @@ impl Instruction {
 
     fn from_unprefixed_byte(cpu: &mut Cpu, opcode: u8) -> Self {
         // https://gb-archive.github.io/salvage/decoding_gbz80_opcodes/Decoding%20Gamboy%20Z80%20Opcodes.html
-        let x = (opcode >> 6) & 0b00000011;
-        let y = (opcode >> 3) & 0b00000111;
-        let z = opcode & 0b00000111;
+        let x = (opcode >> 6) & 0x03;
+        let y = (opcode >> 3) & 0x07;
+        let z = opcode & 0x07;
         let p = y >> 1;
-        let q = y & 0b00000001;
+        let q = y & 0x01;
 
         let pc = cpu.register_pair(RegisterPair::PC);
 
@@ -1674,7 +1672,7 @@ impl Instruction {
             ),
             (0, 1, 1, _, _) => Self::ADD(
                 // ADD HL, rp[p]
-                MATHTarget::HL,
+                MATHTarget::RegisterPair(RegisterPair::HL),
                 MATHTarget::RegisterPair(Table::rp(p)),
             ),
             (0, 2, 0, _, 0) => Self::LD(
@@ -2053,8 +2051,6 @@ impl std::fmt::Debug for LDTarget {
 impl std::fmt::Debug for MATHTarget {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match *self {
-            MATHTarget::HL => f.write_str("HL"),
-            MATHTarget::SP => f.write_str("SP"),
             MATHTarget::Register(reg) => write!(f, "{:?}", reg),
             MATHTarget::RegisterPair(pair) => write!(f, "{:?}", pair),
             MATHTarget::ImmediateByte(byte) => write!(f, "{:#04X}", byte),
diff --git a/src/main.rs b/src/main.rs
index e31cd8a..1f2d22a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,7 @@ fn main() -> Result<()> {
     let mut input = WinitInputHelper::new();
     let window = create_window(&event_loop)?;
     let mut pixels = create_pixels(&window)?;
-    let mut game_boy = LR35902::boot_new();
+    let mut game_boy = LR35902::new();
     game_boy.load_cartridge("bin/cpu_instrs.gb");
 
     event_loop.run(move |event, _, control_flow| {