From f35276072ce4b4822bd8d655fde3b2307cc54680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Sat, 2 Jul 2022 15:08:02 +0100
Subject: [PATCH] feat: new ignore on error I/O writing
---
.gitignore | 1 +
examples/sdl/src/main.rs | 2 +-
src/mmu.rs | 4 ++--
src/ppu.rs | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 70b5e2ae..4a77473d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ Cargo.lock
/.idea
/target
+/res/roms
/examples/*/target
diff --git a/examples/sdl/src/main.rs b/examples/sdl/src/main.rs
index 6aa5f707..8692010c 100644
--- a/examples/sdl/src/main.rs
+++ b/examples/sdl/src/main.rs
@@ -75,7 +75,7 @@ fn main() {
let mut game_boy = GameBoy::new();
game_boy.load_boot_default();
- game_boy.load_rom("C:/Users/joamag/Desktop/tetris.gb");
+ game_boy.load_rom("../../res/roms/tetris.gb");
let mut counter = 0;
diff --git a/src/mmu.rs b/src/mmu.rs
index a840ad23..f43396fd 100644
--- a/src/mmu.rs
+++ b/src/mmu.rs
@@ -64,7 +64,7 @@ impl Mmu {
0x000 | 0x100 | 0x200 | 0x300 | 0x400 | 0x500 | 0x600 | 0x700 | 0x800 | 0x900
| 0xa00 | 0xb00 | 0xc00 | 0xd00 => self.ram[(addr & 0x1fff) as usize],
0xe00 => {
- println!("READING FROM PPU OAM - NOT IMPLEMENTED");
+ println!("Reading from PPU OAM - NOT IMPLEMENTED");
0x00
}
0xf00 => {
@@ -126,7 +126,7 @@ impl Mmu {
self.ram[(addr & 0x1fff) as usize] = value;
}
0xe00 => {
- println!("WRITING TO PPU OAM");
+ println!("Writing to PPU OAM");
}
0xf00 => {
if addr >= 0xff80 {
diff --git a/src/ppu.rs b/src/ppu.rs
index f83abba0..16da0326 100644
--- a/src/ppu.rs
+++ b/src/ppu.rs
@@ -241,7 +241,8 @@ impl Ppu {
color_index => panic!("Invalid palette color index {:04x}", color_index),
}
}
- }
+ },
+ 0x007f => (),
addr => panic!("Writing in unknown PPU location 0x{:04x}", addr),
}
}
--
GitLab