FranLMSP/rmg-001
1
0
Fork 0
mirror of https://github.com/FranLMSP/rmg-001.git synced 2024-11-23 10:12:11 +00:00
Code Issues Projects Releases Wiki Activity

Bug on LD instruction

Browse Source
This commit is contained in:
Franco Colmenarez 2021-10-17 12:29:02 -05:00
parent e1d29d9530
commit ebadad803b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bus.rs
View File

@ -48,7 +48,7 @@ impl Bus {
_ => ROM::from_bytes(&[0; 0xFFFF]) _ => ROM::from_bytes(&[0; 0xFFFF])
}; };
Self { Self {
data: [0; 0x10000], data: [0xFF; 0x10000],
game_rom, game_rom,
} }
} }
@ -73,6 +73,9 @@ impl Bus {
pub fn write(&mut self, address: u16, data: u8) { pub fn write(&mut self, address: u16, data: u8) {
match MemoryMap::get_map(address) { match MemoryMap::get_map(address) {
MemoryMap::BankZero | MemoryMap::BankSwitchable => {
// println!("WRITING TO ROM");
},
MemoryMap::WorkRAM1 | MemoryMap::WorkRAM2 => { MemoryMap::WorkRAM1 | MemoryMap::WorkRAM2 => {
self.data[address as usize] = data; self.data[address as usize] = data;
// Copy to the ECHO RAM // Copy to the ECHO RAM
@ -82,8 +85,7 @@ impl Bus {
}, },
MemoryMap::EchoRAM => { MemoryMap::EchoRAM => {
self.data[address as usize] = data; self.data[address as usize] = data;
// Copy to the working RAM self.data[(0xC000 + (address - 0xE000)) as usize] = data; // Copy to the working RAM
self.data[(0xC000 + (address - 0xE000)) as usize] = data;
}, },
_ => self.data[address as usize] = data, _ => self.data[address as usize] = data,
}; };

13
src/cpu.rs
View File

@ -328,7 +328,10 @@ impl CPU {
self.registers.increment(Register::PC, 1); self.registers.increment(Register::PC, 1);
}, },
OpcodeParameter::Register_U16(register, val) => { OpcodeParameter::Register_U16(register, val) => {
self.registers.set(register, val); match register.is_8bit() {
true => self.registers.set(register, bus.read(val) as u16),
false => self.registers.set(register, val),
};
self.registers.increment(Register::PC, 3); self.registers.increment(Register::PC, 3);
}, },
OpcodeParameter::Register_U8(register, val) => { OpcodeParameter::Register_U8(register, val) => {
@ -942,6 +945,14 @@ mod tests {
assert_eq!(cpu.registers.get(Register::SP), 0xF1F1); assert_eq!(cpu.registers.get(Register::SP), 0xF1F1);
assert_eq!(cpu.registers.get(Register::PC), 0x103); assert_eq!(cpu.registers.get(Register::PC), 0x103);
let mut cpu = CPU::new();
let mut bus = Bus::new();
let addr = 0xC000;
bus.write(addr, 0xF1);
cpu.exec(Opcode::LD(OpcodeParameter::Register_U16(Register::A, addr)), &mut bus);
assert_eq!(cpu.registers.get(Register::A), 0xF1);
assert_eq!(cpu.registers.get(Register::PC), 0x103);
let mut cpu = CPU::new(); let mut cpu = CPU::new();
let mut bus = Bus::new(); let mut bus = Bus::new();
cpu.exec(Opcode::LD(OpcodeParameter::Register_U8(Register::B, 0xF1)), &mut bus); cpu.exec(Opcode::LD(OpcodeParameter::Register_U8(Register::B, 0xF1)), &mut bus);