Start implementing profiling

Reviewed-on: #6

Cargo.toml

@@ -16,11 +16,11 @@ bytemuck = { version = "1", features = ["derive"] }
 clap = { version = "4", features = ["derive"] }
 cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
 directories = "6"
-egui = { version = "0.30", features = ["serde"] }
-egui_extras = { version = "0.30", features = ["image"] }
-egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
-egui-winit = "0.30"
-egui-wgpu = { version = "0.30", features = ["winit"] }
+egui = { version = "0.32", features = ["serde"] }
+egui_extras = { version = "0.32", features = ["image"] }
+egui-notify = "0.20"
+egui-winit = "0.32"
+egui-wgpu = { version = "0.32", features = ["winit"] }
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
 hex = "0.4"
@@ -30,20 +30,21 @@ num-derive = "0.4"
 num-traits = "0.2"
 oneshot = "0.1"
 pollster = "0.4"
+rand = "0.9"
 rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
 rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thread-priority = "1"
+thread-priority = "2"
 tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-wgpu = "23"
+wgpu = "25"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.59", features = ["Win32_System_Threading"] }
+windows = { version = "0.61", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

build.rs

@@ -23,7 +23,9 @@ fn main() -> Result<(), Box<dyn Error>> {
         .define("VB_LITTLE_ENDIAN", None)
         .define("VB_SIGNED_PROPAGATE", None)
         .define("VB_DIV_GENERIC", None)
+        .define("VB_DIRECT_EXCEPTION", "on_exception")
         .define("VB_DIRECT_EXECUTE", "on_execute")
+        .define("VB_DIRECT_FETCH", "on_fetch")
         .define("VB_DIRECT_FRAME", "on_frame")
         .define("VB_DIRECT_READ", "on_read")
         .define("VB_DIRECT_WRITE", "on_write")

src/app.rs

@@ -298,10 +298,10 @@ impl ApplicationHandler<UserEvent> for Application {
 }
 
 struct WgpuState {
-    instance: Arc<wgpu::Instance>,
-    adapter: Arc<wgpu::Adapter>,
-    device: Arc<wgpu::Device>,
-    queue: Arc<wgpu::Queue>,
+    instance: wgpu::Instance,
+    adapter: wgpu::Adapter,
+    device: wgpu::Device,
+    queue: wgpu::Queue,
 }
 
 impl WgpuState {
@@ -309,21 +309,21 @@ impl WgpuState {
         #[allow(unused_variables)]
         let egui_wgpu::WgpuConfiguration {
             wgpu_setup:
-                egui_wgpu::WgpuSetup::CreateNew {
-                    supported_backends,
+                egui_wgpu::WgpuSetup::CreateNew(egui_wgpu::WgpuSetupCreateNew {
+                    instance_descriptor: wgpu::InstanceDescriptor { backends, .. },
                     device_descriptor,
                     ..
-                },
+                }),
             ..
         } = egui_wgpu::WgpuConfiguration::default()
         else {
             panic!("required fields not found")
         };
         #[cfg(windows)]
-        let supported_backends = wgpu::util::backend_bits_from_env()
+        let backends = wgpu::Backends::from_env()
             .unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
-        let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
-            backends: supported_backends,
+        let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
+            backends,
             ..wgpu::InstanceDescriptor::default()
         });
 
@@ -334,17 +334,14 @@ impl WgpuState {
         }))
         .expect("could not create adapter");
 
-        let trace_path = std::env::var("WGPU_TRACE");
-        let (device, queue) = pollster::block_on(adapter.request_device(
-            &(*device_descriptor)(&adapter),
-            trace_path.ok().as_ref().map(std::path::Path::new),
-        ))
+        let (device, queue) =
+            pollster::block_on(adapter.request_device(&(*device_descriptor)(&adapter)))
                 .expect("could not request device");
         Self {
-            instance: Arc::new(instance),
-            adapter: Arc::new(adapter),
-            device: Arc::new(device),
-            queue: Arc::new(queue),
+            instance,
+            adapter,
+            device,
+            queue,
         }
     }
 }
@@ -382,24 +379,30 @@ impl Viewport {
         ctx.set_fonts(fonts);
         ctx.style_mut(|s| {
             s.wrap_mode = Some(TextWrapMode::Extend);
-            s.visuals.menu_rounding = Default::default();
+            s.visuals.menu_corner_radius = Default::default();
             s.spacing.scroll = ScrollStyle::thin();
         });
         egui_extras::install_image_loaders(&ctx);
 
         let wgpu_config = egui_wgpu::WgpuConfiguration {
             present_mode: wgpu::PresentMode::AutoNoVsync,
-            wgpu_setup: egui_wgpu::WgpuSetup::Existing {
+            wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
                 instance: wgpu.instance.clone(),
                 adapter: wgpu.adapter.clone(),
                 device: wgpu.device.clone(),
                 queue: wgpu.queue.clone(),
-            },
+            }),
             ..egui_wgpu::WgpuConfiguration::default()
         };
 
-        let mut painter =
-            egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
+        let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
+            ctx.clone(),
+            wgpu_config,
+            1,
+            None,
+            false,
+            true,
+        ));
 
         let mut info = ViewportInfo::default();
         let mut builder = app.initial_viewport();

src/emulator.rs

@@ -1,24 +1,24 @@
 use std::{
     collections::HashMap,
     fmt::Display,
-    fs::{self, File},
-    io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
         Arc, Weak,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, RecvError, TryRecvError},
     },
+    time::Duration,
 };
 
 use anyhow::Result;
 use atomic::Atomic;
 use bytemuck::NoUninit;
-use egui_toast::{Toast, ToastKind, ToastOptions};
+use egui_notify::Toast;
 use tracing::{error, warn};
 
 use crate::{
     audio::Audio,
+    emulator::{cart::Cart, profiler::Profiler},
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
@@ -26,6 +26,8 @@ use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
 pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
+mod cart;
+mod profiler;
 mod shrooms_vb_core;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
@@ -60,43 +62,6 @@ impl Display for SimId {
     }
 }
 
-struct Cart {
-    rom_path: PathBuf,
-    rom: Vec<u8>,
-    sram_file: File,
-    sram: Vec<u8>,
-}
-
-impl Cart {
-    fn load(rom_path: &Path, sim_id: SimId) -> Result<Self> {
-        let rom = fs::read(rom_path)?;
-
-        let mut sram_file = File::options()
-            .read(true)
-            .write(true)
-            .create(true)
-            .truncate(false)
-            .open(sram_path(rom_path, sim_id))?;
-        sram_file.set_len(8 * 1024)?;
-
-        let mut sram = vec![];
-        sram_file.read_to_end(&mut sram)?;
-        Ok(Cart {
-            rom_path: rom_path.to_path_buf(),
-            rom,
-            sram_file,
-            sram,
-        })
-    }
-}
-
-fn sram_path(rom_path: &Path, sim_id: SimId) -> PathBuf {
-    match sim_id {
-        SimId::Player1 => rom_path.with_extension("p1.sram"),
-        SimId::Player2 => rom_path.with_extension("p2.sram"),
-    }
-}
-
 pub struct EmulatorBuilder {
     rom: Option<PathBuf>,
     commands: mpsc::Receiver<EmulatorCommand>,
@@ -105,6 +70,7 @@ pub struct EmulatorBuilder {
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
     start_paused: bool,
+    monitor_events: bool,
 }
 
 impl EmulatorBuilder {
@@ -121,6 +87,7 @@ impl EmulatorBuilder {
             audio_on: Arc::new([AtomicBool::new(true), AtomicBool::new(true)]),
             linked: Arc::new(AtomicBool::new(false)),
             start_paused: false,
+            monitor_events: false,
         };
         let client = EmulatorClient {
             queue,
@@ -146,6 +113,13 @@ impl EmulatorBuilder {
         }
     }
 
+    pub fn monitor_events(self, monitor_events: bool) -> Self {
+        Self {
+            monitor_events,
+            ..self
+        }
+    }
+
     pub fn build(self) -> Result<Emulator> {
         let mut emulator = Emulator::new(
             self.commands,
@@ -160,6 +134,9 @@ impl EmulatorBuilder {
         if self.start_paused {
             emulator.pause_sims()?;
         }
+        if self.monitor_events {
+            emulator.monitor_events(SimId::Player1)?;
+        }
         Ok(emulator)
     }
 }
@@ -173,6 +150,7 @@ pub struct Emulator {
     state: Arc<Atomic<EmulatorState>>,
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
+    profilers: [Profiler; 2],
     renderers: HashMap<SimId, TextureSink>,
     messages: HashMap<SimId, mpsc::Sender<Toast>>,
     debuggers: HashMap<SimId, DebugInfo>,
@@ -200,6 +178,7 @@ impl Emulator {
             state,
             audio_on,
             linked,
+            profilers: [Profiler::new(), Profiler::new()],
             renderers: HashMap::new(),
             messages: HashMap::new(),
             debuggers: HashMap::new(),
@@ -218,12 +197,12 @@ impl Emulator {
     }
 
     pub fn start_second_sim(&mut self, rom: Option<PathBuf>) -> Result<()> {
-        let rom_path = if let Some(path) = rom {
+        let file_path = if let Some(path) = rom {
             Some(path)
         } else {
-            self.carts[0].as_ref().map(|c| c.rom_path.clone())
+            self.carts[0].as_ref().map(|c| c.file_path.clone())
         };
-        let cart = match rom_path {
+        let cart = match file_path {
             Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
             None => None,
         };
@@ -249,6 +228,7 @@ impl Emulator {
         }
         let sim = &mut self.sims[index];
         sim.reset();
+        sim.monitor_events(self.profilers[sim_id.to_index()].is_enabled());
         if let Some(cart) = new_cart {
             sim.load_cart(cart.rom.clone(), cart.sram.clone())?;
             self.carts[index] = Some(cart);
@@ -336,8 +316,7 @@ impl Emulator {
         let cart = self.carts[sim_id.to_index()].as_mut();
         if let (Some(sim), Some(cart)) = (sim, cart) {
             sim.read_sram(&mut cart.sram);
-            cart.sram_file.seek(SeekFrom::Start(0))?;
-            cart.sram_file.write_all(&cart.sram)?;
+            cart.save_sram()?;
         }
         Ok(())
     }
@@ -420,6 +399,11 @@ impl Emulator {
         self.watched_regions.insert(range, region);
     }
 
+    fn monitor_events(&mut self, sim_id: SimId) -> Result<()> {
+        self.profilers[sim_id.to_index()].enable(true);
+        self.reset_sim(sim_id, None)
+    }
+
     pub fn run(&mut self) {
         loop {
             let idle = self.tick();
@@ -475,12 +459,20 @@ impl Emulator {
         let p1_running = running && p1_state == SimState::Ready;
         let p2_running = running && p2_state == SimState::Ready;
         let mut idle = !p1_running && !p2_running;
-        if p1_running && p2_running {
-            Sim::emulate_many(&mut self.sims);
-        } else if p1_running {
-            self.sims[SimId::Player1.to_index()].emulate();
-        } else if p2_running {
-            self.sims[SimId::Player2.to_index()].emulate();
+
+        let cycles = self.emulate(p1_running, p2_running);
+
+        // if we're profiling, track events
+        for ((sim, profiler), running) in self
+            .sims
+            .iter_mut()
+            .zip(self.profilers.iter_mut())
+            .zip([p1_running, p2_running])
+        {
+            if !running || !profiler.is_enabled() {
+                continue;
+            }
+            profiler.track(cycles, sim.take_sim_event());
         }
 
         if state == EmulatorState::Stepping {
@@ -507,7 +499,7 @@ impl Emulator {
                 let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                     continue;
                 };
-                if let Some(reason) = sim.stop_reason() {
+                if let Some(reason) = sim.take_stop_reason() {
                     let stop_reason = match reason {
                         StopReason::Stepped => DebugStopReason::Trace,
                         StopReason::Watchpoint(watch, address) => {
@@ -566,6 +558,19 @@ impl Emulator {
         idle
     }
 
+    fn emulate(&mut self, p1_running: bool, p2_running: bool) -> u32 {
+        const MAX_CYCLES: u32 = 20_000_000;
+        let mut cycles = MAX_CYCLES;
+        if p1_running && p2_running {
+            Sim::emulate_many(&mut self.sims, &mut cycles);
+        } else if p1_running {
+            self.sims[SimId::Player1.to_index()].emulate(&mut cycles);
+        } else if p2_running {
+            self.sims[SimId::Player2.to_index()].emulate(&mut cycles);
+        }
+        MAX_CYCLES - cycles
+    }
+
     fn handle_command(&mut self, command: EmulatorCommand) {
         match command {
             EmulatorCommand::ConnectToSim(sim_id, renderer, messages) => {
@@ -726,10 +731,8 @@ impl Emulator {
             .get(&sim_id)
             .or_else(|| self.messages.get(&SimId::Player1));
         if let Some(msg) = messages {
-            let toast = Toast::new()
-                .kind(ToastKind::Error)
-                .options(ToastOptions::default().duration_in_seconds(5.0))
-                .text(&message);
+            let mut toast = Toast::error(&message);
+            toast.duration(Some(Duration::from_secs(5)));
             if msg.send(toast).is_ok() {
                 return;
             }

src/emulator/cart.rs

@@ -0,0 +1,63 @@
+use anyhow::Result;
+use rand::Rng;
+use std::{
+    fs::{self, File},
+    io::{Read, Seek as _, SeekFrom, Write as _},
+    path::{Path, PathBuf},
+};
+
+use crate::emulator::SimId;
+
+pub struct Cart {
+    pub file_path: PathBuf,
+    pub rom: Vec<u8>,
+    sram_file: File,
+    pub sram: Vec<u8>,
+}
+
+impl Cart {
+    pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
+        let rom = fs::read(file_path)?;
+
+        let mut sram_file = File::options()
+            .read(true)
+            .write(true)
+            .create(true)
+            .truncate(false)
+            .open(sram_path(file_path, sim_id))?;
+
+        let sram = if sram_file.metadata()?.len() == 0 {
+            // new SRAM file, randomize the contents
+            let mut sram = vec![0; 16 * 1024];
+            let mut rng = rand::rng();
+            for dst in sram.iter_mut().step_by(2) {
+                *dst = rng.random();
+            }
+            sram
+        } else {
+            let mut sram = Vec::with_capacity(16 * 1024);
+            sram_file.read_to_end(&mut sram)?;
+            sram
+        };
+
+        Ok(Cart {
+            file_path: file_path.to_path_buf(),
+            rom,
+            sram_file,
+            sram,
+        })
+    }
+
+    pub fn save_sram(&mut self) -> Result<()> {
+        self.sram_file.seek(SeekFrom::Start(0))?;
+        self.sram_file.write_all(&self.sram)?;
+        Ok(())
+    }
+}
+
+fn sram_path(file_path: &Path, sim_id: SimId) -> PathBuf {
+    match sim_id {
+        SimId::Player1 => file_path.with_extension("p1.sram"),
+        SimId::Player2 => file_path.with_extension("p2.sram"),
+    }
+}

src/emulator/profiler.rs

@@ -0,0 +1,23 @@
+use crate::emulator::shrooms_vb_core::SimEvent;
+
+pub struct Profiler {
+    enabled: bool,
+}
+
+impl Profiler {
+    pub fn new() -> Self {
+        Self { enabled: false }
+    }
+
+    pub fn enable(&mut self, enabled: bool) {
+        self.enabled = enabled;
+    }
+
+    pub fn is_enabled(&self) -> bool {
+        self.enabled
+    }
+
+    pub fn track(&mut self, cycles: u32, event: Option<SimEvent>) {
+        println!("profiler {cycles} {event:0x?}");
+    }
+}

src/emulator/shrooms_vb_core.rs

@@ -71,8 +71,16 @@ pub enum VBWatchpointType {
     Access,
 }
 
+type OnException = extern "C" fn(sim: *mut VB, cause: *mut u16) -> c_int;
 type OnExecute =
     extern "C" fn(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int;
+type OnFetch = extern "C" fn(
+    sim: *mut VB,
+    fetch: c_int,
+    address: u32,
+    value: *mut i32,
+    cycles: *mut u32,
+) -> c_int;
 type OnFrame = extern "C" fn(sim: *mut VB) -> c_int;
 type OnRead = extern "C" fn(
     sim: *mut VB,
@@ -135,8 +143,15 @@ unsafe extern "C" {
     fn vb_set_cart_ram(sim: *mut VB, sram: *mut c_void, size: u32) -> c_int;
     #[link_name = "vbSetCartROM"]
     fn vb_set_cart_rom(sim: *mut VB, rom: *mut c_void, size: u32) -> c_int;
+    #[link_name = "vbSetExceptionCallback"]
+    fn vb_set_exception_callback(
+        sim: *mut VB,
+        callback: Option<OnException>,
+    ) -> Option<OnException>;
     #[link_name = "vbSetExecuteCallback"]
     fn vb_set_execute_callback(sim: *mut VB, callback: Option<OnExecute>) -> Option<OnExecute>;
+    #[link_name = "vbSetFetchCallback"]
+    fn vb_set_fetch_callback(sim: *mut VB, callback: Option<OnFetch>) -> Option<OnFetch>;
     #[link_name = "vbSetFrameCallback"]
     fn vb_set_frame_callback(sim: *mut VB, callback: Option<OnFrame>) -> Option<OnFrame>;
     #[link_name = "vbSetKeys"]
@@ -180,11 +195,21 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
 }
 
 #[unsafe(no_mangle)]
-extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
+extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
     let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
 
+    if data.monitor.enabled {
+        // SAFETY: length is the length of code, in elements
+        let code = unsafe { slice::from_raw_parts(code, length as usize) };
+        if data.monitor.detect_event(sim, address, code) {
+            // Something interesting will happen after this instruction is run.
+            // The on_fetch callback will fire when it does.
+            unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
+        }
+    }
+
     let mut stopped = data.stop_reason.is_some();
     if data.step_from.is_some_and(|s| s != address) {
         data.step_from = None;
@@ -199,6 +224,35 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length:
     if stopped { 1 } else { 0 }
 }
 
+#[unsafe(no_mangle)]
+extern "C" fn on_fetch(
+    sim: *mut VB,
+    _fetch: c_int,
+    _address: u32,
+    _value: *mut i32,
+    _cycles: *mut u32,
+) -> c_int {
+    // SAFETY: the *mut VB owns its userdata.
+    // There is no way for the userdata to be null or otherwise invalid.
+    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
+    data.monitor.event = data.monitor.queued_event.take();
+    unsafe { vb_set_exception_callback(sim, Some(on_exception)) };
+    unsafe { vb_set_fetch_callback(sim, None) };
+    1
+}
+
+#[unsafe(no_mangle)]
+extern "C" fn on_exception(sim: *mut VB, cause: *mut u16) -> c_int {
+    // SAFETY: the *mut VB owns its userdata.
+    // There is no way for the userdata to be null or otherwise invalid.
+    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
+    data.monitor.event = data.monitor.queued_event.take();
+    data.monitor.queued_event = Some(SimEvent::Interrupt(unsafe { *cause }));
+    unsafe { vb_set_exception_callback(sim, None) };
+    unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
+    if data.monitor.event.is_some() { 1 } else { 0 }
+}
+
 #[unsafe(no_mangle)]
 extern "C" fn on_read(
     sim: *mut VB,
@@ -260,6 +314,83 @@ extern "C" fn on_write(
     0
 }
 
+#[allow(dead_code)]
+#[derive(Debug)]
+pub enum SimEvent {
+    Call(u32),
+    Return,
+    Interrupt(u16),
+    Reti,
+}
+
+struct EventMonitor {
+    enabled: bool,
+    event: Option<SimEvent>,
+    queued_event: Option<SimEvent>,
+}
+
+impl EventMonitor {
+    fn new() -> Self {
+        Self {
+            enabled: false,
+            event: None,
+            queued_event: None,
+        }
+    }
+
+    fn detect_event(&mut self, sim: *mut VB, address: u32, code: &[u16]) -> bool {
+        self.queued_event = self.do_detect_event(sim, address, code);
+        self.queued_event.is_some()
+    }
+
+    fn do_detect_event(&self, sim: *mut VB, address: u32, code: &[u16]) -> Option<SimEvent> {
+        const JAL_OPCODE: u16 = 0b101011;
+        const JMP_OPCODE: u16 = 0b000110;
+        const RETI_OPCODE: u16 = 0b011001;
+
+        const fn format_i_reg_1(code: &[u16]) -> u8 {
+            (code[0] & 0x1f) as u8
+        }
+
+        const fn format_iv_disp(code: &[u16]) -> i32 {
+            let value = ((code[0] & 0x3ff) as i32) << 16 | (code[1] as i32);
+            value << 6 >> 6
+        }
+
+        let opcode = code[0] >> 10;
+
+        if opcode == JAL_OPCODE {
+            let disp = format_iv_disp(code);
+            if disp != 4 {
+                // JAL .+4 is how programs get r31 to a known value for indirect calls
+                // (which we detect later.)
+                // Any other JAL is a function call.
+                return Some(SimEvent::Call(address.wrapping_add_signed(disp)));
+            }
+        }
+
+        if opcode == JMP_OPCODE {
+            let jmp_reg = format_i_reg_1(code);
+            if jmp_reg == 31 {
+                // JMP[r31] is a return
+                return Some(SimEvent::Return);
+            }
+            let r31 = unsafe { vb_get_program_register(sim, 31) };
+            if r31 as u32 == address.wrapping_add(2) {
+                // JMP anywhere else, if r31 points to after the JMP, is an indirect call
+                let target = unsafe { vb_get_program_register(sim, jmp_reg as u32) };
+                return Some(SimEvent::Call(target as u32));
+            }
+        }
+
+        if opcode == RETI_OPCODE {
+            return Some(SimEvent::Reti);
+        }
+
+        None
+    }
+}
+
 const AUDIO_CAPACITY_SAMPLES: usize = 834 * 4;
 const AUDIO_CAPACITY_FLOATS: usize = AUDIO_CAPACITY_SAMPLES * 2;
 pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
@@ -267,6 +398,7 @@ pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
 struct VBState {
     frame_seen: bool,
     stop_reason: Option<StopReason>,
+    monitor: EventMonitor,
     step_from: Option<u32>,
     breakpoints: Vec<u32>,
     read_watchpoints: AddressSet,
@@ -277,6 +409,7 @@ struct VBState {
 impl VBState {
     fn needs_execute_callback(&self) -> bool {
         self.step_from.is_some()
+            || self.monitor.enabled
             || !self.breakpoints.is_empty()
             || !self.read_watchpoints.is_empty()
             || !self.write_watchpoints.is_empty()
@@ -311,6 +444,7 @@ impl Sim {
         let state = VBState {
             frame_seen: false,
             stop_reason: None,
+            monitor: EventMonitor::new(),
             step_from: None,
             breakpoints: vec![],
             read_watchpoints: AddressSet::new(),
@@ -332,6 +466,23 @@ impl Sim {
         unsafe { vb_reset(self.sim) };
     }
 
+    pub fn monitor_events(&mut self, enabled: bool) {
+        let state = self.get_state();
+        state.monitor.enabled = enabled;
+        state.monitor.event = None;
+        state.monitor.queued_event = None;
+        if enabled {
+            unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
+            unsafe { vb_set_exception_callback(self.sim, Some(on_exception)) };
+        } else {
+            if !state.needs_execute_callback() {
+                unsafe { vb_set_execute_callback(self.sim, None) };
+            }
+            unsafe { vb_set_exception_callback(self.sim, None) };
+            unsafe { vb_set_fetch_callback(self.sim, None) };
+        }
+    }
+
     pub fn load_cart(&mut self, mut rom: Vec<u8>, mut sram: Vec<u8>) -> Result<()> {
         self.unload_cart();
 
@@ -394,16 +545,14 @@ impl Sim {
         unsafe { vb_set_peer(self.sim, ptr::null_mut()) };
     }
 
-    pub fn emulate(&mut self) {
-        let mut cycles = 20_000_000;
-        unsafe { vb_emulate(self.sim, &mut cycles) };
+    pub fn emulate(&mut self, cycles: &mut u32) {
+        unsafe { vb_emulate(self.sim, cycles) };
     }
 
-    pub fn emulate_many(sims: &mut [Sim]) {
-        let mut cycles = 20_000_000;
+    pub fn emulate_many(sims: &mut [Sim], cycles: &mut u32) {
         let count = sims.len() as c_uint;
         let sims = sims.as_mut_ptr().cast();
-        unsafe { vb_emulate_ex(sims, count, &mut cycles) };
+        unsafe { vb_emulate_ex(sims, count, cycles) };
     }
 
     pub fn read_pixels(&mut self, buffers: &mut [u8]) -> bool {
@@ -632,7 +781,7 @@ impl Sim {
         Some(string)
     }
 
-    pub fn stop_reason(&mut self) -> Option<StopReason> {
+    pub fn take_stop_reason(&mut self) -> Option<StopReason> {
         let data = self.get_state();
         let reason = data.stop_reason.take();
         if !data.needs_execute_callback() {
@@ -641,6 +790,11 @@ impl Sim {
         reason
     }
 
+    pub fn take_sim_event(&mut self) -> Option<SimEvent> {
+        let data = self.get_state();
+        data.monitor.event.take()
+    }
+
     fn get_state(&mut self) -> &mut VBState {
         // SAFETY: the *mut VB owns its userdata.
         // There is no way for the userdata to be null or otherwise invalid.

src/graphics.rs

@@ -10,7 +10,7 @@ use std::{
 use anyhow::{Result, bail};
 use itertools::Itertools as _;
 use wgpu::{
-    Device, Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, Queue, Texture,
+    Device, Extent3d, Origin3d, Queue, TexelCopyBufferLayout, TexelCopyTextureInfo, Texture,
     TextureDescriptor, TextureFormat, TextureUsages, TextureView, TextureViewDescriptor,
 };
 
@@ -21,7 +21,7 @@ pub struct TextureSink {
 }
 
 impl TextureSink {
-    pub fn new(device: &Device, queue: Arc<Queue>) -> (Self, TextureView) {
+    pub fn new(device: &Device, queue: Queue) -> (Self, TextureView) {
         let texture = Self::create_texture(device);
         let view = texture.create_view(&TextureViewDescriptor::default());
         let buffers = Arc::new(BufferPool::new());
@@ -72,7 +72,7 @@ impl TextureSink {
     }
 
     fn write_texture(queue: &Queue, texture: &Texture, bytes: &[u8]) {
-        let texture = ImageCopyTexture {
+        let texture = TexelCopyTextureInfo {
             texture,
             mip_level: 0,
             origin: Origin3d::ZERO,
@@ -83,7 +83,7 @@ impl TextureSink {
             height: 224,
             depth_or_array_layers: 1,
         };
-        let data_layout = ImageDataLayout {
+        let data_layout = TexelCopyBufferLayout {
             offset: 0,
             bytes_per_row: Some(384 * 2),
             rows_per_image: Some(224),

src/images.rs

@@ -193,8 +193,8 @@ struct ImageState {
 impl ImageState {
     fn new(size: [usize; 2]) -> Self {
         let buffers = [
-            Arc::new(ColorImage::new(size, Color32::BLACK)),
-            Arc::new(ColorImage::new(size, Color32::BLACK)),
+            Arc::new(ColorImage::filled(size, Color32::BLACK)),
+            Arc::new(ColorImage::filled(size, Color32::BLACK)),
         ];
         let sink = buffers[0].clone();
         Self {

src/main.rs

@@ -31,6 +31,9 @@ struct Args {
     /// Start a GDB/LLDB debug server on this port.
     #[arg(short, long)]
     debug_port: Option<u16>,
+    /// Enable profiling a game
+    #[arg(short, long)]
+    profile: bool,
 }
 
 fn init_logger() {
@@ -106,6 +109,12 @@ fn main() -> Result<()> {
         }
         builder = builder.start_paused(true);
     }
+    if args.profile {
+        if args.rom.is_none() {
+            bail!("to start profiling, please select a game.");
+        }
+        builder = builder.monitor_events(true)
+    }
 
     ThreadBuilder::default()
         .name("Emulator".to_owned())

src/window/game.rs

@@ -1,4 +1,4 @@
-use std::sync::mpsc;
+use std::{sync::mpsc, time::Duration};
 
 use crate::{
     app::UserEvent,
@@ -8,10 +8,10 @@ use crate::{
 };
 use anyhow::Context as _;
 use egui::{
-    Align2, Button, CentralPanel, Color32, Context, Direction, Frame, TopBottomPanel, Ui, Vec2,
-    ViewportBuilder, ViewportCommand, ViewportId, Window, menu,
+    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
+    ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
-use egui_toast::{Toast, ToastKind, ToastOptions, Toasts};
+use egui_notify::{Anchor, Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
@@ -43,6 +43,7 @@ pub struct GameWindow {
     shortcuts: ShortcutProvider,
     sim_id: SimId,
     config: GameConfig,
+    toasts: Toasts,
     screen: Option<GameScreen>,
     messages: Option<mpsc::Receiver<Toast>>,
     color_picker: Option<ColorPickerState>,
@@ -57,6 +58,10 @@ impl GameWindow {
         sim_id: SimId,
     ) -> Self {
         let config = load_config(&persistence, sim_id);
+        let toasts = Toasts::new()
+            .with_anchor(Anchor::BottomLeft)
+            .with_margin((10.0, 10.0).into())
+            .reverse(true);
         Self {
             client,
             proxy,
@@ -64,13 +69,14 @@ impl GameWindow {
             shortcuts,
             sim_id,
             config,
+            toasts,
             screen: None,
             messages: None,
             color_picker: None,
         }
     }
 
-    fn show_menu(&mut self, ctx: &Context, ui: &mut Ui, toasts: &mut Toasts) {
+    fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
         let state = self.client.emulator_state();
         let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
         let can_pause = is_ready && state == EmulatorState::Running;
@@ -119,7 +125,7 @@ impl GameWindow {
                     if autopause {
                         self.client.send_command(EmulatorCommand::Pause);
                     }
-                    pollster::block_on(self.take_screenshot(toasts));
+                    pollster::block_on(self.take_screenshot());
                     if autopause {
                         self.client.send_command(EmulatorCommand::Resume);
                     }
@@ -139,7 +145,6 @@ impl GameWindow {
                     self.client
                         .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
                 }
-                ui.close_menu();
             }
             if ui
                 .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
@@ -158,7 +163,6 @@ impl GameWindow {
                     .clicked()
                 {
                     self.client.send_command(EmulatorCommand::Pause);
-                    ui.close_menu();
                 }
             } else if ui
                 .add_enabled(
@@ -168,7 +172,6 @@ impl GameWindow {
                 .clicked()
             {
                 self.client.send_command(EmulatorCommand::Resume);
-                ui.close_menu();
             }
             if ui
                 .add_enabled(is_ready, self.button_for(ui.ctx(), "Reset", Command::Reset))
@@ -176,7 +179,6 @@ impl GameWindow {
             {
                 self.client
                     .send_command(EmulatorCommand::Reset(self.sim_id));
-                ui.close_menu();
             }
             ui.separator();
             if ui
@@ -187,7 +189,6 @@ impl GameWindow {
                 .clicked()
             {
                 self.client.send_command(EmulatorCommand::FrameAdvance);
-                ui.close_menu();
             }
             ui.separator();
             if ui
@@ -197,8 +198,7 @@ impl GameWindow {
                 )
                 .clicked()
             {
-                pollster::block_on(self.take_screenshot(toasts));
-                ui.close_menu();
+                pollster::block_on(self.take_screenshot());
             }
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
@@ -211,17 +211,14 @@ impl GameWindow {
                 self.client
                     .send_command(EmulatorCommand::StartSecondSim(None));
                 self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
-                ui.close_menu();
             }
             if has_player_2 {
                 let linked = self.client.are_sims_linked();
                 if linked && ui.button("Unlink").clicked() {
                     self.client.send_command(EmulatorCommand::Unlink);
-                    ui.close_menu();
                 }
                 if !linked && ui.button("Link").clicked() {
                     self.client.send_command(EmulatorCommand::Link);
-                    ui.close_menu();
                 }
             }
         });
@@ -230,78 +227,63 @@ impl GameWindow {
                 self.proxy
                     .send_event(UserEvent::OpenTerminal(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("GDB Server").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenDebugger(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             ui.separator();
             if ui.button("Character Data").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenCharacterData(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Background Maps").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenBgMap(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Objects").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenObjects(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Worlds").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenWorlds(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Frame Buffers").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
             if ui.button("Registers").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenRegisters(self.sim_id))
                     .unwrap();
-                ui.close_menu();
             }
         });
         ui.menu_button("Help", |ui| {
             if ui.button("About").clicked() {
                 self.proxy.send_event(UserEvent::OpenAbout).unwrap();
-                ui.close_menu();
             }
         });
     }
 
-    async fn take_screenshot(&self, toasts: &mut Toasts) {
+    async fn take_screenshot(&mut self) {
         match self.try_take_screenshot().await {
             Ok(Some(path)) => {
-                toasts.add(
-                    Toast::new()
-                        .kind(ToastKind::Info)
-                        .options(ToastOptions::default().duration_in_seconds(5.0))
-                        .text(format!("Saved to {path}")),
-                );
+                let mut toast = Toast::info(format!("Saved to {path}"));
+                toast.duration(Some(Duration::from_secs(5)));
+                self.toasts.add(toast);
             }
             Ok(None) => {}
             Err(error) => {
-                toasts.add(
-                    Toast::new()
-                        .kind(ToastKind::Error)
-                        .options(ToastOptions::default().duration_in_seconds(5.0))
-                        .text(format!("{error:#}")),
-                );
+                let mut toast = Toast::error(format!("{error:#}"));
+                toast.duration(Some(Duration::from_secs(5)));
+                self.toasts.add(toast);
             }
         }
     }
@@ -348,7 +330,6 @@ impl GameWindow {
                         .clicked()
                     {
                         ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
-                        ui.close_menu();
                     }
                 }
             });
@@ -385,13 +366,11 @@ impl GameWindow {
                     c.display_mode = display_mode;
                     c.dimensions = current_dims * scale;
                 });
-                ui.close_menu();
             });
             ui.menu_button("Colors", |ui| {
                 for preset in COLOR_PRESETS {
                     if ui.color_pair_button(preset[0], preset[1]).clicked() {
                         self.update_config(|c| c.colors = preset);
-                        ui.close_menu();
                     }
                 }
                 ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
@@ -412,7 +391,6 @@ impl GameWindow {
                             just_opened: true,
                             unpause_on_close: is_running,
                         });
-                        ui.close_menu();
                     }
                 });
             });
@@ -423,23 +401,19 @@ impl GameWindow {
             if ui.selectable_button(p1_enabled, "Player 1").clicked() {
                 self.client
                     .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
-                ui.close_menu();
             }
             if ui.selectable_button(p2_enabled, "Player 2").clicked() {
                 self.client
                     .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
-                ui.close_menu();
             }
         });
         ui.menu_button("Input", |ui| {
             if ui.button("Bind Inputs").clicked() {
                 self.proxy.send_event(UserEvent::OpenInput).unwrap();
-                ui.close_menu();
             }
         });
         if ui.button("Hotkeys").clicked() {
             self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
-            ui.close_menu();
         }
     }
 
@@ -535,19 +509,16 @@ impl AppWindow for GameWindow {
         };
         self.update_config(|c| c.dimensions = dimensions);
 
-        let mut toasts = Toasts::new()
-            .anchor(Align2::LEFT_BOTTOM, (10.0, 10.0))
-            .direction(Direction::BottomUp);
         if let Some(messages) = self.messages.as_mut() {
             while let Ok(toast) = messages.try_recv() {
-                toasts.add(toast);
+                self.toasts.add(toast);
             }
         }
         TopBottomPanel::top("menubar")
             .exact_height(22.0)
             .show(ctx, |ui| {
-                menu::bar(ui, |ui| {
-                    self.show_menu(ctx, ui, &mut toasts);
+                MenuBar::new().ui(ui, |ui| {
+                    self.show_menu(ctx, ui);
                 });
             });
         if self.color_picker.is_some() {
@@ -566,7 +537,7 @@ impl AppWindow for GameWindow {
                 ui.add(screen);
             }
         });
-        toasts.show(ctx);
+        self.toasts.show(ctx);
     }
 
     fn on_init(&mut self, _ctx: &Context, render_state: &egui_wgpu::RenderState) {

src/window/utils.rs

@@ -6,8 +6,8 @@ use std::{
 
 use atoi::FromRadix16;
 use egui::{
-    Align, Color32, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response, RichText,
-    Rounding, Sense, Shape, Stroke, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
+    Align, Color32, CornerRadius, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response,
+    RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
     ecolor::HexColor,
 };
 use num_traits::{CheckedAdd, CheckedSub, One};
@@ -37,8 +37,8 @@ impl UiExt for Ui {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui)) {
         let title: String = title.into();
         let mut frame = Frame::group(self.style());
-        frame.outer_margin.top += 10.0;
-        frame.inner_margin.top += 2.0;
+        frame.outer_margin.top += 10;
+        frame.inner_margin.top += 2;
         let res = self.push_id(&title, |ui| {
             frame.show(ui, |ui| {
                 ui.set_max_width(ui.available_width());
@@ -49,7 +49,7 @@ impl UiExt for Ui {
         let old_rect = res.response.rect;
         let mut text_rect = old_rect;
         text_rect.min.x += 6.0;
-        self.allocate_new_ui(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
+        self.scope_builder(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
         if old_rect.width() > 0.0 {
             self.advance_cursor_after_rect(old_rect);
         }
@@ -73,7 +73,8 @@ impl UiExt for Ui {
         self.painter().rect_filled(right_rect, 0.0, right);
 
         let style = self.style().interact(&response);
-        self.painter().rect_stroke(rect, 0.0, style.fg_stroke);
+        self.painter()
+            .rect_stroke(rect, 0.0, style.fg_stroke, StrokeKind::Inside);
         response
     }
 
@@ -265,10 +266,10 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
             .id(id)
             .desired_width(desired_width)
             .margin(Margin {
-                left: 4.0,
-                right: if self.arrows { 20.0 } else { 4.0 },
-                top: 2.0,
-                bottom: 2.0,
+                left: 4,
+                right: if self.arrows { 20 } else { 4 },
+                top: 2,
+                bottom: 2,
             });
         let mut res = if valid {
             ui.add(text)
@@ -337,7 +338,7 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
             }
             str = to_string(self.value);
             stale = true;
-        } else if res.changed {
+        } else if res.changed() {
             if let Some(new_value) = from_string(&str).filter(in_range) {
                 if *self.value != new_value {
                     res.mark_changed();
@@ -355,27 +356,20 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
 
 fn draw_arrow(ui: &mut Ui, rect: Rect, up: bool) -> Response {
     let arrow_res = ui
-        .allocate_rect(
-            rect,
-            Sense {
-                click: true,
-                drag: true,
-                focusable: false,
-            },
-        )
+        .allocate_rect(rect, Sense::all())
         .on_hover_cursor(CursorIcon::Default);
     let visuals = ui.style().visuals.widgets.style(&arrow_res);
     let painter = ui.painter_at(arrow_res.rect);
 
     let rounding = if up {
-        Rounding {
-            ne: 2.0,
-            ..Rounding::ZERO
+        CornerRadius {
+            ne: 2,
+            ..CornerRadius::ZERO
         }
     } else {
-        Rounding {
-            se: 2.0,
-            ..Rounding::ZERO
+        CornerRadius {
+            se: 2,
+            ..CornerRadius::ZERO
         }
     };
     painter.rect_filled(arrow_res.rect, rounding, visuals.bg_fill);