From 613129a3ec66c90ab955161089203717c5f75c50 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Tue, 28 Nov 2023 17:06:28 -0500
Subject: [PATCH] ADC, SUB, SBC

---
 src/cpu.rs | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/cpu.rs b/src/cpu.rs
index 6a19182..e234568 100644
--- a/src/cpu.rs
+++ b/src/cpu.rs
@@ -92,11 +92,43 @@ impl CPU {
 
     fn alu_add(&mut self, x: u8) {
         let a = self.reg.a;
-        let x = a.wrapping_add(x);
-        self.reg.set_flag(Flags::C, u16::from(a) + u16::from(x) > 0xFF);
+        let r = a.wrapping_add(x);
+        self.reg.set_flag(Flags::C, u16::from(a) + u16::from(x) > u16::from(u8::max));
         self.reg.set_flag(Flags::H, (a & 0x0F) + (a & 0x0F) > 0x0F);
         self.reg.set_flag(Flags::N, false);
-        self.reg.set_flag(Flags::Z, x == 0x00);
-        self.reg.a = x;
+        self.reg.set_flag(Flags::Z, r == 0x00);
+        self.reg.a = r;
+    }
+
+    fn alu_adc(&mut self, x: u8) {
+        let a = self.reg.a;
+        let c = u8::from(self.reg.get_flag(Flags::C));
+        let r = a.wrapping_add(x).wrapping_add(c);
+        self.reg.set_flag(Flags::C, u16::from(a) + u16::from(x) + u16::from(c) > u16::from(u8::max));
+        self.reg.set_flag(Flags::H, (a & 0x0F) + (a & 0x0F)  + (c & 0x0F) > 0x0F);
+        self.reg.set_flag(Flags::N, false);
+        self.reg.set_flag(Flags::Z, r == 0x00);
+        self.reg.a = r;
+    }
+
+    fn alu_sub(&mut self, x: u8) {
+        let a = self.reg.a;
+        let r = a.wrapping_sub(x);
+        self.reg.set_flag(Flags::C, u16::from(a) < u16::from(x));
+        self.reg.set_flag(Flags::H, (a & 0xF) < (x & 0xF));
+        self.reg.set_flag(Flags::N, true);
+        self.reg.set_flag(Flags::Z, r == 0x00);
+        self.reg.a = r;
+    }
+
+    fn alu_sbc(&mut self, x: u8) {
+        let a = self.reg.a;
+        let c = u8::from(self.reg.get_flag(Flags::C));
+        let r = a.wrapping_sub(x).wrapping_sub(c);
+        self.reg.set_flag(Flags::C, u16::from(a) < u16::from(x) + u16::from(c));
+        self.reg.set_flag(Flags::H, (a & 0xF) < (x & 0xF) + c);
+        self.reg.set_flag(Flags::N, true);
+        self.reg.set_flag(Flags::Z, r == 0x00);
+        self.reg.a = r;
     }
 }
\ No newline at end of file