Add get_cpu method to System trait

Co-authored-by: Ava Silver <[email protected]>

src/systems/basic.rs

@@ -91,6 +91,10 @@ pub struct BasicSystem {
 }
 
 impl System for BasicSystem {
+  fn get_cpu(&self) -> Box<&dyn Cpu> {
+    Box::new(&self.cpu)
+  }
+
   fn tick(&mut self) -> Duration {
     Duration::from_secs_f64(1.0 / 20_000.0) * self.cpu.tick().into()
   }

src/systems/c64/mod.rs

@@ -313,6 +313,10 @@ pub struct C64System {
 }
 
 impl System for C64System {
+  fn get_cpu(&self) -> Box<&dyn Cpu> {
+    Box::new(&self.cpu)
+  }
+
   fn tick(&mut self) -> Duration {
     Duration::from_secs_f64(1.0 / 1_000_000.0) * self.cpu.tick() as u32
   }

src/systems/easy.rs

@@ -93,6 +93,10 @@ pub struct Easy6502System {
 }
 
 impl System for Easy6502System {
+  fn get_cpu(&self) -> Box<&dyn Cpu> {
+    Box::new(&self.cpu)
+  }
+
   fn tick(&mut self) -> Duration {
     Duration::from_secs_f64(1.0 / 20_000.0) * self.cpu.tick().into()
   }

src/systems/klaus.rs

@@ -45,6 +45,10 @@ pub struct KlausSystem {
 }
 
 impl System for KlausSystem {
+  fn get_cpu(&self) -> Box<&dyn Cpu> {
+    Box::new(&self.cpu)
+  }
+
   fn tick(&mut self) -> Duration {
     self.cpu.tick();
     if let Some(pc) = &self.pc {

src/systems/mod.rs

@@ -1,4 +1,7 @@
-use crate::platform::{PlatformProvider, WindowConfig};
+use crate::{
+  cpu::Cpu,
+  platform::{PlatformProvider, WindowConfig},
+};
 use instant::Duration;
 use std::sync::Arc;
 
@@ -21,6 +24,9 @@ pub trait BuildableSystem<RomRegistry, SystemConfig> {
 
 /// A representation of an emulated system.
 pub trait System {
+  /// Return a mutable reference to the CPU used in this system.
+  fn get_cpu(&self) -> Box<&dyn Cpu>;
+
   /// Advance the system by one tick.
   fn tick(&mut self) -> Duration;
 

src/systems/pet/mod.rs

@@ -210,6 +210,10 @@ pub struct PetSystem {
 }
 
 impl System for PetSystem {
+  fn get_cpu(&self) -> Box<&dyn Cpu> {
+    Box::new(&self.cpu)
+  }
+
   fn tick(&mut self) -> Duration {
     Duration::from_secs_f64(1.0 / 1_000_000.0) * self.cpu.tick() as u32
   }

src/systems/vic/mod.rs

@@ -311,6 +311,10 @@ pub struct Vic20System {
 }
 
 impl System for Vic20System {
+  fn get_cpu(&self) -> Box<&dyn Cpu> {
+    Box::new(&self.cpu)
+  }
+
   fn tick(&mut self) -> instant::Duration {
     Duration::from_secs_f64(1.0 / 1_000_000.0) * self.cpu.tick() as u32
   }