From d655442b9af35d64470edd9f31c393316ac5c516 Mon Sep 17 00:00:00 2001
From: Franco Colmenarez <info@francoacg.com>
Date: Fri, 22 Oct 2021 09:56:54 -0500
Subject: [PATCH] Prevent crashing on debug

---
 src/bus.rs | 4 ++--
 src/cpu.rs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bus.rs b/src/bus.rs
index 7414968..d4fc8ee 100644
--- a/src/bus.rs
+++ b/src/bus.rs
@@ -76,7 +76,7 @@ impl Bus {
     }
 
     pub fn read_16bit(&self, address: u16) -> u16 {
-        join_bytes(self.read(address + 1), self.read(address))
+        join_bytes(self.read(address.wrapping_add(1)), self.read(address))
     }
 
     pub fn write(&mut self, address: u16, data: u8) {
@@ -105,6 +105,6 @@ impl Bus {
     pub fn write_16bit(&mut self, address: u16, data: u16) {
         let bytes = data.to_le_bytes();
         self.write(address, bytes[0]);
-        self.write(address + 1, bytes[1]);
+        self.write(address.wrapping_add(1), bytes[1]);
     }
 }
diff --git a/src/cpu.rs b/src/cpu.rs
index 8fa7fa9..d0ce862 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -227,9 +227,9 @@ impl OpcodeParameterBytes {
     pub fn from_address(address: u16, bus: &Bus)-> OpcodeParameterBytes {
         OpcodeParameterBytes(
             bus.read(address),
-            bus.read(address + 1),
-            bus.read(address + 2),
-            bus.read(address + 3),
+            bus.read(address.wrapping_add(1)),
+            bus.read(address.wrapping_add(2)),
+            bus.read(address.wrapping_add(3)),
         )
     }
 
@@ -872,7 +872,7 @@ impl CPU {
         // self.log(parameter_bytes);
         self.increment_cycles(cycles);
         self.exec(opcode, bus);
-        self.increment_exec_calls_count();
+        // self.increment_exec_calls_count();
     }
 
     pub fn exec(&mut self, opcode: Opcode, bus: &mut Bus) {