aboutsummaryrefslogtreecommitdiff
path: root/src/memory.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/memory.rs')
-rw-r--r--src/memory.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/memory.rs b/src/memory.rs
index 99a6bae..8954c91 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -45,16 +45,16 @@ impl<'a> CPUBus<'a> {
let cpu = self.get_cpu();
let ppu = self.get_ppu();
let apu = self.get_apu();
- if ppu.tick(self) || ppu.tick(self) || ppu.tick(self) {
- cpu.trigger_nmi()
- }
+ cpu.tick();
if apu.tick(self) {
cpu.trigger_irq()
}
+ if ppu.tick(self) || ppu.tick(self) || ppu.tick(self) {
+ cpu.trigger_nmi()
+ }
if let (true, _) = self.ppu_sampler.borrow_mut().tick() {
ppu.scr.frame()
}
- cpu.tick();
}
}