added ppu

src/main.rs

@@ -43,6 +43,7 @@ fn main() {
             }
         }
 
+        nes.single_frame();
         unsafe { context::clear(); }
 
         window.swap_buffers();

src/nes/bus.rs

@@ -2,11 +2,13 @@ use std::cell::RefCell;
 use std::rc::{Rc, Weak};
 
 use crate::nes::cpu::CPU;
+use crate::nes::ppu::PPU;
 use crate::nes::cartridge::Cartridge;
 
 pub struct Bus
 {
 	cpu: Weak<RefCell<CPU>>,
+	ppu: Weak<RefCell<PPU>>,
 	cartridge: Cartridge,
 
 	ram: Vec<u8>
@@ -19,6 +21,7 @@ impl Bus
 		Bus 
 		{
 			cpu: Weak::new(),
+			ppu: Weak::new(),
 			cartridge: Cartridge::new("roms/nestest.nes"),
 			ram: vec![0; 0x800]
 		}
@@ -29,6 +32,11 @@ impl Bus
 		self.cpu = Rc::downgrade(cpu);
 	}
 
+	pub fn attach_ppu(&mut self, ppu: &Rc<RefCell<PPU>>)
+	{	
+		self.ppu = Rc::downgrade(ppu);
+	}
+
 	pub fn read_cpu(&self, addr: u16) -> u8 
 	{
 		match addr
@@ -36,7 +44,7 @@ impl Bus
 			0..=0x1FFF 		=> self.ram[(addr & 0x7FF) as usize],
 			0x8000..=0xFFFF => self.cartridge.read_prg(addr & 0x7FFF),
 
-			_ => panic!("Tried to access invalid memory address {}", addr)
+			_ => panic!("Tried to access invalid memory address ${:04X}", addr)
 		}
 	}
 
@@ -47,7 +55,7 @@ impl Bus
 			0..=0x1FFF 		=> self.ram[(addr & 0x7FF) as usize] = val,
 			0x8000..=0xFFFF => self.cartridge.write_prg(addr & 0x7FFF, val),
 
-			_ => panic!("Tried to access invalid memory address {}", addr)
+			_ => panic!("Tried to access invalid memory address ${:04X}", addr)
 		}
 	}
 }

src/nes/cpu.rs

@@ -71,19 +71,25 @@ impl CPU
 		self.pc = 0xC000;
 	}
 
-	pub fn cycle(&mut self)
+	pub fn cycle(&mut self) -> bool
 	{
 		self.total_cycles += 1;
 
 		if self.cycle > 0
 		{
 			self.cycle -= 1;
-			return;
+			return false;
 		}
 
 		self.execute();
 
 		self.cycle -= 1;
+		true
+	}
+
+	pub fn sync(&self) -> bool
+	{
+		self.cycle == 0
 	}
 
 	fn execute(&mut self)
@@ -115,7 +121,7 @@ impl CPU
 		self.cycle += instr.cycles + self.additional_cycles;
 		self.additional_cycles = 0;
 
-		println!("A:{:02X} X:{:02X} Y:{:02X} P:{:02X} SP:{:02X} CYC:{}", self.acc, self.x, self.y, self.p, self.sp, self.total_cycles);
+		print!("A:{:02X} X:{:02X} Y:{:02X} P:{:02X} SP:{:02X} CYC:{} ", self.acc, self.x, self.y, self.p, self.sp, self.total_cycles);
 	}
 
 }

src/nes/mod.rs

@@ -1,6 +1,7 @@
 pub mod nes;
 
 mod cpu;
+mod ppu;
 mod bus;
 mod addressing;
 mod instructions;

src/nes/nes.rs

@@ -2,11 +2,30 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use crate::nes::bus::Bus;
 use crate::nes::cpu::CPU;
+use crate::nes::ppu::PPU;
 
 pub struct NES
 {
 	bus: Rc<RefCell<Bus>>,
-	cpu: Rc<RefCell<CPU>>
+	cpu: Rc<RefCell<CPU>>,
+	ppu: Rc<RefCell<PPU>>
+}
+
+macro_rules! clock 
+{
+	($cpu: ident, $ppu: ident) =>
+	{
+		let res = $cpu.cycle();
+
+		$ppu.dot();
+		$ppu.dot();
+		$ppu.dot();
+
+		if res {
+			let (x, y) = $ppu.current_dot();
+			println!("PPU:{: <3},{: <3}", y, x);
+		}
+	}
 }
 
 impl NES
@@ -15,13 +34,16 @@ impl NES
 	{
 		let bus: Rc<RefCell<Bus>> = Rc::new(RefCell::new(Bus::new()));
 		let cpu: Rc<RefCell<CPU>> = Rc::new(RefCell::new(CPU::new(&bus)));
+		let ppu: Rc<RefCell<PPU>> = Rc::new(RefCell::new(PPU::new(&bus)));
 
 		bus.borrow_mut().attach_cpu(&cpu);
+		bus.borrow_mut().attach_ppu(&ppu);
 
 		NES 
 		{
 			bus: bus,
-			cpu: cpu
+			cpu: cpu,
+			ppu: ppu
 		}
 	}
 
@@ -32,6 +54,31 @@ impl NES
 
 	pub fn clock(&self)
 	{
-		self.cpu.borrow_mut().cycle();
+		let mut cpu = self.cpu.borrow_mut();
+		let mut ppu = self.ppu.borrow_mut();
+
+		clock!(cpu, ppu);
+	}
+
+	pub fn single_step(&self)
+	{
+		let mut cpu = self.cpu.borrow_mut();
+		let mut ppu = self.ppu.borrow_mut();
+
+		while !cpu.sync() {
+			clock!(cpu, ppu);
+		}
+
+		clock!(cpu, ppu);
+	}
+
+	pub fn single_frame(&self)
+	{
+		let mut cpu = self.cpu.borrow_mut();
+		let mut ppu = self.ppu.borrow_mut();
+
+		while !ppu.sync() {
+			clock!(cpu, ppu);
+		}
 	}
 }

src/nes/ppu.rs

@@ -0,0 +1,55 @@
+use std::rc::{Rc, Weak};
+use std::cell::RefCell;
+use crate::nes::bus::Bus;
+
+pub struct PPU
+{
+	screen_x: u16,
+	screen_y: u16,
+	new_frame: bool,
+
+	bus: Weak<RefCell<Bus>>
+}
+
+impl PPU 
+{
+	pub fn new(bus: &Rc<RefCell<Bus>>) -> PPU 
+	{
+		PPU {
+			screen_x: 0,
+			screen_y: 0,
+			new_frame: false,
+
+			bus: Rc::downgrade(bus)
+		}
+	}
+
+	pub fn dot(&mut self)
+	{
+		self.screen_x += 1;
+
+		if self.screen_x > 340 {
+			self.screen_x = 0;
+			self.screen_y += 1;
+
+			if self.screen_y > 261 {
+				self.screen_y = 0;
+			}
+		}
+	}
+
+	pub fn sync(&mut self) -> bool
+	{
+		if self.new_frame {
+			self.new_frame = false;
+			return true;
+		}
+
+		false
+	}
+
+	pub fn current_dot(&self) -> (u16, u16)
+	{
+		(self.screen_x, self.screen_y)
+	}
+}