paoda/gb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: add more debug tools to gui

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2021-12-09 05:21:05 -04:00
parent bbcbbd8ce3
commit e72b11f946
7 changed files with 172 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cpu.rs
View File

@@ -73,15 +73,12 @@ impl Cpu {
///
/// If opcode == 0xCB, then decoding costs 4 cycles.
/// Otherwise, decoding is free
pub(crate) fn decode(&mut self, mut opcode: u8) -> Instruction {
let instr = if opcode == 0xCB {
opcode = self.fetch();
Instruction::decode(opcode, true)
pub(crate) fn decode(&mut self, opcode: u8) -> Instruction {
if opcode == 0xCB {
Instruction::decode(self.fetch(), true)
} else {
Instruction::decode(opcode, false)
};
instr.unwrap_or_else(|| panic!("{:#04X} is an invalid instruction", opcode))
}
}
/// Execute an [Instruction].
@@ -366,15 +363,12 @@ impl Cpu {
}
fn _dbg_instr(&self) -> Instruction {
let mut byte = self.read_byte(self.reg.pc);
let instr = if byte == 0xCB {
byte = self.read_byte(self.reg.pc + 1);
Instruction::decode(byte, true)
let byte = self.read_byte(self.reg.pc);
if byte == 0xCB {
Instruction::decode(self.read_byte(self.reg.pc + 1), true)
} else {
Instruction::decode(byte, false)
};
instr.unwrap_or_else(|| panic!("{:#04X} is an invalid instruction", byte))
}
}
}