From 0edff96acccceb102fd97a9200f5504200d5fa50 Mon Sep 17 00:00:00 2001 From: Determinant Date: Sat, 11 Nov 2017 20:05:49 -0500 Subject: ... --- src/main.rs | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 4a963b6..447fa85 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,20 +4,24 @@ mod mos6502; mod ppu; mod cartridge; mod mapper; -fn main() { - /* - let code = [0xa9, 0x01, 0x8d, 0x00, 0x02, 0xa9, 0x05, 0x8d, 0x01, 0x02, 0xa9, 0x08, 0x8d, 0x02, 0x02 ]; - let code2 = [0xa9, 0x03, 0x4c, 0x08, 0x06, 0x00, 0x00, 0x00, 0x8d, 0x00, 0x02 ]; - let dasm = mos6502::disasm::Disassembler::new(code2.iter()); - for l in dasm { - println!("{}", l); +use core::ptr::null_mut; + +struct Window { +} + +impl ppu::Screen for Window { + fn put(&mut self, x: u8, y: u8, color: u8) { + println!("put color 0x{:02x} at ({}, {})", color, x, y); + } + fn render(&self) { + println!("a frame has been redrawn"); } - let a = 0x03; - let b = 0x4c; - let c = 0x08; - let d = 0x06; - println!("{}", disasm::parse(code2[0], &[a, b, c, d])); - */ - let mut mem = memory::CPUMemory::new(); +} + +fn main() { + //let mut ppu = ppu::PPU::new( + let mut cart = cartridge::Cartridge::new(); + let mut mapper = mapper::Mapper2::new(&mut cart); + let mut mem = memory::CPUMemory::new(null_mut(), null_mut(), &mut mapper); let cpu = mos6502::CPU::new(&mut mem); } -- cgit v1.2.3