chore: Release lemur version 0.7.2

Cargo.toml

@@ -4,7 +4,7 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.7.1"
+version = "0.7.2"
 edition = "2024"
 
 [dependencies]
@@ -21,14 +21,11 @@ egui_extras = { version = "0.32", features = ["image"] }
 egui-notify = "0.20"
 egui-winit = "0.32"
 egui-wgpu = { version = "0.32", features = ["winit"] }
-elf = "0.8"
-fxprof-processed-profile = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
 itertools = "0.14"
-normpath = "1"
 num-derive = "0.4"
 num-traits = "0.2"
 oneshot = "0.1"
@@ -44,7 +41,6 @@ tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 wgpu = "25"
-wholesym = "0.8"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]

build.rs

@@ -23,9 +23,7 @@ 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")

shrooms-vb-core

@@ -1 +1 @@
-Subproject commit ecbd103917315e3aa24fd2a682208f5548ec5d1b
+Subproject commit fe9c5c47815c28a4618dad57337a58f0b216af0f

src/app.rs

@@ -24,8 +24,8 @@ use crate::{
     persistence::Persistence,
     window::{
         AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
+        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, RegisterWindow, TerminalWindow,
-        TerminalWindow, WorldWindow,
+        WorldWindow,
     },
 };
 
@@ -54,7 +54,6 @@ pub struct Application {
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
     init_debug_port: Option<u16>,
-    init_profiling: bool,
 }
 
 impl Application {
@@ -62,7 +61,6 @@ impl Application {
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         debug_port: Option<u16>,
-        profiling: bool,
     ) -> Self {
         let wgpu = WgpuState::new();
         let icon = load_icon().ok().map(Arc::new);
@@ -91,7 +89,6 @@ impl Application {
             viewports: HashMap::new(),
             focused: None,
             init_debug_port: debug_port,
-            init_profiling: profiling,
         }
     }
 
@@ -124,11 +121,6 @@ impl ApplicationHandler<UserEvent> for Application {
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
-        if self.init_profiling {
-            let mut profiler = ProfileWindow::new(SimId::Player1, self.client.clone());
-            profiler.launch();
-            self.open(event_loop, Box::new(profiler));
-        }
     }
 
     fn window_event(
@@ -256,10 +248,6 @@ impl ApplicationHandler<UserEvent> for Application {
                 let terminal = TerminalWindow::new(sim_id, &self.client);
                 self.open(event_loop, Box::new(terminal));
             }
-            UserEvent::OpenProfiler(sim_id) => {
-                let profile = ProfileWindow::new(sim_id, self.client.clone());
-                self.open(event_loop, Box::new(profile));
-            }
             UserEvent::OpenDebugger(sim_id) => {
                 let debugger =
                     GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
@@ -534,7 +522,6 @@ pub enum UserEvent {
     OpenFrameBuffers(SimId),
     OpenRegisters(SimId),
     OpenTerminal(SimId),
-    OpenProfiler(SimId),
     OpenDebugger(SimId),
     OpenInput,
     OpenHotkeys,

src/emulator.rs

@@ -23,7 +23,7 @@ use crate::{
     memory::{MemoryRange, MemoryRegion},
 };
 use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
-pub use shrooms_vb_core::{SimEvent, VBKey, VBRegister, VBWatchpointType};
+pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
 mod cart;
@@ -137,7 +137,6 @@ pub struct Emulator {
     state: Arc<Atomic<EmulatorState>>,
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
-    profilers: [Option<ProfileSender>; 2],
     renderers: HashMap<SimId, TextureSink>,
     messages: HashMap<SimId, mpsc::Sender<Toast>>,
     debuggers: HashMap<SimId, DebugInfo>,
@@ -165,7 +164,6 @@ impl Emulator {
             state,
             audio_on,
             linked,
-            profilers: [None, None],
             renderers: HashMap::new(),
             messages: HashMap::new(),
             debuggers: HashMap::new(),
@@ -220,24 +218,6 @@ impl Emulator {
             self.carts[index] = Some(cart);
             self.sim_state[index].store(SimState::Ready, Ordering::Release);
         }
-        let mut profiling = false;
-        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref() {
-            if let Some(cart) = self.carts[index].as_ref() {
-                if profiler
-                    .send(ProfileEvent::Start {
-                        file_path: cart.file_path.clone(),
-                    })
-                    .is_ok()
-                {
-                    sim.monitor_events(true);
-                    profiling = true;
-                }
-            }
-        }
-        if !profiling {
-            sim.monitor_events(false);
-        }
-
         if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
             self.resume_sims();
         }
@@ -335,11 +315,6 @@ impl Emulator {
         Ok(())
     }
 
-    fn start_profiling(&mut self, sim_id: SimId, sender: ProfileSender) -> Result<()> {
-        self.profilers[sim_id.to_index()] = Some(sender);
-        self.reset_sim(sim_id, None)
-    }
-
     fn start_debugging(&mut self, sim_id: SimId, sender: DebugSender) {
         if self.sim_state[sim_id.to_index()].load(Ordering::Acquire) != SimState::Ready {
             // Can't debug unless a game is connected
@@ -463,30 +438,12 @@ 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 {
-        let cycles = self.emulate(p1_running, p2_running);
+            Sim::emulate_many(&mut self.sims);
-
+        } else if p1_running {
-        // if we're profiling, track events
+            self.sims[SimId::Player1.to_index()].emulate();
-        for ((sim, profiler), running) in self
+        } else if p2_running {
-            .sims
+            self.sims[SimId::Player2.to_index()].emulate();
-            .iter_mut()
-            .zip(self.profilers.iter_mut())
-            .zip([p1_running, p2_running])
-        {
-            if !running {
-                continue;
-            }
-            if let Some(p) = profiler {
-                if p.send(ProfileEvent::Update {
-                    cycles,
-                    event: sim.take_sim_event(),
-                })
-                .is_err()
-                {
-                    sim.monitor_events(false);
-                    *profiler = None;
-                }
-            }
         }
 
         if state == EmulatorState::Stepping {
@@ -513,7 +470,7 @@ impl Emulator {
                 let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                     continue;
                 };
-                if let Some(reason) = sim.take_stop_reason() {
+                if let Some(reason) = sim.stop_reason() {
                     let stop_reason = match reason {
                         StopReason::Stepped => DebugStopReason::Trace,
                         StopReason::Watchpoint(watch, address) => {
@@ -572,19 +529,6 @@ 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) => {
@@ -628,11 +572,6 @@ impl Emulator {
                     self.report_error(SimId::Player1, format!("Error setting speed: {error}"));
                 }
             }
-            EmulatorCommand::StartProfiling(sim_id, profiler) => {
-                if let Err(error) = self.start_profiling(sim_id, profiler) {
-                    self.report_error(SimId::Player1, format!("Error enaling profiler: {error}"));
-                }
-            }
             EmulatorCommand::StartDebugging(sim_id, debugger) => {
                 self.start_debugging(sim_id, debugger);
             }
@@ -770,7 +709,6 @@ pub enum EmulatorCommand {
     Resume,
     FrameAdvance,
     SetSpeed(f64),
-    StartProfiling(SimId, ProfileSender),
     StartDebugging(SimId, DebugSender),
     StopDebugging(SimId),
     DebugInterrupt(SimId),
@@ -812,7 +750,6 @@ pub enum EmulatorState {
     Debugging,
 }
 
-type ProfileSender = tokio::sync::mpsc::UnboundedSender<ProfileEvent>;
 type DebugSender = tokio::sync::mpsc::UnboundedSender<DebugEvent>;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -836,16 +773,6 @@ pub enum DebugEvent {
     Stopped(DebugStopReason),
 }
 
-pub enum ProfileEvent {
-    Start {
-        file_path: PathBuf,
-    },
-    Update {
-        cycles: u32,
-        event: Option<SimEvent>,
-    },
-}
-
 #[derive(Clone)]
 pub struct EmulatorClient {
     queue: mpsc::Sender<EmulatorCommand>,

src/emulator/cart.rs

@@ -18,7 +18,6 @@ pub struct Cart {
 impl Cart {
     pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
         let rom = fs::read(file_path)?;
-        let rom = try_parse_elf(&rom).unwrap_or(rom);
 
         let mut sram_file = File::options()
             .read(true)
@@ -56,23 +55,6 @@ impl Cart {
     }
 }
 
-fn try_parse_elf(data: &[u8]) -> Option<Vec<u8>> {
-    let parsed = elf::ElfBytes::<elf::endian::AnyEndian>::minimal_parse(data).ok()?;
-    let mut bytes = vec![];
-    let mut pstart = None;
-    for phdr in parsed.segments()? {
-        if phdr.p_filesz == 0 {
-            continue;
-        }
-        let start = pstart.unwrap_or(phdr.p_paddr);
-        pstart = Some(start);
-        bytes.resize((phdr.p_paddr - start) as usize, 0);
-        let data = parsed.segment_data(&phdr).ok()?;
-        bytes.extend_from_slice(data);
-    }
-    Some(bytes)
-}
-
 fn sram_path(file_path: &Path, sim_id: SimId) -> PathBuf {
     match sim_id {
         SimId::Player1 => file_path.with_extension("p1.sram"),

src/emulator/shrooms_vb_core.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, ffi::c_void, ptr, slice};
+use std::{ffi::c_void, ptr, slice};
 
 use anyhow::{Result, anyhow};
 use bitflags::bitflags;
@@ -71,16 +71,8 @@ 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,
@@ -143,15 +135,8 @@ 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"]
@@ -191,29 +176,16 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
     // 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.frame_seen = true;
-    if data.monitor.enabled {
-        data.monitor.event = Some(SimEvent::Marker(Cow::Borrowed("Frame Drawn")));
-    }
     1
 }
 
 #[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 {
+    let mut stopped = data.stop_reason.is_some();
-        // 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() || data.monitor.event.is_some();
     if data.step_from.is_some_and(|s| s != address) {
         data.step_from = None;
         data.stop_reason = Some(StopReason::Stepped);
@@ -227,41 +199,6 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
     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();
-    let cause = unsafe { *cause };
-    let pc = if cause == 0xff70 {
-        0xffffff60
-    } else {
-        (cause & 0xfff0) as u32 | 0xffff0000
-    };
-    data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc));
-    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,
@@ -323,100 +260,6 @@ extern "C" fn on_write(
     0
 }
 
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum SimEvent {
-    Call(u32),
-    Return,
-    Halt,
-    Interrupt(u16, u32),
-    Reti,
-    Marker(Cow<'static, str>),
-}
-
-struct EventMonitor {
-    enabled: bool,
-    event: Option<SimEvent>,
-    queued_event: Option<SimEvent>,
-    just_halted: bool,
-}
-
-impl EventMonitor {
-    fn new() -> Self {
-        Self {
-            enabled: false,
-            event: None,
-            queued_event: None,
-            just_halted: false,
-        }
-    }
-
-    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(&mut self, sim: *mut VB, address: u32, code: &[u16]) -> Option<SimEvent> {
-        const HALT_OPCODE: u16 = 0b011010;
-        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 == HALT_OPCODE {
-            if !self.just_halted {
-                self.just_halted = true;
-                self.event = Some(SimEvent::Halt);
-            } else {
-                self.just_halted = false;
-            }
-            // Don't _return_ an event, we want to emit this right away.
-            // If the CPU is halting, no other callbacks will run for a long time.
-            return None;
-        }
-
-        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;
@@ -424,7 +267,6 @@ 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,
@@ -435,7 +277,6 @@ 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()
@@ -470,7 +311,6 @@ impl Sim {
         let state = VBState {
             frame_seen: false,
             stop_reason: None,
-            monitor: EventMonitor::new(),
             step_from: None,
             breakpoints: vec![],
             read_watchpoints: AddressSet::new(),
@@ -492,23 +332,6 @@ 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();
 
@@ -571,14 +394,16 @@ impl Sim {
         unsafe { vb_set_peer(self.sim, ptr::null_mut()) };
     }
 
-    pub fn emulate(&mut self, cycles: &mut u32) {
+    pub fn emulate(&mut self) {
-        unsafe { vb_emulate(self.sim, cycles) };
+        let mut cycles = 20_000_000;
+        unsafe { vb_emulate(self.sim, &mut cycles) };
     }
 
-    pub fn emulate_many(sims: &mut [Sim], cycles: &mut u32) {
+    pub fn emulate_many(sims: &mut [Sim]) {
+        let mut cycles = 20_000_000;
         let count = sims.len() as c_uint;
         let sims = sims.as_mut_ptr().cast();
-        unsafe { vb_emulate_ex(sims, count, cycles) };
+        unsafe { vb_emulate_ex(sims, count, &mut cycles) };
     }
 
     pub fn read_pixels(&mut self, buffers: &mut [u8]) -> bool {
@@ -807,7 +632,7 @@ impl Sim {
         Some(string)
     }
 
-    pub fn take_stop_reason(&mut self) -> Option<StopReason> {
+    pub fn stop_reason(&mut self) -> Option<StopReason> {
         let data = self.get_state();
         let reason = data.stop_reason.take();
         if !data.needs_execute_callback() {
@@ -816,11 +641,6 @@ 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/main.rs

@@ -22,7 +22,6 @@ mod images;
 mod input;
 mod memory;
 mod persistence;
-mod profiler;
 mod window;
 
 #[derive(Parser)]
@@ -32,9 +31,6 @@ 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() {
@@ -110,9 +106,6 @@ fn main() -> Result<()> {
         }
         builder = builder.start_paused(true);
     }
-    if args.profile {
-        builder = builder.start_paused(true)
-    }
 
     ThreadBuilder::default()
         .name("Emulator".to_owned())
@@ -131,11 +124,6 @@ fn main() -> Result<()> {
     let event_loop = EventLoop::with_user_event().build().unwrap();
     event_loop.set_control_flow(ControlFlow::Poll);
     let proxy = event_loop.create_proxy();
-    event_loop.run_app(&mut Application::new(
+    event_loop.run_app(&mut Application::new(client, proxy, args.debug_port))?;
-        client,
-        proxy,
-        args.debug_port,
-        args.profile,
-    ))?;
     Ok(())
 }

src/profiler.rs

@@ -1,251 +0,0 @@
-use std::{
-    path::PathBuf,
-    sync::{Arc, Mutex},
-    thread,
-};
-
-use anyhow::Result;
-use tokio::{select, sync::mpsc};
-
-use crate::emulator::{EmulatorClient, EmulatorCommand, ProfileEvent, SimEvent, SimId};
-use recording::Recording;
-use state::ProgramState;
-
-mod recording;
-mod state;
-mod symbols;
-
-pub struct Profiler {
-    sim_id: SimId,
-    client: EmulatorClient,
-    status: Arc<Mutex<ProfilerStatus>>,
-    action: Option<mpsc::UnboundedSender<RecordingAction>>,
-    killer: Option<oneshot::Sender<()>>,
-}
-
-impl Profiler {
-    pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
-        Self {
-            sim_id,
-            client,
-            status: Arc::new(Mutex::new(ProfilerStatus::Disabled)),
-            action: None,
-            killer: None,
-        }
-    }
-
-    pub fn status(&self) -> ProfilerStatus {
-        self.status.lock().unwrap().clone()
-    }
-
-    pub fn enable(&mut self) {
-        let sim_id = self.sim_id;
-        let client = self.client.clone();
-        let status = self.status.clone();
-        let (action_tx, action_rx) = mpsc::unbounded_channel();
-        self.action = Some(action_tx);
-        let (killer_tx, killer_rx) = oneshot::channel();
-        self.killer = Some(killer_tx);
-        thread::spawn(move || {
-            tokio::runtime::Builder::new_current_thread()
-                .enable_all()
-                .build()
-                .unwrap()
-                .block_on(async move {
-                    select! {
-                        _ = run_profile(sim_id, client, status.clone(), action_rx) => {}
-                        _ = killer_rx => {
-                            *status.lock().unwrap() = ProfilerStatus::Disabled;
-                        }
-                    }
-                })
-        });
-    }
-
-    pub fn disable(&mut self) {
-        if let Some(killer) = self.killer.take() {
-            let _ = killer.send(());
-        }
-    }
-
-    pub fn start_recording(&mut self) {
-        if let Some(action) = &self.action {
-            let _ = action.send(RecordingAction::Start);
-        }
-    }
-
-    pub fn finish_recording(&mut self) -> oneshot::Receiver<Vec<u8>> {
-        let (tx, rx) = oneshot::channel();
-        if let Some(action) = &self.action {
-            let _ = action.send(RecordingAction::Finish(tx));
-        }
-        rx
-    }
-
-    pub fn cancel_recording(&mut self) {
-        if let Some(action) = &self.action {
-            let _ = action.send(RecordingAction::Cancel);
-        }
-    }
-}
-
-impl Drop for Profiler {
-    fn drop(&mut self) {
-        self.disable();
-    }
-}
-
-async fn run_profile(
-    sim_id: SimId,
-    client: EmulatorClient,
-    status: Arc<Mutex<ProfilerStatus>>,
-    mut action_source: mpsc::UnboundedReceiver<RecordingAction>,
-) {
-    let (profile_sync, mut profile_source) = mpsc::unbounded_channel();
-    client.send_command(EmulatorCommand::StartProfiling(sim_id, profile_sync));
-
-    *status.lock().unwrap() = ProfilerStatus::Enabled;
-
-    let mut session = ProfilerSession::new();
-    loop {
-        select! {
-            maybe_event = profile_source.recv() => {
-                let Some(event) = maybe_event else {
-                    break; // emulator thread disconnected
-                };
-                if let Err(error) = handle_event(event, &mut session).await {
-                    *status.lock().unwrap() = ProfilerStatus::Error(error.to_string());
-                    return;
-                }
-            }
-            maybe_action = action_source.recv() => {
-                let Some(action) = maybe_action else {
-                    break; // ui thread disconnected
-                };
-                handle_action(action, &mut session, &status);
-            }
-        }
-    }
-
-    *status.lock().unwrap() = ProfilerStatus::Disabled;
-}
-
-async fn handle_event(event: ProfileEvent, session: &mut ProfilerSession) -> Result<()> {
-    match event {
-        ProfileEvent::Start { file_path } => session.start_profiling(file_path).await,
-        ProfileEvent::Update { cycles, event } => {
-            session.track_elapsed_cycles(cycles);
-            if let Some(event) = event {
-                session.track_event(event)?;
-            }
-        }
-    }
-    Ok(())
-}
-
-fn handle_action(
-    action: RecordingAction,
-    session: &mut ProfilerSession,
-    status: &Mutex<ProfilerStatus>,
-) {
-    match action {
-        RecordingAction::Start => {
-            session.start_recording();
-            *status.lock().unwrap() = ProfilerStatus::Recording;
-        }
-        RecordingAction::Finish(rx) => {
-            if let Some(bytes) = session.finish_recording() {
-                let _ = rx.send(bytes);
-            }
-            *status.lock().unwrap() = ProfilerStatus::Enabled;
-        }
-        RecordingAction::Cancel => {
-            session.cancel_recording();
-            *status.lock().unwrap() = ProfilerStatus::Enabled;
-        }
-    }
-}
-
-#[derive(Clone)]
-pub enum ProfilerStatus {
-    Disabled,
-    Enabled,
-    Recording,
-    Error(String),
-}
-
-impl ProfilerStatus {
-    pub fn enabled(&self) -> bool {
-        matches!(self, Self::Enabled | Self::Recording)
-    }
-}
-
-enum RecordingAction {
-    Start,
-    Finish(oneshot::Sender<Vec<u8>>),
-    Cancel,
-}
-
-struct ProfilerSession {
-    program: Option<ProgramState>,
-    recording: Option<Recording>,
-}
-
-impl ProfilerSession {
-    fn new() -> Self {
-        Self {
-            program: None,
-            recording: None,
-        }
-    }
-
-    async fn start_profiling(&mut self, file_path: PathBuf) {
-        let program = ProgramState::new(file_path).await;
-        let recording = if self.recording.is_some() {
-            Some(Recording::new(&program))
-        } else {
-            None
-        };
-        self.program = Some(program);
-        self.recording = recording;
-    }
-
-    fn track_elapsed_cycles(&mut self, cycles: u32) {
-        if let (Some(state), Some(recording)) = (&self.program, &mut self.recording) {
-            recording.track_elapsed_cycles(state, cycles);
-        }
-    }
-
-    fn track_event(&mut self, event: SimEvent) -> Result<()> {
-        let Some(program) = &mut self.program else {
-            return Ok(());
-        };
-        match event {
-            SimEvent::Call(address) => program.track_call(address),
-            SimEvent::Return => program.track_return(),
-            SimEvent::Halt => program.track_halt(),
-            SimEvent::Interrupt(code, address) => program.track_interrupt(code, address),
-            SimEvent::Reti => program.track_reti(),
-            SimEvent::Marker(name) => {
-                if let Some(recording) = &mut self.recording {
-                    recording.track_marker(name);
-                };
-                Ok(())
-            }
-        }
-    }
-
-    fn start_recording(&mut self) {
-        if let Some(program) = &self.program {
-            self.recording = Some(Recording::new(program));
-        }
-    }
-
-    fn finish_recording(&mut self) -> Option<Vec<u8>> {
-        self.recording.take().map(|r| r.finish())
-    }
-
-    fn cancel_recording(&mut self) {
-        self.recording.take();
-    }
-}

src/profiler/recording.rs

@@ -1,147 +0,0 @@
-use std::{borrow::Cow, collections::HashMap};
-
-use fxprof_processed_profile::{
-    CategoryHandle, CpuDelta, Frame, FrameFlags, FrameInfo, MarkerTiming, ProcessHandle, Profile,
-    ReferenceTimestamp, SamplingInterval, StackHandle, StaticSchemaMarker, StringHandle,
-    ThreadHandle, Timestamp,
-};
-
-use crate::profiler::state::{ProgramState, RESET_CODE, StackFrame};
-
-pub struct Recording {
-    profile: Profile,
-    process: ProcessHandle,
-    threads: HashMap<u16, ThreadHandle>,
-    now: u64,
-}
-
-impl Recording {
-    pub fn new(state: &ProgramState) -> Self {
-        let reference_timestamp = ReferenceTimestamp::from_millis_since_unix_epoch(0.0);
-        let interval = SamplingInterval::from_hz(20_000_000.0);
-        let mut profile = Profile::new(state.name(), reference_timestamp, interval);
-
-        let process =
-            profile.add_process(state.name(), 1, Timestamp::from_nanos_since_reference(0));
-
-        if let Some(symbol_file) = state.symbol_file() {
-            let lib = profile.add_lib(symbol_file.library_info().clone());
-            profile.add_lib_mapping(process, lib, 0x00000000, 0xffffffff, 0);
-        }
-
-        let mut me = Self {
-            profile,
-            process,
-            threads: HashMap::new(),
-            now: 0,
-        };
-        me.track_elapsed_cycles(state, 0);
-        me
-    }
-
-    pub fn track_elapsed_cycles(&mut self, state: &ProgramState, cycles: u32) {
-        self.now += cycles as u64;
-        let timestamp = Timestamp::from_nanos_since_reference(self.now * 50);
-        let weight = 1;
-
-        let active_code = if let Some((code, frames)) = state.current_stack() {
-            let thread = *self.threads.entry(code).or_insert_with(|| {
-                let process = self.process;
-                let tid = code as u32;
-                let start_time = Timestamp::from_nanos_since_reference(self.now * 50);
-                let is_main = code == RESET_CODE;
-                let thread = self.profile.add_thread(process, tid, start_time, is_main);
-                self.profile
-                    .set_thread_name(thread, &thread_name_for_code(code));
-                thread
-            });
-
-            let stack = self.handle_for_stack(thread, frames);
-            let cpu_delta = CpuDelta::from_nanos((self.now - cycles as u64) * 50);
-            self.profile
-                .add_sample(thread, timestamp, stack, cpu_delta, weight);
-            Some(code)
-        } else {
-            None
-        };
-        for (code, thread) in &self.threads {
-            if active_code == Some(*code) {
-                continue;
-            }
-            self.profile
-                .add_sample_same_stack_zero_cpu(*thread, timestamp, weight);
-        }
-    }
-
-    pub fn track_marker(&mut self, name: Cow<'static, str>) {
-        let Some(thread) = self.threads.get(&RESET_CODE) else {
-            return;
-        };
-        let timing = MarkerTiming::Instant(Timestamp::from_nanos_since_reference(self.now * 50));
-        let marker = SimpleMarker(name);
-        self.profile.add_marker(*thread, timing, marker);
-    }
-
-    pub fn finish(self) -> Vec<u8> {
-        serde_json::to_vec(&self.profile).expect("could not serialize profile")
-    }
-
-    fn handle_for_stack(
-        &mut self,
-        thread: ThreadHandle,
-        frames: &[StackFrame],
-    ) -> Option<StackHandle> {
-        self.profile.intern_stack_frames(
-            thread,
-            frames.iter().map(|f| FrameInfo {
-                frame: Frame::InstructionPointer(f.address as u64),
-                category_pair: CategoryHandle::OTHER.into(),
-                flags: FrameFlags::empty(),
-            }),
-        )
-    }
-}
-
-struct SimpleMarker(Cow<'static, str>);
-
-impl StaticSchemaMarker for SimpleMarker {
-    const UNIQUE_MARKER_TYPE_NAME: &'static str = "Simple";
-    const FIELDS: &'static [fxprof_processed_profile::StaticSchemaMarkerField] = &[];
-
-    fn name(&self, profile: &mut Profile) -> StringHandle {
-        profile.intern_string(&self.0)
-    }
-
-    fn category(&self, _profile: &mut Profile) -> CategoryHandle {
-        CategoryHandle::OTHER
-    }
-
-    fn string_field_value(&self, _field_index: u32) -> StringHandle {
-        unreachable!()
-    }
-
-    fn number_field_value(&self, _field_index: u32) -> f64 {
-        unreachable!()
-    }
-}
-
-fn thread_name_for_code(code: u16) -> std::borrow::Cow<'static, str> {
-    match code {
-        RESET_CODE => "Main".into(),
-        0xffd0 => "Duplexed exception".into(),
-        0xfe40 => "VIP interrupt".into(),
-        0xfe30 => "Communication interrupt".into(),
-        0xfe20 => "Game pak interrupt".into(),
-        0xfe10 => "Timer interrupt".into(),
-        0xfe00 => "Game pad interrupt".into(),
-        0xffc0 => "Address trap".into(),
-        0xffa0..0xffc0 => format!("Trap (vector {})", code - 0xffa0).into(),
-        0xff90 => "Illegal opcode exception".into(),
-        0xff80 => "Zero division exception".into(),
-        0xff60 => "Floating-point reserved operand exception".into(),
-        0xff70 => "Floating-point invalid operation exception".into(),
-        0xff68 => "Floating-point zero division exception".into(),
-        0xff64 => "Floating-point overflow exception".into(),
-        other => format!("Unrecognized handler (0x{other:04x})").into(),
-    }
-}

src/profiler/state.rs

@@ -1,123 +0,0 @@
-use std::{collections::HashMap, path::PathBuf};
-
-use anyhow::{Result, bail};
-
-use crate::profiler::symbols::SymbolFile;
-
-pub struct ProgramState {
-    name: String,
-    symbol_file: Option<SymbolFile>,
-    call_stacks: HashMap<u16, Vec<StackFrame>>,
-    context_stack: Vec<u16>,
-}
-
-pub struct StackFrame {
-    pub address: u32,
-}
-
-pub const RESET_CODE: u16 = 0xfff0;
-impl ProgramState {
-    pub async fn new(file_path: PathBuf) -> Self {
-        let symbol_file = SymbolFile::load(&file_path).await.ok();
-        let name = symbol_file
-            .as_ref()
-            .map(|f| f.name().to_string())
-            .or_else(|| {
-                file_path
-                    .file_stem()
-                    .map(|s| s.to_string_lossy().into_owned())
-            })
-            .unwrap_or_else(|| "game".to_string());
-        let mut call_stacks = HashMap::new();
-        call_stacks.insert(
-            RESET_CODE,
-            vec![StackFrame {
-                address: 0xfffffff0,
-            }],
-        );
-        Self {
-            name,
-            symbol_file,
-            call_stacks,
-            context_stack: vec![RESET_CODE],
-        }
-    }
-
-    pub fn name(&self) -> &str {
-        &self.name
-    }
-
-    pub fn symbol_file(&self) -> Option<&SymbolFile> {
-        self.symbol_file.as_ref()
-    }
-
-    pub fn current_stack(&self) -> Option<(u16, &[StackFrame])> {
-        let code = self.context_stack.last()?;
-        let call_stack = self.call_stacks.get(code)?;
-        Some((*code, call_stack))
-    }
-
-    pub fn track_call(&mut self, address: u32) -> Result<()> {
-        let Some(code) = self.context_stack.last() else {
-            bail!("How did we call anything when we're halted?");
-        };
-        let Some(stack) = self.call_stacks.get_mut(code) else {
-            bail!("missing stack {code:04x}");
-        };
-        stack.push(StackFrame { address });
-        Ok(())
-    }
-
-    pub fn track_return(&mut self) -> Result<()> {
-        let Some(code) = self.context_stack.last() else {
-            bail!("how did we return when we're halted?");
-        };
-        let Some(stack) = self.call_stacks.get_mut(code) else {
-            bail!("missing stack {code:04x}");
-        };
-        if stack.pop().is_none() {
-            bail!("returned from {code:04x} but stack was empty");
-        }
-        if stack.is_empty() {
-            bail!("returned to oblivion");
-        }
-        Ok(())
-    }
-
-    pub fn track_halt(&mut self) -> Result<()> {
-        let Some(RESET_CODE) = self.context_stack.pop() else {
-            bail!("halted when not in an interrupt");
-        };
-        Ok(())
-    }
-
-    pub fn track_interrupt(&mut self, code: u16, address: u32) -> Result<()> {
-        // if the CPU was halted before, wake it up now
-        if self.context_stack.is_empty() {
-            self.context_stack.push(RESET_CODE);
-        }
-
-        self.context_stack.push(code);
-        if self
-            .call_stacks
-            .insert(code, vec![StackFrame { address }])
-            .is_some()
-        {
-            bail!("{code:04x} fired twice");
-        }
-        Ok(())
-    }
-
-    pub fn track_reti(&mut self) -> Result<()> {
-        let Some(code) = self.context_stack.pop() else {
-            bail!("RETI when halted");
-        };
-        if code == RESET_CODE {
-            bail!("RETI when not in interrupt");
-        }
-        if self.call_stacks.remove(&code).is_none() {
-            bail!("{code:04x} popped but never called");
-        }
-        Ok(())
-    }
-}

src/profiler/symbols.rs

@@ -1,67 +0,0 @@
-use std::{path::Path, sync::Arc};
-
-use anyhow::Result;
-use fxprof_processed_profile::{LibraryInfo, Symbol, SymbolTable};
-use wholesym::{SymbolManager, samply_symbols::demangle_any};
-
-pub struct SymbolFile {
-    library_info: LibraryInfo,
-}
-
-impl SymbolFile {
-    pub async fn load(file_path: &Path) -> Result<Self> {
-        let normalized = normpath::PathExt::normalize(file_path)?;
-        let library_info =
-            SymbolManager::library_info_for_binary_at_path(normalized.as_path(), None).await?;
-
-        let symbol_manager = SymbolManager::with_config(Default::default());
-        let symbol_map = symbol_manager
-            .load_symbol_map_for_binary_at_path(normalized.as_path(), None)
-            .await?;
-
-        let name = library_info
-            .name
-            .or_else(|| {
-                normalized
-                    .file_name()
-                    .map(|n| n.to_string_lossy().into_owned())
-            })
-            .unwrap_or("game".to_string());
-        let debug_name = library_info.debug_name.unwrap_or_else(|| name.clone());
-        let path = library_info
-            .path
-            .unwrap_or_else(|| normalized.into_os_string().to_string_lossy().into_owned());
-        let debug_path = library_info.debug_path.unwrap_or_else(|| path.clone());
-        let debug_id = library_info.debug_id.unwrap_or_default();
-        let code_id = library_info.code_id.map(|id| id.to_string());
-        let arch = library_info.arch;
-        let symbols = symbol_map
-            .iter_symbols()
-            .map(|(address, name)| Symbol {
-                address: address + 0x07000000,
-                size: None,
-                name: demangle_any(&name),
-            })
-            .collect();
-        Ok(Self {
-            library_info: LibraryInfo {
-                name,
-                debug_name,
-                path,
-                debug_path,
-                debug_id,
-                code_id,
-                arch,
-                symbol_table: Some(Arc::new(SymbolTable::new(symbols))),
-            },
-        })
-    }
-
-    pub fn name(&self) -> &str {
-        &self.library_info.name
-    }
-
-    pub fn library_info(&self) -> &LibraryInfo {
-        &self.library_info
-    }
-}

src/window.rs

@@ -4,7 +4,6 @@ pub use game::GameWindow;
 pub use gdb::GdbServerWindow;
 pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
-pub use profile::ProfileWindow;
 pub use terminal::TerminalWindow;
 pub use vip::{
     BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
@@ -19,7 +18,6 @@ mod game_screen;
 mod gdb;
 mod hotkeys;
 mod input;
-mod profile;
 mod terminal;
 mod utils;
 mod vip;

src/window/game.rs

@@ -228,11 +228,6 @@ impl GameWindow {
                     .send_event(UserEvent::OpenTerminal(self.sim_id))
                     .unwrap();
             }
-            if ui.button("Profiler").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenProfiler(self.sim_id))
-                    .unwrap();
-            }
             if ui.button("GDB Server").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenDebugger(self.sim_id))

src/window/profile.rs

@@ -1,126 +0,0 @@
-use std::{fs, time::Duration};
-
-use anyhow::Result;
-use egui::{Button, CentralPanel, Checkbox, ViewportBuilder, ViewportId};
-use egui_notify::{Anchor, Toast, Toasts};
-
-use crate::{
-    emulator::{EmulatorClient, SimId},
-    profiler::{Profiler, ProfilerStatus},
-    window::AppWindow,
-};
-
-pub struct ProfileWindow {
-    sim_id: SimId,
-    profiler: Profiler,
-    toasts: Toasts,
-}
-
-impl ProfileWindow {
-    pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
-        Self {
-            sim_id,
-            profiler: Profiler::new(sim_id, client),
-            toasts: Toasts::new()
-                .with_anchor(Anchor::BottomLeft)
-                .with_margin((10.0, 10.0).into())
-                .reverse(true),
-        }
-    }
-
-    pub fn launch(&mut self) {
-        self.profiler.enable();
-    }
-
-    fn finish_recording(&mut self) {
-        match self.try_finish_recording() {
-            Ok(Some(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) => {
-                let mut toast = Toast::error(format!("{error:#}"));
-                toast.duration(Some(Duration::from_secs(5)));
-                self.toasts.add(toast);
-            }
-        }
-    }
-
-    fn try_finish_recording(&mut self) -> Result<Option<String>> {
-        let bytes_receiver = self.profiler.finish_recording();
-        let file = rfd::FileDialog::new()
-            .add_filter("Profiler files", &["json"])
-            .set_file_name("profile.json")
-            .save_file();
-        if let Some(path) = file {
-            let bytes = pollster::block_on(bytes_receiver)?;
-            fs::write(&path, bytes)?;
-            Ok(Some(path.display().to_string()))
-        } else {
-            self.profiler.cancel_recording();
-            Ok(None)
-        }
-    }
-}
-
-impl AppWindow for ProfileWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("Profile-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Profiler ({})", self.sim_id))
-            .with_inner_size((300.0, 200.0))
-    }
-
-    fn show(&mut self, ctx: &egui::Context) {
-        let status = self.profiler.status();
-        let recording = matches!(status, ProfilerStatus::Recording);
-        CentralPanel::default().show(ctx, |ui| {
-            let mut enabled = status.enabled();
-            let enabled_checkbox = Checkbox::new(&mut enabled, "Profiling enabled?");
-            if ui.add_enabled(!recording, enabled_checkbox).changed() {
-                if enabled {
-                    self.profiler.enable();
-                } else {
-                    self.profiler.disable();
-                }
-            }
-
-            ui.horizontal(|ui| {
-                if !recording {
-                    let record_button = Button::new("Record");
-                    let can_record = matches!(status, ProfilerStatus::Enabled);
-                    if ui.add_enabled(can_record, record_button).clicked() {
-                        self.profiler.start_recording();
-                    }
-                } else {
-                    if ui.button("Finish recording").clicked() {
-                        self.finish_recording();
-                    }
-                    if ui.button("Cancel recording").clicked() {
-                        self.profiler.cancel_recording();
-                    }
-                }
-            });
-
-            match &status {
-                ProfilerStatus::Recording => {
-                    ui.label("Recording...");
-                }
-                ProfilerStatus::Error(message) => {
-                    ui.label(message);
-                }
-                _ => {}
-            }
-        });
-        self.toasts.show(ctx);
-    }
-}

src/window/utils.rs

@@ -301,11 +301,11 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
 
         let mut delta = None;
         if self.arrows {
-            let arrow_left = res.rect.max.x + 4.0;
+            let arrow_left = res.rect.max.x - 16.0;
-            let arrow_right = res.rect.max.x + 20.0;
+            let arrow_right = res.rect.max.x;
-            let arrow_top = res.rect.min.y - 2.0;
+            let arrow_top = res.rect.min.y;
             let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
-            let arrow_bottom = res.rect.max.y + 2.0;
+            let arrow_bottom = res.rect.max.y;
 
             let top_arrow_rect = Rect {
                 min: (arrow_left, arrow_top).into(),