FranLMSP/rmg-001
1
0
Fork 0
mirror of https://github.com/FranLMSP/rmg-001.git synced 2024-09-20 18:20:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix some bugs and implement a way to compare the logs

Browse Source
This commit is contained in:
Franco Colmenarez 2021-10-16 14:17:28 -05:00
parent 15e3d6685b
commit f94314ad01
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/target /target
*.log

3
src/console.rs
View File

@ -24,7 +24,8 @@ impl Console {
while !exit { while !exit {
self.cpu.run(&mut self.bus); self.cpu.run(&mut self.bus);
thread::sleep(time::Duration::from_millis(500)); // thread::sleep(time::Duration::from_millis(100));
exit = self.cpu.get_exec_calls_count() > 1258895;
} }
} }
} }

14
src/cpu.rs
View File

@ -90,7 +90,7 @@ impl Registers {
a: 0x01, a: 0x01,
f: 0xB0, // The first 4 lower bits are always set to 0 f: 0xB0, // The first 4 lower bits are always set to 0
b: 0x00, b: 0x00,
c: 0x00, c: 0x13,
d: 0x00, d: 0x00,
e: 0xD8, e: 0xD8,
h: 0x01, h: 0x01,
@ -273,14 +273,15 @@ impl CPU {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
registers: Registers::new(), registers: Registers::new(),
exec_calls_count: 0,
} }
} }
pub fn get_exec_calls_count(&self) { pub fn get_exec_calls_count(&self) -> usize {
self.exec_calls_count self.exec_calls_count
} }
pub fn increment_exec_calls_count(&mut self) { fn increment_exec_calls_count(&mut self) {
self.exec_calls_count += 1; self.exec_calls_count += 1;
} }
@ -306,6 +307,7 @@ impl CPU {
parameter_bytes.3, parameter_bytes.3,
); );
self.exec(opcode, bus); self.exec(opcode, bus);
self.increment_exec_calls_count();
} }
pub fn exec(&mut self, opcode: Opcode, bus: &mut Bus) { pub fn exec(&mut self, opcode: Opcode, bus: &mut Bus) {
@ -346,6 +348,7 @@ impl CPU {
}, },
// Increment or decrement program counter by signed N // Increment or decrement program counter by signed N
Opcode::JR(params) => { Opcode::JR(params) => {
self.registers.increment(Register::PC, 2);
let mut condition_met = false; let mut condition_met = false;
let mut value = 0 as i16; let mut value = 0 as i16;
match params { match params {
@ -367,7 +370,6 @@ impl CPU {
let pc = (self.registers.get(Register::PC) as i16) + (value as i16); let pc = (self.registers.get(Register::PC) as i16) + (value as i16);
self.registers.set(Register::PC, pc as u16); self.registers.set(Register::PC, pc as u16);
} }
self.registers.increment(Register::PC, 2);
}, },
// Load and increment // Load and increment
Opcode::LDI(params) => match params { Opcode::LDI(params) => match params {
@ -560,8 +562,8 @@ impl CPU {
0x36 => Opcode::LD(OpcodeParameter::Register_U8(Register::HL, params.1)), 0x36 => Opcode::LD(OpcodeParameter::Register_U8(Register::HL, params.1)),
0x0A => Opcode::LD(OpcodeParameter::Register_Register(Register::A, Register::BC)), 0x0A => Opcode::LD(OpcodeParameter::Register_Register(Register::A, Register::BC)),
0x1A => Opcode::LD(OpcodeParameter::Register_Register(Register::A, Register::DE)), 0x1A => Opcode::LD(OpcodeParameter::Register_Register(Register::A, Register::DE)),
0xFA => Opcode::LD(OpcodeParameter::Register_U8(Register::A, params.1)), // Receives 16 bit value, but lower bit is ignored 0xFA => Opcode::LD(OpcodeParameter::Register_U16(Register::A, two_byte_param)), // Receives 16 bit value, but lower bit is ignored
0x3E => Opcode::LD(OpcodeParameter::Register_U16(Register::A, two_byte_param)), 0x3E => Opcode::LD(OpcodeParameter::Register_U8(Register::A, params.1)),
0xEA => Opcode::LD(OpcodeParameter::U16_Register(two_byte_param, Register::A)), 0xEA => Opcode::LD(OpcodeParameter::U16_Register(two_byte_param, Register::A)),
0xF2 => Opcode::LD(OpcodeParameter::Register_FF00plusRegister(Register::A, Register::C)), 0xF2 => Opcode::LD(OpcodeParameter::Register_FF00plusRegister(Register::A, Register::C)),
0xE2 => Opcode::LD(OpcodeParameter::FF00plusRegister_Register(Register::A, Register::C)), 0xE2 => Opcode::LD(OpcodeParameter::FF00plusRegister_Register(Register::A, Register::C)),