From b3e6baaa3f7b2a13209b413609296aa01bc00965 Mon Sep 17 00:00:00 2001 From: Franco Colmenarez Date: Mon, 11 Oct 2021 11:39:13 -0500 Subject: [PATCH] Getters and setters for registers --- src/cpu.rs | 98 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 86 insertions(+), 12 deletions(-) diff --git a/src/cpu.rs b/src/cpu.rs index fa3ec37..121c44b 100644 --- a/src/cpu.rs +++ b/src/cpu.rs @@ -1,26 +1,100 @@ pub enum Register { - A(u8), - B(u8), + A(u8), // Accumulator + F(u8), // Flags + B(u8), C(u8), D(u8), E(u8), - F(u8), H(u8), L(u8), + // This registers are just the same as above but combined to get a 16 bits register + BC(u16), + DE(u16), + HL(u16), + SP(u16), PC(u16), } pub struct Registers { - a: Register, - b: Register, - c: Register, - d: Register, - e: Register, - f: Register, - h: Register, - sp: Register, - pc: Register, + a: u8, + f: u8, + b: u8, + c: u8, + d: u8, + e: u8, + h: u8, + l: u8, + sp: u16, + pc: u16, +} + +impl Registers { + pub fn get(&self, register: Register) -> u16 { + match register { + Register::A(_) => self.a as u16, + Register::B(_) => self.b as u16, + Register::C(_) => self.c as u16, + Register::D(_) => self.d as u16, + Register::E(_) => self.e as u16, + Register::F(_) => self.f as u16, + Register::H(_) => self.h as u16, + Register::L(_) => self.l as u16, + Register::BC(_) => self.get_bc(), + Register::DE(_) => self.get_de(), + Register::HL(_) => self.get_hl(), + Register::SP(_) => self.sp, + Register::PC(_) => self.pc, + } + } + + pub fn set(&mut self, register: Register) { + match register { + Register::A(val) => self.a = val, + Register::B(val) => self.b = val, + Register::C(val) => self.c = val, + Register::D(val) => self.d = val, + Register::E(val) => self.e = val, + Register::F(val) => self.f = val, + Register::H(val) => self.h = val, + Register::L(val) => self.l = val, + Register::BC(val) => self.set_bc(val), + Register::DE(val) => self.set_de(val), + Register::HL(val) => self.set_hl(val), + Register::SP(val) => self.sp = val, + Register::PC(val) => self.pc = val, + } + } + + fn get_bc(&self) -> u16 { + ((self.b as u16) << 8) | (self.c as u16) + } + + fn get_de(&self) -> u16 { + ((self.d as u16) << 8) | (self.e as u16) + } + + fn get_hl(&self) -> u16 { + ((self.h as u16) << 8) | (self.l as u16) + } + + fn set_bc(&mut self, val: u16) { + let bytes = val.to_be_bytes(); + self.b = bytes[0]; + self.c = bytes[1]; + } + + fn set_de(&mut self, val: u16) { + let bytes = val.to_be_bytes(); + self.d = bytes[0]; + self.e = bytes[1]; + } + + fn set_hl(&mut self, val: u16) { + let bytes = val.to_be_bytes(); + self.h = bytes[0]; + self.l = bytes[1]; + } } pub struct CPU {