Skip to content
Snippets Groups Projects
Verified Commit c75ce04f authored by João Magalhães's avatar João Magalhães :rocket:
Browse files

feat: moved hram to ppu

parent 09b0dd5d
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,6 @@ pub const BIOS_SIZE: usize = 256; ...@@ -4,7 +4,6 @@ pub const BIOS_SIZE: usize = 256;
pub const ROM_SIZE: usize = 32768; pub const ROM_SIZE: usize = 32768;
pub const RAM_SIZE: usize = 8192; pub const RAM_SIZE: usize = 8192;
pub const ERAM_SIZE: usize = 8192; pub const ERAM_SIZE: usize = 8192;
pub const HRAM_SIZE: usize = 128;
pub struct Mmu { pub struct Mmu {
ppu: Ppu, ppu: Ppu,
...@@ -13,7 +12,6 @@ pub struct Mmu { ...@@ -13,7 +12,6 @@ pub struct Mmu {
rom: [u8; ROM_SIZE], rom: [u8; ROM_SIZE],
ram: [u8; RAM_SIZE], ram: [u8; RAM_SIZE],
eram: [u8; RAM_SIZE], eram: [u8; RAM_SIZE],
hram: [u8; HRAM_SIZE],
} }
impl Mmu { impl Mmu {
...@@ -25,7 +23,6 @@ impl Mmu { ...@@ -25,7 +23,6 @@ impl Mmu {
rom: [0u8; ROM_SIZE], rom: [0u8; ROM_SIZE],
ram: [0u8; RAM_SIZE], ram: [0u8; RAM_SIZE],
eram: [0u8; ERAM_SIZE], eram: [0u8; ERAM_SIZE],
hram: [0u8; HRAM_SIZE],
} }
} }
...@@ -81,7 +78,7 @@ impl Mmu { ...@@ -81,7 +78,7 @@ impl Mmu {
} }
0xf00 => { 0xf00 => {
if addr >= 0xff80 { if addr >= 0xff80 {
self.hram[(addr & 0x7f) as usize] self.ppu.hram[(addr & 0x7f) as usize]
} else { } else {
println!("WRITING TO IO control"); println!("WRITING TO IO control");
0x00 0x00
...@@ -137,7 +134,7 @@ impl Mmu { ...@@ -137,7 +134,7 @@ impl Mmu {
} }
0xf00 => { 0xf00 => {
if addr >= 0xff80 { if addr >= 0xff80 {
self.hram[(addr & 0x7f) as usize] = value; self.ppu.hram[(addr & 0x7f) as usize] = value;
} else { } else {
println!("WRITING TO IO control"); println!("WRITING TO IO control");
} }
......
pub const VRAM_SIZE: usize = 8192; pub const VRAM_SIZE: usize = 8192;
pub const HRAM_SIZE: usize = 128;
pub struct Ppu { pub struct Ppu {
pub vram: [u8; VRAM_SIZE], pub vram: [u8; VRAM_SIZE],
pub hram: [u8; HRAM_SIZE],
} }
impl Ppu { impl Ppu {
pub fn new() -> Ppu { pub fn new() -> Ppu {
Ppu { Ppu {
vram: [0u8; VRAM_SIZE], vram: [0u8; VRAM_SIZE],
hram: [0u8; HRAM_SIZE],
} }
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment