call flushing from the cpu cleanup

src/cpu/mod.rs

@@ -14,4 +14,7 @@ pub trait Cpu {
 
   /// Execute a single instruction. Return the number of cycles elapsed.
   fn tick(&mut self) -> u8;
+
+  /// Clean up any resources used by this CPU.
+  fn cleanup(&mut self) -> Result<(), &str>;
 }

src/cpu/mos6502/mod.rs

@@ -2,7 +2,7 @@ mod execute;
 mod fetch;
 mod registers;
 use crate::memory::{ActiveInterrupt, Memory};
-use crate::trace::TraceHandler;
+use crate::trace::{CpuTrace, TraceHandler};
 use execute::Execute;
 use fetch::Fetch;
 use registers::{flags, Registers};
@@ -171,6 +171,14 @@ impl Cpu for Mos6502 {
   /// Execute a single instruction.
   fn tick(&mut self) -> u8 {
     let opcode = self.fetch();
+
+    if let Some(tracer) = &mut self.trace {
+      tracer.handle(&CpuTrace {
+        address: self.registers.pc.address(),
+        opcode,
+      });
+    }
+
     match self.execute(opcode) {
       Ok(cycles) => {
         self.cycle_count += cycles as u64;
@@ -199,4 +207,12 @@ impl Cpu for Mos6502 {
       }
     }
   }
+
+  fn cleanup(&mut self) -> Result<(), &str> {
+    if let Some(tracer) = &mut self.trace {
+      tracer.flush()
+    } else {
+      Ok(())
+    }
+  }
 }

src/systems/mod.rs

@@ -43,6 +43,6 @@ pub trait System {
 
   /// Clean up any resources used by this system.
   fn cleanup(&mut self) -> Result<(), &str> {
-    Ok(())
+    self.get_cpu_mut().cleanup()
   }
 }

src/trace/mod.rs

@@ -13,5 +13,7 @@ pub trait TraceHandler {
   fn handle(&mut self, trace: &CpuTrace);
 
   /// Flush any existing resource buffers.
-  fn flush(&mut self) -> Result<(), &str>{ Ok(())}
+  fn flush(&mut self) -> Result<(), &str> {
+    Ok(())
+  }
 }