Profile without ELF data

Cargo.toml

@@ -4,54 +4,51 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.10.2"
+version = "0.7.1"
 edition = "2024"
 
 [dependencies]
 anyhow = "1"
 atoi = "2"
-audioadapter-buffers = "2"
 atomic = "0.6"
 bitflags = { version = "2", features = ["serde"] }
 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.33", features = ["serde"] }
+egui = { version = "0.32", features = ["serde"] }
-egui_extras = { version = "0.33", features = ["image"] }
+egui_extras = { version = "0.32", features = ["image"] }
-egui-notify = "0.21"
+egui-notify = "0.20"
-egui-winit = "0.33"
+egui-winit = "0.32"
-egui-wgpu = { version = "0.33", features = ["winit"] }
+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"] }
-gimli = "0.33"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
 itertools = "0.14"
 normpath = "1"
-notify = "8"
 num-derive = "0.4"
 num-traits = "0.2"
-object = "0.38"
 oneshot = "0.1"
 pollster = "0.4"
 rand = "0.9"
-rfd = "0.17"
+rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
 rtrb = "0.3"
-rubato = "1"
+rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thread-priority = "3"
+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 = "27"
+wgpu = "25"
 wholesym = "0.8"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.62", features = ["Win32_System_Threading"] }
+windows = { version = "0.61", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

build.Dockerfile

@@ -1,39 +1,24 @@
 # This Dockerfile produces a base image for builds.
 # It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
 
-FROM debian:bookworm AS osxcross
+FROM crazymax/osxcross:latest-ubuntu AS osxcross
-ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-WORKDIR /build/osxcross
-ADD "https://github.com/tpoechtrager/osxcross.git#47936a512273bb3b414b5a2e83043c92eabc7ae7" .
-ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.sdk.tar.xz" ./tarballs/MacOSX14.5.sdk.tar.xz
-RUN apt-get update && \
-    apt-get install -y ca-certificates
-COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
-RUN apt-get update && \
-    apt-get install -y bash bzip2 clang-21 git lld-21 llvm-21 make patch xz-utils && \
-    ln -s $(which clang-21) /usr/bin/clang && \
-    ln -s $(which clang++-21) /usr/bin/clang++ && \
-    ln -s $(which ld64.lld-21) /usr/bin/ld64.lld && \
-    SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:1.93-bookworm
+FROM rust:latest
-ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add x86_64-apple-darwin && \
     rustup target add aarch64-apple-darwin && \
     apt-get update && \
-    apt-get install -y clang-21 lld-21 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
+    apt-get install -y clang-19 lld-19 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
     cargo install cargo-bundle xwin && \
     xwin --accept-license splat --output xwin && \
     rm -rf .xwin-cache && \
-    ln -s $(which clang-21) /usr/bin/clang && \
+    ln -s $(which clang-19) /usr/bin/clang && \
-    ln -s $(which clang++-21) /usr/bin/clang++
+    ln -s $(which clang++-19) /usr/bin/clang++
 COPY --from=osxcross /osxcross /osxcross
 
 ENV PATH="/osxcross/bin:$PATH" \
     LD_LIBRARY_PATH="/osxcross/lib" \
-    CC="clang-21" CXX="clang++-21" AR="llvm-ar-21" \
+    CC="clang-19" CXX="clang++-19" AR="llvm-ar-19" \
     CC_x86_64-apple-darwin="o64-clang" \
     CXX_x86_64-apple-darwin="o64-clang++" \
     CC_aarch64-apple-darwin="oa64-clang" \
@@ -41,13 +26,11 @@ ENV PATH="/osxcross/bin:$PATH" \
     SHROOMS_CFLAGS_x86_64-unknown-linux-gnu="-flto" \
     CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang -Clink-arg=-fuse-ld=lld" \
     SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
-    CFLAGS_x86_64-pc-windows-msvc="-I/xwin/crt/include -I/xwin/sdk/include/ucrt -I/xwin/sdk/include/um -I/xwin/sdk/include/shared" \
     CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
-    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-21" \
+    CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-19" \
     CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
-    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-21" \
+    CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-19" \
     CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
-    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-21" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-19" \
-    RC_PATH="llvm-rc-21" \
+    RC_PATH="llvm-rc-19" \
     MACOSX_DEPLOYMENT_TARGET="14.5"
-ENTRYPOINT ["bash"]

build.rs

@@ -18,10 +18,8 @@ fn main() -> Result<(), Box<dyn Error>> {
     };
     builder
         .include(Path::new("shrooms-vb-core/core"))
-        .include(Path::new("shrooms-vb-core/util"))
         .opt_level(opt_level)
         .flag_if_supported("-fno-strict-aliasing")
-        .define("_CRT_SECURE_NO_WARNINGS", None)
         .define("VB_LITTLE_ENDIAN", None)
         .define("VB_SIGNED_PROPAGATE", None)
         .define("VB_DIV_GENERIC", None)
@@ -31,10 +29,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         .define("VB_DIRECT_FRAME", "on_frame")
         .define("VB_DIRECT_READ", "on_read")
         .define("VB_DIRECT_WRITE", "on_write")
-        .define("VBU_REALLOC", "vbu_realloc_shim")
         .file(Path::new("shrooms-vb-core/core/vb.c"))
-        .file(Path::new("shrooms-vb-core/util/isx.c"))
-        .file(Path::new("shrooms-vb-core/util/vbu.c"))
         .compile("vb");
 
     Ok(())

llvm.sources

@@ -1,4 +0,0 @@
-Types: deb deb-src
-URIs: http://apt.llvm.org/bookworm/
-Suites: llvm-toolchain-bookworm-21
-Components: main

scripts/bundle.sh

@@ -1,4 +0,0 @@
-set -e
-
-docker build --pull -f build.Dockerfile -t lemur-build .
-MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app lemur-build /app/scripts/do-bundle.sh

scripts/release.sh

@@ -24,7 +24,8 @@ if ! command -v docker 2>&1 >/dev/null; then
     exit 1
 fi
 
-./scripts/bundle.sh
+docker build -f build.Dockerfile -t lemur-build .
+MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-bundle.sh
 
 body=$(cat <<EOF
 ## How to install

src/app.rs

@@ -16,7 +16,6 @@ use winit::{
 };
 
 use crate::{
-    config::CliArgs,
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
     images::ImageProcessor,
@@ -25,8 +24,8 @@ use crate::{
     persistence::Persistence,
     window::{
         AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow,
+        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
-        RegisterWindow, TerminalWindow, WorldWindow,
+        TerminalWindow, WorldWindow,
     },
 };
 
@@ -56,24 +55,18 @@ pub struct Application {
     focused: Option<ViewportId>,
     init_debug_port: Option<u16>,
     init_profiling: bool,
-    init_bgmap: bool,
-    init_chardata: bool,
-    init_objects: bool,
-    init_worlds: bool,
-    init_framebuffers: bool,
-    init_registers: bool,
-    init_terminal: bool,
 }
 
 impl Application {
     pub fn new(
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
-        persistence: Persistence,
+        debug_port: Option<u16>,
-        args: CliArgs,
+        profiling: bool,
     ) -> Self {
         let wgpu = WgpuState::new();
         let icon = load_icon().ok().map(Arc::new);
+        let persistence = Persistence::new();
         let mappings = MappingProvider::new(persistence.clone());
         let shortcuts = ShortcutProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
@@ -97,15 +90,8 @@ impl Application {
             persistence,
             viewports: HashMap::new(),
             focused: None,
-            init_debug_port: args.debug_port,
+            init_debug_port: debug_port,
-            init_profiling: args.profile,
+            init_profiling: profiling,
-            init_bgmap: args.bgmap_data,
-            init_chardata: args.character_data,
-            init_objects: args.object_data,
-            init_worlds: args.worlds,
-            init_framebuffers: args.frame_buffers,
-            init_registers: args.registers,
-            init_terminal: args.terminal,
         }
     }
 
@@ -138,40 +124,11 @@ impl ApplicationHandler<UserEvent> for Application {
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
-        let sim_id = SimId::Player1;
         if self.init_profiling {
-            let mut profiler = ProfileWindow::new(sim_id, self.client.clone());
+            let mut profiler = ProfileWindow::new(SimId::Player1, self.client.clone());
             profiler.launch();
             self.open(event_loop, Box::new(profiler));
         }
-        if self.init_chardata {
-            let chardata = CharacterDataWindow::new(sim_id, &self.memory, &mut self.images);
-            self.open(event_loop, Box::new(chardata));
-        }
-        if self.init_bgmap {
-            let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.images);
-            self.open(event_loop, Box::new(bgmap));
-        }
-        if self.init_objects {
-            let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.images);
-            self.open(event_loop, Box::new(objects));
-        }
-        if self.init_worlds {
-            let world = WorldWindow::new(sim_id, &self.memory, &mut self.images);
-            self.open(event_loop, Box::new(world));
-        }
-        if self.init_framebuffers {
-            let fb = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
-            self.open(event_loop, Box::new(fb));
-        }
-        if self.init_registers {
-            let registers = RegisterWindow::new(sim_id, &self.memory);
-            self.open(event_loop, Box::new(registers));
-        }
-        if self.init_terminal {
-            let terminal = TerminalWindow::new(sim_id, &self.client);
-            self.open(event_loop, Box::new(terminal));
-        }
     }
 
     fn window_event(
@@ -260,10 +217,11 @@ impl ApplicationHandler<UserEvent> for Application {
                     .focused
                     .as_ref()
                     .and_then(|id| self.viewports.get_mut(id))
-                    && viewport.app.handle_gamepad_event(&event)
                 {
+                    if viewport.app.handle_gamepad_event(&event) {
                         return;
                     }
+                }
                 self.controllers.handle_gamepad_event(&event);
             }
             UserEvent::OpenAbout => {
@@ -287,8 +245,8 @@ impl ApplicationHandler<UserEvent> for Application {
                 self.open(event_loop, Box::new(world));
             }
             UserEvent::OpenFrameBuffers(sim_id) => {
-                let fb = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
+                let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(fb));
+                self.open(event_loop, Box::new(world));
             }
             UserEvent::OpenRegisters(sim_id) => {
                 let registers = RegisterWindow::new(sim_id, &self.memory);
@@ -343,12 +301,12 @@ impl ApplicationHandler<UserEvent> for Application {
 
     fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
         let (sender, receiver) = oneshot::channel();
-        if self.client.send_command(EmulatorCommand::Exit(sender))
+        if self.client.send_command(EmulatorCommand::Exit(sender)) {
-            && let Err(error) = receiver.recv_timeout(Duration::from_secs(5))
+            if let Err(error) = receiver.recv_timeout(Duration::from_secs(5)) {
-        {
                 error!(%error, "could not gracefully exit.");
             }
         }
+    }
 }
 
 struct WgpuState {
@@ -382,8 +340,7 @@ impl WgpuState {
         });
 
         let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference:
+            power_preference: wgpu::PowerPreference::HighPerformance,
-                wgpu::PowerPreference::from_env().unwrap_or(wgpu::PowerPreference::LowPower),
             compatible_surface: None,
             force_fallback_adapter: false,
         }))
@@ -440,7 +397,7 @@ impl Viewport {
         egui_extras::install_image_loaders(&ctx);
 
         let wgpu_config = egui_wgpu::WgpuConfiguration {
-            present_mode: wgpu::PresentMode::AutoVsync,
+            present_mode: wgpu::PresentMode::AutoNoVsync,
             wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
                 instance: wgpu.instance.clone(),
                 adapter: wgpu.adapter.clone(),
@@ -450,12 +407,13 @@ impl Viewport {
             ..egui_wgpu::WgpuConfiguration::default()
         };
 
-        let options = egui_wgpu::RendererOptions::default();
         let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
             ctx.clone(),
             wgpu_config,
+            1,
+            None,
             false,
-            options,
+            true,
         ));
 
         let mut info = ViewportInfo::default();
@@ -466,13 +424,7 @@ impl Viewport {
         let (window, state) = create_window_and_state(&ctx, event_loop, &builder, &mut painter);
         egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
 
-        let render_state = painter.render_state();
+        app.on_init(&ctx, painter.render_state().as_ref().unwrap());
-        let args = InitArgs {
-            ctx: &ctx,
-            window: &window,
-            render_state: render_state.as_ref().unwrap(),
-        };
-        app.on_init(args);
         Self {
             painter,
             ctx,
@@ -554,7 +506,7 @@ impl Viewport {
             &mut self.info,
             std::mem::take(&mut self.commands),
             &self.window,
-            &mut vec![],
+            &mut HashSet::default(),
         );
 
         if self.info.close_requested() {

src/audio.rs

@@ -1,17 +1,17 @@
 use std::time::Duration;
 
 use anyhow::{Result, bail};
-use audioadapter_buffers::direct::InterleavedSlice;
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
-use rubato::Resampler;
+use itertools::Itertools;
+use rubato::{FastFixedOut, Resampler};
 use tracing::error;
 
 pub struct Audio {
     #[allow(unused)]
     stream: cpal::Stream,
-    sampler: rubato::Async<f32>,
+    sampler: FastFixedOut<f32>,
-    input_buffer: Vec<f32>,
+    input_buffer: Vec<Vec<f32>>,
-    output_buffer: Vec<f32>,
+    output_buffer: Vec<Vec<f32>>,
     sample_sink: rtrb::Producer<f32>,
 }
 
@@ -32,18 +32,17 @@ impl Audio {
         let mut config = config.with_max_sample_rate().config();
         let resample_ratio = config.sample_rate.0 as f64 / VB_FREQUENCY as f64;
         let chunk_size = (834.0 * resample_ratio) as usize;
-        let sampler = rubato::Async::new_poly(
+        let sampler = FastFixedOut::new(
             resample_ratio,
             64.0,
             rubato::PolynomialDegree::Cubic,
             chunk_size,
             2,
-            rubato::FixedAsync::Output,
         )?;
         config.buffer_size = cpal::BufferSize::Fixed(sampler.output_frames_max() as u32);
 
-        let input_buffer = Vec::with_capacity(sampler.nbr_channels() * sampler.input_frames_max());
+        let input_buffer = sampler.input_buffer_allocate(true);
-        let output_buffer = vec![0.0; sampler.nbr_channels() * sampler.output_frames_max()];
+        let output_buffer = sampler.output_buffer_allocate(true);
         let (sample_sink, mut sample_source) =
             rtrb::RingBuffer::new(sampler.output_frames_max() * 4);
 
@@ -79,38 +78,34 @@ impl Audio {
         })
     }
 
-    pub fn update(&mut self, mut samples: &[f32]) {
+    pub fn update(&mut self, samples: &[f32]) {
-        while self.input_buffer.len() + samples.len() >= self.sampler.input_frames_next() * 2 {
+        for sample in samples.chunks_exact(2) {
-            let samples_needed =
+            for (channel, value) in self.input_buffer.iter_mut().zip(sample) {
-                (self.sampler.input_frames_next() * 2).saturating_sub(self.input_buffer.len());
+                channel.push(*value);
-            let (current_samples, future_samples) = samples.split_at(samples_needed);
+            }
-            self.input_buffer.extend_from_slice(current_samples);
+            if self.input_buffer[0].len() >= self.sampler.input_frames_next() {
-            samples = future_samples;
-
-            let buffer_in =
-                InterleavedSlice::new(&self.input_buffer, 2, self.sampler.input_frames_next())
-                    .unwrap();
-            let mut buffer_out = InterleavedSlice::new_mut(
-                &mut self.output_buffer,
-                2,
-                self.sampler.output_frames_next(),
-            )
-            .unwrap();
                 let (_, output_samples) = self
                     .sampler
-                .process_into_buffer(&buffer_in, &mut buffer_out, None)
+                    .process_into_buffer(&self.input_buffer, &mut self.output_buffer, None)
                     .unwrap();
+
                 let chunk = match self.sample_sink.write_chunk_uninit(output_samples * 2) {
                     Ok(c) => c,
                     Err(rtrb::chunks::ChunkError::TooFewSlots(n)) => {
                         self.sample_sink.write_chunk_uninit(n).unwrap()
                     }
                 };
-            chunk.fill_from_iter(self.output_buffer[..output_samples * 2].iter().copied());
+                let interleaved = self.output_buffer[0]
+                    .iter()
+                    .interleave(self.output_buffer[1].iter())
+                    .cloned();
+                chunk.fill_from_iter(interleaved);
 
-            self.input_buffer.clear();
+                for channel in &mut self.input_buffer {
+                    channel.clear();
+                }
+            }
         }
-        self.input_buffer.extend_from_slice(samples);
 
         while self.sample_sink.slots() < self.sampler.output_frames_max() * 2 {
             std::thread::sleep(Duration::from_micros(500));

src/config.rs

@@ -1,96 +0,0 @@
-use anyhow::Result;
-use clap::Parser;
-use egui::{Color32, Vec2};
-use serde::{Deserialize, Serialize};
-
-use crate::{emulator::SimId, persistence::Persistence, window::DisplayMode};
-use std::path::PathBuf;
-
-#[derive(Parser)]
-pub struct CliArgs {
-    /// The path to a virtual boy ROM to run.
-    pub rom: Option<PathBuf>,
-    /// Start a GDB/LLDB debug server on this port.
-    #[arg(short, long)]
-    pub debug_port: Option<u16>,
-    /// Enable profiling a game
-    #[arg(short, long)]
-    pub profile: bool,
-    /// Open character data window
-    #[arg(short, long)]
-    pub character_data: bool,
-    /// Open bgmap data window
-    #[arg(short, long)]
-    pub bgmap_data: bool,
-    /// Open object data window
-    #[arg(short, long)]
-    pub object_data: bool,
-    /// Open worlds window
-    #[arg(long)]
-    pub worlds: bool,
-    /// Open frame buffers window
-    #[arg(short, long)]
-    pub frame_buffers: bool,
-    /// Open registers window
-    #[arg(short, long)]
-    pub registers: bool,
-    /// Open terminal
-    #[arg(short, long)]
-    pub terminal: bool,
-    /// Watch ROM files for changes, automatically reload
-    #[arg(short, long)]
-    pub watch: bool,
-}
-
-pub const COLOR_PRESETS: [[Color32; 2]; 3] = [
-    [
-        Color32::from_rgb(0xff, 0x00, 0x00),
-        Color32::from_rgb(0x00, 0xc6, 0xf0),
-    ],
-    [
-        Color32::from_rgb(0x00, 0xb4, 0x00),
-        Color32::from_rgb(0xc8, 0x00, 0xff),
-    ],
-    [
-        Color32::from_rgb(0xb4, 0x9b, 0x00),
-        Color32::from_rgb(0x00, 0x00, 0xff),
-    ],
-];
-
-const fn default_audio_enabled() -> bool {
-    true
-}
-
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
-pub struct SimConfig {
-    pub display_mode: DisplayMode,
-    pub colors: [Color32; 2],
-    pub dimensions: Vec2,
-    #[serde(default = "default_audio_enabled")]
-    pub audio_enabled: bool,
-}
-
-impl SimConfig {
-    pub fn load(persistence: &Persistence, sim_id: SimId) -> Self {
-        if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
-            return config;
-        }
-        Self {
-            display_mode: DisplayMode::Anaglyph,
-            colors: COLOR_PRESETS[0],
-            dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
-            audio_enabled: true,
-        }
-    }
-
-    pub fn save(&self, persistence: &Persistence, sim_id: SimId) -> Result<()> {
-        persistence.save_config(config_filename(sim_id), self)
-    }
-}
-
-fn config_filename(sim_id: SimId) -> &'static str {
-    match sim_id {
-        SimId::Player1 => "config_p1",
-        SimId::Player2 => "config_p2",
-    }
-}

src/emulator.rs

@@ -5,7 +5,7 @@ use std::{
     sync::{
         Arc, Weak,
         atomic::{AtomicBool, Ordering},
-        mpsc::{self, RecvTimeoutError, TryRecvError},
+        mpsc::{self, RecvError, TryRecvError},
     },
     time::Duration,
 };
@@ -18,22 +18,16 @@ use tracing::{error, warn};
 
 use crate::{
     audio::Audio,
+    emulator::cart::Cart,
     graphics::TextureSink,
     memory::{MemoryRange, MemoryRegion},
 };
-use cart::Cart;
-pub use game_info::GameInfo;
-pub use inline_stack_map::InlineStack;
-use inline_stack_map::InlineStackMap;
 use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
 pub use shrooms_vb_core::{SimEvent, VBKey, VBRegister, VBWatchpointType};
 
 mod address_set;
 mod cart;
-mod game_info;
-mod inline_stack_map;
 mod shrooms_vb_core;
-mod shrooms_vb_util;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub enum SimId {
@@ -75,7 +69,6 @@ pub struct EmulatorBuilder {
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
     start_paused: bool,
-    watch_rom: Arc<[AtomicBool; 2]>,
 }
 
 impl EmulatorBuilder {
@@ -92,13 +85,12 @@ impl EmulatorBuilder {
             audio_on: Arc::new([AtomicBool::new(true), AtomicBool::new(true)]),
             linked: Arc::new(AtomicBool::new(false)),
             start_paused: false,
-            watch_rom: Arc::new([AtomicBool::new(false), AtomicBool::new(false)]),
         };
         let client = EmulatorClient {
             queue,
             sim_state: builder.sim_state.clone(),
             state: builder.state.clone(),
-            watch_rom: builder.watch_rom.clone(),
+            audio_on: builder.audio_on.clone(),
             linked: builder.linked.clone(),
         };
         (builder, client)
@@ -118,25 +110,12 @@ impl EmulatorBuilder {
         }
     }
 
-    pub fn with_audio_on(self, p1: bool, p2: bool) -> Self {
-        self.audio_on[0].store(p1, Ordering::Relaxed);
-        self.audio_on[1].store(p2, Ordering::Relaxed);
-        self
-    }
-
-    pub fn with_watch_rom(self, p1: bool, p2: bool) -> Self {
-        self.watch_rom[0].store(p1, Ordering::Relaxed);
-        self.watch_rom[1].store(p2, Ordering::Relaxed);
-        self
-    }
-
     pub fn build(self) -> Result<Emulator> {
         let mut emulator = Emulator::new(
             self.commands,
             self.sim_state,
             self.state,
             self.audio_on,
-            self.watch_rom,
             self.linked,
         )?;
         if let Some(path) = self.rom {
@@ -157,7 +136,6 @@ pub struct Emulator {
     sim_state: Arc<[Atomic<SimState>; 2]>,
     state: Arc<Atomic<EmulatorState>>,
     audio_on: Arc<[AtomicBool; 2]>,
-    watch_rom: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
     profilers: [Option<ProfileSender>; 2],
     renderers: HashMap<SimId, TextureSink>,
@@ -176,7 +154,6 @@ impl Emulator {
         sim_state: Arc<[Atomic<SimState>; 2]>,
         state: Arc<Atomic<EmulatorState>>,
         audio_on: Arc<[AtomicBool; 2]>,
-        watch_rom: Arc<[AtomicBool; 2]>,
         linked: Arc<AtomicBool>,
     ) -> Result<Self> {
         Ok(Self {
@@ -187,7 +164,6 @@ impl Emulator {
             sim_state,
             state,
             audio_on,
-            watch_rom,
             linked,
             profilers: [None, None],
             renderers: HashMap::new(),
@@ -201,18 +177,9 @@ impl Emulator {
         })
     }
 
-    pub fn reload_cart(&mut self, sim_id: SimId) -> Result<()> {
-        let Some(cart) = &self.carts[sim_id.to_index()] else {
-            return Ok(());
-        };
-        let path = cart.file_path.clone();
-        self.load_cart(sim_id, &path)
-    }
-
     pub fn load_cart(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
-        let watch = self.watch_rom[sim_id.to_index()].load(Ordering::Acquire);
+        let cart = Cart::load(path, sim_id)?;
-        let cart = Cart::load(path, sim_id, watch)?;
+        self.reset_sim(sim_id, Some(cart))?;
-        self.try_reset_sim(sim_id, Some(cart))?;
         Ok(())
     }
 
@@ -222,26 +189,16 @@ impl Emulator {
         } else {
             self.carts[0].as_ref().map(|c| c.file_path.clone())
         };
-        let watch = self.watch_rom[SimId::Player2.to_index()].load(Ordering::Acquire);
         let cart = match file_path {
-            Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2, watch)?),
+            Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
             None => None,
         };
-        self.try_reset_sim(SimId::Player2, cart)?;
+        self.reset_sim(SimId::Player2, cart)?;
         self.link_sims();
         Ok(())
     }
 
-    fn reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> bool {
+    fn reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> Result<()> {
-        if let Err(error) = self.try_reset_sim(sim_id, new_cart) {
-            self.report_error(sim_id, format!("Error resetting sim: {error}"));
-            false
-        } else {
-            true
-        }
-    }
-
-    fn try_reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> Result<()> {
         self.save_sram(sim_id)?;
 
         let index = sim_id.to_index();
@@ -262,25 +219,23 @@ impl Emulator {
             sim.load_cart(cart.rom.clone(), cart.sram.clone())?;
             self.carts[index] = Some(cart);
             self.sim_state[index].store(SimState::Ready, Ordering::Release);
-        } else if let Some(cart) = self.carts[index].as_mut()
-            && cart.is_watching()
-        {
-            cart.restart_watching();
         }
         let mut profiling = false;
-        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref()
+        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref() {
-            && let Some(cart) = self.carts[index].as_ref()
+            if let Some(cart) = self.carts[index].as_ref() {
-            && profiler
+                if profiler
                     .send(ProfileEvent::Start {
-                    info: cart.info.clone(),
+                        file_path: cart.file_path.clone(),
                     })
                     .is_ok()
                 {
-            sim.monitor_events(true, cart.info.inline_stack_map().clone());
+                    sim.monitor_events(true);
                     profiling = true;
                 }
+            }
+        }
         if !profiling {
-            sim.monitor_events(false, InlineStackMap::empty());
+            sim.monitor_events(false);
         }
 
         if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
@@ -382,7 +337,7 @@ impl Emulator {
 
     fn start_profiling(&mut self, sim_id: SimId, sender: ProfileSender) -> Result<()> {
         self.profilers[sim_id.to_index()] = Some(sender);
-        self.try_reset_sim(sim_id, None)
+        self.reset_sim(sim_id, None)
     }
 
     fn start_debugging(&mut self, sim_id: SimId, sender: DebugSender) {
@@ -458,33 +413,14 @@ impl Emulator {
             let idle = self.tick();
             if idle {
                 // The game is paused, and we have output all the video/audio we have.
-                // Block the thread until a new command comes in, or a ROM changes.
+                // Block the thread until a new command comes in.
-                loop {
+                match self.commands.recv() {
-                    match self.commands.recv_timeout(Duration::from_millis(250)) {
+                    Ok(command) => self.handle_command(command),
-                        Ok(command) => {
+                    Err(RecvError) => {
-                            self.handle_command(command);
-                            break;
-                        }
-                        Err(RecvTimeoutError::Timeout) => {
-                            let mut changed = false;
-                            for sim_id in SimId::values() {
-                                let Some(cart) = self.carts[sim_id.to_index()].as_ref() else {
-                                    continue;
-                                };
-                                if cart.changed() {
-                                    changed |= self.reset_sim(sim_id, None);
-                                }
-                            }
-                            if changed {
-                                break;
-                            }
-                        }
-                        Err(RecvTimeoutError::Disconnected) => {
                         return;
                     }
                 }
             }
-            }
             loop {
                 match self.commands.try_recv() {
                     Ok(command) => self.handle_command(command),
@@ -496,14 +432,6 @@ impl Emulator {
                     }
                 }
             }
-            for sim_id in SimId::values() {
-                let Some(cart) = self.carts[sim_id.to_index()].as_ref() else {
-                    continue;
-                };
-                if cart.changed() {
-                    self.reset_sim(sim_id, None);
-                }
-            }
             self.watched_regions.retain(|range, region| {
                 let Some(region) = region.upgrade() else {
                     return false;
@@ -549,15 +477,13 @@ impl Emulator {
                 continue;
             }
             if let Some(p) = profiler {
-                let (event, inline_stack) = sim.take_profiler_updates();
                 if p.send(ProfileEvent::Update {
                     cycles,
-                    event,
+                    event: sim.take_sim_event(),
-                    inline_stack,
                 })
                 .is_err()
                 {
-                    sim.monitor_events(false, InlineStackMap::empty());
+                    sim.monitor_events(false);
                     *profiler = None;
                 }
             }
@@ -572,12 +498,12 @@ impl Emulator {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                 return true;
             };
-            if let Some(text) = sim.take_stdout()
+            if let Some(text) = sim.take_stdout() {
-                && stdout.send(text).is_err()
+                if stdout.send(text).is_err() {
-            {
                     sim.watch_stdout(false);
                     return false;
                 }
+            }
             true
         });
 
@@ -670,22 +596,6 @@ impl Emulator {
                     self.report_error(sim_id, format!("Error loading rom: {error}"));
                 }
             }
-            EmulatorCommand::ReloadRom(sim_id) => {
-                if let Err(error) = self.reload_cart(sim_id) {
-                    self.report_error(sim_id, format!("Error loading rom: {error}"));
-                }
-            }
-            EmulatorCommand::WatchRom(sim_id, watch) => {
-                self.watch_rom[sim_id.to_index()].store(watch, Ordering::Release);
-                let Some(cart) = self.carts[sim_id.to_index()].as_mut() else {
-                    return;
-                };
-                if watch {
-                    cart.restart_watching();
-                } else {
-                    cart.stop_watching();
-                }
-            }
             EmulatorCommand::StartSecondSim(path) => {
                 if let Err(error) = self.start_second_sim(path) {
                     self.report_error(
@@ -799,8 +709,9 @@ impl Emulator {
                 };
                 sim.watch_stdout(true);
             }
-            EmulatorCommand::SetAudioEnabled(sim_id, enabled) => {
+            EmulatorCommand::SetAudioEnabled(p1, p2) => {
-                self.audio_on[sim_id.to_index()].store(enabled, Ordering::Release);
+                self.audio_on[SimId::Player1.to_index()].store(p1, Ordering::Release);
+                self.audio_on[SimId::Player2.to_index()].store(p2, Ordering::Release);
             }
             EmulatorCommand::Link => {
                 self.link_sims();
@@ -809,7 +720,9 @@ impl Emulator {
                 self.unlink_sims();
             }
             EmulatorCommand::Reset(sim_id) => {
-                self.reset_sim(sim_id, None);
+                if let Err(error) = self.reset_sim(sim_id, None) {
+                    self.report_error(sim_id, format!("Error resetting sim: {error}"));
+                }
             }
             EmulatorCommand::SetKeys(sim_id, keys) => {
                 if let Some(sim) = self.sims.get_mut(sim_id.to_index()) {
@@ -851,8 +764,6 @@ impl Emulator {
 pub enum EmulatorCommand {
     ConnectToSim(SimId, TextureSink, mpsc::Sender<Toast>),
     LoadGame(SimId, PathBuf),
-    ReloadRom(SimId),
-    WatchRom(SimId, bool),
     StartSecondSim(Option<PathBuf>),
     StopSecondSim,
     Pause,
@@ -875,7 +786,7 @@ pub enum EmulatorCommand {
     AddWatchpoint(SimId, u32, usize, VBWatchpointType),
     RemoveWatchpoint(SimId, u32, usize, VBWatchpointType),
     WatchStdout(SimId, mpsc::Sender<String>),
-    SetAudioEnabled(SimId, bool),
+    SetAudioEnabled(bool, bool),
     Link,
     Unlink,
     Reset(SimId),
@@ -927,12 +838,11 @@ pub enum DebugEvent {
 
 pub enum ProfileEvent {
     Start {
-        info: Arc<GameInfo>,
+        file_path: PathBuf,
     },
     Update {
         cycles: u32,
         event: Option<SimEvent>,
-        inline_stack: Option<InlineStack>,
     },
 }
 
@@ -941,8 +851,8 @@ pub struct EmulatorClient {
     queue: mpsc::Sender<EmulatorCommand>,
     sim_state: Arc<[Atomic<SimState>; 2]>,
     state: Arc<Atomic<EmulatorState>>,
+    audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
-    watch_rom: Arc<[AtomicBool; 2]>,
 }
 
 impl EmulatorClient {
@@ -952,12 +862,12 @@ impl EmulatorClient {
     pub fn emulator_state(&self) -> EmulatorState {
         self.state.load(Ordering::Acquire)
     }
+    pub fn is_audio_enabled(&self, sim_id: SimId) -> bool {
+        self.audio_on[sim_id.to_index()].load(Ordering::Acquire)
+    }
     pub fn are_sims_linked(&self) -> bool {
         self.linked.load(Ordering::Acquire)
     }
-    pub fn is_rom_watched(&self, sim_id: SimId) -> bool {
-        self.watch_rom[sim_id.to_index()].load(Ordering::Acquire)
-    }
     pub fn send_command(&self, command: EmulatorCommand) -> bool {
         match self.queue.send(command) {
             Ok(()) => true,

src/emulator/cart.rs

@@ -1,31 +1,24 @@
 use anyhow::Result;
-use notify::Watcher;
 use rand::Rng;
 use std::{
     fs::{self, File},
     io::{Read, Seek as _, SeekFrom, Write as _},
     path::{Path, PathBuf},
-    sync::{Arc, atomic::AtomicBool},
 };
 
-use crate::emulator::{SimId, game_info::GameInfo, shrooms_vb_util::rom_from_isx};
+use crate::emulator::SimId;
 
 pub struct Cart {
     pub file_path: PathBuf,
     pub rom: Vec<u8>,
     sram_file: File,
     pub sram: Vec<u8>,
-    pub info: Arc<GameInfo>,
-    watcher: Option<notify::RecommendedWatcher>,
-    changed: Arc<AtomicBool>,
 }
 
 impl Cart {
-    pub fn load(file_path: &Path, sim_id: SimId, watch: bool) -> Result<Self> {
+    pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
         let rom = fs::read(file_path)?;
-        let (rom, info) = try_parse_isx(file_path, &rom)
+        let rom = try_parse_elf(&rom).unwrap_or(rom);
-            .or_else(|| try_parse_elf(file_path, &rom))
-            .unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
 
         let mut sram_file = File::options()
             .read(true)
@@ -48,21 +41,11 @@ impl Cart {
             sram
         };
 
-        let changed = Arc::new(AtomicBool::new(false));
-        let watcher = if watch {
-            build_watcher(file_path, changed.clone())
-        } else {
-            None
-        };
-
         Ok(Cart {
             file_path: file_path.to_path_buf(),
             rom,
             sram_file,
             sram,
-            info: Arc::new(info),
-            watcher,
-            changed,
         })
     }
 
@@ -71,92 +54,20 @@ impl Cart {
         self.sram_file.write_all(&self.sram)?;
         Ok(())
     }
-
-    pub fn changed(&self) -> bool {
-        self.changed.load(std::sync::atomic::Ordering::Relaxed)
-    }
-
-    pub fn is_watching(&self) -> bool {
-        self.watcher.is_some()
-    }
-
-    pub fn restart_watching(&mut self) {
-        self.changed = Arc::new(AtomicBool::new(false));
-        if let Some(mut watcher) = self.watcher.take() {
-            let _ = watcher.unwatch(&self.file_path);
-        };
-        self.watcher = build_watcher(&self.file_path, self.changed.clone());
-    }
-
-    pub fn stop_watching(&mut self) {
-        self.changed = Arc::new(AtomicBool::new(false));
-        self.watcher = None;
-    }
 }
 
-fn build_watcher(file_path: &Path, changed: Arc<AtomicBool>) -> Option<notify::RecommendedWatcher> {
+fn try_parse_elf(data: &[u8]) -> Option<Vec<u8>> {
-    let file_path = file_path.to_path_buf();
+    let parsed = elf::ElfBytes::<elf::endian::AnyEndian>::minimal_parse(data).ok()?;
-    let mut watcher =
-        notify::recommended_watcher(move |event: Result<notify::Event, notify::Error>| {
-            let Ok(e) = event else {
-                return;
-            };
-            let modified = !matches!(
-                e.kind,
-                notify::EventKind::Access(_)
-                    | notify::EventKind::Modify(notify::event::ModifyKind::Metadata(_))
-            );
-            if modified {
-                changed.store(true, std::sync::atomic::Ordering::Relaxed);
-            }
-        })
-        .ok()?;
-    watcher
-        .watch(&file_path, notify::RecursiveMode::NonRecursive)
-        .ok()?;
-    Some(watcher)
-}
-
-fn try_parse_isx(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
-    let rom = rom_from_isx(data)?;
-    let info = GameInfo::from_isx(file_path, data);
-    Some((rom, info))
-}
-
-fn try_parse_elf(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
-    use object::read::elf::FileHeader;
-    let program = match object::FileKind::parse(data).ok()? {
-        object::FileKind::Elf32 => {
-            let header = object::elf::FileHeader32::parse(data).ok()?;
-            parse_elf_program(header, data)?
-        }
-        object::FileKind::Elf64 => {
-            let header = object::elf::FileHeader64::parse(data).ok()?;
-            parse_elf_program(header, data)?
-        }
-        _ => return None,
-    };
-    let info = GameInfo::from_elf(file_path, data).unwrap_or_else(|_| GameInfo::empty(file_path));
-    Some((program, info))
-}
-
-fn parse_elf_program<Elf: object::read::elf::FileHeader<Endian = object::Endianness>>(
-    header: &Elf,
-    data: &[u8],
-) -> Option<Vec<u8>> {
-    use object::read::elf::ProgramHeader;
-    let endian = header.endian().ok()?;
     let mut bytes = vec![];
     let mut pstart = None;
-    for phdr in header.program_headers(endian, data).ok()? {
+    for phdr in parsed.segments()? {
-        let pma = phdr.p_paddr(endian).into();
+        if phdr.p_filesz == 0 {
-        if pma < 0x07000000 || phdr.p_filesz(endian).into() == 0 {
             continue;
         }
-        let start = pstart.unwrap_or(pma);
+        let start = pstart.unwrap_or(phdr.p_paddr);
         pstart = Some(start);
-        bytes.resize((pma - start) as usize, 0);
+        bytes.resize((phdr.p_paddr - start) as usize, 0);
-        let data = phdr.data(endian, data).ok()?;
+        let data = parsed.segment_data(&phdr).ok()?;
         bytes.extend_from_slice(data);
     }
     Some(bytes)

src/emulator/game_info.rs

@@ -1,284 +0,0 @@
-use std::{borrow::Cow, path::Path, sync::Arc};
-
-use anyhow::{Result, bail};
-use fxprof_processed_profile::{LibraryInfo, Symbol, SymbolTable, debugid::DebugId};
-use object::{Object, ObjectSection, ObjectSymbol};
-use wholesym::samply_symbols::{DebugIdExt, demangle_any};
-
-use crate::emulator::inline_stack_map::{InlineStackMap, InlineStackMapBuilder};
-
-#[derive(Debug)]
-pub struct GameInfo {
-    library_info: LibraryInfo,
-    inline_stack_map: InlineStackMap,
-}
-
-impl GameInfo {
-    pub fn from_elf(file_path: &Path, input: &[u8]) -> Result<Self> {
-        let file = object::File::parse(input)?;
-
-        let (name, path) = name_and_path(file_path);
-        let debug_id = file
-            .build_id()?
-            .map(|id| DebugId::from_identifier(id, true))
-            .unwrap_or_default();
-        let code_id = file.build_id()?.map(hex::encode);
-        let mut symbols = vec![];
-        for sym in file.symbols() {
-            symbols.push(Symbol {
-                address: sym.address() as u32,
-                size: Some(sym.size() as u32),
-                name: demangle_any(sym.name()?),
-            });
-        }
-
-        let inline_stack_map =
-            build_inline_stack_map(file).unwrap_or_else(|_| InlineStackMap::empty());
-
-        let library_info = LibraryInfo {
-            name: name.clone(),
-            debug_name: name,
-            path: path.clone(),
-            debug_path: path,
-            debug_id,
-            code_id,
-            arch: None,
-            symbol_table: Some(Arc::new(SymbolTable::new(symbols))),
-        };
-
-        Ok(Self {
-            library_info,
-            inline_stack_map,
-        })
-    }
-
-    pub fn from_isx(file_path: &Path, input: &[u8]) -> Self {
-        let (name, path) = name_and_path(file_path);
-        let symbols = extract_isx_symbols(input);
-        let library_info = LibraryInfo {
-            name: name.clone(),
-            debug_name: name,
-            path: path.clone(),
-            debug_path: path,
-            debug_id: DebugId::default(),
-            code_id: None,
-            arch: None,
-            symbol_table: symbols.map(|syms| Arc::new(SymbolTable::new(syms))),
-        };
-        let inline_stack_map = InlineStackMap::empty();
-        Self {
-            library_info,
-            inline_stack_map,
-        }
-    }
-
-    pub fn empty(file_path: &Path) -> Self {
-        let (name, path) = name_and_path(file_path);
-        let library_info = LibraryInfo {
-            name: name.clone(),
-            debug_name: name,
-            path: path.clone(),
-            debug_path: path,
-            debug_id: DebugId::default(),
-            code_id: None,
-            arch: None,
-            symbol_table: None,
-        };
-        let inline_stack_map = InlineStackMap::empty();
-        Self {
-            library_info,
-            inline_stack_map,
-        }
-    }
-
-    pub fn name(&self) -> &str {
-        &self.library_info.name
-    }
-
-    pub fn library_info(&self) -> &LibraryInfo {
-        &self.library_info
-    }
-
-    pub fn inline_stack_map(&self) -> &InlineStackMap {
-        &self.inline_stack_map
-    }
-}
-
-fn build_inline_stack_map(file: object::File) -> Result<InlineStackMap> {
-    let endian = if file.is_little_endian() {
-        gimli::RunTimeEndian::Little
-    } else {
-        gimli::RunTimeEndian::Big
-    };
-    fn load_section<'a>(file: &'a object::File, id: gimli::SectionId) -> Result<Cow<'a, [u8]>> {
-        let input = match file.section_by_name(id.name()) {
-            Some(section) => section.uncompressed_data()?,
-            None => Cow::Owned(vec![]),
-        };
-        Ok(input)
-    }
-    let dorf = gimli::DwarfSections::load(|id| load_section(&file, id))?;
-    let dorf = dorf.borrow(|sec| gimli::EndianSlice::new(sec, endian));
-    let mut units = dorf.units();
-    let mut frames = InlineStackMap::builder();
-    while let Some(header) = units.next()? {
-        let unit = dorf.unit(header)?;
-        let mut entree = unit.entries_tree(None)?;
-        let root = entree.root()?;
-        let mut ctx = ParseContext {
-            dorf: &dorf,
-            unit: &unit,
-            frames: &mut frames,
-        };
-        parse_inline(&mut ctx, root)?;
-    }
-    Ok(frames.build())
-}
-
-fn extract_isx_symbols(input: &[u8]) -> Option<Vec<Symbol>> {
-    let mut syms = vec![];
-    let (_, mut buf) = input.split_at_checked(32)?;
-    while !buf.is_empty() {
-        let typ;
-        (typ, buf) = buf.split_first()?;
-        match typ {
-            0x11 => {
-                // Code (Virtual Boy)
-                (_, buf) = buf.split_at_checked(4)?;
-                let len_bytes;
-                (len_bytes, buf) = buf.split_first_chunk()?;
-                let len = u32::from_le_bytes(*len_bytes);
-                (_, buf) = buf.split_at_checked(len as usize)?;
-            }
-            0x13 => {
-                // Range (Virtual Boy)
-                let count_bytes;
-                (count_bytes, buf) = buf.split_first_chunk()?;
-                let count = u16::from_le_bytes(*count_bytes);
-                (_, buf) = buf.split_at_checked(count as usize * 9)?;
-            }
-            0x14 => {
-                // Symbol (Virtual Boy)
-                let count_bytes;
-                (count_bytes, buf) = buf.split_first_chunk()?;
-                let count = u16::from_le_bytes(*count_bytes);
-                for _ in 0..count {
-                    let name_len;
-                    (name_len, buf) = buf.split_first()?;
-                    let name_bytes;
-                    (name_bytes, buf) = buf.split_at_checked(*name_len as usize)?;
-                    (_, buf) = buf.split_at_checked(2)?;
-                    let address_bytes;
-                    (address_bytes, buf) = buf.split_first_chunk()?;
-
-                    let name_str = String::from_utf8_lossy(name_bytes);
-                    let address = u32::from_le_bytes(*address_bytes);
-                    syms.push(Symbol {
-                        address: address & 0x07ffffff,
-                        size: Some(4),
-                        name: demangle_any(&name_str),
-                    });
-                }
-            }
-            0x20..=0x22 => {
-                // System (undocumented)
-                let length_bytes;
-                (length_bytes, buf) = buf.split_first_chunk()?;
-                let length = u32::from_le_bytes(*length_bytes);
-                (_, buf) = buf.split_at_checked(length as usize)?;
-            }
-            _ => {
-                return None;
-            }
-        }
-    }
-    Some(syms)
-}
-
-type Reader<'a> = gimli::EndianSlice<'a, gimli::RunTimeEndian>;
-
-struct ParseContext<'a> {
-    dorf: &'a gimli::Dwarf<Reader<'a>>,
-    unit: &'a gimli::Unit<Reader<'a>>,
-    frames: &'a mut InlineStackMapBuilder,
-}
-impl ParseContext<'_> {
-    fn name_attr(&self, attr: gimli::AttributeValue<Reader>) -> Result<Option<String>> {
-        match attr {
-            gimli::AttributeValue::DebugInfoRef(offset) => {
-                let mut units = self.dorf.units();
-                while let Some(header) = units.next()? {
-                    if let Some(offset) = offset.to_unit_offset(&header) {
-                        let unit = self.dorf.unit(header)?;
-                        return self.name_entry(&unit, offset);
-                    }
-                }
-                Ok(None)
-            }
-            gimli::AttributeValue::UnitRef(offset) => self.name_entry(self.unit, offset),
-            other => {
-                bail!("unrecognized attr {other:?}");
-            }
-        }
-    }
-
-    fn name_entry(
-        &self,
-        unit: &gimli::Unit<Reader>,
-        offset: gimli::UnitOffset,
-    ) -> Result<Option<String>> {
-        let abbreviations = self.dorf.abbreviations(&unit.header)?;
-        let mut entries = unit.header.entries_raw(&abbreviations, Some(offset))?;
-        let Some(abbrev) = entries.read_abbreviation()? else {
-            return Ok(None);
-        };
-        let mut name = None;
-        for spec in abbrev.attributes() {
-            let attr = entries.read_attribute(*spec)?;
-            if attr.name() == gimli::DW_AT_linkage_name
-                || (attr.name() == gimli::DW_AT_name && name.is_none())
-            {
-                name = Some(self.dorf.attr_string(unit, attr.value())?)
-            }
-        }
-        Ok(name.map(|n| demangle_any(&String::from_utf8_lossy(&n))))
-    }
-}
-
-fn parse_inline<'a>(
-    ctx: &mut ParseContext<'a>,
-    node: gimli::EntriesTreeNode<'a, '_, Reader<'a>>,
-) -> Result<()> {
-    if node.entry().tag() == gimli::DW_TAG_inlined_subroutine
-        && let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)
-        && let Some(name) = ctx.name_attr(attr)?
-    {
-        let name = Arc::new(name);
-        let mut ranges = ctx.dorf.die_ranges(ctx.unit, node.entry())?;
-        while let Some(range) = ranges.next()? {
-            let start = range.begin as u32 & 0x07ffffff;
-            let end = range.end as u32 & 0x07ffffff;
-            ctx.frames.add(start, end, name.clone());
-        }
-    }
-    let mut children = node.children();
-    while let Some(child) = children.next()? {
-        parse_inline(ctx, child)?;
-    }
-    Ok(())
-}
-
-fn name_and_path(file_path: &Path) -> (String, String) {
-    let normalized = normpath::PathExt::normalize(file_path);
-    let path = normalized
-        .as_ref()
-        .map(|n| n.as_path())
-        .unwrap_or(file_path);
-
-    let name = match path.file_stem() {
-        Some(s) => s.to_string_lossy().into_owned(),
-        None => "game".to_string(),
-    };
-    let path = path.to_string_lossy().into_owned();
-    (name, path)
-}

src/emulator/inline_stack_map.rs

@@ -1,87 +0,0 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    sync::Arc,
-};
-
-pub type InlineStack = Arc<Vec<Arc<String>>>;
-
-#[derive(Debug, Clone)]
-pub struct InlineStackMap {
-    entries: Vec<(u32, InlineStack)>,
-    empty: InlineStack,
-}
-
-impl InlineStackMap {
-    pub fn empty() -> Self {
-        Self {
-            entries: vec![],
-            empty: Arc::new(vec![]),
-        }
-    }
-    pub fn builder() -> InlineStackMapBuilder {
-        InlineStackMapBuilder {
-            events: BTreeMap::new(),
-        }
-    }
-    pub fn get(&self, address: u32) -> &InlineStack {
-        match self.entries.binary_search_by_key(&address, |(a, _)| *a) {
-            Ok(index) => self.entries.get(index),
-            Err(after) => after.checked_sub(1).and_then(|i| self.entries.get(i)),
-        }
-        .map(|(_, s)| s)
-        .unwrap_or(&self.empty)
-    }
-}
-
-#[derive(Default)]
-struct Event {
-    end: usize,
-    start: Vec<Arc<String>>,
-}
-
-pub struct InlineStackMapBuilder {
-    events: BTreeMap<u32, Event>,
-}
-
-impl InlineStackMapBuilder {
-    pub fn add(&mut self, start: u32, end: u32, name: Arc<String>) {
-        self.events.entry(start).or_default().start.push(name);
-        self.events.entry(end).or_default().end += 1;
-    }
-
-    pub fn build(self) -> InlineStackMap {
-        let empty = Arc::new(vec![]);
-        let mut entries = vec![];
-        let mut stack_indexes = vec![];
-        let mut stack = vec![];
-        let mut string_dedup = HashMap::new();
-        let mut stack_dedup = BTreeMap::new();
-        stack_dedup.insert(vec![], empty.clone());
-
-        for (address, event) in self.events {
-            for _ in 0..event.end {
-                stack.pop();
-                stack_indexes.pop();
-            }
-            for call in event.start {
-                if let Some(index) = string_dedup.get(&call) {
-                    stack.push(call);
-                    stack_indexes.push(*index);
-                } else {
-                    let index = string_dedup.len();
-                    string_dedup.insert(call.clone(), index);
-                    stack.push(call);
-                    stack_indexes.push(index);
-                }
-            }
-            if let Some(stack) = stack_dedup.get(&stack_indexes) {
-                entries.push((address, stack.clone()));
-            } else {
-                let stack = Arc::new(stack.clone());
-                stack_dedup.insert(stack_indexes.clone(), stack.clone());
-                entries.push((address, stack));
-            }
-        }
-        InlineStackMap { entries, empty }
-    }
-}

src/emulator/shrooms_vb_core.rs

@@ -1,12 +1,10 @@
-use std::{borrow::Cow, ffi::c_void, ptr, slice, sync::Arc};
+use std::{borrow::Cow, ffi::c_void, ptr, slice};
 
 use anyhow::{Result, anyhow};
 use bitflags::bitflags;
 use num_derive::{FromPrimitive, ToPrimitive};
 use serde::{Deserialize, Serialize};
 
-use crate::emulator::inline_stack_map::{InlineStack, InlineStackMap};
-
 use super::address_set::AddressSet;
 
 #[repr(C)]
@@ -208,9 +206,11 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
     if data.monitor.enabled {
         // SAFETY: length is the length of code, in elements
         let code = unsafe { slice::from_raw_parts(code, length as usize) };
-        data.monitor.detect_event(sim, address, code);
+        if data.monitor.detect_event(sim, address, code) {
             // Something interesting will happen after this instruction is run.
-        // We'll react in the on_fetch callback it does.
+            // 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();
@@ -231,7 +231,7 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
 extern "C" fn on_fetch(
     sim: *mut VB,
     _fetch: c_int,
-    address: u32,
+    _address: u32,
     _value: *mut i32,
     _cycles: *mut u32,
 ) -> c_int {
@@ -239,13 +239,9 @@ extern "C" fn on_fetch(
     // 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.new_inline_stack = data.monitor.detect_new_inline_stack(address);
     unsafe { vb_set_exception_callback(sim, Some(on_exception)) };
-    if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
+    unsafe { vb_set_fetch_callback(sim, None) };
     1
-    } else {
-        0
-    }
 }
 
 #[unsafe(no_mangle)]
@@ -253,21 +249,17 @@ 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.event = data.monitor.queued_event.take();
+    data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc));
-    data.monitor.new_inline_stack = data.monitor.detect_new_inline_stack(pc);
-    data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc & 0x07ffffff));
     unsafe { vb_set_exception_callback(sim, None) };
-    if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
+    unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
-        1
+    if data.monitor.event.is_some() { 1 } else { 0 }
-    } else {
-        0
-    }
 }
 
 #[unsafe(no_mangle)]
@@ -300,7 +292,7 @@ extern "C" fn on_read(
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,
-    typ_: VBDataType,
+    _type: VBDataType,
     value: *mut i32,
     _cycles: *mut u32,
     _cancel: *mut c_int,
@@ -317,29 +309,6 @@ extern "C" fn on_write(
         }
     }
 
-    // If we have profiling enabled, track custom markers
-    if data.monitor.enabled {
-        let normalized_hw_address = address & 0x0700003f;
-        if normalized_hw_address == 0x02000038 && matches!(typ_, VBDataType::S32) {
-            assert!(data.monitor.queued_event.is_none());
-            // The game has written the address of a null-terminated string
-            // (whose length is at most 64 bytes). Read that string.
-            let str_address = unsafe { *value } as u32;
-            let mut bytes = [0u8; 64];
-            let mut len = 0;
-            for (dst, src_address) in bytes.iter_mut().zip(str_address..str_address + 64) {
-                let char = unsafe { vb_read(sim, src_address, VBDataType::U8) } as u8;
-                if char == 0 {
-                    break;
-                }
-                *dst = char;
-                len += 1;
-            }
-            let name = String::from_utf8_lossy(&bytes[..len]).into_owned();
-            data.monitor.queued_event = Some(SimEvent::Marker(Cow::Owned(name)));
-        }
-    }
-
     if let Some(start) = data.write_watchpoints.start_of_range_containing(address) {
         let watch = if data.read_watchpoints.contains(address) {
             VBWatchpointType::Access
@@ -370,35 +339,18 @@ struct EventMonitor {
     event: Option<SimEvent>,
     queued_event: Option<SimEvent>,
     just_halted: bool,
-    inline_stack_map: InlineStackMap,
-    new_inline_stack: Option<InlineStack>,
-    last_inline_stack: InlineStack,
 }
 
 impl EventMonitor {
     fn new() -> Self {
-        let inline_stack_map = InlineStackMap::empty();
-        let last_inline_stack = inline_stack_map.get(0).clone();
         Self {
             enabled: false,
             event: None,
             queued_event: None,
             just_halted: false,
-            inline_stack_map,
-            new_inline_stack: None,
-            last_inline_stack,
         }
     }
 
-    fn detect_new_inline_stack(&mut self, address: u32) -> Option<InlineStack> {
-        let stack = self.inline_stack_map.get(address);
-        if Arc::ptr_eq(stack, &self.last_inline_stack) {
-            return None;
-        }
-        self.last_inline_stack = stack.clone();
-        Some(stack.clone())
-    }
-
     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()
@@ -439,9 +391,7 @@ impl EventMonitor {
                 // 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(
+                return Some(SimEvent::Call(address.wrapping_add_signed(disp)));
-                    address.wrapping_add_signed(disp) & 0x07ffffff,
-                ));
             }
         }
 
@@ -455,7 +405,7 @@ impl EventMonitor {
             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 & 0x07ffffff));
+                return Some(SimEvent::Call(target as u32));
             }
         }
 
@@ -490,10 +440,6 @@ impl VBState {
             || !self.read_watchpoints.is_empty()
             || !self.write_watchpoints.is_empty()
     }
-
-    fn needs_write_callback(&self) -> bool {
-        self.stdout.is_some() || self.monitor.enabled || !self.write_watchpoints.is_empty()
-    }
 }
 
 pub enum StopReason {
@@ -546,30 +492,20 @@ impl Sim {
         unsafe { vb_reset(self.sim) };
     }
 
-    pub fn monitor_events(&mut self, enabled: bool, inline_stack_map: InlineStackMap) {
+    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;
-        state.monitor.new_inline_stack = None;
-        state.monitor.last_inline_stack = inline_stack_map.get(0).clone();
-        state.monitor.inline_stack_map = inline_stack_map;
         if enabled {
             unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
             unsafe { vb_set_exception_callback(self.sim, Some(on_exception)) };
-            unsafe { vb_set_fetch_callback(self.sim, Some(on_fetch)) };
-            unsafe { vb_set_write_callback(self.sim, Some(on_write)) };
         } else {
-            let needs_execute = state.needs_execute_callback();
+            if !state.needs_execute_callback() {
-            let needs_write = state.needs_write_callback();
-            if !needs_execute {
                 unsafe { vb_set_execute_callback(self.sim, None) };
             }
             unsafe { vb_set_exception_callback(self.sim, None) };
             unsafe { vb_set_fetch_callback(self.sim, None) };
-            if !needs_write {
-                unsafe { vb_set_write_callback(self.sim, None) };
-            }
         }
     }
 
@@ -811,10 +747,9 @@ impl Sim {
     fn remove_write_watchpoint(&mut self, address: u32, length: usize) {
         let state = self.get_state();
         state.write_watchpoints.remove(address, length);
-        let needs_write = state.needs_write_callback();
         let needs_execute = state.needs_execute_callback();
         if state.write_watchpoints.is_empty() {
-            if !needs_write {
+            if state.stdout.is_none() {
                 unsafe { vb_set_write_callback(self.sim, None) };
             }
             if !needs_execute {
@@ -838,16 +773,13 @@ impl Sim {
         data.breakpoints.clear();
         data.read_watchpoints.clear();
         data.write_watchpoints.clear();
-        let needs_write = data.needs_write_callback();
+        let needs_write = data.stdout.is_some();
-        let needs_execute = data.needs_execute_callback();
         unsafe { vb_set_read_callback(self.sim, None) };
         if !needs_write {
             unsafe { vb_set_write_callback(self.sim, None) };
         }
-        if !needs_execute {
         unsafe { vb_set_execute_callback(self.sim, None) };
     }
-    }
 
     pub fn watch_stdout(&mut self, watch: bool) {
         let data = self.get_state();
@@ -858,7 +790,7 @@ impl Sim {
             }
         } else {
             data.stdout.take();
-            if !data.needs_write_callback() {
+            if data.write_watchpoints.is_empty() {
                 unsafe { vb_set_write_callback(self.sim, None) };
             }
         }
@@ -884,11 +816,9 @@ impl Sim {
         reason
     }
 
-    pub fn take_profiler_updates(&mut self) -> (Option<SimEvent>, Option<InlineStack>) {
+    pub fn take_sim_event(&mut self) -> Option<SimEvent> {
         let data = self.get_state();
-        let event = data.monitor.event.take();
+        data.monitor.event.take()
-        let inline_stack = data.monitor.new_inline_stack.take();
-        (event, inline_stack)
     }
 
     fn get_state(&mut self) -> &mut VBState {

src/emulator/shrooms_vb_util.rs

@@ -1,31 +0,0 @@
-use std::ffi::c_void;
-
-#[unsafe(no_mangle)]
-unsafe fn vbu_realloc_shim(ptr: *mut c_void, new_size: usize) -> *mut c_void {
-    if !ptr.is_null() {
-        // not supporting proper realloc because it needs bookkeeping and it's unnecessary
-        return std::ptr::null_mut();
-    }
-    let allocation = vec![0u8; new_size].into_boxed_slice();
-    Box::into_raw(allocation).cast()
-}
-
-#[link(name = "vb")]
-unsafe extern "C" {
-    #[link_name = "vbuFromISX"]
-    fn vbu_from_isx(bytes: *const c_void, length: usize, rom_length: *mut usize) -> *mut c_void;
-}
-
-pub fn rom_from_isx(bytes: &[u8]) -> Option<Vec<u8>> {
-    if !bytes.starts_with(b"ISX") {
-        return None;
-    }
-    let mut rom_length = 0;
-    let raw_rom = unsafe { vbu_from_isx(bytes.as_ptr().cast(), bytes.len(), &mut rom_length) };
-    if raw_rom.is_null() {
-        return None;
-    }
-    // SAFETY: the rom was allocated by vbu_realloc_shim, which created it from a Vec<u8>.
-    let rom = unsafe { Vec::from_raw_parts(raw_rom.cast(), rom_length, rom_length) };
-    Some(rom)
-}

src/input.rs

@@ -457,10 +457,15 @@ struct PersistedGamepadMapping {
     default_axes: Vec<(Code, (VBKey, VBKey))>,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct Shortcut {
+    pub shortcut: KeyboardShortcut,
+    pub command: Command,
+}
+
 #[derive(Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub enum Command {
     OpenRom,
-    ReloadRom,
     Quit,
     FrameAdvance,
     FastForward(u32),
@@ -471,10 +476,9 @@ pub enum Command {
 }
 
 impl Command {
-    pub fn all() -> [Self; 8] {
+    pub fn all() -> [Self; 7] {
         [
             Self::OpenRom,
-            Self::ReloadRom,
             Self::Quit,
             Self::PauseResume,
             Self::Reset,
@@ -487,7 +491,6 @@ impl Command {
     pub fn name(self) -> &'static str {
         match self {
             Self::OpenRom => "Open ROM",
-            Self::ReloadRom => "Reload ROM",
             Self::Quit => "Exit",
             Self::PauseResume => "Pause/Resume",
             Self::Reset => "Reset",
@@ -519,10 +522,6 @@ impl Default for Shortcuts {
             Command::OpenRom,
             KeyboardShortcut::new(Modifiers::COMMAND, Key::O),
         );
-        shortcuts.set(
-            Command::ReloadRom,
-            KeyboardShortcut::new(Modifiers::COMMAND | Modifiers::SHIFT, Key::F5),
-        );
         shortcuts.set(
             Command::Quit,
             KeyboardShortcut::new(Modifiers::COMMAND, Key::Q),
@@ -683,7 +682,7 @@ impl ShortcutProvider {
                 else {
                     return true;
                 };
-                if *key != shortcut.logical_key || !modifiers.contains(shortcut.modifiers) {
+                if shortcut.logical_key != *key || !shortcut.modifiers.contains(*modifiers) {
                     return true;
                 }
                 if matches!(command, Command::FastForward(_)) {

src/main.rs

@@ -1,7 +1,7 @@
 // hide console in release mode
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use std::{process, time::SystemTime};
+use std::{path::PathBuf, process, time::SystemTime};
 
 use anyhow::{Result, bail};
 use app::Application;
@@ -12,15 +12,8 @@ use tracing::error;
 use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
 use winit::event_loop::{ControlFlow, EventLoop};
 
-use crate::{
-    config::{CliArgs, SimConfig},
-    emulator::SimId,
-    persistence::Persistence,
-};
-
 mod app;
 mod audio;
-mod config;
 mod controller;
 mod emulator;
 mod gdbserver;
@@ -32,6 +25,18 @@ mod persistence;
 mod profiler;
 mod window;
 
+#[derive(Parser)]
+struct Args {
+    /// The path to a virtual boy ROM to run.
+    rom: Option<PathBuf>,
+    /// 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() {
     let directives = std::env::var("RUST_LOG").unwrap_or("error,lemur=info".into());
     let filter = EnvFilter::builder().parse_lossy(directives);
@@ -93,9 +98,7 @@ fn main() -> Result<()> {
     #[cfg(windows)]
     set_process_priority_to_high()?;
 
-    let args = CliArgs::parse();
+    let args = Args::parse();
-
-    let persistence = Persistence::new();
 
     let (mut builder, client) = EmulatorBuilder::new();
     if let Some(path) = &args.rom {
@@ -110,14 +113,6 @@ fn main() -> Result<()> {
     if args.profile {
         builder = builder.start_paused(true)
     }
-    let p1 = SimConfig::load(&persistence, SimId::Player1);
-    let p2 = SimConfig::load(&persistence, SimId::Player2);
-
-    let watch = args.watch;
-
-    builder = builder
-        .with_audio_on(p1.audio_enabled, p2.audio_enabled)
-        .with_watch_rom(watch, watch);
 
     ThreadBuilder::default()
         .name("Emulator".to_owned())
@@ -136,6 +131,11 @@ 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(client, proxy, persistence, args))?;
+    event_loop.run_app(&mut Application::new(
+        client,
+        proxy,
+        args.debug_port,
+        args.profile,
+    ))?;
     Ok(())
 }

src/memory.rs

@@ -50,11 +50,11 @@ impl MemoryClient {
 }
 
 fn aligned_memory(start: u32, length: usize) -> BoxBytes {
-    if start.is_multiple_of(4) && length.is_multiple_of(4) {
+    if start % 4 == 0 && length % 4 == 0 {
         let memory = vec![0u32; length / 4].into_boxed_slice();
         return bytemuck::box_bytes_of(memory);
     }
-    if start.is_multiple_of(2) && length.is_multiple_of(2) {
+    if start % 2 == 0 && length % 2 == 0 {
         let memory = vec![0u16; length / 2].into_boxed_slice();
         return bytemuck::box_bytes_of(memory);
     }
@@ -169,7 +169,7 @@ impl MemoryRef<'_> {
         T::from_bytes(&self.inner[from..to])
     }
 
-    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<'_, T> {
+    pub fn range<T: MemoryValue>(&self, start: usize, count: usize) -> MemoryIter<T> {
         let from = start * size_of::<T>();
         let to = from + (count * size_of::<T>());
         MemoryIter::new(&self.inner[from..to])

src/profiler.rs

@@ -1,4 +1,5 @@
 use std::{
+    path::PathBuf,
     sync::{Arc, Mutex},
     thread,
 };
@@ -6,14 +7,13 @@ use std::{
 use anyhow::Result;
 use tokio::{select, sync::mpsc};
 
-use crate::emulator::{
+use crate::emulator::{EmulatorClient, EmulatorCommand, ProfileEvent, SimEvent, SimId};
-    EmulatorClient, EmulatorCommand, GameInfo, InlineStack, ProfileEvent, SimEvent, SimId,
-};
 use recording::Recording;
 use state::ProgramState;
 
 mod recording;
 mod state;
+mod symbols;
 
 pub struct Profiler {
     sim_id: SimId,
@@ -132,19 +132,12 @@ async fn run_profile(
 
 async fn handle_event(event: ProfileEvent, session: &mut ProfilerSession) -> Result<()> {
     match event {
-        ProfileEvent::Start { info } => session.start_profiling(info).await,
+        ProfileEvent::Start { file_path } => session.start_profiling(file_path).await,
-        ProfileEvent::Update {
+        ProfileEvent::Update { cycles, event } => {
-            cycles,
-            event,
-            inline_stack,
-        } => {
             session.track_elapsed_cycles(cycles);
             if let Some(event) = event {
                 session.track_event(event)?;
             }
-            if let Some(stack) = inline_stack {
-                session.track_inline_stack(stack);
-            }
         }
     }
     Ok(())
@@ -206,8 +199,8 @@ impl ProfilerSession {
         }
     }
 
-    async fn start_profiling(&mut self, info: Arc<GameInfo>) {
+    async fn start_profiling(&mut self, file_path: PathBuf) {
-        let program = ProgramState::new(info).await;
+        let program = ProgramState::new(file_path).await;
         let recording = if self.recording.is_some() {
             Some(Recording::new(&program))
         } else {
@@ -242,12 +235,6 @@ impl ProfilerSession {
         }
     }
 
-    fn track_inline_stack(&mut self, inline_stack: InlineStack) {
-        if let Some(program) = &mut self.program {
-            program.track_inline_stack(inline_stack);
-        }
-    }
-
     fn start_recording(&mut self) {
         if let Some(program) = &self.program {
             self.recording = Some(Recording::new(program));

src/profiler/recording.rs

@@ -24,8 +24,10 @@ impl Recording {
         let process =
             profile.add_process(state.name(), 1, Timestamp::from_nanos_since_reference(0));
 
-        let lib = profile.add_lib(state.library_info().clone());
+        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,
@@ -89,21 +91,14 @@ impl Recording {
         thread: ThreadHandle,
         frames: &[StackFrame],
     ) -> Option<StackHandle> {
-        let frames = frames
+        self.profile.intern_stack_frames(
-            .iter()
+            thread,
-            .map(|f| {
+            frames.iter().map(|f| FrameInfo {
-                let frame = match f {
+                frame: Frame::InstructionPointer(f.address as u64),
-                    StackFrame::Address(address) => Frame::InstructionPointer(*address as u64),
-                    StackFrame::Label(label) => Frame::Label(self.profile.intern_string(label)),
-                };
-                FrameInfo {
-                    frame,
                 category_pair: CategoryHandle::OTHER.into(),
                 flags: FrameFlags::empty(),
-                }
+            }),
-            })
+        )
-            .collect::<Vec<_>>();
-        self.profile.intern_stack_frames(thread, frames.into_iter())
     }
 }
 

src/profiler/state.rs

@@ -1,39 +1,54 @@
-use std::{collections::HashMap, sync::Arc};
+use std::{collections::HashMap, path::PathBuf};
 
 use anyhow::{Result, bail};
-use fxprof_processed_profile::LibraryInfo;
 
-use crate::emulator::{GameInfo, InlineStack};
+use crate::profiler::symbols::SymbolFile;
 
 pub struct ProgramState {
-    info: Arc<GameInfo>,
+    name: String,
+    symbol_file: Option<SymbolFile>,
     call_stacks: HashMap<u16, Vec<StackFrame>>,
     context_stack: Vec<u16>,
 }
 
-pub enum StackFrame {
+pub struct StackFrame {
-    Address(u32),
+    pub address: u32,
-    Label(Arc<String>),
 }
 
 pub const RESET_CODE: u16 = 0xfff0;
 impl ProgramState {
-    pub async fn new(info: Arc<GameInfo>) -> Self {
+    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)]);
+        call_stacks.insert(
+            RESET_CODE,
+            vec![StackFrame {
+                address: 0xfffffff0,
+            }],
+        );
         Self {
-            info,
+            name,
+            symbol_file,
             call_stacks,
             context_stack: vec![RESET_CODE],
         }
     }
 
     pub fn name(&self) -> &str {
-        self.info.name()
+        &self.name
     }
 
-    pub fn library_info(&self) -> &LibraryInfo {
+    pub fn symbol_file(&self) -> Option<&SymbolFile> {
-        self.info.library_info()
+        self.symbol_file.as_ref()
     }
 
     pub fn current_stack(&self) -> Option<(u16, &[StackFrame])> {
@@ -49,7 +64,7 @@ impl ProgramState {
         let Some(stack) = self.call_stacks.get_mut(code) else {
             bail!("missing stack {code:04x}");
         };
-        stack.push(StackFrame::Address(address));
+        stack.push(StackFrame { address });
         Ok(())
     }
 
@@ -60,11 +75,6 @@ impl ProgramState {
         let Some(stack) = self.call_stacks.get_mut(code) else {
             bail!("missing stack {code:04x}");
         };
-        // just popping the inline frames first
-        while stack
-            .pop_if(|f| matches!(f, StackFrame::Label(_)))
-            .is_some()
-        {}
         if stack.pop().is_none() {
             bail!("returned from {code:04x} but stack was empty");
         }
@@ -90,7 +100,7 @@ impl ProgramState {
         self.context_stack.push(code);
         if self
             .call_stacks
-            .insert(code, vec![StackFrame::Address(address)])
+            .insert(code, vec![StackFrame { address }])
             .is_some()
         {
             bail!("{code:04x} fired twice");
@@ -110,20 +120,4 @@ impl ProgramState {
         }
         Ok(())
     }
-
-    pub fn track_inline_stack(&mut self, inline_stack: InlineStack) {
-        let Some(code) = self.context_stack.last() else {
-            return;
-        };
-        let Some(call_stack) = self.call_stacks.get_mut(code) else {
-            return;
-        };
-        while call_stack
-            .pop_if(|f| matches!(f, StackFrame::Label(_)))
-            .is_some()
-        {}
-        for label in inline_stack.iter() {
-            call_stack.push(StackFrame::Label(label.clone()));
-        }
-    }
 }

src/profiler/symbols.rs

@@ -0,0 +1,67 @@
+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

@@ -1,9 +1,6 @@
-use std::sync::Arc;
-
 pub use about::AboutWindow;
 use egui::{Context, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
-pub use game_screen::DisplayMode;
 pub use gdb::GdbServerWindow;
 pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
@@ -12,7 +9,7 @@ pub use terminal::TerminalWindow;
 pub use vip::{
     BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
 };
-use winit::{event::KeyEvent, window::Window};
+use winit::event::KeyEvent;
 
 use crate::emulator::SimId;
 
@@ -34,8 +31,9 @@ pub trait AppWindow {
     }
     fn initial_viewport(&self) -> ViewportBuilder;
     fn show(&mut self, ctx: &Context);
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, ctx: &Context, render_state: &egui_wgpu::RenderState) {
-        let _ = args;
+        let _ = ctx;
+        let _ = render_state;
     }
     fn on_destroy(&mut self) {}
     fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
@@ -47,9 +45,3 @@ pub trait AppWindow {
         false
     }
 }
-
-pub struct InitArgs<'a> {
-    pub ctx: &'a Context,
-    pub window: &'a Arc<Window>,
-    pub render_state: &'a egui_wgpu::RenderState,
-}

src/window/game.rs

@@ -1,15 +1,10 @@
-use std::{
+use std::{sync::mpsc, time::Duration};
-    sync::{Arc, mpsc},
-    time::Duration,
-};
 
 use crate::{
     app::UserEvent,
-    config::{COLOR_PRESETS, SimConfig},
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
     input::{Command, ShortcutProvider},
     persistence::Persistence,
-    window::InitArgs,
 };
 use anyhow::Context as _;
 use egui::{
@@ -17,6 +12,7 @@ use egui::{
     ViewportBuilder, ViewportCommand, ViewportId, Window,
 };
 use egui_notify::{Anchor, Toast, Toasts};
+use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
@@ -25,18 +21,32 @@ use super::{
     utils::UiExt as _,
 };
 
+const COLOR_PRESETS: [[Color32; 2]; 3] = [
+    [
+        Color32::from_rgb(0xff, 0x00, 0x00),
+        Color32::from_rgb(0x00, 0xc6, 0xf0),
+    ],
+    [
+        Color32::from_rgb(0x00, 0xb4, 0x00),
+        Color32::from_rgb(0xc8, 0x00, 0xff),
+    ],
+    [
+        Color32::from_rgb(0xb4, 0x9b, 0x00),
+        Color32::from_rgb(0x00, 0x00, 0xff),
+    ],
+];
+
 pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
     shortcuts: ShortcutProvider,
     sim_id: SimId,
-    config: SimConfig,
+    config: GameConfig,
     toasts: Toasts,
     screen: Option<GameScreen>,
     messages: Option<mpsc::Receiver<Toast>>,
     color_picker: Option<ColorPickerState>,
-    window: Option<Arc<winit::window::Window>>,
 }
 
 impl GameWindow {
@@ -47,7 +57,7 @@ impl GameWindow {
         shortcuts: ShortcutProvider,
         sim_id: SimId,
     ) -> Self {
-        let config = SimConfig::load(&persistence, sim_id);
+        let config = load_config(&persistence, sim_id);
         let toasts = Toasts::new()
             .with_anchor(Anchor::BottomLeft)
             .with_margin((10.0, 10.0).into())
@@ -63,7 +73,6 @@ impl GameWindow {
             screen: None,
             messages: None,
             color_picker: None,
-            window: None,
         }
     }
 
@@ -78,17 +87,13 @@ impl GameWindow {
             match command {
                 Command::OpenRom => {
                     let rom = rfd::FileDialog::new()
-                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
+                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
                         .pick_file();
                     if let Some(path) = rom {
                         self.client
                             .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
                     }
                 }
-                Command::ReloadRom => {
-                    self.client
-                        .send_command(EmulatorCommand::ReloadRom(self.sim_id));
-                }
                 Command::Quit => {
                     let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
                 }
@@ -134,25 +139,13 @@ impl GameWindow {
                 .clicked()
             {
                 let rom = rfd::FileDialog::new()
-                    .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
+                    .add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
                     .pick_file();
                 if let Some(path) = rom {
                     self.client
                         .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
                 }
             }
-            if ui
-                .add(self.button_for(ui.ctx(), "Reload ROM", Command::ReloadRom))
-                .clicked()
-            {
-                self.client
-                    .send_command(EmulatorCommand::ReloadRom(self.sim_id));
-            }
-            let watch_rom = self.client.is_rom_watched(self.sim_id);
-            if ui.selectable_button(watch_rom, "Watch ROM").clicked() {
-                self.client
-                    .send_command(EmulatorCommand::WatchRom(self.sim_id, !watch_rom));
-            }
             if ui
                 .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
                 .clicked()
@@ -305,13 +298,10 @@ impl GameWindow {
         self.client
             .send_command(EmulatorCommand::Screenshot(self.sim_id, tx));
         let bytes = rx.await.context("Could not take screenshot")?;
-        let mut file_dialog = rfd::FileDialog::new()
+        let file = rfd::FileDialog::new()
             .add_filter("PNG images", &["png"])
-            .set_file_name("screenshot.png");
+            .set_file_name("screenshot.png")
-        if let Some(window) = self.window.as_ref() {
+            .save_file();
-            file_dialog = file_dialog.set_parent(window);
-        }
-        let file = file_dialog.save_file();
         let Some(path) = file else {
             return Ok(None);
         };
@@ -411,15 +401,15 @@ impl GameWindow {
             });
         });
         ui.menu_button("Audio", |ui| {
-            if ui
+            let p1_enabled = self.client.is_audio_enabled(SimId::Player1);
-                .selectable_button(self.config.audio_enabled, "Enabled")
+            let p2_enabled = self.client.is_audio_enabled(SimId::Player2);
-                .clicked()
+            if ui.selectable_button(p1_enabled, "Player 1").clicked() {
-            {
+                self.client
-                self.update_config(|c| c.audio_enabled = !c.audio_enabled);
+                    .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
-                self.client.send_command(EmulatorCommand::SetAudioEnabled(
+            }
-                    self.sim_id,
+            if ui.selectable_button(p2_enabled, "Player 2").clicked() {
-                    self.config.audio_enabled,
+                self.client
-                ));
+                    .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
             }
         });
         ui.menu_button("Input", |ui| {
@@ -461,16 +451,18 @@ impl GameWindow {
         }
     }
 
-    fn update_config(&mut self, update: impl FnOnce(&mut SimConfig)) {
+    fn update_config(&mut self, update: impl FnOnce(&mut GameConfig)) {
         let mut new_config = self.config.clone();
         update(&mut new_config);
         if self.config != new_config {
-            let _ = new_config.save(&self.persistence, self.sim_id);
+            let _ = self
+                .persistence
+                .save_config(config_filename(self.sim_id), &new_config);
         }
         self.config = new_config;
     }
 
-    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button<'_> {
+    fn button_for(&self, ctx: &Context, text: &str, command: Command) -> Button {
         let button = Button::new(text);
         match self.shortcuts.shortcut_for(command) {
             Some(shortcut) => button.shortcut_text(ctx.format_shortcut(&shortcut)),
@@ -479,6 +471,24 @@ impl GameWindow {
     }
 }
 
+fn config_filename(sim_id: SimId) -> &'static str {
+    match sim_id {
+        SimId::Player1 => "config_p1",
+        SimId::Player2 => "config_p2",
+    }
+}
+
+fn load_config(persistence: &Persistence, sim_id: SimId) -> GameConfig {
+    if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
+        return config;
+    }
+    GameConfig {
+        display_mode: DisplayMode::Anaglyph,
+        colors: COLOR_PRESETS[0],
+        dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
+    }
+}
+
 impl AppWindow for GameWindow {
     fn viewport_id(&self) -> ViewportId {
         match self.sim_id {
@@ -535,8 +545,8 @@ impl AppWindow for GameWindow {
         self.toasts.show(ctx);
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, _ctx: &Context, render_state: &egui_wgpu::RenderState) {
-        let (screen, sink) = GameScreen::init(args.render_state);
+        let (screen, sink) = GameScreen::init(render_state);
         let (message_sink, message_source) = mpsc::channel();
         self.client.send_command(EmulatorCommand::ConnectToSim(
             self.sim_id,
@@ -545,7 +555,6 @@ impl AppWindow for GameWindow {
         ));
         self.screen = Some(screen);
         self.messages = Some(message_source);
-        self.window = Some(args.window.clone());
     }
 
     fn on_destroy(&mut self) {
@@ -561,3 +570,10 @@ struct ColorPickerState {
     just_opened: bool,
     unpause_on_close: bool,
 }
+
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
+struct GameConfig {
+    display_mode: DisplayMode,
+    colors: [Color32; 2],
+    dimensions: Vec2,
+}

src/window/hotkeys.rs

@@ -62,8 +62,8 @@ impl HotkeysWindow {
                     }
                 });
         });
-        if let Some(command) = self.now_binding
+        if let Some(command) = self.now_binding {
-            && let Some(shortcut) = ui.input_mut(|i| {
+            if let Some(shortcut) = ui.input_mut(|i| {
                 i.events.iter().find_map(|event| match event {
                     Event::Key {
                         key,
@@ -73,12 +73,12 @@ impl HotkeysWindow {
                     } => Some(KeyboardShortcut::new(*modifiers, *key)),
                     _ => None,
                 })
-            })
+            }) {
-        {
                 self.shortcuts.set(command, shortcut);
                 self.now_binding = None;
             }
         }
+    }
 
     fn show_ff_settings(&mut self, ui: &mut Ui) {
         let row_height = ui.spacing().interact_size.y;

src/window/profile.rs

@@ -1,35 +1,30 @@
-use std::{fs, sync::Arc, time::Duration};
+use std::{fs, time::Duration};
 
 use anyhow::Result;
-use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
+use egui::{Button, CentralPanel, Checkbox, ViewportBuilder, ViewportId};
 use egui_notify::{Anchor, Toast, Toasts};
-use winit::window::Window;
 
 use crate::{
-    emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId},
+    emulator::{EmulatorClient, SimId},
     profiler::{Profiler, ProfilerStatus},
-    window::{AppWindow, InitArgs},
+    window::AppWindow,
 };
 
 pub struct ProfileWindow {
     sim_id: SimId,
-    client: EmulatorClient,
     profiler: Profiler,
     toasts: Toasts,
-    window: Option<Arc<Window>>,
 }
 
 impl ProfileWindow {
     pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
         Self {
             sim_id,
-            client: client.clone(),
             profiler: Profiler::new(sim_id, client),
             toasts: Toasts::new()
                 .with_anchor(Anchor::BottomLeft)
                 .with_margin((10.0, 10.0).into())
                 .reverse(true),
-            window: None,
         }
     }
 
@@ -38,10 +33,6 @@ impl ProfileWindow {
     }
 
     fn finish_recording(&mut self) {
-        let pause = matches!(self.client.emulator_state(), EmulatorState::Running);
-        if pause {
-            self.client.send_command(EmulatorCommand::Pause);
-        }
         match self.try_finish_recording() {
             Ok(Some(path)) => {
                 let mut toast = Toast::info(format!("Saved to {path}"));
@@ -55,23 +46,16 @@ impl ProfileWindow {
                 self.toasts.add(toast);
             }
         }
-        if pause {
-            self.client.send_command(EmulatorCommand::Resume);
-        }
     }
 
     fn try_finish_recording(&mut self) -> Result<Option<String>> {
         let bytes_receiver = self.profiler.finish_recording();
-        let mut file_dialog = rfd::FileDialog::new()
+        let file = rfd::FileDialog::new()
             .add_filter("Profiler files", &["json"])
-            .set_file_name("profile.json");
+            .set_file_name("profile.json")
-        if let Some(window) = self.window.as_ref() {
+            .save_file();
-            file_dialog = file_dialog.set_parent(window);
-        }
-        let file = file_dialog.save_file();
         if let Some(path) = file {
             let bytes = pollster::block_on(bytes_receiver)?;
-            let _ = fs::remove_file(&path);
             fs::write(&path, bytes)?;
             Ok(Some(path.display().to_string()))
         } else {
@@ -100,32 +84,8 @@ impl AppWindow for ProfileWindow {
         let status = self.profiler.status();
         let recording = matches!(status, ProfilerStatus::Recording);
         CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal_wrapped(|ui| {
-                ui.spacing_mut().item_spacing.x = 0.0;
-                ui.add(
-                    Label::new(
-                        "Use this tool to record performance profiles of your game, for use in ",
-                    )
-                    .wrap_mode(egui::TextWrapMode::Wrap),
-                );
-                ui.hyperlink("https://profiler.firefox.com");
-                ui.label(".");
-            });
-            ui.horizontal_wrapped(|ui| {
-                ui.spacing_mut().item_spacing.x = 0.0;
-                ui.add(
-                    Label::new("For more instructions, see ").wrap_mode(egui::TextWrapMode::Wrap),
-                );
-                ui.hyperlink_to(
-                    "the Lemur wiki",
-                    "https://git.virtual-boy.com/PVB/lemur/wiki/Profiling-with-Lemur",
-                );
-                ui.label(".");
-            });
-            ui.separator();
-
             let mut enabled = status.enabled();
-            let enabled_checkbox = Checkbox::new(&mut enabled, "Enable profiling");
+            let enabled_checkbox = Checkbox::new(&mut enabled, "Profiling enabled?");
             if ui.add_enabled(!recording, enabled_checkbox).changed() {
                 if enabled {
                     self.profiler.enable();
@@ -133,9 +93,7 @@ impl AppWindow for ProfileWindow {
                     self.profiler.disable();
                 }
             }
-            if !enabled {
+
-                ui.label("Enabling profiling will restart your current game.");
-            } else {
             ui.horizontal(|ui| {
                 if !recording {
                     let record_button = Button::new("Record");
@@ -152,7 +110,6 @@ impl AppWindow for ProfileWindow {
                     }
                 }
             });
-            }
 
             match &status {
                 ProfilerStatus::Recording => {
@@ -166,8 +123,4 @@ impl AppWindow for ProfileWindow {
         });
         self.toasts.show(ctx);
     }
-
-    fn on_init(&mut self, args: InitArgs) {
-        self.window = Some(args.window.clone());
-    }
 }

src/window/utils.rs

@@ -86,11 +86,11 @@ impl UiExt for Ui {
                 let (rect, _) = ui.allocate_at_least(Vec2::new(100.0, 100.0), Sense::hover());
                 ui.painter().rect_filled(rect, 0.0, *color);
                 let resp = ui.text_edit_singleline(hex);
-                if resp.changed()
+                if resp.changed() {
-                    && let Ok(new_color) = HexColor::from_str_without_hash(hex)
+                    if let Ok(new_color) = HexColor::from_str_without_hash(hex) {
-                {
                         *color = new_color.color();
                     }
+                }
                 resp
             },
         )
@@ -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 - 16.0;
+            let arrow_left = res.rect.max.x + 4.0;
-            let arrow_right = res.rect.max.x;
+            let arrow_right = res.rect.max.x + 20.0;
-            let arrow_top = res.rect.min.y;
+            let arrow_top = res.rect.min.y - 2.0;
             let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
-            let arrow_bottom = res.rect.max.y;
+            let arrow_bottom = res.rect.max.y + 2.0;
 
             let top_arrow_rect = Rect {
                 min: (arrow_left, arrow_top).into(),

src/window/vip/bgmap.rs

@@ -11,7 +11,7 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt},
     },
 };
@@ -187,8 +187,8 @@ impl AppWindow for BgMapWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
-        args.ctx.add_texture_loader(self.loader.clone());
+        ctx.add_texture_loader(self.loader.clone());
     }
 
     fn show(&mut self, ctx: &Context) {

src/window/vip/chardata.rs

@@ -12,7 +12,7 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -251,8 +251,8 @@ impl AppWindow for CharacterDataWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
-        args.ctx.add_texture_loader(self.loader.clone());
+        ctx.add_texture_loader(self.loader.clone());
     }
 
     fn show(&mut self, ctx: &Context) {
@@ -274,6 +274,12 @@ impl AppWindow for CharacterDataWindow {
     }
 }
 
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
+enum CharDataResource {
+    Character { palette: Palette, index: usize },
+    CharacterData { palette: Palette },
+}
+
 #[derive(Clone, Default, PartialEq, Eq)]
 struct CharDataParams {
     palette: Palette,

src/window/vip/framebuffer.rs

@@ -11,7 +11,7 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -153,8 +153,8 @@ impl AppWindow for FrameBufferWindow {
             .with_inner_size((640.0, 480.0))
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
-        args.ctx.add_texture_loader(self.loader.clone());
+        ctx.add_texture_loader(self.loader.clone());
     }
 
     fn show(&mut self, ctx: &Context) {

src/window/vip/object.rs

@@ -11,7 +11,7 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryView},
     window::{
-        AppWindow, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -208,8 +208,8 @@ impl AppWindow for ObjectWindow {
             .with_inner_size((640.0, 500.0))
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
-        args.ctx.add_texture_loader(self.loader.clone());
+        ctx.add_texture_loader(self.loader.clone());
     }
 
     fn show(&mut self, ctx: &Context) {

src/window/vip/world.rs

@@ -17,7 +17,7 @@ use crate::{
     images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
     memory::{MemoryClient, MemoryRef, MemoryView},
     window::{
-        AppWindow, InitArgs,
+        AppWindow,
         utils::{NumberEdit, UiExt as _},
     },
 };
@@ -523,8 +523,8 @@ impl AppWindow for WorldWindow {
             .with_inner_size((640.0, 520.0))
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
-        args.ctx.add_texture_loader(self.loader.clone());
+        ctx.add_texture_loader(self.loader.clone());
     }
 
     fn show(&mut self, ctx: &Context) {