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

chore(ppu): emu now properly handles VRAM and OAM write guards

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2021-06-09 22:02:39 -05:00
parent 2b7958f5f3
commit 17024c439a
2 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bus.rs
View File

@@ -1,6 +1,5 @@
use crate::cartridge::Cartridge;
use crate::high_ram::HighRam;
use crate::instruction::Cycle;
use crate::interrupt::{Interrupt, InterruptFlag};
use crate::joypad::Joypad;
use crate::ppu::{Ppu, PpuMode};
@@ -159,7 +158,7 @@ impl BusIo for Bus {
0x8000..=0x9FFF => {
// 8KB Video RAM
match self.ppu.stat.mode() {
PpuMode::VBlank => 0xFF,
PpuMode::Drawing => 0xFF,
_ => self.ppu.read_byte(addr),
}
}
@@ -266,14 +265,10 @@ impl BusIo for Bus {
}
0x8000..=0x9FFF => {
// 8KB Video RAM
// TODO: Fix timing issues in the PPU
// match self.ppu.stat.mode() {
// PpuMode::VBlank => {}
// _ => self.ppu.write_byte(addr, byte),
// }
self.ppu.write_byte(addr, byte)
match self.ppu.stat.mode() {
PpuMode::Drawing => {}
_ => self.ppu.write_byte(addr, byte),
}
}
0xA000..=0xBFFF => {
// 8KB External RAM
@@ -365,7 +360,7 @@ impl BusIo for Bus {
self.boot = None;
}
}
_ => {} // unimplemented!("Unable to write to {:#06X} in I/O Registers", addr),
_ => unimplemented!("Unable to write to {:#06X} in I/O Registers", addr),
};
}
0xFF80..=0xFFFE => {