From 6bc8fc27c0072c57237eac1d745088c1e28e3b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Sun, 3 Jul 2022 05:51:37 +0100
Subject: [PATCH] feat: better format
---
src/mmu.rs | 56 ++++++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/mmu.rs b/src/mmu.rs
index 07b12d51..13e8a564 100644
--- a/src/mmu.rs
+++ b/src/mmu.rs
@@ -80,7 +80,7 @@ impl Mmu {
0x00 => {
println!("Reading from Game Pad control 0x{:04x}", addr);
0x00
- },
+ }
_ => {
println!("Reading from unknown IO control 0x{:04x}", addr);
0x00
@@ -129,39 +129,41 @@ impl Mmu {
self.ram[(addr & 0x1fff) as usize] = value;
}
// Working RAM Shadow, I/O, Zero-page RAM
- 0xf000 => match addr & 0x0f00 {
- 0x000 | 0x100 | 0x200 | 0x300 | 0x400 | 0x500 | 0x600 | 0x700 | 0x800 | 0x900
- | 0xa00 | 0xb00 | 0xc00 | 0xd00 => {
- self.ram[(addr & 0x1fff) as usize] = value;
- }
- 0xe00 => {
- println!("Writing to PPU OAM at 0x{:04x}", addr);
- }
- 0xf00 => {
- if addr >= 0xff80 {
- self.ppu.hram[(addr & 0x007f) as usize] = value;
- } else {
- match addr & 0x00f0 {
- 0x40 | 0x60 | 0x70 => {
- self.ppu.write(addr, value);
- }
- 0x00 => {
- println!("Writing to Game Pad, timer, etc. control 0x{:04x} := 0x{:02x}", addr, value);
- },
- 0x50 => match addr & 0x00ff {
- 0x50 => self.boot_active = false,
+ 0xf000 => {
+ match addr & 0x0f00 {
+ 0x000 | 0x100 | 0x200 | 0x300 | 0x400 | 0x500 | 0x600 | 0x700 | 0x800
+ | 0x900 | 0xa00 | 0xb00 | 0xc00 | 0xd00 => {
+ self.ram[(addr & 0x1fff) as usize] = value;
+ }
+ 0xe00 => {
+ println!("Writing to PPU OAM at 0x{:04x}", addr);
+ }
+ 0xf00 => {
+ if addr >= 0xff80 {
+ self.ppu.hram[(addr & 0x007f) as usize] = value;
+ } else {
+ match addr & 0x00f0 {
+ 0x40 | 0x60 | 0x70 => {
+ self.ppu.write(addr, value);
+ }
+ 0x00 => {
+ println!("Writing to Game Pad, timer, etc. control 0x{:04x} := 0x{:02x}", addr, value);
+ }
+ 0x50 => match addr & 0x00ff {
+ 0x50 => self.boot_active = false,
+ _ => {
+ println!("Writing to unknown IO control 0x{:04x}", addr);
+ }
+ },
_ => {
println!("Writing to unknown IO control 0x{:04x}", addr);
}
- },
- _ => {
- println!("Writing to unknown IO control 0x{:04x}", addr);
}
}
}
+ addr => panic!("Writing in unknown location 0x{:04x}", addr),
}
- addr => panic!("Writing in unknown location 0x{:04x}", addr),
- },
+ }
addr => panic!("Writing in unknown location 0x{:04x}", addr),
}
}
--
GitLab