From 5b5c5b41abab6201a8a74745704c2baf7b60af35 Mon Sep 17 00:00:00 2001
From: John Breaux <j@soft.fish>
Date: Sun, 23 Apr 2023 12:15:36 -0500
Subject: [PATCH] chirp: Update chirp for changes in cpu.rs

---
 src/bin/chirp-minifb/main.rs | 17 +++++++++++------
 src/bin/chirp-minifb/ui.rs   |  6 ++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/bin/chirp-minifb/main.rs b/src/bin/chirp-minifb/main.rs
index 7393284..f1d51c7 100644
--- a/src/bin/chirp-minifb/main.rs
+++ b/src/bin/chirp-minifb/main.rs
@@ -47,7 +47,7 @@ struct Arguments {
     #[options(help = "Enable pause mode at startup.")]
     pub pause: bool,
 
-    #[options(help = "Set the instructions-per-delay rate, or use realtime.")]
+    #[options(help = "Set the instructions-per-delay rate. If unspecified, use realtime.")]
     pub speed: Option<usize>,
     #[options(help = "Set the instructions-per-frame rate.")]
     pub step: Option<usize>,
@@ -76,16 +76,19 @@ struct Arguments {
         help = "Use CHIP-48 style DMA instructions, which don't touch I."
     )]
     pub memory: bool,
+
     #[options(
         short = "v",
         help = "Use CHIP-48 style bit-shifts, which don't touch vY."
     )]
     pub shift: bool,
+
     #[options(
         short = "b",
         help = "Use SUPER-CHIP style indexed jump, which is indexed relative to v[adr]."
     )]
     pub jumping: bool,
+
     #[options(
         long = "break",
         help = "Set breakpoints for the emulator to stop at.",
@@ -93,12 +96,14 @@ struct Arguments {
         meta = "BP"
     )]
     pub breakpoints: Vec<u16>,
+
     #[options(
         help = "Load additional word at address 0x1fe",
         parse(try_from_str = "parse_hex"),
         meta = "WORD"
     )]
     pub data: u16,
+
     #[options(help = "Set the target framerate.", default = "60", meta = "FR")]
     pub frame_rate: u64,
 }
@@ -131,7 +136,7 @@ impl State {
                     Screen  [0x1000..0x1100],
                 },
                 cpu: CPU::new(
-                    0x1000,
+                    &options.file,
                     0x50,
                     0x200,
                     Dis::default(),
@@ -143,7 +148,7 @@ impl State {
                         monotonic: options.speed,
                         ..Default::default()
                     },
-                ),
+                )?,
             },
             ui: UIBuilder::new(128, 64, &options.file).build()?,
             ft: Instant::now(),
@@ -189,9 +194,9 @@ impl State {
         Ok(())
     }
     fn wait_for_next_frame(&mut self) {
-        let rate = 1_000_000_000 / self.rate + 1;
-        std::thread::sleep(Duration::from_nanos(rate).saturating_sub(self.ft.elapsed()));
-        self.ft = Instant::now();
+        let rate = Duration::from_nanos(1_000_000_000 / self.rate + 1);
+        std::thread::sleep(rate.saturating_sub(self.ft.elapsed()));
+        self.ft = self.ft + rate;
     }
 }
 
diff --git a/src/bin/chirp-minifb/ui.rs b/src/bin/chirp-minifb/ui.rs
index ef56716..e6c7717 100644
--- a/src/bin/chirp-minifb/ui.rs
+++ b/src/bin/chirp-minifb/ui.rs
@@ -80,8 +80,10 @@ pub struct FrameBufferFormat {
 impl Default for FrameBufferFormat {
     fn default() -> Self {
         FrameBufferFormat {
-            fg: 0x0011a434,
-            bg: 0x001E2431,
+            // fg: 0x0011a434,
+            // bg: 0x001E2431,
+            fg: 0x00FFFF00,
+            bg: 0x00623701,
         }
     }
 }