Cargo.toml

@@ -4,8 +4,8 @@ description = "An emulator for the Virtual Boy."
 repository = "https://git.virtual-boy.com/PVB/lemur"
 publish = false
 license = "MIT"
-version = "0.9.2"
+version = "0.2.7"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
 anyhow = "1"
@@ -15,41 +15,34 @@ 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"
+directories = "5"
-egui = { version = "0.32", features = ["serde"] }
+egui = { version = "0.30", features = ["serde"] }
-egui_extras = { version = "0.32", features = ["image"] }
+egui_extras = { version = "0.30", features = ["image"] }
-egui-notify = "0.20"
+egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
-egui-winit = "0.32"
+egui-winit = "0.30"
-egui-wgpu = { version = "0.32", features = ["winit"] }
+egui-wgpu = { version = "0.30", features = ["winit"] }
-fxprof-processed-profile = "0.8"
-fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
-gimli = "0.32"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
-itertools = "0.14"
+itertools = "0.13"
-normpath = "1"
 num-derive = "0.4"
 num-traits = "0.2"
-object = "0.37"
 oneshot = "0.1"
 pollster = "0.4"
-rand = "0.9"
+rfd = "0.15"
-rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "async-std"]}
 rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-thread-priority = "2"
+thread-priority = "1"
-tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
+tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync"] }
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-wgpu = "25"
+wgpu = "23"
-wholesym = "0.8"
 winit = { version = "0.30", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.61", features = ["Win32_System_Threading"] }
+windows = { version = "0.58", features = ["Win32_System_Threading"] }
 
 [build-dependencies]
 cc = "1"

README.md

@@ -6,8 +6,6 @@ A Virtual Boy emulator built around the shrooms-vb core. Written in Rust, using
 
 Install the following dependencies:
  - `cargo` (via [rustup](https://rustup.rs/), the version from your package manager is too old)
- - a C compiler (any will do, [the build script](https://docs.rs/cc/latest/cc/#compile-time-requirements) will find it automatically)
- - (on linux) `libasound2-dev` and `libudev-dev`
 
 Run
 ```sh

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-20 git lld-20 llvm-20 make patch xz-utils && \
-    ln -s $(which clang-20) /usr/bin/clang && \
-    ln -s $(which clang++-20) /usr/bin/clang++ && \
-    ln -s $(which ld64.lld-20) /usr/bin/ld64.lld && \
-    SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:1.89-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-20 lld-20 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-20) /usr/bin/clang && \
+    ln -s $(which clang-19) /usr/bin/clang && \
-    ln -s $(which clang++-20) /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-20" CXX="clang++-20" AR="llvm-ar-20" \
+    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,12 @@ 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-20" \
+    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-20" \
+    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-20" \
+    CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-19" \
-    RC_PATH="llvm-rc-20" \
+    CROSS_COMPILE="setting-this-to-silence-a-warning-" \
+    RC_PATH="llvm-rc-19" \
     MACOSX_DEPLOYMENT_TARGET="14.5"
-ENTRYPOINT ["bash"]

build.rs

@@ -18,22 +18,16 @@ 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("VB_LITTLE_ENDIAN", None)
         .define("VB_SIGNED_PROPAGATE", None)
         .define("VB_DIV_GENERIC", None)
-        .define("VB_DIRECT_EXCEPTION", "on_exception")
         .define("VB_DIRECT_EXECUTE", "on_execute")
-        .define("VB_DIRECT_FETCH", "on_fetch")
         .define("VB_DIRECT_FRAME", "on_frame")
         .define("VB_DIRECT_READ", "on_read")
         .define("VB_DIRECT_WRITE", "on_write")
-        .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-20
-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

shrooms-vb-core

@@ -1 +1 @@
-Subproject commit 4ed3b7299507b8ea0079a0965f33b0c8a6886572
+Subproject commit 57dcd8370a885541ae6a1de0f35b25675728b226

src/app.rs

@@ -1,10 +1,9 @@
 use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
 
 use egui::{
+    ahash::{HashMap, HashMapExt},
     Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
     ViewportCommand, ViewportId, ViewportInfo,
-    ahash::{HashMap, HashMapExt},
-    style::ScrollStyle,
 };
 use gilrs::{EventType, Gilrs};
 use tracing::{error, warn};
@@ -18,15 +17,9 @@ use winit::{
 use crate::{
     controller::ControllerManager,
     emulator::{EmulatorClient, EmulatorCommand, SimId},
-    images::ImageProcessor,
+    input::MappingProvider,
-    input::{MappingProvider, ShortcutProvider},
-    memory::MemoryClient,
     persistence::Persistence,
-    window::{
+    window::{AboutWindow, AppWindow, GameWindow, GdbServerWindow, InputWindow},
-        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow,
-        RegisterWindow, TerminalWindow, WorldWindow,
-    },
 };
 
 fn load_icon() -> anyhow::Result<IconData> {
@@ -42,19 +35,14 @@ fn load_icon() -> anyhow::Result<IconData> {
 
 pub struct Application {
     icon: Option<Arc<IconData>>,
-    wgpu: WgpuState,
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     mappings: MappingProvider,
-    shortcuts: ShortcutProvider,
     controllers: ControllerManager,
-    memory: Arc<MemoryClient>,
-    images: ImageProcessor,
     persistence: Persistence,
     viewports: HashMap<ViewportId, Viewport>,
     focused: Option<ViewportId>,
     init_debug_port: Option<u16>,
-    init_profiling: bool,
 }
 
 impl Application {
@@ -62,16 +50,11 @@ impl Application {
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         debug_port: Option<u16>,
-        profiling: bool,
     ) -> Self {
-        let wgpu = WgpuState::new();
         let icon = load_icon().ok().map(Arc::new);
         let persistence = Persistence::new();
         let mappings = MappingProvider::new(persistence.clone());
-        let shortcuts = ShortcutProvider::new(persistence.clone());
         let controllers = ControllerManager::new(client.clone(), &mappings);
-        let memory = Arc::new(MemoryClient::new(client.clone()));
-        let images = ImageProcessor::new();
         {
             let mappings = mappings.clone();
             let proxy = proxy.clone();
@@ -79,31 +62,25 @@ impl Application {
         }
         Self {
             icon,
-            wgpu,
             client,
             proxy,
             mappings,
-            shortcuts,
-            memory,
-            images,
             controllers,
             persistence,
             viewports: HashMap::new(),
             focused: None,
             init_debug_port: debug_port,
-            init_profiling: profiling,
         }
     }
 
     fn open(&mut self, event_loop: &ActiveEventLoop, window: Box<dyn AppWindow>) {
         let viewport_id = window.viewport_id();
-        if let Some(viewport) = self.viewports.get(&viewport_id) {
+        if self.viewports.contains_key(&viewport_id) {
-            viewport.window.focus_window();
             return;
         }
         self.viewports.insert(
             viewport_id,
-            Viewport::new(event_loop, &self.wgpu, self.icon.clone(), window),
+            Viewport::new(event_loop, self.icon.clone(), window),
         );
     }
 }
@@ -120,15 +97,9 @@ impl ApplicationHandler<UserEvent> for Application {
             self.client.clone(),
             self.proxy.clone(),
             self.persistence.clone(),
-            self.shortcuts.clone(),
             SimId::Player1,
         );
         self.open(event_loop, Box::new(app));
-        if self.init_profiling {
-            let mut profiler = ProfileWindow::new(SimId::Player1, self.client.clone());
-            profiler.launch();
-            self.open(event_loop, Box::new(profiler));
-        }
     }
 
     fn window_event(
@@ -145,23 +116,19 @@ impl ApplicationHandler<UserEvent> for Application {
             return;
         };
         let viewport_id = viewport.id();
+        match &event {
+            WindowEvent::KeyboardInput { event, .. } => {
+                self.controllers.handle_key_event(event);
+                viewport.app.handle_key_event(event);
+            }
+            WindowEvent::Focused(new_focused) => {
+                self.focused = new_focused.then_some(viewport_id);
+            }
+            _ => {}
+        }
         let mut queue_redraw = false;
         let mut inactive_viewports = HashSet::new();
-        let (consumed, action) = viewport.on_window_event(&event);
+        match viewport.on_window_event(event) {
-        if !consumed {
-            match event {
-                WindowEvent::KeyboardInput { event, .. } => {
-                    if !viewport.app.handle_key_event(&event) {
-                        self.controllers.handle_key_event(&event);
-                    }
-                }
-                WindowEvent::Focused(new_focused) => {
-                    self.focused = new_focused.then_some(viewport_id);
-                }
-                _ => {}
-            }
-        }
-        match action {
             Some(Action::Redraw) => {
                 for viewport in self.viewports.values_mut() {
                     match viewport.redraw(event_loop) {
@@ -213,52 +180,20 @@ impl ApplicationHandler<UserEvent> for Application {
     fn user_event(&mut self, event_loop: &ActiveEventLoop, event: UserEvent) {
         match event {
             UserEvent::GamepadEvent(event) => {
-                if let Some(viewport) = self
+                self.controllers.handle_gamepad_event(&event);
+                let Some(viewport) = self
                     .focused
                     .as_ref()
                     .and_then(|id| self.viewports.get_mut(id))
-                    && viewport.app.handle_gamepad_event(&event)
+                else {
-                {
                     return;
-                }
+                };
-                self.controllers.handle_gamepad_event(&event);
+                viewport.app.handle_gamepad_event(&event);
             }
             UserEvent::OpenAbout => {
                 let about = AboutWindow;
                 self.open(event_loop, Box::new(about));
             }
-            UserEvent::OpenCharacterData(sim_id) => {
-                let chardata = CharacterDataWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(chardata));
-            }
-            UserEvent::OpenBgMap(sim_id) => {
-                let bgmap = BgMapWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(bgmap));
-            }
-            UserEvent::OpenObjects(sim_id) => {
-                let objects = ObjectWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(objects));
-            }
-            UserEvent::OpenWorlds(sim_id) => {
-                let world = WorldWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(world));
-            }
-            UserEvent::OpenFrameBuffers(sim_id) => {
-                let world = FrameBufferWindow::new(sim_id, &self.memory, &mut self.images);
-                self.open(event_loop, Box::new(world));
-            }
-            UserEvent::OpenRegisters(sim_id) => {
-                let registers = RegisterWindow::new(sim_id, &self.memory);
-                self.open(event_loop, Box::new(registers));
-            }
-            UserEvent::OpenTerminal(sim_id) => {
-                let terminal = TerminalWindow::new(sim_id, &self.client);
-                self.open(event_loop, Box::new(terminal));
-            }
-            UserEvent::OpenProfiler(sim_id) => {
-                let profile = ProfileWindow::new(sim_id, self.client.clone());
-                self.open(event_loop, Box::new(profile));
-            }
             UserEvent::OpenDebugger(sim_id) => {
                 let debugger =
                     GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
@@ -268,16 +203,11 @@ impl ApplicationHandler<UserEvent> for Application {
                 let input = InputWindow::new(self.mappings.clone());
                 self.open(event_loop, Box::new(input));
             }
-            UserEvent::OpenHotkeys => {
-                let hotkeys = HotkeysWindow::new(self.shortcuts.clone());
-                self.open(event_loop, Box::new(hotkeys));
-            }
             UserEvent::OpenPlayer2 => {
                 let p2 = GameWindow::new(
                     self.client.clone(),
                     self.proxy.clone(),
                     self.persistence.clone(),
-                    self.shortcuts.clone(),
                     SimId::Player2,
                 );
                 self.open(event_loop, Box::new(p2));
@@ -300,59 +230,10 @@ 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.");
-            error!(%error, "could not gracefully exit.");
+            }
-        }
-    }
-}
-
-struct WgpuState {
-    instance: wgpu::Instance,
-    adapter: wgpu::Adapter,
-    device: wgpu::Device,
-    queue: wgpu::Queue,
-}
-
-impl WgpuState {
-    fn new() -> Self {
-        #[allow(unused_variables)]
-        let egui_wgpu::WgpuConfiguration {
-            wgpu_setup:
-                egui_wgpu::WgpuSetup::CreateNew(egui_wgpu::WgpuSetupCreateNew {
-                    instance_descriptor: wgpu::InstanceDescriptor { backends, .. },
-                    device_descriptor,
-                    ..
-                }),
-            ..
-        } = egui_wgpu::WgpuConfiguration::default()
-        else {
-            panic!("required fields not found")
-        };
-        #[cfg(windows)]
-        let backends = wgpu::Backends::from_env()
-            .unwrap_or((wgpu::Backends::PRIMARY | wgpu::Backends::GL) - wgpu::Backends::VULKAN);
-        let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor {
-            backends,
-            ..wgpu::InstanceDescriptor::default()
-        });
-
-        let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions {
-            power_preference: wgpu::PowerPreference::HighPerformance,
-            compatible_surface: None,
-            force_fallback_adapter: false,
-        }))
-        .expect("could not create adapter");
-
-        let (device, queue) =
-            pollster::block_on(adapter.request_device(&(*device_descriptor)(&adapter)))
-                .expect("could not request device");
-        Self {
-            instance,
-            adapter,
-            device,
-            queue,
         }
     }
 }
@@ -370,7 +251,6 @@ struct Viewport {
 impl Viewport {
     pub fn new(
         event_loop: &ActiveEventLoop,
-        wgpu: &WgpuState,
         icon: Option<Arc<IconData>>,
         mut app: Box<dyn AppWindow>,
     ) -> Self {
@@ -390,30 +270,27 @@ impl Viewport {
         ctx.set_fonts(fonts);
         ctx.style_mut(|s| {
             s.wrap_mode = Some(TextWrapMode::Extend);
-            s.visuals.menu_corner_radius = Default::default();
+            s.visuals.menu_rounding = Default::default();
-            s.spacing.scroll = ScrollStyle::thin();
         });
         egui_extras::install_image_loaders(&ctx);
 
-        let wgpu_config = egui_wgpu::WgpuConfiguration {
+        #[allow(unused_mut)]
+        let mut wgpu_config = egui_wgpu::WgpuConfiguration {
             present_mode: wgpu::PresentMode::AutoNoVsync,
-            wgpu_setup: egui_wgpu::WgpuSetup::Existing(egui_wgpu::WgpuSetupExisting {
-                instance: wgpu.instance.clone(),
-                adapter: wgpu.adapter.clone(),
-                device: wgpu.device.clone(),
-                queue: wgpu.queue.clone(),
-            }),
             ..egui_wgpu::WgpuConfiguration::default()
         };
+        #[cfg(windows)]
+        {
+            if let egui_wgpu::WgpuSetup::CreateNew {
+                supported_backends, ..
+            } = &mut wgpu_config.wgpu_setup
+            {
+                *supported_backends -= wgpu::Backends::VULKAN;
+            }
+        }
 
-        let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
+        let mut painter =
-            ctx.clone(),
+            egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
-            wgpu_config,
-            1,
-            None,
-            false,
-            true,
-        ));
 
         let mut info = ViewportInfo::default();
         let mut builder = app.initial_viewport();
@@ -423,13 +300,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(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,
@@ -446,8 +317,8 @@ impl Viewport {
         self.app.viewport_id()
     }
 
-    pub fn on_window_event(&mut self, event: &WindowEvent) -> (bool, Option<Action>) {
+    pub fn on_window_event(&mut self, event: WindowEvent) -> Option<Action> {
-        let response = self.state.on_window_event(&self.window, event);
+        let response = self.state.on_window_event(&self.window, &event);
         egui_winit::update_viewport_info(
             &mut self.info,
             self.state.egui_ctx(),
@@ -455,22 +326,22 @@ impl Viewport {
             false,
         );
 
-        let action = match event {
+        match event {
             WindowEvent::RedrawRequested => Some(Action::Redraw),
             WindowEvent::CloseRequested => Some(Action::Close),
             WindowEvent::Resized(size) => {
-                if let (Some(width), Some(height)) =
+                let (Some(width), Some(height)) =
                     (NonZero::new(size.width), NonZero::new(size.height))
-                {
+                else {
-                    self.painter
+                    return None;
-                        .on_window_resized(ViewportId::ROOT, width, height);
+                };
-                }
+                self.painter
+                    .on_window_resized(ViewportId::ROOT, width, height);
                 None
             }
             _ if response.repaint => Some(Action::Redraw),
             _ => None,
-        };
+        }
-        (response.consumed, action)
     }
 
     fn redraw(&mut self, event_loop: &ActiveEventLoop) -> Option<Action> {
@@ -532,17 +403,8 @@ impl Drop for Viewport {
 pub enum UserEvent {
     GamepadEvent(gilrs::Event),
     OpenAbout,
-    OpenCharacterData(SimId),
-    OpenBgMap(SimId),
-    OpenObjects(SimId),
-    OpenWorlds(SimId),
-    OpenFrameBuffers(SimId),
-    OpenRegisters(SimId),
-    OpenTerminal(SimId),
-    OpenProfiler(SimId),
     OpenDebugger(SimId),
     OpenInput,
-    OpenHotkeys,
     OpenPlayer2,
     Quit(SimId),
 }

src/audio.rs

@@ -1,22 +1,20 @@
 use std::time::Duration;
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
 use itertools::Itertools;
-use rubato::{FastFixedOut, Resampler};
+use rubato::{FftFixedInOut, Resampler};
 use tracing::error;
 
 pub struct Audio {
     #[allow(unused)]
     stream: cpal::Stream,
-    sampler: FastFixedOut<f32>,
+    sampler: FftFixedInOut<f32>,
     input_buffer: Vec<Vec<f32>>,
     output_buffer: Vec<Vec<f32>>,
     sample_sink: rtrb::Producer<f32>,
 }
 
-const VB_FREQUENCY: usize = 41700;
-
 impl Audio {
     pub fn init() -> Result<Self> {
         let host = cpal::default_host();
@@ -30,15 +28,7 @@ impl Audio {
             bail!("No suitable output config available");
         };
         let mut config = config.with_max_sample_rate().config();
-        let resample_ratio = config.sample_rate.0 as f64 / VB_FREQUENCY as f64;
+        let sampler = FftFixedInOut::new(41700, config.sample_rate.0 as usize, 834, 2)?;
-        let chunk_size = (834.0 * resample_ratio) as usize;
-        let sampler = FastFixedOut::new(
-            resample_ratio,
-            64.0,
-            rubato::PolynomialDegree::Cubic,
-            chunk_size,
-            2,
-        )?;
         config.buffer_size = cpal::BufferSize::Fixed(sampler.output_frames_max() as u32);
 
         let input_buffer = sampler.input_buffer_allocate(true);
@@ -111,10 +101,4 @@ impl Audio {
             std::thread::sleep(Duration::from_micros(500));
         }
     }
-
-    pub fn set_speed(&mut self, speed: f64) -> Result<()> {
-        self.sampler
-            .set_resample_ratio_relative(1.0 / speed, false)?;
-        Ok(())
-    }
 }

src/controller.rs

@@ -1,6 +1,6 @@
 use std::sync::{Arc, RwLock};
 
-use gilrs::{Event as GamepadEvent, EventType, GamepadId, ev::Code};
+use gilrs::{ev::Code, Event as GamepadEvent, EventType, GamepadId};
 use winit::{
     event::{ElementState, KeyEvent},
     keyboard::PhysicalKey,

src/emulator.rs

@@ -1,39 +1,28 @@
 use std::{
     collections::HashMap,
     fmt::Display,
+    fs::{self, File},
+    io::{Read, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
     sync::{
-        Arc, Weak,
         atomic::{AtomicBool, Ordering},
         mpsc::{self, RecvError, TryRecvError},
+        Arc,
     },
-    time::Duration,
 };
 
 use anyhow::Result;
 use atomic::Atomic;
 use bytemuck::NoUninit;
-use egui_notify::Toast;
+use egui_toast::{Toast, ToastKind, ToastOptions};
 use tracing::{error, warn};
 
-use crate::{
+use crate::{audio::Audio, graphics::TextureSink};
-    audio::Audio,
+use shrooms_vb_core::{Sim, StopReason, EXPECTED_FRAME_SIZE};
-    graphics::TextureSink,
+pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
-    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 {
@@ -50,13 +39,6 @@ impl SimId {
             Self::Player2 => 1,
         }
     }
-    pub const fn from_index(index: usize) -> Option<Self> {
-        match index {
-            0 => Some(Self::Player1),
-            1 => Some(Self::Player2),
-            _ => None,
-        }
-    }
 }
 impl Display for SimId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -67,6 +49,43 @@ impl Display for SimId {
     }
 }
 
+struct Cart {
+    rom_path: PathBuf,
+    rom: Vec<u8>,
+    sram_file: File,
+    sram: Vec<u8>,
+}
+
+impl Cart {
+    fn load(rom_path: &Path, sim_id: SimId) -> Result<Self> {
+        let rom = fs::read(rom_path)?;
+
+        let mut sram_file = File::options()
+            .read(true)
+            .write(true)
+            .create(true)
+            .truncate(false)
+            .open(sram_path(rom_path, sim_id))?;
+        sram_file.set_len(8 * 1024)?;
+
+        let mut sram = vec![];
+        sram_file.read_to_end(&mut sram)?;
+        Ok(Cart {
+            rom_path: rom_path.to_path_buf(),
+            rom,
+            sram_file,
+            sram,
+        })
+    }
+}
+
+fn sram_path(rom_path: &Path, sim_id: SimId) -> PathBuf {
+    match sim_id {
+        SimId::Player1 => rom_path.with_extension("p1.sram"),
+        SimId::Player2 => rom_path.with_extension("p2.sram"),
+    }
+}
+
 pub struct EmulatorBuilder {
     rom: Option<PathBuf>,
     commands: mpsc::Receiver<EmulatorCommand>,
@@ -143,15 +162,11 @@ pub struct Emulator {
     state: Arc<Atomic<EmulatorState>>,
     audio_on: Arc<[AtomicBool; 2]>,
     linked: Arc<AtomicBool>,
-    profilers: [Option<ProfileSender>; 2],
     renderers: HashMap<SimId, TextureSink>,
     messages: HashMap<SimId, mpsc::Sender<Toast>>,
     debuggers: HashMap<SimId, DebugInfo>,
-    stdouts: HashMap<SimId, mpsc::Sender<String>>,
+    eye_contents: Vec<u8>,
-    watched_regions: HashMap<MemoryRange, Weak<MemoryRegion>>,
-    eye_contents: [Vec<u8>; 2],
     audio_samples: Vec<f32>,
-    buffer: Vec<u8>,
 }
 
 impl Emulator {
@@ -171,15 +186,11 @@ impl Emulator {
             state,
             audio_on,
             linked,
-            profilers: [None, None],
             renderers: HashMap::new(),
             messages: HashMap::new(),
             debuggers: HashMap::new(),
-            stdouts: HashMap::new(),
+            eye_contents: vec![0u8; 384 * 224 * 2],
-            watched_regions: HashMap::new(),
-            eye_contents: [vec![0u8; 384 * 224 * 2], vec![0u8; 384 * 224 * 2]],
             audio_samples: Vec::with_capacity(EXPECTED_FRAME_SIZE),
-            buffer: vec![],
         })
     }
 
@@ -190,12 +201,12 @@ impl Emulator {
     }
 
     pub fn start_second_sim(&mut self, rom: Option<PathBuf>) -> Result<()> {
-        let file_path = if let Some(path) = rom {
+        let rom_path = if let Some(path) = rom {
             Some(path)
         } else {
-            self.carts[0].as_ref().map(|c| c.file_path.clone())
+            self.carts[0].as_ref().map(|c| c.rom_path.clone())
         };
-        let cart = match file_path {
+        let cart = match rom_path {
             Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
             None => None,
         };
@@ -209,15 +220,8 @@ impl Emulator {
 
         let index = sim_id.to_index();
         while self.sims.len() <= index {
-            let new_index = self.sims.len();
             self.sims.push(Sim::new());
-            if self
+            self.sim_state[index].store(SimState::NoGame, Ordering::Release);
-                .stdouts
-                .contains_key(&SimId::from_index(new_index).unwrap())
-            {
-                self.sims[new_index].watch_stdout(true);
-            }
-            self.sim_state[new_index].store(SimState::NoGame, Ordering::Release);
         }
         let sim = &mut self.sims[index];
         sim.reset();
@@ -226,22 +230,6 @@ impl Emulator {
             self.carts[index] = Some(cart);
             self.sim_state[index].store(SimState::Ready, Ordering::Release);
         }
-        let mut profiling = false;
-        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref()
-            && let Some(cart) = self.carts[index].as_ref()
-            && profiler
-                .send(ProfileEvent::Start {
-                    info: cart.info.clone(),
-                })
-                .is_ok()
-        {
-            sim.monitor_events(true, cart.info.inline_stack_map().clone());
-            profiling = true;
-        }
-        if !profiling {
-            sim.monitor_events(false, InlineStackMap::empty());
-        }
-
         if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
             self.resume_sims();
         }
@@ -295,36 +283,13 @@ impl Emulator {
         );
     }
 
-    fn frame_advance(&mut self) {
-        if self
-            .state
-            .compare_exchange(
-                EmulatorState::Paused,
-                EmulatorState::Stepping,
-                Ordering::AcqRel,
-                Ordering::Acquire,
-            )
-            .is_err_and(|s| s == EmulatorState::Running)
-        {
-            let _ = self.state.compare_exchange(
-                EmulatorState::Running,
-                EmulatorState::Stepping,
-                Ordering::AcqRel,
-                Ordering::Relaxed,
-            );
-        }
-    }
-
-    fn set_speed(&mut self, speed: f64) -> Result<()> {
-        self.audio.set_speed(speed)
-    }
-
     fn save_sram(&mut self, sim_id: SimId) -> Result<()> {
         let sim = self.sims.get_mut(sim_id.to_index());
         let cart = self.carts[sim_id.to_index()].as_mut();
         if let (Some(sim), Some(cart)) = (sim, cart) {
             sim.read_sram(&mut cart.sram);
-            cart.save_sram()?;
+            cart.sram_file.seek(SeekFrom::Start(0))?;
+            cart.sram_file.write_all(&cart.sram)?;
         }
         Ok(())
     }
@@ -339,11 +304,6 @@ impl Emulator {
         Ok(())
     }
 
-    fn start_profiling(&mut self, sim_id: SimId, sender: ProfileSender) -> Result<()> {
-        self.profilers[sim_id.to_index()] = Some(sender);
-        self.reset_sim(sim_id, None)
-    }
-
     fn start_debugging(&mut self, sim_id: SimId, sender: DebugSender) {
         if self.sim_state[sim_id.to_index()].load(Ordering::Acquire) != SimState::Ready {
             // Can't debug unless a game is connected
@@ -398,7 +358,6 @@ impl Emulator {
         debugger.stop_reason = None;
         true
     }
-
     fn debug_step(&mut self, sim_id: SimId) {
         if self.debug_continue(sim_id) {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
@@ -408,10 +367,6 @@ impl Emulator {
         }
     }
 
-    fn watch_memory(&mut self, range: MemoryRange, region: Weak<MemoryRegion>) {
-        self.watched_regions.insert(range, region);
-    }
-
     pub fn run(&mut self) {
         loop {
             let idle = self.tick();
@@ -436,18 +391,6 @@ impl Emulator {
                     }
                 }
             }
-            self.watched_regions.retain(|range, region| {
-                let Some(region) = region.upgrade() else {
-                    return false;
-                };
-                let Some(sim) = self.sims.get_mut(range.sim.to_index()) else {
-                    return false;
-                };
-                self.buffer.clear();
-                sim.read_memory(range.start, range.length, &mut self.buffer);
-                region.update(&self.buffer);
-                true
-            });
         }
     }
 
@@ -461,65 +404,27 @@ impl Emulator {
         // Don't emulate if the state is "paused", or if any sim is paused in the debugger
         let running = match state {
             EmulatorState::Paused => false,
-            EmulatorState::Running | EmulatorState::Stepping => true,
+            EmulatorState::Running => true,
             EmulatorState::Debugging => self.debuggers.values().all(|d| d.stop_reason.is_none()),
         };
         let p1_running = running && p1_state == SimState::Ready;
         let p2_running = running && p2_state == SimState::Ready;
         let mut idle = !p1_running && !p2_running;
-
+        if p1_running && p2_running {
-        let cycles = self.emulate(p1_running, p2_running);
+            Sim::emulate_many(&mut self.sims);
-
+        } else if p1_running {
-        // if we're profiling, track events
+            self.sims[SimId::Player1.to_index()].emulate();
-        for ((sim, profiler), running) in self
+        } else if p2_running {
-            .sims
+            self.sims[SimId::Player2.to_index()].emulate();
-            .iter_mut()
-            .zip(self.profilers.iter_mut())
-            .zip([p1_running, p2_running])
-        {
-            if !running {
-                continue;
-            }
-            if let Some(p) = profiler {
-                let (event, inline_stack) = sim.take_profiler_updates();
-                if p.send(ProfileEvent::Update {
-                    cycles,
-                    event,
-                    inline_stack,
-                })
-                .is_err()
-                {
-                    sim.monitor_events(false, InlineStackMap::empty());
-                    *profiler = None;
-                }
-            }
         }
 
-        if state == EmulatorState::Stepping {
-            self.state.store(EmulatorState::Paused, Ordering::Release);
-        }
-
-        // stdout
-        self.stdouts.retain(|sim_id, stdout| {
-            let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
-                return true;
-            };
-            if let Some(text) = sim.take_stdout()
-                && stdout.send(text).is_err()
-            {
-                sim.watch_stdout(false);
-                return false;
-            }
-            true
-        });
-
         // Debug state
         if state == EmulatorState::Debugging {
             for sim_id in SimId::values() {
                 let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                     continue;
                 };
-                if let Some(reason) = sim.take_stop_reason() {
+                if let Some(reason) = sim.stop_reason() {
                     let stop_reason = match reason {
                         StopReason::Stepped => DebugStopReason::Trace,
                         StopReason::Watchpoint(watch, address) => {
@@ -540,12 +445,9 @@ impl Emulator {
             let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                 continue;
             };
-            if sim.read_pixels(&mut self.eye_contents[sim_id.to_index()]) {
+            if sim.read_pixels(&mut self.eye_contents) {
                 idle = false;
-                if renderer
+                if renderer.queue_render(&self.eye_contents).is_err() {
-                    .queue_render(&self.eye_contents[sim_id.to_index()])
-                    .is_err()
-                {
                     self.renderers.remove(&sim_id);
                 }
             }
@@ -578,19 +480,6 @@ impl Emulator {
         idle
     }
 
-    fn emulate(&mut self, p1_running: bool, p2_running: bool) -> u32 {
-        const MAX_CYCLES: u32 = 20_000_000;
-        let mut cycles = MAX_CYCLES;
-        if p1_running && p2_running {
-            Sim::emulate_many(&mut self.sims, &mut cycles);
-        } else if p1_running {
-            self.sims[SimId::Player1.to_index()].emulate(&mut cycles);
-        } else if p2_running {
-            self.sims[SimId::Player2.to_index()].emulate(&mut cycles);
-        }
-        MAX_CYCLES - cycles
-    }
-
     fn handle_command(&mut self, command: EmulatorCommand) {
         match command {
             EmulatorCommand::ConnectToSim(sim_id, renderer, messages) => {
@@ -626,19 +515,6 @@ impl Emulator {
             EmulatorCommand::Resume => {
                 self.resume_sims();
             }
-            EmulatorCommand::FrameAdvance => {
-                self.frame_advance();
-            }
-            EmulatorCommand::SetSpeed(speed) => {
-                if let Err(error) = self.set_speed(speed) {
-                    self.report_error(SimId::Player1, format!("Error setting speed: {error}"));
-                }
-            }
-            EmulatorCommand::StartProfiling(sim_id, profiler) => {
-                if let Err(error) = self.start_profiling(sim_id, profiler) {
-                    self.report_error(SimId::Player1, format!("Error enaling profiler: {error}"));
-                }
-            }
             EmulatorCommand::StartDebugging(sim_id, debugger) => {
                 self.start_debugging(sim_id, debugger);
             }
@@ -681,9 +557,6 @@ impl Emulator {
                 sim.write_memory(start, &buffer);
                 let _ = done.send(buffer);
             }
-            EmulatorCommand::WatchMemory(range, region) => {
-                self.watch_memory(range, region);
-            }
             EmulatorCommand::AddBreakpoint(sim_id, address) => {
                 let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                     return;
@@ -708,13 +581,6 @@ impl Emulator {
                 };
                 sim.remove_watchpoint(address, length, watch);
             }
-            EmulatorCommand::WatchStdout(sim_id, stdout_sink) => {
-                self.stdouts.insert(sim_id, stdout_sink);
-                let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
-                    return;
-                };
-                sim.watch_stdout(true);
-            }
             EmulatorCommand::SetAudioEnabled(p1, p2) => {
                 self.audio_on[SimId::Player1.to_index()].store(p1, Ordering::Release);
                 self.audio_on[SimId::Player2.to_index()].store(p2, Ordering::Release);
@@ -735,10 +601,6 @@ impl Emulator {
                     sim.set_keys(keys);
                 }
             }
-            EmulatorCommand::Screenshot(sim_id, sender) => {
-                let contents = self.eye_contents[sim_id.to_index()].clone();
-                let _ = sender.send(contents);
-            }
             EmulatorCommand::Exit(done) => {
                 for sim_id in SimId::values() {
                     if let Err(error) = self.save_sram(sim_id) {
@@ -756,8 +618,10 @@ impl Emulator {
             .get(&sim_id)
             .or_else(|| self.messages.get(&SimId::Player1));
         if let Some(msg) = messages {
-            let mut toast = Toast::error(&message);
+            let toast = Toast::new()
-            toast.duration(Some(Duration::from_secs(5)));
+                .kind(ToastKind::Error)
+                .options(ToastOptions::default().duration_in_seconds(5.0))
+                .text(&message);
             if msg.send(toast).is_ok() {
                 return;
             }
@@ -774,9 +638,6 @@ pub enum EmulatorCommand {
     StopSecondSim,
     Pause,
     Resume,
-    FrameAdvance,
-    SetSpeed(f64),
-    StartProfiling(SimId, ProfileSender),
     StartDebugging(SimId, DebugSender),
     StopDebugging(SimId),
     DebugInterrupt(SimId),
@@ -786,18 +647,15 @@ pub enum EmulatorCommand {
     WriteRegister(SimId, VBRegister, u32),
     ReadMemory(SimId, u32, usize, Vec<u8>, oneshot::Sender<Vec<u8>>),
     WriteMemory(SimId, u32, Vec<u8>, oneshot::Sender<Vec<u8>>),
-    WatchMemory(MemoryRange, Weak<MemoryRegion>),
     AddBreakpoint(SimId, u32),
     RemoveBreakpoint(SimId, u32),
     AddWatchpoint(SimId, u32, usize, VBWatchpointType),
     RemoveWatchpoint(SimId, u32, usize, VBWatchpointType),
-    WatchStdout(SimId, mpsc::Sender<String>),
     SetAudioEnabled(bool, bool),
     Link,
     Unlink,
     Reset(SimId),
     SetKeys(SimId, VBKey),
-    Screenshot(SimId, oneshot::Sender<Vec<u8>>),
     Exit(oneshot::Sender<()>),
 }
 
@@ -814,11 +672,9 @@ pub enum SimState {
 pub enum EmulatorState {
     Paused,
     Running,
-    Stepping,
     Debugging,
 }
 
-type ProfileSender = tokio::sync::mpsc::UnboundedSender<ProfileEvent>;
 type DebugSender = tokio::sync::mpsc::UnboundedSender<DebugEvent>;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -842,17 +698,6 @@ pub enum DebugEvent {
     Stopped(DebugStopReason),
 }
 
-pub enum ProfileEvent {
-    Start {
-        info: Arc<GameInfo>,
-    },
-    Update {
-        cycles: u32,
-        event: Option<SimEvent>,
-        inline_stack: Option<InlineStack>,
-    },
-}
-
 #[derive(Clone)]
 pub struct EmulatorClient {
     queue: mpsc::Sender<EmulatorCommand>,

src/emulator/cart.rs

@@ -1,114 +0,0 @@
-use anyhow::Result;
-use rand::Rng;
-use std::{
-    fs::{self, File},
-    io::{Read, Seek as _, SeekFrom, Write as _},
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-use crate::emulator::{SimId, game_info::GameInfo, shrooms_vb_util::rom_from_isx};
-
-pub struct Cart {
-    pub file_path: PathBuf,
-    pub rom: Vec<u8>,
-    sram_file: File,
-    pub sram: Vec<u8>,
-    pub info: Arc<GameInfo>,
-}
-
-impl Cart {
-    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)
-            .or_else(|| try_parse_elf(file_path, &rom))
-            .unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
-
-        let mut sram_file = File::options()
-            .read(true)
-            .write(true)
-            .create(true)
-            .truncate(false)
-            .open(sram_path(file_path, sim_id))?;
-
-        let sram = if sram_file.metadata()?.len() == 0 {
-            // new SRAM file, randomize the contents
-            let mut sram = vec![0; 16 * 1024];
-            let mut rng = rand::rng();
-            for dst in sram.iter_mut().step_by(2) {
-                *dst = rng.random();
-            }
-            sram
-        } else {
-            let mut sram = Vec::with_capacity(16 * 1024);
-            sram_file.read_to_end(&mut sram)?;
-            sram
-        };
-
-        Ok(Cart {
-            file_path: file_path.to_path_buf(),
-            rom,
-            sram_file,
-            sram,
-            info: Arc::new(info),
-        })
-    }
-
-    pub fn save_sram(&mut self) -> Result<()> {
-        self.sram_file.seek(SeekFrom::Start(0))?;
-        self.sram_file.write_all(&self.sram)?;
-        Ok(())
-    }
-}
-
-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()? {
-        let pma = phdr.p_paddr(endian).into();
-        if pma < 0x07000000 || phdr.p_filesz(endian).into() == 0 {
-            continue;
-        }
-        let start = pstart.unwrap_or(pma);
-        pstart = Some(start);
-        bytes.resize((pma - start) as usize, 0);
-        let data = phdr.data(endian, data).ok()?;
-        bytes.extend_from_slice(data);
-    }
-    Some(bytes)
-}
-
-fn sram_path(file_path: &Path, sim_id: SimId) -> PathBuf {
-    match sim_id {
-        SimId::Player1 => file_path.with_extension("p1.sram"),
-        SimId::Player2 => file_path.with_extension("p2.sram"),
-    }
-}

src/emulator/game_info.rs

@@ -1,281 +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(ctx: &mut ParseContext, node: gimli::EntriesTreeNode<Reader>) -> 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::{ffi::c_void, ptr, slice};
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 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)]
@@ -73,16 +71,8 @@ pub enum VBWatchpointType {
     Access,
 }
 
-type OnException = extern "C" fn(sim: *mut VB, cause: *mut u16) -> c_int;
 type OnExecute =
     extern "C" fn(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int;
-type OnFetch = extern "C" fn(
-    sim: *mut VB,
-    fetch: c_int,
-    address: u32,
-    value: *mut i32,
-    cycles: *mut u32,
-) -> c_int;
 type OnFrame = extern "C" fn(sim: *mut VB) -> c_int;
 type OnRead = extern "C" fn(
     sim: *mut VB,
@@ -101,7 +91,7 @@ type OnWrite = extern "C" fn(
 ) -> c_int;
 
 #[link(name = "vb")]
-unsafe extern "C" {
+extern "C" {
     #[link_name = "vbEmulate"]
     fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
     #[link_name = "vbEmulateEx"]
@@ -145,15 +135,8 @@ unsafe extern "C" {
     fn vb_set_cart_ram(sim: *mut VB, sram: *mut c_void, size: u32) -> c_int;
     #[link_name = "vbSetCartROM"]
     fn vb_set_cart_rom(sim: *mut VB, rom: *mut c_void, size: u32) -> c_int;
-    #[link_name = "vbSetExceptionCallback"]
-    fn vb_set_exception_callback(
-        sim: *mut VB,
-        callback: Option<OnException>,
-    ) -> Option<OnException>;
     #[link_name = "vbSetExecuteCallback"]
     fn vb_set_execute_callback(sim: *mut VB, callback: Option<OnExecute>) -> Option<OnExecute>;
-    #[link_name = "vbSetFetchCallback"]
-    fn vb_set_fetch_callback(sim: *mut VB, callback: Option<OnFetch>) -> Option<OnFetch>;
     #[link_name = "vbSetFrameCallback"]
     fn vb_set_frame_callback(sim: *mut VB, callback: Option<OnFrame>) -> Option<OnFrame>;
     #[link_name = "vbSetKeys"]
@@ -187,33 +170,22 @@ unsafe extern "C" {
     fn vb_write(sim: *mut VB, address: u32, _type: VBDataType, value: i32) -> i32;
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
 extern "C" fn on_frame(sim: *mut VB) -> 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.frame_seen = true;
-    if data.monitor.enabled {
-        data.monitor.event = Some(SimEvent::Marker(Cow::Borrowed("Frame Drawn")));
-    }
     1
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
-extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int {
+extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
     // SAFETY: the *mut VB owns its userdata.
     // There is no way for the userdata to be null or otherwise invalid.
     let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
 
-    if data.monitor.enabled {
+    let mut stopped = data.stop_reason.is_some();
-        // SAFETY: length is the length of code, in elements
-        let code = unsafe { slice::from_raw_parts(code, length as usize) };
-        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.
-    }
-
-    let mut stopped = data.stop_reason.is_some() || data.monitor.event.is_some();
     if data.step_from.is_some_and(|s| s != address) {
         data.step_from = None;
         data.stop_reason = Some(StopReason::Stepped);
@@ -224,53 +196,14 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
         stopped = true;
     }
 
-    if stopped { 1 } else { 0 }
+    if stopped {
-}
-
-#[unsafe(no_mangle)]
-extern "C" fn on_fetch(
-    sim: *mut VB,
-    _fetch: c_int,
-    address: u32,
-    _value: *mut i32,
-    _cycles: *mut u32,
-) -> c_int {
-    // SAFETY: the *mut VB owns its userdata.
-    // There is no way for the userdata to be null or otherwise invalid.
-    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
-    data.monitor.event = data.monitor.queued_event.take();
-    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() {
         1
     } else {
         0
     }
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
-extern "C" fn on_exception(sim: *mut VB, cause: *mut u16) -> c_int {
-    // SAFETY: the *mut VB owns its userdata.
-    // There is no way for the userdata to be null or otherwise invalid.
-    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
-    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.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() {
-        1
-    } else {
-        0
-    }
-}
-
-#[unsafe(no_mangle)]
 extern "C" fn on_read(
     sim: *mut VB,
     address: u32,
@@ -296,12 +229,12 @@ extern "C" fn on_read(
     0
 }
 
-#[unsafe(no_mangle)]
+#[no_mangle]
 extern "C" fn on_write(
     sim: *mut VB,
     address: u32,
-    typ_: VBDataType,
+    _type: VBDataType,
-    value: *mut i32,
+    _value: *mut i32,
     _cycles: *mut u32,
     _cancel: *mut c_int,
 ) -> c_int {
@@ -309,37 +242,6 @@ extern "C" fn on_write(
     // There is no way for the userdata to be null or otherwise invalid.
     let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
 
-    // If we're monitoring stdout, track this write
-    if let Some(stdout) = data.stdout.as_mut() {
-        let normalized_hw_address = address & 0x0700003f;
-        if normalized_hw_address == 0x02000030 {
-            stdout.push(unsafe { *value } as u8);
-        }
-    }
-
-    // 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
@@ -354,119 +256,6 @@ extern "C" fn on_write(
     0
 }
 
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum SimEvent {
-    Call(u32),
-    Return,
-    Halt,
-    Interrupt(u16, u32),
-    Reti,
-    Marker(Cow<'static, str>),
-}
-
-struct EventMonitor {
-    enabled: bool,
-    event: Option<SimEvent>,
-    queued_event: Option<SimEvent>,
-    just_halted: bool,
-    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()
-    }
-
-    fn do_detect_event(&mut self, sim: *mut VB, address: u32, code: &[u16]) -> Option<SimEvent> {
-        const HALT_OPCODE: u16 = 0b011010;
-        const JAL_OPCODE: u16 = 0b101011;
-        const JMP_OPCODE: u16 = 0b000110;
-        const RETI_OPCODE: u16 = 0b011001;
-
-        const fn format_i_reg_1(code: &[u16]) -> u8 {
-            (code[0] & 0x1f) as u8
-        }
-
-        const fn format_iv_disp(code: &[u16]) -> i32 {
-            let value = ((code[0] & 0x3ff) as i32) << 16 | (code[1] as i32);
-            value << 6 >> 6
-        }
-
-        let opcode = code[0] >> 10;
-
-        if opcode == HALT_OPCODE {
-            if !self.just_halted {
-                self.just_halted = true;
-                self.event = Some(SimEvent::Halt);
-            } else {
-                self.just_halted = false;
-            }
-            // Don't _return_ an event, we want to emit this right away.
-            // If the CPU is halting, no other callbacks will run for a long time.
-            return None;
-        }
-
-        if opcode == JAL_OPCODE {
-            let disp = format_iv_disp(code);
-            if disp != 4 {
-                // JAL .+4 is how programs get r31 to a known value for indirect calls
-                // (which we detect later.)
-                // Any other JAL is a function call.
-                return Some(SimEvent::Call(
-                    address.wrapping_add_signed(disp) & 0x07ffffff,
-                ));
-            }
-        }
-
-        if opcode == JMP_OPCODE {
-            let jmp_reg = format_i_reg_1(code);
-            if jmp_reg == 31 {
-                // JMP[r31] is a return
-                return Some(SimEvent::Return);
-            }
-            let r31 = unsafe { vb_get_program_register(sim, 31) };
-            if r31 as u32 == address.wrapping_add(2) {
-                // JMP anywhere else, if r31 points to after the JMP, is an indirect call
-                let target = unsafe { vb_get_program_register(sim, jmp_reg as u32) };
-                return Some(SimEvent::Call(target as u32 & 0x07ffffff));
-            }
-        }
-
-        if opcode == RETI_OPCODE {
-            return Some(SimEvent::Reti);
-        }
-
-        None
-    }
-}
-
 const AUDIO_CAPACITY_SAMPLES: usize = 834 * 4;
 const AUDIO_CAPACITY_FLOATS: usize = AUDIO_CAPACITY_SAMPLES * 2;
 pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
@@ -474,26 +263,19 @@ pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
 struct VBState {
     frame_seen: bool,
     stop_reason: Option<StopReason>,
-    monitor: EventMonitor,
     step_from: Option<u32>,
     breakpoints: Vec<u32>,
     read_watchpoints: AddressSet,
     write_watchpoints: AddressSet,
-    stdout: Option<Vec<u8>>,
 }
 
 impl VBState {
     fn needs_execute_callback(&self) -> bool {
         self.step_from.is_some()
-            || self.monitor.enabled
             || !self.breakpoints.is_empty()
             || !self.read_watchpoints.is_empty()
             || !self.write_watchpoints.is_empty()
     }
-
-    fn needs_write_callback(&self) -> bool {
-        self.stdout.is_some() || self.monitor.enabled || !self.write_watchpoints.is_empty()
-    }
 }
 
 pub enum StopReason {
@@ -524,12 +306,10 @@ impl Sim {
         let state = VBState {
             frame_seen: false,
             stop_reason: None,
-            monitor: EventMonitor::new(),
             step_from: None,
             breakpoints: vec![],
             read_watchpoints: AddressSet::new(),
             write_watchpoints: AddressSet::new(),
-            stdout: None,
         };
         unsafe { vb_set_user_data(sim, Box::into_raw(Box::new(state)).cast()) };
         unsafe { vb_set_frame_callback(sim, Some(on_frame)) };
@@ -546,33 +326,6 @@ impl Sim {
         unsafe { vb_reset(self.sim) };
     }
 
-    pub fn monitor_events(&mut self, enabled: bool, inline_stack_map: InlineStackMap) {
-        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();
-            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) };
-            }
-        }
-    }
-
     pub fn load_cart(&mut self, mut rom: Vec<u8>, mut sram: Vec<u8>) -> Result<()> {
         self.unload_cart();
 
@@ -635,14 +388,16 @@ impl Sim {
         unsafe { vb_set_peer(self.sim, ptr::null_mut()) };
     }
 
-    pub fn emulate(&mut self, cycles: &mut u32) {
+    pub fn emulate(&mut self) {
-        unsafe { vb_emulate(self.sim, cycles) };
+        let mut cycles = 20_000_000;
+        unsafe { vb_emulate(self.sim, &mut cycles) };
     }
 
-    pub fn emulate_many(sims: &mut [Sim], cycles: &mut u32) {
+    pub fn emulate_many(sims: &mut [Sim]) {
+        let mut cycles = 20_000_000;
         let count = sims.len() as c_uint;
         let sims = sims.as_mut_ptr().cast();
-        unsafe { vb_emulate_ex(sims, count, cycles) };
+        unsafe { vb_emulate_ex(sims, count, &mut cycles) };
     }
 
     pub fn read_pixels(&mut self, buffers: &mut [u8]) -> bool {
@@ -811,12 +566,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 {
+            unsafe { vb_set_write_callback(self.sim, None) };
-                unsafe { vb_set_write_callback(self.sim, None) };
-            }
             if !needs_execute {
                 unsafe { vb_set_execute_callback(self.sim, None) };
             }
@@ -838,44 +590,12 @@ impl Sim {
         data.breakpoints.clear();
         data.read_watchpoints.clear();
         data.write_watchpoints.clear();
-        let needs_write = data.needs_write_callback();
-        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) };
-            unsafe { vb_set_write_callback(self.sim, None) };
+        unsafe { vb_set_execute_callback(self.sim, None) };
-        }
-        if !needs_execute {
-            unsafe { vb_set_execute_callback(self.sim, None) };
-        }
     }
 
-    pub fn watch_stdout(&mut self, watch: bool) {
+    pub fn stop_reason(&mut self) -> Option<StopReason> {
-        let data = self.get_state();
-        if watch {
-            if data.stdout.is_none() {
-                data.stdout = Some(vec![]);
-                unsafe { vb_set_write_callback(self.sim, Some(on_write)) };
-            }
-        } else {
-            data.stdout.take();
-            if !data.needs_write_callback() {
-                unsafe { vb_set_write_callback(self.sim, None) };
-            }
-        }
-    }
-
-    pub fn take_stdout(&mut self) -> Option<String> {
-        let data = self.get_state();
-        let stdout = data.stdout.take()?;
-        let string = match String::from_utf8(stdout) {
-            Ok(str) => str,
-            Err(err) => String::from_utf8_lossy(err.as_bytes()).into_owned(),
-        };
-        data.stdout = Some(vec![]);
-        Some(string)
-    }
-
-    pub fn take_stop_reason(&mut self) -> Option<StopReason> {
         let data = self.get_state();
         let reason = data.stop_reason.take();
         if !data.needs_execute_callback() {
@@ -884,13 +604,6 @@ impl Sim {
         reason
     }
 
-    pub fn take_profiler_updates(&mut self) -> (Option<SimEvent>, Option<InlineStack>) {
-        let data = self.get_state();
-        let event = data.monitor.event.take();
-        let inline_stack = data.monitor.new_inline_stack.take();
-        (event, inline_stack)
-    }
-
     fn get_state(&mut self) -> &mut VBState {
         // SAFETY: the *mut VB owns its userdata.
         // There is no way for the userdata to be null or otherwise invalid.

src/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/gdbserver.rs

@@ -1,4 +1,4 @@
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use registers::REGISTERS;
 use request::{Request, RequestKind, RequestSource};
 use response::Response;
@@ -12,7 +12,7 @@ use tokio::{
     pin, select,
     sync::{mpsc, oneshot},
 };
-use tracing::{Level, debug, enabled, error, info};
+use tracing::{debug, enabled, error, info, Level};
 
 use crate::emulator::{
     DebugEvent, DebugStopReason, EmulatorClient, EmulatorCommand, SimId, VBWatchpointType,

src/gdbserver/registers.rs

@@ -12,7 +12,7 @@ impl RegisterInfo {
     pub fn to_description(&self) -> String {
         let mut string = format!("name:{}", self.name);
         if let Some(alt) = self.alt_name {
-            string.push_str(&format!(";alt-name:{alt}"));
+            string.push_str(&format!(";alt-name:{}", alt));
         }
         string.push_str(&format!(
             ";bitsize:32;offset:{};encoding:uint;format:hex;set:{};dwarf:{}",
@@ -21,7 +21,7 @@ impl RegisterInfo {
             self.dwarf
         ));
         if let Some(generic) = self.generic {
-            string.push_str(&format!(";generic:{generic}"));
+            string.push_str(&format!(";generic:{}", generic));
         }
         string
     }

src/gdbserver/request.rs

@@ -1,4 +1,4 @@
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use atoi::FromRadix16;
 use tokio::io::{AsyncRead, AsyncReadExt as _};
 

src/graphics.rs

@@ -1,16 +1,15 @@
 use std::{
     sync::{
-        Arc, Mutex, MutexGuard,
         atomic::{AtomicU64, Ordering},
-        mpsc,
+        mpsc, Arc, Mutex, MutexGuard,
     },
     thread,
 };
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use itertools::Itertools as _;
 use wgpu::{
-    Device, Extent3d, Origin3d, Queue, TexelCopyBufferLayout, TexelCopyTextureInfo, Texture,
+    Device, Extent3d, ImageCopyTexture, ImageDataLayout, Origin3d, Queue, Texture,
     TextureDescriptor, TextureFormat, TextureUsages, TextureView, TextureViewDescriptor,
 };
 
@@ -21,7 +20,7 @@ pub struct TextureSink {
 }
 
 impl TextureSink {
-    pub fn new(device: &Device, queue: Queue) -> (Self, TextureView) {
+    pub fn new(device: &Device, queue: Arc<Queue>) -> (Self, TextureView) {
         let texture = Self::create_texture(device);
         let view = texture.create_view(&TextureViewDescriptor::default());
         let buffers = Arc::new(BufferPool::new());
@@ -65,14 +64,16 @@ impl TextureSink {
             sample_count: 1,
             dimension: wgpu::TextureDimension::D2,
             format: TextureFormat::Rg8Unorm,
-            usage: TextureUsages::COPY_DST | TextureUsages::TEXTURE_BINDING,
+            usage: TextureUsages::COPY_SRC
+                | TextureUsages::COPY_DST
+                | TextureUsages::TEXTURE_BINDING,
             view_formats: &[TextureFormat::Rg8Unorm],
         };
         device.create_texture(&desc)
     }
 
     fn write_texture(queue: &Queue, texture: &Texture, bytes: &[u8]) {
-        let texture = TexelCopyTextureInfo {
+        let texture = ImageCopyTexture {
             texture,
             mip_level: 0,
             origin: Origin3d::ZERO,
@@ -83,7 +84,7 @@ impl TextureSink {
             height: 224,
             depth_or_array_layers: 1,
         };
-        let data_layout = TexelCopyBufferLayout {
+        let data_layout = ImageDataLayout {
             offset: 0,
             bytes_per_row: Some(384 * 2),
             rows_per_image: Some(224),

src/images.rs

@@ -1,328 +0,0 @@
-use std::{
-    collections::HashMap,
-    ops::Deref,
-    sync::{Arc, Mutex, Weak},
-    thread,
-    time::Duration,
-};
-
-use egui::{
-    Color32, ColorImage, TextureHandle, TextureOptions,
-    epaint::ImageDelta,
-    load::{LoadError, SizedTexture, TextureLoader, TexturePoll},
-};
-use tokio::{sync::mpsc, time::timeout};
-
-pub struct ImageProcessor {
-    sender: mpsc::UnboundedSender<Box<dyn ImageRendererImpl>>,
-}
-
-impl ImageProcessor {
-    pub fn new() -> Self {
-        let (sender, receiver) = mpsc::unbounded_channel();
-        thread::spawn(move || {
-            tokio::runtime::Builder::new_current_thread()
-                .enable_all()
-                .build()
-                .unwrap()
-                .block_on(async move {
-                    let mut worker = ImageProcessorWorker {
-                        receiver,
-                        renderers: vec![],
-                    };
-                    worker.run().await
-                })
-        });
-        Self { sender }
-    }
-
-    pub fn add<const N: usize, R: ImageRenderer<N> + 'static>(
-        &self,
-        renderer: R,
-        params: R::Params,
-    ) -> ([ImageHandle; N], ImageParams<R::Params>) {
-        let states = renderer.sizes().map(ImageState::new);
-        let handles = states.clone().map(|state| ImageHandle {
-            size: state.size.map(|i| i as f32),
-            data: state.sink,
-        });
-        let images = renderer
-            .sizes()
-            .map(|[width, height]| ImageBuffer::new(width, height));
-        let sink = Arc::new(Mutex::new(params.clone()));
-        let _ = self.sender.send(Box::new(ImageRendererWrapper {
-            renderer,
-            params: Arc::downgrade(&sink),
-            images,
-            states,
-        }));
-        let params = ImageParams {
-            value: params,
-            sink,
-        };
-        (handles, params)
-    }
-}
-
-struct ImageProcessorWorker {
-    receiver: mpsc::UnboundedReceiver<Box<dyn ImageRendererImpl>>,
-    renderers: Vec<Box<dyn ImageRendererImpl>>,
-}
-
-impl ImageProcessorWorker {
-    async fn run(&mut self) {
-        loop {
-            if self.renderers.is_empty() {
-                // if we have nothing to do, block until we have something to do
-                if self.receiver.recv_many(&mut self.renderers, 64).await == 0 {
-                    // shutdown
-                    return;
-                }
-                while let Ok(renderer) = self.receiver.try_recv() {
-                    self.renderers.push(renderer);
-                }
-            }
-            self.renderers
-                .retain_mut(|renderer| renderer.try_update().is_ok());
-            // wait up to 10 ms for more renderers
-            if timeout(
-                Duration::from_millis(10),
-                self.receiver.recv_many(&mut self.renderers, 64),
-            )
-            .await
-            .is_ok()
-            {
-                while let Ok(renderer) = self.receiver.try_recv() {
-                    self.renderers.push(renderer);
-                }
-            }
-        }
-    }
-}
-
-pub struct ImageBuffer {
-    pub size: [usize; 2],
-    pub pixels: Vec<Color32>,
-}
-
-impl ImageBuffer {
-    pub fn new(width: usize, height: usize) -> Self {
-        Self {
-            size: [width, height],
-            pixels: vec![Color32::BLACK; width * height],
-        }
-    }
-
-    pub fn clear(&mut self) {
-        for pixel in self.pixels.iter_mut() {
-            *pixel = Color32::BLACK;
-        }
-    }
-
-    pub fn write(&mut self, coords: (usize, usize), pixel: Color32) {
-        self.pixels[coords.1 * self.size[0] + coords.0] = pixel;
-    }
-
-    pub fn add(&mut self, coords: (usize, usize), pixel: Color32) {
-        let index = coords.1 * self.size[0] + coords.0;
-        let old = self.pixels[index];
-        self.pixels[index] = Color32::from_rgb(
-            old.r() + pixel.r(),
-            old.g() + pixel.g(),
-            old.b() + pixel.b(),
-        );
-    }
-
-    pub fn changed(&self, image: &ColorImage) -> bool {
-        image.pixels.iter().zip(&self.pixels).any(|(a, b)| a != b)
-    }
-
-    pub fn read(&self, image: &mut ColorImage) {
-        image.pixels.copy_from_slice(&self.pixels);
-    }
-}
-
-#[derive(Clone)]
-pub struct ImageHandle {
-    size: [f32; 2],
-    data: Arc<Mutex<Option<Arc<ColorImage>>>>,
-}
-
-impl ImageHandle {
-    fn pull(&mut self) -> Option<Arc<ColorImage>> {
-        self.data.lock().unwrap().take()
-    }
-}
-
-pub struct ImageParams<T> {
-    value: T,
-    sink: Arc<Mutex<T>>,
-}
-
-impl<T> Deref for ImageParams<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}
-
-impl<T: Clone + Eq> ImageParams<T> {
-    pub fn write(&mut self, value: T) {
-        if self.value != value {
-            self.value = value.clone();
-            *self.sink.lock().unwrap() = value;
-        }
-    }
-}
-
-pub trait ImageRenderer<const N: usize>: Send {
-    type Params: Clone + Send;
-    fn sizes(&self) -> [[usize; 2]; N];
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; N]);
-}
-
-#[derive(Clone)]
-struct ImageState {
-    size: [usize; 2],
-    buffers: [Arc<ColorImage>; 2],
-    last_buffer: usize,
-    sink: Arc<Mutex<Option<Arc<ColorImage>>>>,
-}
-
-impl ImageState {
-    fn new(size: [usize; 2]) -> Self {
-        let buffers = [
-            Arc::new(ColorImage::filled(size, Color32::BLACK)),
-            Arc::new(ColorImage::filled(size, Color32::BLACK)),
-        ];
-        let sink = buffers[0].clone();
-        Self {
-            size,
-            buffers,
-            last_buffer: 0,
-            sink: Arc::new(Mutex::new(Some(sink))),
-        }
-    }
-    fn try_send_update(&mut self, image: &ImageBuffer) {
-        let last = &self.buffers[self.last_buffer];
-        if !image.changed(last) {
-            return;
-        }
-
-        let next_buffer = (self.last_buffer + 1) % self.buffers.len();
-        let next = &mut self.buffers[next_buffer];
-        image.read(Arc::make_mut(next));
-        self.last_buffer = next_buffer;
-        self.sink.lock().unwrap().replace(next.clone());
-    }
-}
-
-struct ImageRendererWrapper<const N: usize, R: ImageRenderer<N>> {
-    renderer: R,
-    params: Weak<Mutex<R::Params>>,
-    images: [ImageBuffer; N],
-    states: [ImageState; N],
-}
-
-trait ImageRendererImpl: Send {
-    fn try_update(&mut self) -> Result<(), ()>;
-}
-
-impl<const N: usize, R: ImageRenderer<N> + Send> ImageRendererImpl for ImageRendererWrapper<N, R> {
-    fn try_update(&mut self) -> Result<(), ()> {
-        let params = match self.params.upgrade() {
-            Some(params) => params.lock().unwrap().clone(),
-            None => {
-                // the UI isn't using this anymore
-                return Err(());
-            }
-        };
-        self.renderer.render(&params, &mut self.images);
-
-        for (state, image) in self.states.iter_mut().zip(&self.images) {
-            state.try_send_update(image);
-        }
-        Ok(())
-    }
-}
-
-pub struct ImageTextureLoader {
-    cache: Mutex<HashMap<String, (ImageHandle, Option<TextureHandle>)>>,
-}
-
-impl ImageTextureLoader {
-    pub fn new(renderers: impl IntoIterator<Item = (String, ImageHandle)>) -> Self {
-        let mut cache = HashMap::new();
-        for (key, image) in renderers {
-            cache.insert(key, (image, None));
-        }
-        Self {
-            cache: Mutex::new(cache),
-        }
-    }
-}
-
-impl TextureLoader for ImageTextureLoader {
-    fn id(&self) -> &str {
-        concat!(module_path!(), "ImageTextureLoader")
-    }
-
-    fn load(
-        &self,
-        ctx: &egui::Context,
-        uri: &str,
-        texture_options: TextureOptions,
-        _size_hint: egui::SizeHint,
-    ) -> Result<TexturePoll, LoadError> {
-        let mut cache = self.cache.lock().unwrap();
-        let Some((image, maybe_handle)) = cache.get_mut(uri) else {
-            return Err(LoadError::NotSupported);
-        };
-        if texture_options != TextureOptions::NEAREST {
-            return Err(LoadError::Loading(
-                "Only TextureOptions::NEAREST are supported".into(),
-            ));
-        }
-        match (image.pull(), maybe_handle.as_ref()) {
-            (Some(update), Some(handle)) => {
-                let delta = ImageDelta::full(update, texture_options);
-                ctx.tex_manager().write().set(handle.id(), delta);
-                let texture = SizedTexture::new(handle, image.size);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (Some(update), None) => {
-                let handle = ctx.load_texture(uri, update, texture_options);
-                let texture = SizedTexture::new(&handle, image.size);
-                maybe_handle.replace(handle);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (None, Some(handle)) => {
-                let texture = SizedTexture::new(handle, image.size);
-                Ok(TexturePoll::Ready { texture })
-            }
-            (None, None) => {
-                let size = image.size.into();
-                Ok(TexturePoll::Pending { size: Some(size) })
-            }
-        }
-    }
-
-    fn forget(&self, uri: &str) {
-        let _ = uri;
-    }
-
-    fn forget_all(&self) {}
-
-    fn byte_size(&self) -> usize {
-        self.cache
-            .lock()
-            .unwrap()
-            .values()
-            .map(|(image, _)| {
-                let [width, height] = image.size;
-                width as usize * height as usize * 4
-            })
-            .sum()
-    }
-}

src/input.rs

@@ -1,14 +1,12 @@
 use std::{
-    cmp::Ordering,
+    collections::{hash_map::Entry, HashMap},
-    collections::{HashMap, hash_map::Entry},
     fmt::Display,
     str::FromStr,
-    sync::{Arc, Mutex, RwLock},
+    sync::{Arc, RwLock},
 };
 
 use anyhow::anyhow;
-use egui::{Event, Key, KeyboardShortcut, Modifiers};
+use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
-use gilrs::{Axis, Button, Gamepad, GamepadId, ev::Code};
 use serde::{Deserialize, Serialize};
 use winit::keyboard::{KeyCode, PhysicalKey};
 
@@ -227,7 +225,7 @@ impl Mappings for InputMapping {
         for (keyboard_key, keys) in &self.keys {
             let name = match keyboard_key {
                 PhysicalKey::Code(code) => format!("{code:?}"),
-                k => format!("{k:?}"),
+                k => format!("{:?}", k),
             };
             for key in keys.iter() {
                 results.entry(key).or_default().push(name.clone());
@@ -456,315 +454,3 @@ struct PersistedGamepadMapping {
     default_buttons: Vec<(Code, VBKey)>,
     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,
-    Quit,
-    FrameAdvance,
-    FastForward(u32),
-    Reset,
-    PauseResume,
-    Screenshot,
-    // if you update this, update Command::all and add a default
-}
-
-impl Command {
-    pub fn all() -> [Self; 7] {
-        [
-            Self::OpenRom,
-            Self::Quit,
-            Self::PauseResume,
-            Self::Reset,
-            Self::FrameAdvance,
-            Self::FastForward(0),
-            Self::Screenshot,
-        ]
-    }
-
-    pub fn name(self) -> &'static str {
-        match self {
-            Self::OpenRom => "Open ROM",
-            Self::Quit => "Exit",
-            Self::PauseResume => "Pause/Resume",
-            Self::Reset => "Reset",
-            Self::FrameAdvance => "Frame Advance",
-            Self::FastForward(_) => "Fast Forward",
-            Self::Screenshot => "Screenshot",
-        }
-    }
-}
-
-impl Display for Command {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.name())
-    }
-}
-
-struct Shortcuts {
-    all: Vec<(Command, KeyboardShortcut)>,
-    by_command: HashMap<Command, KeyboardShortcut>,
-}
-
-impl Default for Shortcuts {
-    fn default() -> Self {
-        let mut shortcuts = Shortcuts {
-            all: vec![],
-            by_command: HashMap::new(),
-        };
-        shortcuts.set(
-            Command::OpenRom,
-            KeyboardShortcut::new(Modifiers::COMMAND, Key::O),
-        );
-        shortcuts.set(
-            Command::Quit,
-            KeyboardShortcut::new(Modifiers::COMMAND, Key::Q),
-        );
-        shortcuts.set(
-            Command::PauseResume,
-            KeyboardShortcut::new(Modifiers::NONE, Key::F5),
-        );
-        shortcuts.set(
-            Command::Reset,
-            KeyboardShortcut::new(Modifiers::SHIFT, Key::F5),
-        );
-        shortcuts.set(
-            Command::FrameAdvance,
-            KeyboardShortcut::new(Modifiers::NONE, Key::F6),
-        );
-        shortcuts.set(
-            Command::FastForward(0),
-            KeyboardShortcut::new(Modifiers::NONE, Key::Space),
-        );
-        shortcuts.set(
-            Command::Screenshot,
-            KeyboardShortcut::new(Modifiers::NONE, Key::F12),
-        );
-        shortcuts
-    }
-}
-
-impl Shortcuts {
-    fn set(&mut self, command: Command, shortcut: KeyboardShortcut) {
-        if self.by_command.insert(command, shortcut).is_some() {
-            for (cmd, sht) in &mut self.all {
-                if *cmd == command {
-                    *sht = shortcut;
-                    break;
-                }
-            }
-        } else {
-            self.all.push((command, shortcut));
-        }
-        self.all.sort_by(|l, r| order_shortcut(l.1, r.1));
-    }
-
-    fn unset(&mut self, command: Command) {
-        if self.by_command.remove(&command).is_some() {
-            self.all.retain(|(c, _)| *c != command);
-        }
-    }
-
-    fn save(&self, saved: &mut PersistedSettings) {
-        for command in Command::all() {
-            let shortcut = self.by_command.get(&command).copied();
-            saved.shortcuts.push((command, shortcut));
-        }
-    }
-}
-
-fn order_shortcut(left: KeyboardShortcut, right: KeyboardShortcut) -> Ordering {
-    left.logical_key.cmp(&right.logical_key).then_with(|| {
-        specificity(left.modifiers)
-            .cmp(&specificity(right.modifiers))
-            .reverse()
-    })
-}
-
-fn specificity(modifiers: egui::Modifiers) -> usize {
-    let mut mods = 0;
-    if modifiers.alt {
-        mods += 1;
-    }
-    if modifiers.command || modifiers.ctrl {
-        mods += 1;
-    }
-    if modifiers.shift {
-        mods += 1;
-    }
-    mods
-}
-
-#[derive(Serialize, Deserialize, Default)]
-struct PersistedSettings {
-    shortcuts: Vec<(Command, Option<KeyboardShortcut>)>,
-    #[serde(default)]
-    ff_settings: FastForwardSettings,
-}
-
-#[derive(Default, Clone)]
-struct ShortcutState {
-    ff_toggled: bool,
-}
-
-#[derive(Default)]
-struct Settings {
-    shortcuts: Shortcuts,
-    ff_settings: FastForwardSettings,
-    state: ShortcutState,
-}
-
-impl Settings {
-    fn save(&self) -> PersistedSettings {
-        let mut saved = PersistedSettings {
-            shortcuts: vec![],
-            ff_settings: self.ff_settings.clone(),
-        };
-        self.shortcuts.save(&mut saved);
-        saved
-    }
-}
-
-#[derive(Clone)]
-pub struct ShortcutProvider {
-    persistence: Persistence,
-    settings: Arc<Mutex<Settings>>,
-}
-
-impl ShortcutProvider {
-    pub fn new(persistence: Persistence) -> Self {
-        let mut settings = Settings::default();
-        if let Ok(saved) = persistence.load_config::<PersistedSettings>("shortcuts") {
-            for (command, shortcut) in saved.shortcuts {
-                if let Some(shortcut) = shortcut {
-                    settings.shortcuts.set(command, shortcut);
-                } else {
-                    settings.shortcuts.unset(command);
-                }
-            }
-            settings.ff_settings = saved.ff_settings;
-        };
-        Self {
-            persistence,
-            settings: Arc::new(Mutex::new(settings)),
-        }
-    }
-
-    pub fn shortcut_for(&self, command: Command) -> Option<KeyboardShortcut> {
-        let lock = self.settings.lock().unwrap();
-        lock.shortcuts.by_command.get(&command).copied()
-    }
-
-    pub fn ff_settings(&self) -> FastForwardSettings {
-        let lock = self.settings.lock().unwrap();
-        lock.ff_settings.clone()
-    }
-
-    pub fn consume_all(&self, input: &mut egui::InputState) -> Vec<Command> {
-        let mut lock = self.settings.lock().unwrap();
-        let mut state = lock.state.clone();
-        let mut consumed = vec![];
-        for (command, shortcut) in &lock.shortcuts.all {
-            input.events.retain(|event| {
-                let Event::Key {
-                    key,
-                    pressed,
-                    repeat,
-                    modifiers,
-                    ..
-                } = event
-                else {
-                    return true;
-                };
-                if shortcut.logical_key != *key || !shortcut.modifiers.contains(*modifiers) {
-                    return true;
-                }
-                if matches!(command, Command::FastForward(_)) {
-                    if *repeat {
-                        return true;
-                    }
-                    let sped_up = if lock.ff_settings.toggle {
-                        if !*pressed {
-                            return true;
-                        }
-                        state.ff_toggled = !state.ff_toggled;
-                        state.ff_toggled
-                    } else {
-                        *pressed
-                    };
-                    let speed = if sped_up { lock.ff_settings.speed } else { 1 };
-                    consumed.push(Command::FastForward(speed));
-                    false
-                } else {
-                    if !*pressed {
-                        return true;
-                    }
-                    consumed.push(*command);
-                    false
-                }
-            });
-        }
-        lock.state = state;
-        consumed
-    }
-
-    pub fn set(&self, command: Command, shortcut: KeyboardShortcut) {
-        let updated = {
-            let mut lock = self.settings.lock().unwrap();
-            lock.shortcuts.set(command, shortcut);
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-
-    pub fn unset(&self, command: Command) {
-        let updated = {
-            let mut lock = self.settings.lock().unwrap();
-            lock.shortcuts.unset(command);
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-
-    pub fn update_ff_settings(&self, ff_settings: FastForwardSettings) {
-        let updated = {
-            let mut lock = self.settings.lock().unwrap();
-            lock.ff_settings = ff_settings;
-            if !lock.ff_settings.toggle {
-                lock.state.ff_toggled = false;
-            }
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-
-    pub fn reset(&self) {
-        let updated = {
-            let mut lock = self.settings.lock().unwrap();
-            *lock = Settings::default();
-            lock.save()
-        };
-        let _ = self.persistence.save_config("shortcuts", &updated);
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-pub struct FastForwardSettings {
-    pub toggle: bool,
-    pub speed: u32,
-}
-
-impl Default for FastForwardSettings {
-    fn default() -> Self {
-        Self {
-            toggle: false,
-            speed: 10,
-        }
-    }
-}

src/main.rs

@@ -3,13 +3,13 @@
 
 use std::{path::PathBuf, process, time::SystemTime};
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use app::Application;
 use clap::Parser;
 use emulator::EmulatorBuilder;
 use thread_priority::{ThreadBuilder, ThreadPriority};
 use tracing::error;
-use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 use winit::event_loop::{ControlFlow, EventLoop};
 
 mod app;
@@ -18,11 +18,8 @@ mod controller;
 mod emulator;
 mod gdbserver;
 mod graphics;
-mod images;
 mod input;
-mod memory;
 mod persistence;
-mod profiler;
 mod window;
 
 #[derive(Parser)]
@@ -32,9 +29,6 @@ struct Args {
     /// Start a GDB/LLDB debug server on this port.
     #[arg(short, long)]
     debug_port: Option<u16>,
-    /// Enable profiling a game
-    #[arg(short, long)]
-    profile: bool,
 }
 
 fn init_logger() {
@@ -48,9 +42,9 @@ fn set_panic_handler() {
     std::panic::set_hook(Box::new(|info| {
         let mut message = String::new();
         if let Some(msg) = info.payload().downcast_ref::<&str>() {
-            message += &format!("{msg}\n");
+            message += &format!("{}\n", msg);
         } else if let Some(msg) = info.payload().downcast_ref::<String>() {
-            message += &format!("{msg}\n");
+            message += &format!("{}\n", msg);
         }
         if let Some(location) = info.location() {
             message += &format!(
@@ -60,9 +54,9 @@ fn set_panic_handler() {
             );
         }
         let backtrace = std::backtrace::Backtrace::force_capture();
-        message += &format!("stack trace:\n{backtrace:#}\n");
+        message += &format!("stack trace:\n{:#}\n", backtrace);
 
-        eprint!("{message}");
+        eprint!("{}", message);
 
         let Some(project_dirs) = directories::ProjectDirs::from("com", "virtual-boy", "Lemur")
         else {
@@ -76,7 +70,7 @@ fn set_panic_handler() {
             .duration_since(SystemTime::UNIX_EPOCH)
             .unwrap()
             .as_millis();
-        let logfile_name = format!("crash-{timestamp}.txt");
+        let logfile_name = format!("crash-{}.txt", timestamp);
         let _ = std::fs::write(data_dir.join(logfile_name), message);
     }));
 }
@@ -110,9 +104,6 @@ fn main() -> Result<()> {
         }
         builder = builder.start_paused(true);
     }
-    if args.profile {
-        builder = builder.start_paused(true)
-    }
 
     ThreadBuilder::default()
         .name("Emulator".to_owned())
@@ -131,11 +122,6 @@ fn main() -> Result<()> {
     let event_loop = EventLoop::with_user_event().build().unwrap();
     event_loop.set_control_flow(ControlFlow::Poll);
     let proxy = event_loop.create_proxy();
-    event_loop.run_app(&mut Application::new(
+    event_loop.run_app(&mut Application::new(client, proxy, args.debug_port))?;
-        client,
-        proxy,
-        args.debug_port,
-        args.profile,
-    ))?;
     Ok(())
 }

src/memory.rs

@@ -1,276 +0,0 @@
-use std::{
-    collections::HashMap,
-    fmt::Debug,
-    iter::FusedIterator,
-    sync::{Arc, Mutex, RwLock, RwLockReadGuard, TryLockError, Weak, atomic::AtomicU64},
-};
-
-use bytemuck::BoxBytes;
-use itertools::Itertools;
-use tracing::warn;
-
-use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
-
-pub struct MemoryClient {
-    client: EmulatorClient,
-    regions: Mutex<HashMap<MemoryRange, Weak<MemoryRegion>>>,
-}
-
-impl MemoryClient {
-    pub fn new(client: EmulatorClient) -> Self {
-        Self {
-            client,
-            regions: Mutex::new(HashMap::new()),
-        }
-    }
-
-    pub fn watch(&self, sim: SimId, start: u32, length: usize) -> MemoryView {
-        let range = MemoryRange { sim, start, length };
-        let mut regions = self.regions.lock().unwrap_or_else(|e| e.into_inner());
-        let region = regions
-            .get(&range)
-            .and_then(|r| r.upgrade())
-            .unwrap_or_else(|| {
-                let region = Arc::new(MemoryRegion::new(start, length));
-                regions.insert(range, Arc::downgrade(&region));
-                self.client
-                    .send_command(EmulatorCommand::WatchMemory(range, Arc::downgrade(&region)));
-                region
-            });
-        MemoryView { region }
-    }
-
-    pub fn write<T: MemoryValue>(&self, sim: SimId, address: u32, data: &T) {
-        let mut buffer = vec![];
-        data.to_bytes(&mut buffer);
-        let (tx, _) = oneshot::channel();
-        self.client
-            .send_command(EmulatorCommand::WriteMemory(sim, address, buffer, tx));
-    }
-}
-
-fn aligned_memory(start: u32, length: usize) -> BoxBytes {
-    if start % 4 == 0 && length % 4 == 0 {
-        let memory = vec![0u32; length / 4].into_boxed_slice();
-        return bytemuck::box_bytes_of(memory);
-    }
-    if start % 2 == 0 && length % 2 == 0 {
-        let memory = vec![0u16; length / 2].into_boxed_slice();
-        return bytemuck::box_bytes_of(memory);
-    }
-    let memory = vec![0u8; length].into_boxed_slice();
-    bytemuck::box_bytes_of(memory)
-}
-
-pub struct MemoryView {
-    region: Arc<MemoryRegion>,
-}
-
-impl MemoryView {
-    pub fn borrow(&self) -> MemoryRef<'_> {
-        self.region.borrow()
-    }
-}
-
-pub struct MemoryRef<'a> {
-    inner: RwLockReadGuard<'a, BoxBytes>,
-}
-
-pub trait MemoryValue {
-    fn from_bytes(bytes: &[u8]) -> Self;
-    fn to_bytes(&self, buffer: &mut Vec<u8>);
-}
-
-macro_rules! primitive_memory_value_impl {
-    ($T:ty, $L: expr) => {
-        impl MemoryValue for $T {
-            #[inline]
-            fn from_bytes(bytes: &[u8]) -> Self {
-                let bytes: [u8; std::mem::size_of::<$T>()] = std::array::from_fn(|i| bytes[i]);
-                <$T>::from_le_bytes(bytes)
-            }
-            #[inline]
-            fn to_bytes(&self, buffer: &mut Vec<u8>) {
-                buffer.extend_from_slice(&self.to_le_bytes())
-            }
-        }
-    };
-}
-
-primitive_memory_value_impl!(u8, 1);
-primitive_memory_value_impl!(i8, 1);
-primitive_memory_value_impl!(u16, 2);
-primitive_memory_value_impl!(i16, 2);
-primitive_memory_value_impl!(u32, 4);
-primitive_memory_value_impl!(i32, 4);
-
-impl<const N: usize, T: MemoryValue> MemoryValue for [T; N] {
-    #[inline]
-    fn from_bytes(bytes: &[u8]) -> Self {
-        std::array::from_fn(|i| {
-            T::from_bytes(&bytes[i * std::mem::size_of::<T>()..(i + 1) * std::mem::size_of::<T>()])
-        })
-    }
-    #[inline]
-    fn to_bytes(&self, buffer: &mut Vec<u8>) {
-        for item in self {
-            item.to_bytes(buffer);
-        }
-    }
-}
-
-pub struct MemoryIter<'a, T> {
-    bytes: &'a [u8],
-    _phantom: std::marker::PhantomData<T>,
-}
-
-impl<'a, T> MemoryIter<'a, T> {
-    fn new(bytes: &'a [u8]) -> Self {
-        Self {
-            bytes,
-            _phantom: std::marker::PhantomData,
-        }
-    }
-}
-
-impl<T: MemoryValue> Iterator for MemoryIter<'_, T> {
-    type Item = T;
-
-    #[inline]
-    fn next(&mut self) -> Option<Self::Item> {
-        let (bytes, rest) = self.bytes.split_at_checked(std::mem::size_of::<T>())?;
-        self.bytes = rest;
-        Some(T::from_bytes(bytes))
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let size = self.bytes.len() / std::mem::size_of::<T>();
-        (size, Some(size))
-    }
-}
-
-impl<T: MemoryValue> DoubleEndedIterator for MemoryIter<'_, T> {
-    fn next_back(&mut self) -> Option<Self::Item> {
-        let mid = self.bytes.len().checked_sub(std::mem::size_of::<T>())?;
-        // SAFETY: the checked_sub above is effectively a bounds check
-        let (rest, bytes) = unsafe { self.bytes.split_at_unchecked(mid) };
-        self.bytes = rest;
-        Some(T::from_bytes(bytes))
-    }
-}
-
-impl<T: MemoryValue> FusedIterator for MemoryIter<'_, T> {}
-
-impl MemoryRef<'_> {
-    pub fn read<T: MemoryValue>(&self, index: usize) -> T {
-        let from = index * size_of::<T>();
-        let to = from + size_of::<T>();
-        T::from_bytes(&self.inner[from..to])
-    }
-
-    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])
-    }
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub struct MemoryRange {
-    pub sim: SimId,
-    pub start: u32,
-    pub length: usize,
-}
-
-const BUFFERS: usize = 4;
-pub struct MemoryRegion {
-    gens: [AtomicU64; BUFFERS],
-    bufs: [RwLock<BoxBytes>; BUFFERS],
-}
-impl Debug for MemoryRegion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("MemoryRegion")
-            .field("gens", &self.gens)
-            .finish_non_exhaustive()
-    }
-}
-// SAFETY: BoxBytes is meant to be Send+Sync, will be in a future version
-unsafe impl Send for MemoryRegion {}
-// SAFETY: BoxBytes is meant to be Send+Sync, will be in a future version
-unsafe impl Sync for MemoryRegion {}
-
-impl MemoryRegion {
-    fn new(start: u32, length: usize) -> Self {
-        Self {
-            gens: std::array::from_fn(|i| AtomicU64::new(i as u64)),
-            bufs: std::array::from_fn(|_| RwLock::new(aligned_memory(start, length))),
-        }
-    }
-
-    pub fn borrow(&self) -> MemoryRef<'_> {
-        /*
-         * When reading memory, a thread will grab the newest buffer (with the highest gen)
-         * It will only fail to grab the lock if the writer already has it,
-         * but the writer prioritizes older buffers (with lower gens).
-         * So this method will only block if the writer produces three full buffers
-         * in the time it takes the reader to do four atomic reads and grab a lock.
-         * In the unlikely event this happens... just try again.
-         */
-        loop {
-            let newest_index = self
-                .gens
-                .iter()
-                .map(|i| i.load(std::sync::atomic::Ordering::Acquire))
-                .enumerate()
-                .max_by_key(|(_, g)| *g)
-                .map(|(i, _)| i)
-                .unwrap();
-            let inner = match self.bufs[newest_index].try_read() {
-                Ok(inner) => inner,
-                Err(TryLockError::Poisoned(e)) => e.into_inner(),
-                Err(TryLockError::WouldBlock) => {
-                    continue;
-                }
-            };
-            break MemoryRef { inner };
-        }
-    }
-
-    pub fn update(&self, data: &[u8]) {
-        let gens = self
-            .gens
-            .each_ref()
-            .map(|i| i.load(std::sync::atomic::Ordering::Acquire));
-        let next_gen = gens.iter().max().unwrap() + 1;
-        let indices = gens
-            .into_iter()
-            .enumerate()
-            .sorted_by_key(|(_, val)| *val)
-            .map(|(i, _)| i);
-        for index in indices {
-            let mut lock = match self.bufs[index].try_write() {
-                Ok(inner) => inner,
-                Err(TryLockError::Poisoned(e)) => e.into_inner(),
-                Err(TryLockError::WouldBlock) => {
-                    continue;
-                }
-            };
-            lock.copy_from_slice(data);
-            self.gens[index].store(next_gen, std::sync::atomic::Ordering::Release);
-            return;
-        }
-        /*
-         * We have four buffers, and (at time of writing) only three threads interacting with memory:
-         * - The UI thread, reading small regions of memory
-         * - The "image renderer" thread, reading large regions of memory
-         * - The emulation thread, writing memory every so often
-         * So it should be impossible for all four buffers to have a read lock at the same time,
-         *  and (because readers always read the newest buffer) at least one of the oldest three
-         *  buffers will be free the entire time we're in this method.
-         * TL;DR this should never happen.
-         * But if it does, do nothing. This isn't medical software, better to show stale data than crash.
-         */
-        warn!("all buffers were locked by a reader at the same time")
-    }
-}

src/persistence.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf};
 
-use anyhow::{Result, bail};
+use anyhow::{bail, Result};
 use directories::ProjectDirs;
 use serde::{Deserialize, Serialize};
 

src/profiler.rs

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

src/profiler/recording.rs

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

src/profiler/state.rs

@@ -1,124 +0,0 @@
-use std::{collections::HashMap, sync::Arc};
-
-use anyhow::{Result, bail};
-use fxprof_processed_profile::LibraryInfo;
-
-use crate::emulator::{GameInfo, InlineStack};
-
-pub struct ProgramState {
-    info: Arc<GameInfo>,
-    call_stacks: HashMap<u16, Vec<StackFrame>>,
-    context_stack: Vec<u16>,
-}
-
-pub enum StackFrame {
-    Address(u32),
-    Label(Arc<String>),
-}
-
-pub const RESET_CODE: u16 = 0xfff0;
-impl ProgramState {
-    pub async fn new(info: Arc<GameInfo>) -> Self {
-        let mut call_stacks = HashMap::new();
-        call_stacks.insert(RESET_CODE, vec![StackFrame::Address(0xfffffff0)]);
-        Self {
-            info,
-            call_stacks,
-            context_stack: vec![RESET_CODE],
-        }
-    }
-
-    pub fn name(&self) -> &str {
-        self.info.name()
-    }
-
-    pub fn library_info(&self) -> &LibraryInfo {
-        self.info.library_info()
-    }
-
-    pub fn current_stack(&self) -> Option<(u16, &[StackFrame])> {
-        let code = self.context_stack.last()?;
-        let call_stack = self.call_stacks.get(code)?;
-        Some((*code, call_stack))
-    }
-
-    pub fn track_call(&mut self, address: u32) -> Result<()> {
-        let Some(code) = self.context_stack.last() else {
-            bail!("How did we call anything when we're halted?");
-        };
-        let Some(stack) = self.call_stacks.get_mut(code) else {
-            bail!("missing stack {code:04x}");
-        };
-        stack.push(StackFrame::Address(address));
-        Ok(())
-    }
-
-    pub fn track_return(&mut self) -> Result<()> {
-        let Some(code) = self.context_stack.last() else {
-            bail!("how did we return when we're halted?");
-        };
-        let Some(stack) = self.call_stacks.get_mut(code) else {
-            bail!("missing stack {code:04x}");
-        };
-        if stack.pop().is_none() {
-            bail!("returned from {code:04x} but stack was empty");
-        }
-        if stack.is_empty() {
-            bail!("returned to oblivion");
-        }
-        Ok(())
-    }
-
-    pub fn track_halt(&mut self) -> Result<()> {
-        let Some(RESET_CODE) = self.context_stack.pop() else {
-            bail!("halted when not in an interrupt");
-        };
-        Ok(())
-    }
-
-    pub fn track_interrupt(&mut self, code: u16, address: u32) -> Result<()> {
-        // if the CPU was halted before, wake it up now
-        if self.context_stack.is_empty() {
-            self.context_stack.push(RESET_CODE);
-        }
-
-        self.context_stack.push(code);
-        if self
-            .call_stacks
-            .insert(code, vec![StackFrame::Address(address)])
-            .is_some()
-        {
-            bail!("{code:04x} fired twice");
-        }
-        Ok(())
-    }
-
-    pub fn track_reti(&mut self) -> Result<()> {
-        let Some(code) = self.context_stack.pop() else {
-            bail!("RETI when halted");
-        };
-        if code == RESET_CODE {
-            bail!("RETI when not in interrupt");
-        }
-        if self.call_stacks.remove(&code).is_none() {
-            bail!("{code:04x} popped but never called");
-        }
-        Ok(())
-    }
-
-    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/window.rs

@@ -1,17 +1,9 @@
-use std::sync::Arc;
-
 pub use about::AboutWindow;
 use egui::{Context, ViewportBuilder, ViewportId};
 pub use game::GameWindow;
 pub use gdb::GdbServerWindow;
-pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
-pub use profile::ProfileWindow;
+use winit::event::KeyEvent;
-pub use terminal::TerminalWindow;
-pub use vip::{
-    BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
-};
-use winit::{event::KeyEvent, window::Window};
 
 use crate::emulator::SimId;
 
@@ -19,12 +11,7 @@ mod about;
 mod game;
 mod game_screen;
 mod gdb;
-mod hotkeys;
 mod input;
-mod profile;
-mod terminal;
-mod utils;
-mod vip;
 
 pub trait AppWindow {
     fn viewport_id(&self) -> ViewportId;
@@ -33,22 +20,14 @@ 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, render_state: &egui_wgpu::RenderState) {
-        let _ = args;
+        let _ = render_state;
     }
     fn on_destroy(&mut self) {}
-    fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
+    fn handle_key_event(&mut self, event: &KeyEvent) {
         let _ = event;
-        false
     }
-    fn handle_gamepad_event(&mut self, event: &gilrs::Event) -> bool {
+    fn handle_gamepad_event(&mut self, event: &gilrs::Event) {
         let _ = event;
-        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,28 +1,22 @@
-use std::{
+use std::sync::mpsc;
-    sync::{Arc, mpsc},
-    time::Duration,
-};
 
 use crate::{
     app::UserEvent,
     emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
-    input::{Command, ShortcutProvider},
     persistence::Persistence,
-    window::InitArgs,
 };
-use anyhow::Context as _;
 use egui::{
-    Align2, Button, CentralPanel, Color32, Context, Frame, MenuBar, TopBottomPanel, Ui, Vec2,
+    ecolor::HexColor, menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame,
-    ViewportBuilder, ViewportCommand, ViewportId, Window,
+    Layout, Response, Sense, TopBottomPanel, Ui, Vec2, ViewportBuilder, ViewportCommand,
+    ViewportId, WidgetText, Window,
 };
-use egui_notify::{Anchor, Toast, Toasts};
+use egui_toast::{Toast, Toasts};
 use serde::{Deserialize, Serialize};
 use winit::event_loop::EventLoopProxy;
 
 use super::{
-    AppWindow,
     game_screen::{DisplayMode, GameScreen},
-    utils::UiExt as _,
+    AppWindow,
 };
 
 const COLOR_PRESETS: [[Color32; 2]; 3] = [
@@ -44,14 +38,11 @@ pub struct GameWindow {
     client: EmulatorClient,
     proxy: EventLoopProxy<UserEvent>,
     persistence: Persistence,
-    shortcuts: ShortcutProvider,
     sim_id: SimId,
     config: GameConfig,
-    toasts: Toasts,
     screen: Option<GameScreen>,
     messages: Option<mpsc::Receiver<Toast>>,
     color_picker: Option<ColorPickerState>,
-    window: Option<Arc<winit::window::Window>>,
 }
 
 impl GameWindow {
@@ -59,152 +50,55 @@ impl GameWindow {
         client: EmulatorClient,
         proxy: EventLoopProxy<UserEvent>,
         persistence: Persistence,
-        shortcuts: ShortcutProvider,
         sim_id: SimId,
     ) -> Self {
         let config = load_config(&persistence, sim_id);
-        let toasts = Toasts::new()
-            .with_anchor(Anchor::BottomLeft)
-            .with_margin((10.0, 10.0).into())
-            .reverse(true);
         Self {
             client,
             proxy,
             persistence,
-            shortcuts,
             sim_id,
             config,
-            toasts,
             screen: None,
             messages: None,
             color_picker: None,
-            window: None,
         }
     }
 
     fn show_menu(&mut self, ctx: &Context, ui: &mut Ui) {
-        let state = self.client.emulator_state();
-        let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
-        let can_pause = is_ready && state == EmulatorState::Running;
-        let can_resume = is_ready && state == EmulatorState::Paused;
-        let can_frame_advance = is_ready && state != EmulatorState::Debugging;
-
-        for command in ui.input_mut(|input| self.shortcuts.consume_all(input)) {
-            match command {
-                Command::OpenRom => {
-                    let rom = rfd::FileDialog::new()
-                        .add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
-                        .pick_file();
-                    if let Some(path) = rom {
-                        self.client
-                            .send_command(EmulatorCommand::LoadGame(self.sim_id, path));
-                    }
-                }
-                Command::Quit => {
-                    let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
-                }
-                Command::PauseResume => {
-                    if state == EmulatorState::Paused && can_resume {
-                        self.client.send_command(EmulatorCommand::Resume);
-                    }
-                    if state == EmulatorState::Running && can_pause {
-                        self.client.send_command(EmulatorCommand::Pause);
-                    }
-                }
-                Command::Reset => {
-                    if is_ready {
-                        self.client
-                            .send_command(EmulatorCommand::Reset(self.sim_id));
-                    }
-                }
-                Command::FrameAdvance => {
-                    if can_frame_advance {
-                        self.client.send_command(EmulatorCommand::FrameAdvance);
-                    }
-                }
-                Command::FastForward(speed) => {
-                    self.client
-                        .send_command(EmulatorCommand::SetSpeed(speed as f64));
-                }
-                Command::Screenshot => {
-                    let autopause = state == EmulatorState::Running && can_pause;
-                    if autopause {
-                        self.client.send_command(EmulatorCommand::Pause);
-                    }
-                    pollster::block_on(self.take_screenshot());
-                    if autopause {
-                        self.client.send_command(EmulatorCommand::Resume);
-                    }
-                }
-            }
-        }
-
         ui.menu_button("ROM", |ui| {
-            if ui
+            if ui.button("Open ROM").clicked() {
-                .add(self.button_for(ui.ctx(), "Open ROM", Command::OpenRom))
-                .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));
                 }
+                ui.close_menu();
             }
-            if ui
+            if ui.button("Quit").clicked() {
-                .add(self.button_for(ui.ctx(), "Quit", Command::Quit))
-                .clicked()
-            {
                 let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
             }
         });
         ui.menu_button("Emulation", |ui| {
+            let state = self.client.emulator_state();
+            let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
+            let can_pause = is_ready && state == EmulatorState::Running;
+            let can_resume = is_ready && state == EmulatorState::Paused;
             if state == EmulatorState::Running {
-                if ui
+                if ui.add_enabled(can_pause, Button::new("Pause")).clicked() {
-                    .add_enabled(
-                        can_pause,
-                        self.button_for(ui.ctx(), "Pause", Command::PauseResume),
-                    )
-                    .clicked()
-                {
                     self.client.send_command(EmulatorCommand::Pause);
+                    ui.close_menu();
                 }
-            } else if ui
+            } else if ui.add_enabled(can_resume, Button::new("Resume")).clicked() {
-                .add_enabled(
-                    can_resume,
-                    self.button_for(ui.ctx(), "Resume", Command::PauseResume),
-                )
-                .clicked()
-            {
                 self.client.send_command(EmulatorCommand::Resume);
+                ui.close_menu();
             }
-            if ui
+            if ui.add_enabled(is_ready, Button::new("Reset")).clicked() {
-                .add_enabled(is_ready, self.button_for(ui.ctx(), "Reset", Command::Reset))
-                .clicked()
-            {
                 self.client
                     .send_command(EmulatorCommand::Reset(self.sim_id));
-            }
+                ui.close_menu();
-            ui.separator();
-            if ui
-                .add_enabled(
-                    can_frame_advance,
-                    self.button_for(ui.ctx(), "Frame Advance", Command::FrameAdvance),
-                )
-                .clicked()
-            {
-                self.client.send_command(EmulatorCommand::FrameAdvance);
-            }
-            ui.separator();
-            if ui
-                .add_enabled(
-                    is_ready,
-                    self.button_for(ui.ctx(), "Screenshot", Command::Screenshot),
-                )
-                .clicked()
-            {
-                pollster::block_on(self.take_screenshot());
             }
         });
         ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
@@ -217,120 +111,39 @@ impl GameWindow {
                 self.client
                     .send_command(EmulatorCommand::StartSecondSim(None));
                 self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
+                ui.close_menu();
             }
             if has_player_2 {
                 let linked = self.client.are_sims_linked();
                 if linked && ui.button("Unlink").clicked() {
                     self.client.send_command(EmulatorCommand::Unlink);
+                    ui.close_menu();
                 }
                 if !linked && ui.button("Link").clicked() {
                     self.client.send_command(EmulatorCommand::Link);
+                    ui.close_menu();
                 }
             }
         });
         ui.menu_button("Tools", |ui| {
-            if ui.button("Terminal").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenTerminal(self.sim_id))
-                    .unwrap();
-            }
-            if ui.button("Profiler").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenProfiler(self.sim_id))
-                    .unwrap();
-            }
             if ui.button("GDB Server").clicked() {
                 self.proxy
                     .send_event(UserEvent::OpenDebugger(self.sim_id))
                     .unwrap();
-            }
+                ui.close_menu();
-            ui.separator();
-            if ui.button("Character Data").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenCharacterData(self.sim_id))
-                    .unwrap();
-            }
-            if ui.button("Background Maps").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenBgMap(self.sim_id))
-                    .unwrap();
-            }
-            if ui.button("Objects").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenObjects(self.sim_id))
-                    .unwrap();
-            }
-            if ui.button("Worlds").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenWorlds(self.sim_id))
-                    .unwrap();
-            }
-            if ui.button("Frame Buffers").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenFrameBuffers(self.sim_id))
-                    .unwrap();
-            }
-            if ui.button("Registers").clicked() {
-                self.proxy
-                    .send_event(UserEvent::OpenRegisters(self.sim_id))
-                    .unwrap();
             }
         });
-        ui.menu_button("Help", |ui| {
+        ui.menu_button("About", |ui| {
-            if ui.button("About").clicked() {
+            self.proxy.send_event(UserEvent::OpenAbout).unwrap();
-                self.proxy.send_event(UserEvent::OpenAbout).unwrap();
+            ui.close_menu();
-            }
         });
     }
 
-    async fn take_screenshot(&mut self) {
-        match self.try_take_screenshot().await {
-            Ok(Some(path)) => {
-                let mut toast = Toast::info(format!("Saved to {path}"));
-                toast.duration(Some(Duration::from_secs(5)));
-                self.toasts.add(toast);
-            }
-            Ok(None) => {}
-            Err(error) => {
-                let mut toast = Toast::error(format!("{error:#}"));
-                toast.duration(Some(Duration::from_secs(5)));
-                self.toasts.add(toast);
-            }
-        }
-    }
-
-    async fn try_take_screenshot(&self) -> anyhow::Result<Option<String>> {
-        let (tx, rx) = oneshot::channel();
-        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()
-            .add_filter("PNG images", &["png"])
-            .set_file_name("screenshot.png");
-        if let Some(window) = self.window.as_ref() {
-            file_dialog = file_dialog.set_parent(window);
-        }
-        let file = file_dialog.save_file();
-        let Some(path) = file else {
-            return Ok(None);
-        };
-        if bytes.len() != 384 * 224 * 2 {
-            anyhow::bail!("Unexpected screenshot size");
-        }
-        let mut screencap = image::GrayImage::new(384 * 2, 224);
-        for (index, pixel) in bytes.into_iter().enumerate() {
-            let x = (index / 2) % 384 + ((index % 2) * 384);
-            let y = (index / 2) / 384;
-            screencap.put_pixel(x as u32, y as u32, image::Luma([pixel]));
-        }
-        screencap.save(&path).context("Could not save screenshot")?;
-        Ok(Some(path.display().to_string()))
-    }
-
     fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) {
         ui.menu_button("Video", |ui| {
             ui.menu_button("Screen Size", |ui| {
-                let current_dims = self.config.dimensions;
+                let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap());
+                let current_dims = current_dims.max - current_dims.min;
 
                 for scale in 1..=4 {
                     let label = format!("x{scale}");
@@ -344,6 +157,7 @@ impl GameWindow {
                         .clicked()
                     {
                         ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
+                        ui.close_menu();
                     }
                 }
             });
@@ -369,7 +183,10 @@ impl GameWindow {
                     return;
                 }
 
-                let current_dims = self.config.dimensions;
+                let current_dims = {
+                    let viewport = ctx.input(|i| i.viewport().inner_rect.unwrap());
+                    viewport.max - viewport.min
+                };
                 let new_proportions = display_mode.proportions();
                 let scale = new_proportions / old_proportions;
                 if scale != Vec2::new(1.0, 1.0) {
@@ -380,11 +197,13 @@ impl GameWindow {
                     c.display_mode = display_mode;
                     c.dimensions = current_dims * scale;
                 });
+                ui.close_menu();
             });
             ui.menu_button("Colors", |ui| {
                 for preset in COLOR_PRESETS {
                     if ui.color_pair_button(preset[0], preset[1]).clicked() {
                         self.update_config(|c| c.colors = preset);
+                        ui.close_menu();
                     }
                 }
                 ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
@@ -405,6 +224,7 @@ impl GameWindow {
                             just_opened: true,
                             unpause_on_close: is_running,
                         });
+                        ui.close_menu();
                     }
                 });
             });
@@ -415,20 +235,20 @@ impl GameWindow {
             if ui.selectable_button(p1_enabled, "Player 1").clicked() {
                 self.client
                     .send_command(EmulatorCommand::SetAudioEnabled(!p1_enabled, p2_enabled));
+                ui.close_menu();
             }
             if ui.selectable_button(p2_enabled, "Player 2").clicked() {
                 self.client
                     .send_command(EmulatorCommand::SetAudioEnabled(p1_enabled, !p2_enabled));
+                ui.close_menu();
             }
         });
         ui.menu_button("Input", |ui| {
             if ui.button("Bind Inputs").clicked() {
                 self.proxy.send_event(UserEvent::OpenInput).unwrap();
+                ui.close_menu();
             }
         });
-        if ui.button("Hotkeys").clicked() {
-            self.proxy.send_event(UserEvent::OpenHotkeys).unwrap();
-        }
     }
 
     fn show_color_picker(&mut self, ui: &mut Ui) {
@@ -470,14 +290,6 @@ impl GameWindow {
         }
         self.config = new_config;
     }
-
-    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)),
-            None => button,
-        }
-    }
 }
 
 fn config_filename(sim_id: SimId) -> &'static str {
@@ -518,20 +330,23 @@ impl AppWindow for GameWindow {
 
     fn show(&mut self, ctx: &Context) {
         let dimensions = {
-            let bounds = ctx.available_rect();
+            let bounds = ctx.input(|i| i.viewport().inner_rect.unwrap());
             bounds.max - bounds.min
         };
         self.update_config(|c| c.dimensions = dimensions);
 
+        let mut toasts = Toasts::new()
+            .anchor(Align2::LEFT_BOTTOM, (10.0, 10.0))
+            .direction(Direction::BottomUp);
         if let Some(messages) = self.messages.as_mut() {
             while let Ok(toast) = messages.try_recv() {
-                self.toasts.add(toast);
+                toasts.add(toast);
             }
         }
         TopBottomPanel::top("menubar")
             .exact_height(22.0)
             .show(ctx, |ui| {
-                MenuBar::new().ui(ui, |ui| {
+                menu::bar(ui, |ui| {
                     self.show_menu(ctx, ui);
                 });
             });
@@ -551,11 +366,11 @@ impl AppWindow for GameWindow {
                 ui.add(screen);
             }
         });
-        self.toasts.show(ctx);
+        toasts.show(ctx);
     }
 
-    fn on_init(&mut self, args: InitArgs) {
+    fn on_init(&mut self, 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,
@@ -564,7 +379,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) {
@@ -575,6 +389,69 @@ impl AppWindow for GameWindow {
     }
 }
 
+trait UiExt {
+    fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response;
+    fn selectable_option<T: Eq>(
+        &mut self,
+        current_value: &mut T,
+        selected_value: T,
+        text: impl Into<WidgetText>,
+    ) -> Response {
+        let response = self.selectable_button(*current_value == selected_value, text);
+        if response.clicked() {
+            *current_value = selected_value;
+        }
+        response
+    }
+
+    fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response;
+
+    fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response;
+}
+
+impl UiExt for Ui {
+    fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response {
+        self.style_mut().visuals.widgets.inactive.bg_fill = Color32::TRANSPARENT;
+        self.style_mut().visuals.widgets.hovered.bg_fill = Color32::TRANSPARENT;
+        self.style_mut().visuals.widgets.active.bg_fill = Color32::TRANSPARENT;
+        let mut selected = selected;
+        self.checkbox(&mut selected, text)
+    }
+
+    fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response {
+        let button_size = Vec2::new(60.0, 20.0);
+        let (rect, response) = self.allocate_at_least(button_size, Sense::click());
+        let center_x = rect.center().x;
+        let left_rect = rect.with_max_x(center_x);
+        self.painter().rect_filled(left_rect, 0.0, left);
+        let right_rect = rect.with_min_x(center_x);
+        self.painter().rect_filled(right_rect, 0.0, right);
+
+        let style = self.style().interact(&response);
+        self.painter().rect_stroke(rect, 0.0, style.fg_stroke);
+        response
+    }
+
+    fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response {
+        self.allocate_ui_with_layout(
+            Vec2::new(100.0, 130.0),
+            Layout::top_down_justified(egui::Align::Center),
+            |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 let Ok(new_color) = HexColor::from_str_without_hash(hex) {
+                        *color = new_color.color();
+                    }
+                }
+                resp
+            },
+        )
+        .inner
+    }
+}
+
 struct ColorPickerState {
     color_codes: [String; 2],
     just_opened: bool,

src/window/game_screen.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use egui::{Color32, Rgba, Vec2, Widget};
 use serde::{Deserialize, Serialize};
-use wgpu::{BindGroup, BindGroupLayout, Buffer, RenderPipeline, util::DeviceExt as _};
+use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
 
 use crate::graphics::TextureSink;
 
@@ -71,7 +71,7 @@ impl GameScreen {
                     module: &shader,
                     entry_point: Some(entry_point),
                     targets: &[Some(wgpu::ColorTargetState {
-                        format: render_state.target_format,
+                        format: wgpu::TextureFormat::Bgra8Unorm,
                         blend: Some(wgpu::BlendState::REPLACE),
                         write_mask: wgpu::ColorWrites::ALL,
                     })],

src/window/hotkeys.rs

@@ -1,150 +0,0 @@
-use egui::{
-    Button, CentralPanel, Context, Event, KeyboardShortcut, Label, Layout, Slider, Ui,
-    ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, TableBuilder};
-
-use crate::input::{Command, ShortcutProvider};
-
-use super::{AppWindow, utils::UiExt};
-
-pub struct HotkeysWindow {
-    shortcuts: ShortcutProvider,
-    now_binding: Option<Command>,
-}
-
-impl HotkeysWindow {
-    pub fn new(shortcuts: ShortcutProvider) -> Self {
-        Self {
-            shortcuts,
-            now_binding: None,
-        }
-    }
-
-    fn show_shortcuts(&mut self, ui: &mut Ui) {
-        let row_height = ui.spacing().interact_size.y;
-        ui.section("Shortcuts", |ui| {
-            let width = ui.available_width() - 16.0;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.3))
-                .column(Column::exact(width * 0.5))
-                .column(Column::exact(width * 0.2))
-                .cell_layout(Layout::left_to_right(egui::Align::Center))
-                .body(|mut body| {
-                    for command in Command::all() {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.add_sized(ui.available_size(), Label::new(command.name()));
-                            });
-                            row.col(|ui| {
-                                let button = if self.now_binding == Some(command) {
-                                    Button::new("Binding...")
-                                } else if let Some(shortcut) = self.shortcuts.shortcut_for(command)
-                                {
-                                    Button::new(ui.ctx().format_shortcut(&shortcut))
-                                } else {
-                                    Button::new("")
-                                };
-                                if ui.add_sized(ui.available_size(), button).clicked() {
-                                    self.now_binding = Some(command);
-                                }
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add_sized(ui.available_size(), Button::new("Clear"))
-                                    .clicked()
-                                {
-                                    self.shortcuts.unset(command);
-                                    self.now_binding = None;
-                                }
-                            });
-                        });
-                    }
-                });
-        });
-        if let Some(command) = self.now_binding
-            && let Some(shortcut) = ui.input_mut(|i| {
-                i.events.iter().find_map(|event| match event {
-                    Event::Key {
-                        key,
-                        pressed: true,
-                        modifiers,
-                        ..
-                    } => 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;
-        ui.section("Fast Forward", |ui| {
-            let width = ui.available_width() - 8.0;
-            let mut ff_settings = self.shortcuts.ff_settings();
-            let mut updated = false;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5))
-                .column(Column::exact(width * 0.5))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Treat button as toggle");
-                        });
-                        row.col(|ui| {
-                            if ui.checkbox(&mut ff_settings.toggle, "").changed() {
-                                updated = true;
-                            }
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Speed multiplier");
-                        });
-                        row.col(|ui| {
-                            if ui
-                                .add_sized(
-                                    ui.available_size(),
-                                    Slider::new(&mut ff_settings.speed, 1..=15),
-                                )
-                                .changed()
-                            {
-                                updated = true;
-                            }
-                        });
-                    });
-                });
-            if updated {
-                self.shortcuts.update_ff_settings(ff_settings);
-            }
-        });
-    }
-}
-
-impl AppWindow for HotkeysWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of("shortcuts")
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title("Keyboard Shortcuts")
-            .with_inner_size((400.0, 400.0))
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal(|ui| {
-                if ui.button("Use defaults").clicked() {
-                    self.shortcuts.reset();
-                }
-            });
-            ui.separator();
-            self.show_shortcuts(ui);
-            self.show_ff_settings(ui);
-        });
-    }
-}

src/window/input.rs

@@ -198,63 +198,58 @@ impl AppWindow for InputWindow {
         });
     }
 
-    fn handle_key_event(&mut self, event: &winit::event::KeyEvent) -> bool {
+    fn handle_key_event(&mut self, event: &winit::event::KeyEvent) {
         if !event.state.is_pressed() {
-            return false;
+            return;
         }
         let sim_id = match self.active_tab {
             InputTab::Player1 => SimId::Player1,
             InputTab::Player2 => SimId::Player2,
             _ => {
-                return false;
+                return;
             }
         };
         let Some(vb) = self.now_binding.take() else {
-            return false;
+            return;
         };
         let mut mappings = self.mappings.for_sim(sim_id).write().unwrap();
         mappings.add_keyboard_mapping(vb, event.physical_key);
         drop(mappings);
         self.mappings.save();
-        true
     }
 
-    fn handle_gamepad_event(&mut self, event: &gilrs::Event) -> bool {
+    fn handle_gamepad_event(&mut self, event: &gilrs::Event) {
         let InputTab::RebindGamepad(gamepad_id) = self.active_tab else {
-            return false;
+            return;
         };
         if gamepad_id != event.id {
-            return false;
+            return;
         }
         let Some(mappings) = self.mappings.for_gamepad(gamepad_id) else {
-            return false;
+            return;
         };
         let Some(vb) = self.now_binding else {
-            return false;
+            return;
         };
         match event.event {
             EventType::ButtonPressed(_, code) => {
                 let mut mapping = mappings.write().unwrap();
                 mapping.add_button_mapping(vb, code);
                 self.now_binding.take();
-                true
             }
             EventType::AxisChanged(_, value, code) => {
                 if value < -0.75 {
                     let mut mapping = mappings.write().unwrap();
                     mapping.add_axis_neg_mapping(vb, code);
                     self.now_binding.take();
-                    true
+                }
-                } else if value > 0.75 {
+                if value > 0.75 {
                     let mut mapping = mappings.write().unwrap();
                     mapping.add_axis_pos_mapping(vb, code);
                     self.now_binding.take();
-                    true
-                } else {
-                    false
                 }
             }
-            _ => false,
+            _ => {}
         }
     }
 }

src/window/profile.rs

@@ -1,173 +0,0 @@
-use std::{fs, sync::Arc, time::Duration};
-
-use anyhow::Result;
-use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
-use egui_notify::{Anchor, Toast, Toasts};
-use winit::window::Window;
-
-use crate::{
-    emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId},
-    profiler::{Profiler, ProfilerStatus},
-    window::{AppWindow, InitArgs},
-};
-
-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,
-        }
-    }
-
-    pub fn launch(&mut self) {
-        self.profiler.enable();
-    }
-
-    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}"));
-                toast.duration(Some(Duration::from_secs(5)));
-                self.toasts.add(toast);
-            }
-            Ok(None) => {}
-            Err(error) => {
-                let mut toast = Toast::error(format!("{error:#}"));
-                toast.duration(Some(Duration::from_secs(5)));
-                self.toasts.add(toast);
-            }
-        }
-        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()
-            .add_filter("Profiler files", &["json"])
-            .set_file_name("profile.json");
-        if let Some(window) = self.window.as_ref() {
-            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 {
-            self.profiler.cancel_recording();
-            Ok(None)
-        }
-    }
-}
-
-impl AppWindow for ProfileWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("Profile-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Profiler ({})", self.sim_id))
-            .with_inner_size((300.0, 200.0))
-    }
-
-    fn show(&mut self, ctx: &egui::Context) {
-        let status = self.profiler.status();
-        let recording = matches!(status, ProfilerStatus::Recording);
-        CentralPanel::default().show(ctx, |ui| {
-            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");
-            if ui.add_enabled(!recording, enabled_checkbox).changed() {
-                if enabled {
-                    self.profiler.enable();
-                } else {
-                    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");
-                        let can_record = matches!(status, ProfilerStatus::Enabled);
-                        if ui.add_enabled(can_record, record_button).clicked() {
-                            self.profiler.start_recording();
-                        }
-                    } else {
-                        if ui.button("Finish recording").clicked() {
-                            self.finish_recording();
-                        }
-                        if ui.button("Cancel recording").clicked() {
-                            self.profiler.cancel_recording();
-                        }
-                    }
-                });
-            }
-
-            match &status {
-                ProfilerStatus::Recording => {
-                    ui.label("Recording...");
-                }
-                ProfilerStatus::Error(message) => {
-                    ui.label(message);
-                }
-                _ => {}
-            }
-        });
-        self.toasts.show(ctx);
-    }
-
-    fn on_init(&mut self, args: InitArgs) {
-        self.window = Some(args.window.clone());
-    }
-}

src/window/terminal.rs

@@ -1,79 +0,0 @@
-use std::{collections::VecDeque, sync::mpsc};
-
-use egui::{
-    Align, CentralPanel, Context, FontFamily, Label, RichText, ScrollArea, ViewportBuilder,
-    ViewportId,
-};
-
-use crate::emulator::{EmulatorClient, EmulatorCommand, SimId};
-
-use super::AppWindow;
-
-const SCROLLBACK: usize = 1000;
-
-pub struct TerminalWindow {
-    sim_id: SimId,
-    receiver: mpsc::Receiver<String>,
-    lines: VecDeque<String>,
-}
-
-impl TerminalWindow {
-    pub fn new(sim_id: SimId, client: &EmulatorClient) -> Self {
-        let (sender, receiver) = mpsc::channel();
-        client.send_command(EmulatorCommand::WatchStdout(sim_id, sender));
-        let mut lines = VecDeque::new();
-        lines.push_back(String::new());
-        Self {
-            sim_id,
-            receiver,
-            lines,
-        }
-    }
-}
-
-impl AppWindow for TerminalWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("terminal-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Terminal ({})", self.sim_id))
-            .with_inner_size((640.0, 480.0))
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        if let Ok(text) = self.receiver.try_recv() {
-            let mut rest = text.as_str();
-            while let Some(index) = rest.find('\n') {
-                let (line, lines) = rest.split_at(index);
-                let current = self.lines.back_mut().unwrap();
-                current.push_str(line);
-                self.lines.push_back(String::new());
-                if self.lines.len() > SCROLLBACK {
-                    self.lines.pop_front();
-                }
-                rest = &lines[1..];
-            }
-            self.lines.back_mut().unwrap().push_str(rest);
-        }
-        CentralPanel::default().show(ctx, |ui| {
-            ScrollArea::vertical()
-                .stick_to_bottom(true)
-                .auto_shrink([false, false])
-                .animated(false)
-                .show(ui, |ui| {
-                    for line in &self.lines {
-                        let label = Label::new(RichText::new(line).family(FontFamily::Monospace))
-                            .halign(Align::LEFT)
-                            .wrap();
-                        ui.add(label);
-                    }
-                });
-        });
-    }
-}

src/window/utils.rs

@@ -1,411 +0,0 @@
-use std::{
-    fmt::{Display, UpperHex},
-    ops::{Bound, RangeBounds},
-    str::FromStr,
-};
-
-use atoi::FromRadix16;
-use egui::{
-    Align, Color32, CornerRadius, CursorIcon, Event, Frame, Key, Layout, Margin, Rect, Response,
-    RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
-    ecolor::HexColor,
-};
-use num_traits::{CheckedAdd, CheckedSub, One};
-
-pub trait UiExt {
-    fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui));
-    fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response;
-    fn selectable_option<T: Eq>(
-        &mut self,
-        current_value: &mut T,
-        selected_value: T,
-        text: impl Into<WidgetText>,
-    ) -> Response {
-        let response = self.selectable_button(*current_value == selected_value, text);
-        if response.clicked() {
-            *current_value = selected_value;
-        }
-        response
-    }
-
-    fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response;
-
-    fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response;
-}
-
-impl UiExt for Ui {
-    fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui)) {
-        let title: String = title.into();
-        let mut frame = Frame::group(self.style());
-        frame.outer_margin.top += 10;
-        frame.inner_margin.top += 2;
-        let res = self.push_id(&title, |ui| {
-            frame.show(ui, |ui| {
-                ui.set_max_width(ui.available_width());
-                add_contents(ui);
-            })
-        });
-        let text = RichText::new(title).background_color(self.style().visuals.panel_fill);
-        let old_rect = res.response.rect;
-        let mut text_rect = old_rect;
-        text_rect.min.x += 6.0;
-        self.scope_builder(UiBuilder::new().max_rect(text_rect), |ui| ui.label(text));
-        if old_rect.width() > 0.0 {
-            self.advance_cursor_after_rect(old_rect);
-        }
-    }
-
-    fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response {
-        self.style_mut().visuals.widgets.inactive.bg_fill = Color32::TRANSPARENT;
-        self.style_mut().visuals.widgets.hovered.bg_fill = Color32::TRANSPARENT;
-        self.style_mut().visuals.widgets.active.bg_fill = Color32::TRANSPARENT;
-        let mut selected = selected;
-        self.checkbox(&mut selected, text)
-    }
-
-    fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response {
-        let button_size = Vec2::new(60.0, 20.0);
-        let (rect, response) = self.allocate_at_least(button_size, Sense::click());
-        let center_x = rect.center().x;
-        let left_rect = rect.with_max_x(center_x);
-        self.painter().rect_filled(left_rect, 0.0, left);
-        let right_rect = rect.with_min_x(center_x);
-        self.painter().rect_filled(right_rect, 0.0, right);
-
-        let style = self.style().interact(&response);
-        self.painter()
-            .rect_stroke(rect, 0.0, style.fg_stroke, StrokeKind::Inside);
-        response
-    }
-
-    fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response {
-        self.allocate_ui_with_layout(
-            Vec2::new(100.0, 130.0),
-            Layout::top_down_justified(egui::Align::Center),
-            |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()
-                    && let Ok(new_color) = HexColor::from_str_without_hash(hex)
-                {
-                    *color = new_color.color();
-                }
-                resp
-            },
-        )
-        .inner
-    }
-}
-
-enum Direction {
-    Up,
-    Down,
-}
-
-pub trait Number:
-    Copy
-    + One
-    + CheckedAdd
-    + CheckedSub
-    + Eq
-    + Ord
-    + Display
-    + FromStr
-    + FromRadix16
-    + UpperHex
-    + Send
-    + Sync
-    + 'static
-{
-}
-impl<
-    T: Copy
-        + One
-        + CheckedAdd
-        + CheckedSub
-        + Eq
-        + Ord
-        + Display
-        + FromStr
-        + FromRadix16
-        + UpperHex
-        + Send
-        + Sync
-        + 'static,
-> Number for T
-{
-}
-
-pub struct NumberEdit<'a, T: Number> {
-    value: &'a mut T,
-    increment: T,
-    precision: usize,
-    min: Option<T>,
-    max: Option<T>,
-    desired_width: Option<f32>,
-    arrows: bool,
-    hex: bool,
-}
-
-impl<'a, T: Number> NumberEdit<'a, T> {
-    pub fn new(value: &'a mut T) -> Self {
-        Self {
-            value,
-            increment: T::one(),
-            precision: 3,
-            min: None,
-            max: None,
-            desired_width: None,
-            arrows: true,
-            hex: false,
-        }
-    }
-
-    pub fn precision(self, precision: usize) -> Self {
-        Self { precision, ..self }
-    }
-
-    pub fn range(self, range: impl RangeBounds<T>) -> Self {
-        let min = match range.start_bound() {
-            Bound::Unbounded => None,
-            Bound::Included(t) => Some(*t),
-            Bound::Excluded(t) => t.checked_add(&self.increment),
-        };
-        let max = match range.end_bound() {
-            Bound::Unbounded => None,
-            Bound::Included(t) => Some(*t),
-            Bound::Excluded(t) => t.checked_sub(&self.increment),
-        };
-        Self { min, max, ..self }
-    }
-
-    pub fn desired_width(self, desired_width: f32) -> Self {
-        Self {
-            desired_width: Some(desired_width),
-            ..self
-        }
-    }
-
-    pub fn arrows(self, arrows: bool) -> Self {
-        Self { arrows, ..self }
-    }
-
-    pub fn hex(self, hex: bool) -> Self {
-        Self { hex, ..self }
-    }
-}
-
-impl<T: Number> Widget for NumberEdit<'_, T> {
-    fn ui(self, ui: &mut Ui) -> Response {
-        let id = ui.id();
-        let to_string = |val: &T| {
-            if self.hex {
-                format!("{val:.0$X}", self.precision)
-            } else {
-                format!("{val:.0$}", self.precision)
-            }
-        };
-        let from_string = |val: &str| {
-            if self.hex {
-                let bytes = val.as_bytes();
-                let (result, consumed) = T::from_radix_16(bytes);
-                (consumed == bytes.len()).then_some(result)
-            } else {
-                val.parse::<T>().ok()
-            }
-        };
-
-        let (last_value, mut str, focus) = ui.memory(|m| {
-            let (lv, s) = m
-                .data
-                .get_temp(id)
-                .unwrap_or((*self.value, to_string(self.value)));
-            let focus = m.has_focus(id);
-            (lv, s, focus)
-        });
-        let mut stale = false;
-        if *self.value != last_value {
-            str = to_string(self.value);
-            stale = true;
-        }
-        let valid = from_string(&str).is_some_and(|v: T| v == *self.value);
-        let mut up_pressed = false;
-        let mut down_pressed = false;
-        if focus {
-            ui.input_mut(|i| {
-                i.events.retain(|e| match e {
-                    Event::Key {
-                        key: Key::ArrowUp,
-                        pressed: true,
-                        ..
-                    } => {
-                        up_pressed = true;
-                        false
-                    }
-                    Event::Key {
-                        key: Key::ArrowDown,
-                        pressed: true,
-                        ..
-                    } => {
-                        down_pressed = true;
-                        false
-                    }
-                    _ => true,
-                })
-            });
-        }
-        let mut desired_width = self
-            .desired_width
-            .unwrap_or_else(|| ui.spacing().text_edit_width);
-        if self.arrows {
-            desired_width -= 16.0;
-        }
-        let text = TextEdit::singleline(&mut str)
-            .horizontal_align(Align::Max)
-            .id(id)
-            .desired_width(desired_width)
-            .margin(Margin {
-                left: 4,
-                right: if self.arrows { 20 } else { 4 },
-                top: 2,
-                bottom: 2,
-            });
-        let mut res = if valid {
-            ui.add(text)
-        } else {
-            let message = match (self.min, self.max) {
-                (Some(min), Some(max)) => format!(
-                    "Please enter a number between {} and {}.",
-                    to_string(&min),
-                    to_string(&max)
-                ),
-                (Some(min), None) => {
-                    format!("Please enter a number greater than {}.", to_string(&min))
-                }
-                (None, Some(max)) => {
-                    format!("Please enter a number less than {}.", to_string(&max))
-                }
-                (None, None) => "Please enter a number.".to_string(),
-            };
-            ui.scope(|ui| {
-                let style = ui.style_mut();
-                style.visuals.selection.stroke.color = style.visuals.error_fg_color;
-                style.visuals.widgets.hovered.bg_stroke.color =
-                    style.visuals.error_fg_color.gamma_multiply(0.60);
-                ui.add(text)
-            })
-            .inner
-            .on_hover_text(message)
-        };
-
-        let mut delta = None;
-        if self.arrows {
-            let arrow_left = res.rect.max.x - 16.0;
-            let arrow_right = res.rect.max.x;
-            let arrow_top = res.rect.min.y;
-            let arrow_middle = (res.rect.min.y + res.rect.max.y) / 2.0;
-            let arrow_bottom = res.rect.max.y;
-
-            let top_arrow_rect = Rect {
-                min: (arrow_left, arrow_top).into(),
-                max: (arrow_right, arrow_middle).into(),
-            };
-            if draw_arrow(ui, top_arrow_rect, true).clicked_or_dragged() || up_pressed {
-                delta = Some(Direction::Up);
-            }
-            let bottom_arrow_rect = Rect {
-                min: (arrow_left, arrow_middle).into(),
-                max: (arrow_right, arrow_bottom).into(),
-            };
-            if draw_arrow(ui, bottom_arrow_rect, false).clicked_or_dragged() || down_pressed {
-                delta = Some(Direction::Down);
-            }
-        }
-
-        let in_range =
-            |val: &T| self.min.is_none_or(|m| &m <= val) && self.max.is_none_or(|m| &m >= val);
-        if let Some(dir) = delta {
-            let value = match dir {
-                Direction::Up => self.value.checked_add(&self.increment),
-                Direction::Down => self.value.checked_sub(&self.increment),
-            };
-            if let Some(new_value) = value.filter(in_range) {
-                if *self.value != new_value {
-                    res.mark_changed();
-                }
-                *self.value = new_value;
-            }
-            str = to_string(self.value);
-            stale = true;
-        } else if res.changed() {
-            if let Some(new_value) = from_string(&str).filter(in_range) {
-                if *self.value != new_value {
-                    res.mark_changed();
-                }
-                *self.value = new_value;
-            }
-            stale = true;
-        }
-        if stale {
-            ui.memory_mut(|m| m.data.insert_temp(id, (*self.value, str)));
-        }
-        res
-    }
-}
-
-fn draw_arrow(ui: &mut Ui, rect: Rect, up: bool) -> Response {
-    let arrow_res = ui
-        .allocate_rect(rect, Sense::all())
-        .on_hover_cursor(CursorIcon::Default);
-    let visuals = ui.style().visuals.widgets.style(&arrow_res);
-    let painter = ui.painter_at(arrow_res.rect);
-
-    let rounding = if up {
-        CornerRadius {
-            ne: 2,
-            ..CornerRadius::ZERO
-        }
-    } else {
-        CornerRadius {
-            se: 2,
-            ..CornerRadius::ZERO
-        }
-    };
-    painter.rect_filled(arrow_res.rect, rounding, visuals.bg_fill);
-
-    let left = rect.left() + 4.0;
-    let center = (rect.left() + rect.right()) / 2.0;
-    let right = rect.right() - 4.0;
-    let top = rect.top() + 3.0;
-    let bottom = rect.bottom() - 3.0;
-    let points = if up {
-        vec![
-            (left, bottom).into(),
-            (center, top).into(),
-            (right, bottom).into(),
-        ]
-    } else {
-        vec![
-            (right, top).into(),
-            (center, bottom).into(),
-            (left, top).into(),
-        ]
-    };
-    painter.add(Shape::convex_polygon(
-        points,
-        visuals.fg_stroke.color,
-        Stroke::NONE,
-    ));
-    arrow_res
-}
-
-trait ResponseExt {
-    fn clicked_or_dragged(&self) -> bool;
-}
-
-impl ResponseExt for Response {
-    fn clicked_or_dragged(&self) -> bool {
-        self.clicked() || self.dragged()
-    }
-}

src/window/vip.rs

@@ -1,14 +0,0 @@
-mod bgmap;
-mod chardata;
-mod framebuffer;
-mod object;
-mod registers;
-mod utils;
-mod world;
-
-pub use bgmap::*;
-pub use chardata::*;
-pub use framebuffer::*;
-pub use object::*;
-pub use registers::*;
-pub use world::*;

src/window/vip/bgmap.rs

@@ -1,315 +0,0 @@
-use std::sync::Arc;
-
-use egui::{
-    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-
-use crate::{
-    emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    memory::{MemoryClient, MemoryView},
-    window::{
-        AppWindow, InitArgs,
-        utils::{NumberEdit, UiExt},
-    },
-};
-
-use super::utils::{self, CellData, CharacterGrid};
-
-pub struct BgMapWindow {
-    sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
-    memory: Arc<MemoryClient>,
-    bgmaps: MemoryView,
-    cell_index: usize,
-    generic_palette: bool,
-    params: ImageParams<BgMapParams>,
-    scale: f32,
-    show_grid: bool,
-}
-
-impl BgMapWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
-        let renderer = BgMapRenderer::new(sim_id, memory);
-        let ([cell, bgmap], params) = images.add(renderer, BgMapParams::default());
-        let loader =
-            ImageTextureLoader::new([("vip://cell".into(), cell), ("vip://bgmap".into(), bgmap)]);
-        Self {
-            sim_id,
-            loader: Arc::new(loader),
-            memory: memory.clone(),
-            bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
-            cell_index: params.cell_index,
-            generic_palette: params.generic_palette,
-            params,
-            scale: 1.0,
-            show_grid: false,
-        }
-    }
-
-    fn show_form(&mut self, ui: &mut Ui) {
-        let row_height = ui.spacing().interact_size.y;
-        ui.vertical(|ui| {
-            TableBuilder::new(ui)
-                .column(Column::auto())
-                .column(Column::remainder())
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Map");
-                        });
-                        row.col(|ui| {
-                            let mut bgmap_index = self.cell_index / 4096;
-                            ui.add(NumberEdit::new(&mut bgmap_index).range(0..16));
-                            if bgmap_index != self.cell_index / 4096 {
-                                self.cell_index = (bgmap_index * 4096) + (self.cell_index % 4096);
-                            }
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Cell");
-                        });
-                        row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.cell_index).range(0..16 * 4096));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Address");
-                        });
-                        row.col(|ui| {
-                            let address = 0x00020000 + (self.cell_index * 2);
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                });
-            let image = Image::new("vip://cell")
-                .maintain_aspect_ratio(true)
-                .texture_options(TextureOptions::NEAREST);
-            ui.add(image);
-            ui.section("Cell", |ui| {
-                let mut data = self.bgmaps.borrow().read::<u16>(self.cell_index);
-                let mut cell = CellData::parse(data);
-                TableBuilder::new(ui)
-                    .column(Column::remainder())
-                    .column(Column::remainder())
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("Character");
-                            });
-                            row.col(|ui| {
-                                ui.add(NumberEdit::new(&mut cell.char_index).range(0..2048));
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("Palette");
-                            });
-                            row.col(|ui| {
-                                ComboBox::from_id_salt("palette")
-                                    .selected_text(format!("BG {}", cell.palette_index))
-                                    .width(ui.available_width())
-                                    .show_ui(ui, |ui| {
-                                        for palette in 0..4 {
-                                            ui.selectable_value(
-                                                &mut cell.palette_index,
-                                                palette,
-                                                format!("BG {palette}"),
-                                            );
-                                        }
-                                    });
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.add(Checkbox::new(&mut cell.hflip, "H-flip"));
-                            });
-                            row.col(|ui| {
-                                ui.add(Checkbox::new(&mut cell.vflip, "V-flip"));
-                            });
-                        });
-                    });
-                if cell.update(&mut data) {
-                    let address = 0x00020000 + (self.cell_index * 2);
-                    self.memory.write(self.sim_id, address as u32, &data);
-                }
-            });
-            ui.section("Display", |ui| {
-                ui.horizontal(|ui| {
-                    ui.label("Scale");
-                    ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
-                        .step_by(1.0)
-                        .show_value(false);
-                    ui.add(slider);
-                });
-                ui.checkbox(&mut self.show_grid, "Show grid");
-                ui.checkbox(&mut self.generic_palette, "Generic palette");
-            });
-        });
-        self.params.write(BgMapParams {
-            cell_index: self.cell_index,
-            generic_palette: self.generic_palette,
-        });
-    }
-
-    fn show_bgmap(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://bgmap")
-            .with_scale(self.scale)
-            .with_grid(self.show_grid)
-            .with_selected(self.cell_index % 4096);
-        if let Some(selected) = grid.show(ui) {
-            self.cell_index = (self.cell_index / 4096 * 4096) + selected;
-        }
-    }
-}
-
-impl AppWindow for BgMapWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("bgmap-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("BG Map Data ({})", self.sim_id))
-            .with_inner_size((640.0, 480.0))
-    }
-
-    fn on_init(&mut self, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal_top(|ui| {
-                StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
-                    .size(Size::remainder())
-                    .horizontal(|mut strip| {
-                        strip.cell(|ui| {
-                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
-                        });
-                        strip.cell(|ui| {
-                            ScrollArea::both().show(ui, |ui| self.show_bgmap(ui));
-                        });
-                    })
-            });
-        });
-    }
-}
-
-#[derive(Default, Clone, PartialEq, Eq)]
-struct BgMapParams {
-    cell_index: usize,
-    generic_palette: bool,
-}
-
-struct BgMapRenderer {
-    chardata: MemoryView,
-    bgmaps: MemoryView,
-    brightness: MemoryView,
-    palettes: MemoryView,
-}
-
-impl BgMapRenderer {
-    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
-        Self {
-            chardata: memory.watch(sim_id, 0x00078000, 0x8000),
-            bgmaps: memory.watch(sim_id, 0x00020000, 0x20000),
-            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.watch(sim_id, 0x0005f860, 16),
-        }
-    }
-
-    fn render_bgmap(&self, image: &mut ImageBuffer, bgmap_index: usize, generic_palette: bool) {
-        let chardata = self.chardata.borrow();
-        let bgmaps = self.bgmaps.borrow();
-        let brightness = self.brightness.borrow();
-        let palettes = self.palettes.borrow();
-
-        let brts = brightness.read::<[u8; 8]>(0);
-        let colors = if generic_palette {
-            [utils::generic_palette(Color32::RED); 4]
-        } else {
-            [0, 2, 4, 6].map(|i| utils::palette_colors(palettes.read(i), &brts, Color32::RED))
-        };
-
-        for (i, cell) in bgmaps.range::<u16>(bgmap_index * 4096, 4096).enumerate() {
-            let CellData {
-                char_index,
-                vflip,
-                hflip,
-                palette_index,
-            } = CellData::parse(cell);
-            let char = chardata.read::<[u16; 8]>(char_index);
-            let palette = &colors[palette_index];
-
-            for row in 0..8 {
-                let y = row + (i / 64) * 8;
-                for (col, pixel) in utils::read_char_row(&char, hflip, vflip, row).enumerate() {
-                    let x = col + (i % 64) * 8;
-                    image.write((x, y), palette[pixel as usize]);
-                }
-            }
-        }
-    }
-
-    fn render_bgmap_cell(&self, image: &mut ImageBuffer, index: usize, generic_palette: bool) {
-        let chardata = self.chardata.borrow();
-        let bgmaps = self.bgmaps.borrow();
-        let brightness = self.brightness.borrow();
-        let palettes = self.palettes.borrow();
-
-        let brts = brightness.read::<[u8; 8]>(0);
-
-        let cell = bgmaps.read::<u16>(index);
-
-        let CellData {
-            char_index,
-            vflip,
-            hflip,
-            palette_index,
-        } = CellData::parse(cell);
-        let char = chardata.read::<[u16; 8]>(char_index);
-        let palette = if generic_palette {
-            utils::generic_palette(Color32::RED)
-        } else {
-            utils::palette_colors(palettes.read(palette_index * 2), &brts, Color32::RED)
-        };
-
-        for row in 0..8 {
-            for (col, pixel) in utils::read_char_row(&char, hflip, vflip, row).enumerate() {
-                image.write((col, row), palette[pixel as usize]);
-            }
-        }
-    }
-}
-
-impl ImageRenderer<2> for BgMapRenderer {
-    type Params = BgMapParams;
-
-    fn sizes(&self) -> [[usize; 2]; 2] {
-        [[8, 8], [8 * 64, 8 * 64]]
-    }
-
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
-        self.render_bgmap_cell(&mut images[0], params.cell_index, params.generic_palette);
-        self.render_bgmap(
-            &mut images[1],
-            params.cell_index / 4096,
-            params.generic_palette,
-        );
-    }
-}

src/window/vip/chardata.rs

@@ -1,356 +0,0 @@
-use std::{fmt::Display, sync::Arc};
-
-use egui::{
-    Align, CentralPanel, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, Vec2, ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    memory::{MemoryClient, MemoryView},
-    window::{
-        AppWindow, InitArgs,
-        utils::{NumberEdit, UiExt as _},
-    },
-};
-
-use super::utils::{self, CharacterGrid};
-
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum Palette {
-    #[default]
-    Generic,
-    Bg0,
-    Bg1,
-    Bg2,
-    Bg3,
-    Obj0,
-    Obj1,
-    Obj2,
-    Obj3,
-}
-
-impl Palette {
-    pub const fn values() -> [Palette; 9] {
-        [
-            Self::Generic,
-            Self::Bg0,
-            Self::Bg1,
-            Self::Bg2,
-            Self::Bg3,
-            Self::Obj0,
-            Self::Obj1,
-            Self::Obj2,
-            Self::Obj3,
-        ]
-    }
-
-    pub const fn offset(self) -> Option<usize> {
-        match self {
-            Self::Generic => None,
-            Self::Bg0 => Some(0),
-            Self::Bg1 => Some(2),
-            Self::Bg2 => Some(4),
-            Self::Bg3 => Some(6),
-            Self::Obj0 => Some(8),
-            Self::Obj1 => Some(10),
-            Self::Obj2 => Some(12),
-            Self::Obj3 => Some(14),
-        }
-    }
-}
-
-impl Display for Palette {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Generic => f.write_str("Generic"),
-            Self::Bg0 => f.write_str("BG 0"),
-            Self::Bg1 => f.write_str("BG 1"),
-            Self::Bg2 => f.write_str("BG 2"),
-            Self::Bg3 => f.write_str("BG 3"),
-            Self::Obj0 => f.write_str("OBJ 0"),
-            Self::Obj1 => f.write_str("OBJ 1"),
-            Self::Obj2 => f.write_str("OBJ 2"),
-            Self::Obj3 => f.write_str("OBJ 3"),
-        }
-    }
-}
-
-pub struct CharacterDataWindow {
-    sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
-    brightness: MemoryView,
-    palettes: MemoryView,
-    palette: Palette,
-    index: usize,
-    params: ImageParams<CharDataParams>,
-    scale: f32,
-    show_grid: bool,
-}
-
-impl CharacterDataWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
-        let renderer = CharDataRenderer::new(sim_id, memory);
-        let ([char, chardata], params) = images.add(renderer, CharDataParams::default());
-        let loader = ImageTextureLoader::new([
-            ("vip://char".into(), char),
-            ("vip://chardata".into(), chardata),
-        ]);
-        Self {
-            sim_id,
-            loader: Arc::new(loader),
-            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.watch(sim_id, 0x0005f860, 16),
-            palette: params.palette,
-            index: params.index,
-            params,
-            scale: 4.0,
-            show_grid: true,
-        }
-    }
-
-    fn show_form(&mut self, ui: &mut Ui) {
-        let row_height = ui.spacing().interact_size.y;
-        ui.vertical(|ui| {
-            TableBuilder::new(ui)
-                .column(Column::auto())
-                .column(Column::remainder())
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Index");
-                        });
-                        row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.index).range(0..2048));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Address");
-                        });
-                        row.col(|ui| {
-                            let address = match self.index {
-                                0x000..0x200 => 0x00060000 + self.index * 16,
-                                0x200..0x400 => 0x000e0000 + (self.index - 0x200) * 16,
-                                0x400..0x600 => 0x00160000 + (self.index - 0x400) * 16,
-                                0x600..0x800 => 0x001e0000 + (self.index - 0x600) * 16,
-                                _ => unreachable!("can't happen"),
-                            };
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Mirror");
-                        });
-                        row.col(|ui| {
-                            let mirror = 0x00078000 + (self.index * 16);
-                            let mut mirror_str = format!("{mirror:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut mirror_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                });
-            let image = Image::new("vip://char")
-                .maintain_aspect_ratio(true)
-                .texture_options(TextureOptions::NEAREST);
-            ui.add(image);
-            ui.section("Colors", |ui| {
-                ui.horizontal(|ui| {
-                    ui.label("Palette");
-                    ComboBox::from_id_salt("palette")
-                        .selected_text(self.palette.to_string())
-                        .width(ui.available_width())
-                        .show_ui(ui, |ui| {
-                            for palette in Palette::values() {
-                                ui.selectable_value(
-                                    &mut self.palette,
-                                    palette,
-                                    palette.to_string(),
-                                );
-                            }
-                        });
-                });
-                TableBuilder::new(ui)
-                    .columns(Column::remainder(), 4)
-                    .body(|mut body| {
-                        let palette = self.load_palette_colors();
-                        body.row(30.0, |mut row| {
-                            for color in palette {
-                                row.col(|ui| {
-                                    let rect = ui.available_rect_before_wrap();
-                                    let scale = rect.height() / rect.width();
-                                    let rect = rect.scale_from_center2(Vec2::new(scale, 1.0));
-                                    ui.painter().rect_filled(rect, 0.0, color);
-                                });
-                            }
-                        });
-                    });
-            });
-            ui.section("Display", |ui| {
-                ui.horizontal(|ui| {
-                    ui.label("Scale");
-                    ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
-                        .step_by(1.0)
-                        .show_value(false);
-                    ui.add(slider);
-                });
-                ui.checkbox(&mut self.show_grid, "Show grid");
-            });
-        });
-
-        self.params.write(CharDataParams {
-            palette: self.palette,
-            index: self.index,
-        });
-    }
-
-    fn load_palette_colors(&self) -> [Color32; 4] {
-        let Some(offset) = self.palette.offset() else {
-            return utils::generic_palette(Color32::RED);
-        };
-        let palette = self.palettes.borrow().read(offset);
-        let brightnesses = self.brightness.borrow();
-        let brts = brightnesses.read(0);
-        utils::palette_colors(palette, &brts, Color32::RED)
-    }
-
-    fn show_chardata(&mut self, ui: &mut Ui) {
-        let grid = CharacterGrid::new("vip://chardata")
-            .with_scale(self.scale)
-            .with_grid(self.show_grid)
-            .with_selected(self.index);
-        if let Some(selected) = grid.show(ui) {
-            self.index = selected;
-        }
-    }
-}
-
-impl AppWindow for CharacterDataWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("chardata-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Character Data ({})", self.sim_id))
-            .with_inner_size((640.0, 480.0))
-    }
-
-    fn on_init(&mut self, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal_top(|ui| {
-                StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
-                    .size(Size::remainder())
-                    .horizontal(|mut strip| {
-                        strip.cell(|ui| {
-                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
-                        });
-                        strip.cell(|ui| {
-                            ScrollArea::both().show(ui, |ui| self.show_chardata(ui));
-                        });
-                    });
-            });
-        });
-    }
-}
-
-#[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,
-    index: usize,
-}
-
-struct CharDataRenderer {
-    chardata: MemoryView,
-    brightness: MemoryView,
-    palettes: MemoryView,
-}
-
-impl ImageRenderer<2> for CharDataRenderer {
-    type Params = CharDataParams;
-
-    fn sizes(&self) -> [[usize; 2]; 2] {
-        [[8, 8], [16 * 8, 128 * 8]]
-    }
-
-    fn render(&mut self, params: &Self::Params, image: &mut [ImageBuffer; 2]) {
-        self.render_character(&mut image[0], params.palette, params.index);
-        self.render_character_data(&mut image[1], params.palette);
-    }
-}
-
-impl CharDataRenderer {
-    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
-        Self {
-            chardata: memory.watch(sim_id, 0x00078000, 0x8000),
-            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.watch(sim_id, 0x0005f860, 16),
-        }
-    }
-
-    fn render_character(&self, image: &mut ImageBuffer, palette: Palette, index: usize) {
-        if index >= 2048 {
-            return;
-        }
-        let palette = self.load_palette(palette);
-        let chardata = self.chardata.borrow();
-        let character = chardata.range::<u16>(index * 8, 8);
-        for (row, pixels) in character.enumerate() {
-            for col in 0..8 {
-                let char = (pixels >> (col * 2)) & 0x03;
-                image.write((col, row), palette[char as usize]);
-            }
-        }
-    }
-
-    fn render_character_data(&self, image: &mut ImageBuffer, palette: Palette) {
-        let palette = self.load_palette(palette);
-        let chardata = self.chardata.borrow();
-        for (row, pixels) in chardata.range::<u16>(0, 8 * 2048).enumerate() {
-            let char_index = row / 8;
-            let row_index = row % 8;
-            let x = (char_index % 16) * 8;
-            let y = (char_index / 16) * 8 + row_index;
-            for col in 0..8 {
-                let char = (pixels >> (col * 2)) & 0x03;
-                image.write((x + col, y), palette[char as usize]);
-            }
-        }
-    }
-
-    fn load_palette(&self, palette: Palette) -> [Color32; 4] {
-        let Some(offset) = palette.offset() else {
-            return utils::GENERIC_PALETTE.map(|p| utils::shade(p, Color32::RED));
-        };
-        let palette = self.palettes.borrow().read(offset);
-        let brightnesses = self.brightness.borrow();
-        let brts = brightnesses.read(0);
-        utils::palette_colors(palette, &brts, Color32::RED)
-    }
-}

src/window/vip/framebuffer.rs

@@ -1,267 +0,0 @@
-use std::sync::Arc;
-
-use egui::{
-    Align, CentralPanel, Color32, Context, Image, ScrollArea, Slider, TextEdit, TextureOptions, Ui,
-    ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-
-use crate::{
-    emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    memory::{MemoryClient, MemoryView},
-    window::{
-        AppWindow, InitArgs,
-        utils::{NumberEdit, UiExt as _},
-    },
-};
-
-use super::utils;
-
-pub struct FrameBufferWindow {
-    sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
-    index: usize,
-    left: bool,
-    right: bool,
-    generic_palette: bool,
-    params: ImageParams<FrameBufferParams>,
-    scale: f32,
-}
-
-impl FrameBufferWindow {
-    pub fn new(sim_id: SimId, memory: &MemoryClient, images: &mut ImageProcessor) -> Self {
-        let initial_params = FrameBufferParams {
-            index: 0,
-            left: true,
-            right: true,
-            generic_palette: false,
-            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
-        };
-        let renderer = FrameBufferRenderer::new(sim_id, memory);
-        let ([buffer], params) = images.add(renderer, initial_params);
-        let loader = ImageTextureLoader::new([("vip://buffer".into(), buffer)]);
-        Self {
-            sim_id,
-            loader: Arc::new(loader),
-            index: params.index,
-            left: params.left,
-            right: params.right,
-            generic_palette: params.generic_palette,
-            params,
-            scale: 2.0,
-        }
-    }
-
-    fn show_form(&mut self, ui: &mut Ui) {
-        let row_height = ui.spacing().interact_size.y;
-        ui.vertical(|ui| {
-            TableBuilder::new(ui)
-                .column(Column::auto())
-                .column(Column::remainder())
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Index");
-                        });
-                        row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.index).range(0..2));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Left");
-                        });
-                        row.col(|ui| {
-                            let address = self.index * 0x00008000;
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Right");
-                        });
-                        row.col(|ui| {
-                            let address = self.index * 0x00008000 + 0x00010000;
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                });
-            ui.section("Display", |ui| {
-                ui.horizontal(|ui| {
-                    ui.label("Scale");
-                    ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
-                        .step_by(1.0)
-                        .show_value(false);
-                    ui.add(slider);
-                });
-                TableBuilder::new(ui)
-                    .columns(Column::remainder(), 2)
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.checkbox(&mut self.left, "Left");
-                            });
-                            row.col(|ui| {
-                                ui.checkbox(&mut self.right, "Right");
-                            });
-                        });
-                    });
-                ui.checkbox(&mut self.generic_palette, "Generic colors");
-            });
-        });
-
-        self.params.write(FrameBufferParams {
-            index: self.index,
-            left: self.left,
-            right: self.right,
-            generic_palette: self.generic_palette,
-            ..*self.params
-        });
-    }
-
-    fn show_buffers(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://buffer")
-            .fit_to_original_size(self.scale)
-            .texture_options(TextureOptions::NEAREST);
-        ui.add(image);
-    }
-}
-
-impl AppWindow for FrameBufferWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("framebuffer-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Frame Buffers ({})", self.sim_id))
-            .with_inner_size((640.0, 480.0))
-    }
-
-    fn on_init(&mut self, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal_top(|ui| {
-                StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
-                    .size(Size::remainder())
-                    .horizontal(|mut strip| {
-                        strip.cell(|ui| {
-                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
-                        });
-                        strip.cell(|ui| {
-                            ScrollArea::both().show(ui, |ui| self.show_buffers(ui));
-                        });
-                    });
-            });
-        });
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-struct FrameBufferParams {
-    index: usize,
-    left: bool,
-    right: bool,
-    generic_palette: bool,
-    left_color: Color32,
-    right_color: Color32,
-}
-
-struct FrameBufferRenderer {
-    buffers: [MemoryView; 4],
-    brightness: MemoryView,
-}
-
-impl FrameBufferRenderer {
-    fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
-        Self {
-            buffers: [
-                memory.watch(sim_id, 0x00000000, 0x6000),
-                memory.watch(sim_id, 0x00008000, 0x6000),
-                memory.watch(sim_id, 0x00010000, 0x6000),
-                memory.watch(sim_id, 0x00018000, 0x6000),
-            ],
-            brightness: memory.watch(sim_id, 0x0005f824, 8),
-        }
-    }
-}
-
-impl ImageRenderer<1> for FrameBufferRenderer {
-    type Params = FrameBufferParams;
-
-    fn sizes(&self) -> [[usize; 2]; 1] {
-        [[384, 224]]
-    }
-
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 1]) {
-        let image = &mut images[0];
-
-        let left_buffer = self.buffers[params.index].borrow();
-        let right_buffer = self.buffers[2 + params.index].borrow();
-
-        let colors = if params.generic_palette {
-            [
-                utils::generic_palette(params.left_color),
-                utils::generic_palette(params.right_color),
-            ]
-        } else {
-            let brts = self.brightness.borrow().read::<[u8; 8]>(0);
-            let shades = utils::parse_shades(&brts);
-            [
-                shades.map(|s| utils::shade(s, params.left_color)),
-                shades.map(|s| utils::shade(s, params.right_color)),
-            ]
-        };
-
-        let left_cols = left_buffer.range::<u8>(0, 0x6000);
-        let right_cols = right_buffer.range::<u8>(0, 0x6000);
-        for (index, (left, right)) in left_cols.zip(right_cols).enumerate() {
-            let top = (index % 64) * 4;
-            if top >= 224 {
-                continue;
-            }
-
-            let pixels = [0, 2, 4, 6].map(|i| {
-                let left = if params.left {
-                    colors[0][(left >> i) as usize & 0x3]
-                } else {
-                    Color32::BLACK
-                };
-                let right = if params.right {
-                    colors[1][(right >> i) as usize & 0x3]
-                } else {
-                    Color32::BLACK
-                };
-                Color32::from_rgb(
-                    left.r() + right.r(),
-                    left.g() + right.g(),
-                    left.b() + right.b(),
-                )
-            });
-            let x = index / 64;
-            for (i, pixel) in pixels.into_iter().enumerate() {
-                let y = top + i;
-                image.write((x, y), pixel);
-            }
-        }
-    }
-}

src/window/vip/object.rs

@@ -1,342 +0,0 @@
-use std::sync::Arc;
-
-use egui::{
-    Align, CentralPanel, Checkbox, Color32, ComboBox, Context, Image, ScrollArea, Slider, TextEdit,
-    TextureOptions, Ui, ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-
-use crate::{
-    emulator::SimId,
-    images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
-    memory::{MemoryClient, MemoryView},
-    window::{
-        AppWindow, InitArgs,
-        utils::{NumberEdit, UiExt as _},
-    },
-};
-
-use super::utils::{self, Object};
-
-pub struct ObjectWindow {
-    sim_id: SimId,
-    loader: Arc<ImageTextureLoader>,
-    memory: Arc<MemoryClient>,
-    objects: MemoryView,
-    index: usize,
-    generic_palette: bool,
-    params: ImageParams<ObjectParams>,
-    scale: f32,
-}
-
-impl ObjectWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>, images: &mut ImageProcessor) -> Self {
-        let initial_params = ObjectParams {
-            index: 0,
-            generic_palette: false,
-            left_color: Color32::from_rgb(0xff, 0x00, 0x00),
-            right_color: Color32::from_rgb(0x00, 0xc6, 0xf0),
-        };
-        let renderer = ObjectRenderer::new(sim_id, memory);
-        let ([zoom, full], params) = images.add(renderer, initial_params);
-        let loader =
-            ImageTextureLoader::new([("vip://zoom".into(), zoom), ("vip://full".into(), full)]);
-        Self {
-            sim_id,
-            loader: Arc::new(loader),
-            memory: memory.clone(),
-            objects: memory.watch(sim_id, 0x0003e000, 0x2000),
-            index: params.index,
-            generic_palette: params.generic_palette,
-            params,
-            scale: 1.0,
-        }
-    }
-
-    fn show_form(&mut self, ui: &mut Ui) {
-        let row_height = ui.spacing().interact_size.y;
-        ui.vertical(|ui| {
-            TableBuilder::new(ui)
-                .column(Column::auto())
-                .column(Column::remainder())
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Index");
-                        });
-                        row.col(|ui| {
-                            ui.add(NumberEdit::new(&mut self.index).range(0..1024));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("Address");
-                        });
-                        row.col(|ui| {
-                            let address = 0x3e000 + self.index * 8;
-                            let mut address_str = format!("{address:08x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut address_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                });
-            let image = Image::new("vip://zoom")
-                .maintain_aspect_ratio(true)
-                .texture_options(TextureOptions::NEAREST);
-            ui.add(image);
-            ui.section("Properties", |ui| {
-                let mut object = self.objects.borrow().read::<[u16; 4]>(self.index);
-                let mut obj = Object::parse(object);
-                TableBuilder::new(ui)
-                    .column(Column::remainder())
-                    .column(Column::remainder())
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("Character");
-                            });
-                            row.col(|ui| {
-                                ui.add(NumberEdit::new(&mut obj.data.char_index).range(0..2048));
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("Palette");
-                            });
-                            row.col(|ui| {
-                                ComboBox::from_id_salt("palette")
-                                    .selected_text(format!("OBJ {}", obj.data.palette_index))
-                                    .width(ui.available_width())
-                                    .show_ui(ui, |ui| {
-                                        for palette in 0..4 {
-                                            ui.selectable_value(
-                                                &mut obj.data.palette_index,
-                                                palette,
-                                                format!("OBJ {palette}"),
-                                            );
-                                        }
-                                    });
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("X");
-                            });
-                            row.col(|ui| {
-                                ui.add(NumberEdit::new(&mut obj.x).range(-512..512));
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("Y");
-                            });
-                            row.col(|ui| {
-                                ui.add(NumberEdit::new(&mut obj.y).range(-8..=224));
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("Parallax");
-                            });
-                            row.col(|ui| {
-                                ui.add(NumberEdit::new(&mut obj.parallax).range(-512..512));
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.add(Checkbox::new(&mut obj.data.hflip, "H-flip"));
-                            });
-                            row.col(|ui| {
-                                ui.add(Checkbox::new(&mut obj.data.vflip, "V-flip"));
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.add(Checkbox::new(&mut obj.lon, "Left"));
-                            });
-                            row.col(|ui| {
-                                ui.add(Checkbox::new(&mut obj.ron, "Right"));
-                            });
-                        });
-                    });
-                if obj.update(&mut object) {
-                    let address = 0x3e000 + self.index * 8;
-                    self.memory.write(self.sim_id, address as u32, &object);
-                }
-            });
-            ui.section("Display", |ui| {
-                ui.horizontal(|ui| {
-                    ui.label("Scale");
-                    ui.spacing_mut().slider_width = ui.available_width();
-                    let slider = Slider::new(&mut self.scale, 1.0..=10.0)
-                        .step_by(1.0)
-                        .show_value(false);
-                    ui.add(slider);
-                });
-                ui.checkbox(&mut self.generic_palette, "Generic palette");
-            });
-        });
-        self.params.write(ObjectParams {
-            index: self.index,
-            generic_palette: self.generic_palette,
-            ..*self.params
-        });
-    }
-
-    fn show_object(&mut self, ui: &mut Ui) {
-        let image = Image::new("vip://full")
-            .fit_to_original_size(self.scale)
-            .texture_options(TextureOptions::NEAREST);
-        ui.add(image);
-    }
-}
-
-impl AppWindow for ObjectWindow {
-    fn viewport_id(&self) -> egui::ViewportId {
-        ViewportId::from_hash_of(format!("object-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Object Data ({})", self.sim_id))
-            .with_inner_size((640.0, 500.0))
-    }
-
-    fn on_init(&mut self, args: InitArgs) {
-        args.ctx.add_texture_loader(self.loader.clone());
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ui.horizontal_top(|ui| {
-                StripBuilder::new(ui)
-                    .size(Size::relative(0.3).at_most(200.0))
-                    .size(Size::remainder())
-                    .horizontal(|mut strip| {
-                        strip.cell(|ui| {
-                            ScrollArea::vertical().show(ui, |ui| self.show_form(ui));
-                        });
-                        strip.cell(|ui| {
-                            ScrollArea::both().show(ui, |ui| self.show_object(ui));
-                        });
-                    });
-            });
-        });
-    }
-}
-
-#[derive(Clone, PartialEq, Eq)]
-struct ObjectParams {
-    index: usize,
-    generic_palette: bool,
-    left_color: Color32,
-    right_color: Color32,
-}
-
-enum Eye {
-    Left,
-    Right,
-}
-
-struct ObjectRenderer {
-    chardata: MemoryView,
-    objects: MemoryView,
-    brightness: MemoryView,
-    palettes: MemoryView,
-}
-
-impl ObjectRenderer {
-    pub fn new(sim_id: SimId, memory: &MemoryClient) -> Self {
-        Self {
-            chardata: memory.watch(sim_id, 0x00078000, 0x8000),
-            objects: memory.watch(sim_id, 0x0003e000, 0x2000),
-            brightness: memory.watch(sim_id, 0x0005f824, 8),
-            palettes: memory.watch(sim_id, 0x0005f860, 16),
-        }
-    }
-
-    fn render_object(
-        &self,
-        image: &mut ImageBuffer,
-        params: &ObjectParams,
-        use_pos: bool,
-        eye: Eye,
-    ) {
-        let chardata = self.chardata.borrow();
-        let objects = self.objects.borrow();
-        let brightness = self.brightness.borrow();
-        let palettes = self.palettes.borrow();
-
-        let object: [u16; 4] = objects.read(params.index);
-        let obj = Object::parse(object);
-
-        if match eye {
-            Eye::Left => !obj.lon,
-            Eye::Right => !obj.ron,
-        } {
-            return;
-        }
-
-        let brts = brightness.read::<[u8; 8]>(0);
-        let (x, y) = if use_pos {
-            let x = match eye {
-                Eye::Left => obj.x - obj.parallax,
-                Eye::Right => obj.x + obj.parallax,
-            };
-            (x, obj.y)
-        } else {
-            (0, 0)
-        };
-
-        let color = match eye {
-            Eye::Left => params.left_color,
-            Eye::Right => params.right_color,
-        };
-
-        let char = chardata.read::<[u16; 8]>(obj.data.char_index);
-        let palette = if params.generic_palette {
-            utils::generic_palette(color)
-        } else {
-            utils::palette_colors(palettes.read(8 + obj.data.palette_index * 2), &brts, color)
-        };
-
-        for row in 0..8 {
-            let real_y = y + row as i16;
-            if !(0..224).contains(&real_y) {
-                continue;
-            }
-            for (col, pixel) in
-                utils::read_char_row(&char, obj.data.hflip, obj.data.vflip, row).enumerate()
-            {
-                let real_x = x + col as i16;
-                if !(0..384).contains(&real_x) {
-                    continue;
-                }
-                image.add((real_x as usize, real_y as usize), palette[pixel as usize]);
-            }
-        }
-    }
-}
-
-impl ImageRenderer<2> for ObjectRenderer {
-    type Params = ObjectParams;
-
-    fn sizes(&self) -> [[usize; 2]; 2] {
-        [[8, 8], [384, 224]]
-    }
-
-    fn render(&mut self, params: &Self::Params, images: &mut [ImageBuffer; 2]) {
-        images[0].clear();
-        self.render_object(&mut images[0], params, false, Eye::Left);
-        self.render_object(&mut images[0], params, false, Eye::Right);
-        images[1].clear();
-        self.render_object(&mut images[1], params, true, Eye::Left);
-        self.render_object(&mut images[1], params, true, Eye::Right);
-    }
-}

src/window/vip/registers.rs

@@ -1,819 +0,0 @@
-use std::sync::Arc;
-
-use egui::{
-    Align, Button, CentralPanel, Checkbox, Color32, Context, Direction, Label, Layout, ScrollArea,
-    TextEdit, Ui, ViewportBuilder, ViewportId,
-};
-use egui_extras::{Column, Size, StripBuilder, TableBuilder};
-
-use crate::{
-    emulator::SimId,
-    memory::{MemoryClient, MemoryRef, MemoryValue, MemoryView},
-    window::{
-        AppWindow,
-        utils::{NumberEdit, UiExt},
-    },
-};
-
-use super::utils;
-
-pub struct RegisterWindow {
-    sim_id: SimId,
-    memory: Arc<MemoryClient>,
-    registers: MemoryView,
-}
-
-impl RegisterWindow {
-    pub fn new(sim_id: SimId, memory: &Arc<MemoryClient>) -> Self {
-        Self {
-            sim_id,
-            memory: memory.clone(),
-            registers: memory.watch(sim_id, 0x0005f800, 0x72),
-        }
-    }
-
-    fn show_interrupts(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let [mut raw_intpnd, mut raw_intenb] = self.read_address(0x0005f800);
-        let mut intenb = InterruptReg::parse(raw_intenb);
-        let mut intpnd = InterruptReg::parse(raw_intpnd);
-        ui.section("Interrupt", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            ui.with_layout(Layout::top_down_justified(Align::Center), |ui| {
-                TableBuilder::new(ui)
-                    .id_salt("raw_values")
-                    .columns(Column::exact(width * 0.5 - xspace), 2)
-                    .cell_layout(Layout::left_to_right(Align::Max))
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("INTENB");
-                            });
-                            row.col(|ui| {
-                                let mut text = format!("{raw_intenb:04x}");
-                                ui.add_sized(
-                                    ui.available_size(),
-                                    TextEdit::singleline(&mut text).horizontal_align(Align::Max),
-                                );
-                            });
-                        });
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label("INTPND");
-                            });
-                            row.col(|ui| {
-                                let mut text = format!("{raw_intpnd:04x}");
-                                ui.add_enabled(
-                                    false,
-                                    TextEdit::singleline(&mut text).horizontal_align(Align::Max),
-                                );
-                            });
-                        });
-                    });
-                ui.add_space(8.0);
-                TableBuilder::new(ui)
-                    .id_salt("flags")
-                    .column(Column::exact(width * 0.5 - xspace))
-                    .columns(Column::exact(width * 0.25 - xspace), 2)
-                    .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
-                    .body(|mut body| {
-                        body.row(row_height, |mut row| {
-                            row.col(|_ui| {});
-                            row.col(|ui| {
-                                ui.add_sized(ui.available_size(), Label::new("ENB"));
-                            });
-                            row.col(|ui| {
-                                ui.add_sized(ui.available_size(), Label::new("PND"));
-                            });
-                        });
-                        let mut add_row = |label: &str, enb: &mut bool, pnd: &mut bool| {
-                            body.row(row_height, |mut row| {
-                                row.col(|ui| {
-                                    ui.label(label);
-                                });
-                                row.col(|ui| {
-                                    let space =
-                                        (ui.available_width() - ui.spacing().icon_width) / 2.0;
-                                    ui.add_space(space);
-                                    ui.checkbox(enb, "");
-                                });
-                                row.col(|ui| {
-                                    let space =
-                                        (ui.available_width() - ui.spacing().icon_width) / 2.0;
-                                    ui.add_space(space);
-                                    ui.checkbox(pnd, "");
-                                });
-                            });
-                        };
-                        add_row("TIMEERR", &mut intenb.timeerr, &mut intpnd.timeerr);
-                        add_row("XPEND", &mut intenb.xpend, &mut intpnd.xpend);
-                        add_row("SBHIT", &mut intenb.sbhit, &mut intpnd.sbhit);
-                        add_row("FRAMESTART", &mut intenb.framestart, &mut intpnd.framestart);
-                        add_row("GAMESTART", &mut intenb.gamestart, &mut intpnd.gamestart);
-                        add_row("RFBEND", &mut intenb.rfbend, &mut intpnd.rfbend);
-                        add_row("LFBEND", &mut intenb.lfbend, &mut intpnd.lfbend);
-                        add_row("SCANERR", &mut intenb.scanerr, &mut intpnd.scanerr);
-                    });
-            });
-            ui.allocate_space(ui.available_size());
-        });
-        if intpnd.update(&mut raw_intpnd) {
-            self.memory.write(self.sim_id, 0x0005f800, &raw_intpnd);
-        }
-        if intenb.update(&mut raw_intenb) {
-            self.memory.write(self.sim_id, 0x0005f802, &raw_intenb);
-        }
-    }
-
-    fn show_display_status(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let mut raw_dpstts = self.read_address(0x0005f820);
-        let mut dpstts = DisplayReg::parse(raw_dpstts);
-        ui.section("Display", |ui| {
-            let width = ui.available_width();
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5))
-                .column(Column::exact(width * 0.5))
-                .cell_layout(Layout::left_to_right(Align::Max))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("DPSTTS");
-                        });
-                        row.col(|ui| {
-                            let mut value_str = format!("{raw_dpstts:04x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.lock, "LOCK"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.r1bsy, "R1BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.synce, "SYNCE"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.l1bsy, "L1BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.re, "RE"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.r0bsy, "R0BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.fclk, "FCLK"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.l0bsy, "L0BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut dpstts.scanrdy, "SCANRDY"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut dpstts.disp, "DISP"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            if ui
-                                .add(Button::new("DPRST").min_size(ui.available_size()))
-                                .clicked()
-                            {
-                                dpstts.dprst = true;
-                            }
-                        });
-                    });
-                });
-            ui.allocate_space(ui.available_size());
-        });
-        if dpstts.update(&mut raw_dpstts) {
-            self.memory.write(self.sim_id, 0x0005f822, &raw_dpstts);
-        }
-    }
-
-    fn show_drawing_status(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let [mut raw_xpstts, raw_xpctrl] = self.read_address(0x0005f840);
-        let mut xpstts = DrawingReg::parse(raw_xpstts);
-        ui.section("Drawing", |ui| {
-            let width = ui.available_width();
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5))
-                .column(Column::exact(width * 0.5))
-                .cell_layout(Layout::left_to_right(Align::Max))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("XPCTRL");
-                        });
-                        row.col(|ui| {
-                            let mut value_str = format!("{raw_xpctrl:04x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("XPSTTS");
-                        });
-                        row.col(|ui| {
-                            let mut value_str = format!("{raw_xpstts:04x}");
-                            ui.add_enabled(
-                                false,
-                                TextEdit::singleline(&mut value_str).horizontal_align(Align::Max),
-                            );
-                        });
-                    });
-                    /*
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("SBCMP");
-                        });
-                        row.col(|ui| {
-                            let old_value = xpctrl.sbcmp;
-                            ui.add_enabled(true, NumberEdit::new(&mut xpctrl.sbcmp).range(0..32));
-                            cmp_changed = xpctrl.sbcmp != old_value;
-                        });
-                    });
-                     */
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("SBCOUNT");
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(
-                                false,
-                                NumberEdit::new(&mut xpstts.sbcount)
-                                    .arrows(false)
-                                    .range(0..32),
-                            );
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.sbout, "SBOUT"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.f1bsy, "F1BSY"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.f0bsy, "F0BSY"));
-                        });
-                        row.col(|ui| {
-                            ui.add_enabled(false, Checkbox::new(&mut xpstts.overtime, "OVERTIME"));
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.add_enabled(true, Checkbox::new(&mut xpstts.xpen, "XPEN"));
-                        });
-                        row.col(|ui| {
-                            if ui
-                                .add(Button::new("XPRST").min_size(ui.available_size()))
-                                .clicked()
-                            {
-                                xpstts.xprst = true;
-                            }
-                        });
-                    });
-                });
-            ui.allocate_space(ui.available_size());
-        });
-        if xpstts.update(&mut raw_xpstts) {
-            xpstts.update(&mut raw_xpstts);
-            self.memory.write(self.sim_id, 0x0005f842, &raw_xpstts);
-        }
-    }
-
-    fn show_colors(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let registers = self.registers.borrow();
-        ui.section("Colors", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.2 - xspace))
-                .columns(Column::exact(width * 0.20 - xspace), 4)
-                .cell_layout(Layout::left_to_right(Align::Max))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            ui.with_layout(
-                                Layout::centered_and_justified(Direction::LeftToRight),
-                                |ui| ui.label("1"),
-                            );
-                        });
-                        row.col(|ui| {
-                            ui.with_layout(
-                                Layout::centered_and_justified(Direction::LeftToRight),
-                                |ui| ui.label("2"),
-                            );
-                        });
-                        row.col(|ui| {
-                            ui.with_layout(
-                                Layout::centered_and_justified(Direction::LeftToRight),
-                                |ui| ui.label("3"),
-                            );
-                        });
-                    });
-                    let mut brts: [u16; 3] = [
-                        read_address(&registers, 0x0005f824),
-                        read_address(&registers, 0x0005f826),
-                        read_address(&registers, 0x0005f828),
-                    ];
-                    body.row(row_height, |mut row| {
-                        let mut stale = false;
-                        row.col(|ui| {
-                            ui.label("BRT");
-                        });
-                        row.col(|_ui| {});
-                        for brt in brts.iter_mut() {
-                            row.col(|ui| {
-                                if ui
-                                    .add(NumberEdit::new(brt).range(0..256).arrows(false).hex(true))
-                                    .changed()
-                                {
-                                    stale = true;
-                                }
-                            });
-                        }
-                        if stale {
-                            self.memory.write(self.sim_id, 0x0005f824, &brts);
-                        }
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        for shade in utils::parse_brts(&brts, Color32::RED) {
-                            row.col(|ui| {
-                                ui.painter().rect_filled(
-                                    ui.available_rect_before_wrap(),
-                                    0.0,
-                                    shade,
-                                );
-                            });
-                        }
-                    });
-                    let mut palettes = read_address::<[u16; 8]>(&registers, 0x0005f860);
-                    let mut add_row = |name: &str, address: u32, value: &mut u16| {
-                        let mut c1 = (*value >> 2) & 0x03;
-                        let mut c2 = (*value >> 4) & 0x03;
-                        let mut c3 = (*value >> 6) & 0x03;
-                        let mut stale = false;
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label(name);
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(value)
-                                            .range(0..256)
-                                            .desired_width(width * 0.2)
-                                            .arrows(false)
-                                            .hex(true),
-                                    )
-                                    .changed()
-                                {
-                                    stale = true;
-                                };
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(&mut c1)
-                                            .range(0..4)
-                                            .desired_width(ui.available_width() - xspace),
-                                    )
-                                    .changed()
-                                {
-                                    *value = (*value & 0xfff3) | (c1 << 2);
-                                    stale = true;
-                                }
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(&mut c2)
-                                            .range(0..4)
-                                            .desired_width(ui.available_width() - xspace),
-                                    )
-                                    .changed()
-                                {
-                                    *value = (*value & 0xffcf) | (c2 << 4);
-                                    stale = true;
-                                }
-                            });
-                            row.col(|ui| {
-                                if ui
-                                    .add(
-                                        NumberEdit::new(&mut c3)
-                                            .range(0..4)
-                                            .desired_width(ui.available_width() - xspace),
-                                    )
-                                    .changed()
-                                {
-                                    *value = (*value & 0xff3f) | (c3 << 6);
-                                    stale = true;
-                                }
-                            });
-                        });
-                        if stale {
-                            self.memory.write(self.sim_id, address, value);
-                        }
-                    };
-
-                    add_row("GPLT0", 0x0005f860, &mut palettes[0]);
-                    add_row("GPLT1", 0x0005f862, &mut palettes[1]);
-                    add_row("GPLT2", 0x0005f864, &mut palettes[2]);
-                    add_row("GPLT3", 0x0005f866, &mut palettes[3]);
-                    add_row("JPLT0", 0x0005f868, &mut palettes[4]);
-                    add_row("JPLT1", 0x0005f86a, &mut palettes[5]);
-                    add_row("JPLT2", 0x0005f86c, &mut palettes[6]);
-                    add_row("JPLT3", 0x0005f86e, &mut palettes[7]);
-
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("BKCOL");
-                        });
-                        row.col(|ui| {
-                            let mut bkcol: u16 = read_address(&registers, 0x0005f870);
-                            if ui
-                                .add(
-                                    NumberEdit::new(&mut bkcol)
-                                        .range(0..4)
-                                        .desired_width(ui.available_width() - xspace),
-                                )
-                                .changed()
-                            {
-                                self.memory.write(self.sim_id, 0x0005f870, &bkcol);
-                            }
-                        });
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            ui.label("REST");
-                        });
-                        row.col(|ui| {
-                            let mut rest: u16 = read_address(&registers, 0x0005f82a);
-                            if ui
-                                .add(
-                                    NumberEdit::new(&mut rest)
-                                        .range(0..256)
-                                        .arrows(false)
-                                        .hex(true),
-                                )
-                                .changed()
-                            {
-                                self.memory.write(self.sim_id, 0x0005f82a, &rest);
-                            }
-                        });
-                    });
-                });
-
-            ui.allocate_space(ui.available_size_before_wrap());
-        });
-    }
-
-    fn show_objects(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        ui.section("Objects", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.3 - xspace))
-                .column(Column::exact(width * 0.3 - xspace))
-                .column(Column::exact(width * 0.4 - xspace))
-                .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|_ui| {});
-                        row.col(|ui| {
-                            ui.add_sized(ui.available_size(), Label::new("Start"));
-                        });
-                        row.col(|ui| {
-                            ui.add_sized(ui.available_size(), Label::new("End"));
-                        });
-                    });
-                    let mut spts = self.read_address::<[u16; 4]>(0x0005f848);
-                    let prevs = std::iter::once(0u16).chain(spts.map(|i| (i + 1) & 0x03ff));
-                    let mut changed = false;
-                    for (index, (spt, prev)) in spts.iter_mut().zip(prevs).enumerate() {
-                        body.row(row_height, |mut row| {
-                            row.col(|ui| {
-                                ui.label(format!("SPT{index}"));
-                            });
-                            row.col(|ui| {
-                                ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                    ui.label(prev.to_string());
-                                });
-                            });
-                            row.col(|ui| {
-                                if ui.add(NumberEdit::new(spt).range(0..1024)).changed() {
-                                    changed = true;
-                                }
-                            });
-                        });
-                    }
-                    if changed {
-                        self.memory.write(self.sim_id, 0x0005f848, &spts);
-                    }
-                });
-            ui.allocate_space(ui.available_size_before_wrap());
-        });
-    }
-
-    fn show_misc(&mut self, ui: &mut Ui) {
-        let row_height = self.row_height(ui);
-        let registers = self.registers.borrow();
-        ui.section("Misc.", |ui| {
-            let width = ui.available_width();
-            let xspace = ui.spacing().item_spacing.x;
-            TableBuilder::new(ui)
-                .column(Column::exact(width * 0.5 - xspace))
-                .column(Column::exact(width * 0.5 - xspace))
-                .cell_layout(Layout::left_to_right(Align::Center).with_main_align(Align::RIGHT))
-                .body(|mut body| {
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("FRMCYC");
-                        });
-                        row.col(|ui| {
-                            let mut frmcyc = read_address::<u16>(&registers, 0x0005f82e);
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                if ui.add(NumberEdit::new(&mut frmcyc).range(0..32)).changed() {
-                                    self.memory.write(self.sim_id, 0x0005f82e, &frmcyc);
-                                }
-                            });
-                        });
-                    });
-                    let mut cta = read_address::<u16>(&registers, 0x0005f830);
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("CTA");
-                        });
-                        row.col(|ui| {
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                ui.add_enabled(
-                                    false,
-                                    NumberEdit::new(&mut cta).arrows(false).hex(true),
-                                );
-                            });
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("CTA_L");
-                        });
-                        row.col(|ui| {
-                            let mut cta_l = cta & 0xff;
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                ui.add_enabled(
-                                    false,
-                                    NumberEdit::new(&mut cta_l).arrows(false).hex(true),
-                                );
-                            });
-                        });
-                    });
-                    body.row(row_height, |mut row| {
-                        row.col(|ui| {
-                            ui.label("CTA_R");
-                        });
-                        row.col(|ui| {
-                            let mut cta_r = (cta >> 8) & 0xff;
-                            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
-                                ui.add_enabled(
-                                    false,
-                                    NumberEdit::new(&mut cta_r).arrows(false).hex(true),
-                                );
-                            });
-                        });
-                    });
-                });
-            ui.allocate_space(ui.available_size_before_wrap());
-        });
-    }
-
-    fn row_height(&self, ui: &mut Ui) -> f32 {
-        ui.spacing().interact_size.y + ui.style().visuals.selection.stroke.width
-    }
-
-    fn read_address<T: MemoryValue>(&self, address: usize) -> T {
-        read_address(&self.registers.borrow(), address)
-    }
-}
-
-fn read_address<T: MemoryValue>(registers: &MemoryRef, address: usize) -> T {
-    let index = (address - 0x0005f800) / size_of::<T>();
-    registers.read(index)
-}
-
-impl AppWindow for RegisterWindow {
-    fn viewport_id(&self) -> ViewportId {
-        ViewportId::from_hash_of(format!("registers-{}", self.sim_id))
-    }
-
-    fn sim_id(&self) -> SimId {
-        self.sim_id
-    }
-
-    fn initial_viewport(&self) -> ViewportBuilder {
-        ViewportBuilder::default()
-            .with_title(format!("Registers ({})", self.sim_id))
-            .with_inner_size((800.0, 480.0))
-    }
-
-    fn show(&mut self, ctx: &Context) {
-        CentralPanel::default().show(ctx, |ui| {
-            ScrollArea::vertical().show(ui, |ui| {
-                ui.horizontal_top(|ui| {
-                    let width = ui.available_width();
-                    let xspace = ui.spacing().item_spacing.x;
-                    StripBuilder::new(ui)
-                        .size(Size::exact(width * 0.25 - xspace))
-                        .size(Size::exact(width * 0.225 - xspace))
-                        .size(Size::exact(width * 0.325 - xspace))
-                        .size(Size::exact(width * 0.2 - xspace))
-                        .horizontal(|mut strip| {
-                            strip.cell(|ui| {
-                                self.show_interrupts(ui);
-                            });
-                            strip.strip(|nested| {
-                                nested.sizes(Size::remainder(), 2).vertical(|mut strip| {
-                                    strip.cell(|ui| {
-                                        self.show_display_status(ui);
-                                    });
-                                    strip.cell(|ui| {
-                                        self.show_drawing_status(ui);
-                                    });
-                                });
-                            });
-                            strip.cell(|ui| {
-                                self.show_colors(ui);
-                            });
-                            strip.strip(|nested| {
-                                nested.sizes(Size::remainder(), 2).vertical(|mut strip| {
-                                    strip.cell(|ui| {
-                                        self.show_objects(ui);
-                                    });
-                                    strip.cell(|ui| {
-                                        self.show_misc(ui);
-                                    });
-                                });
-                            });
-                        });
-                });
-            });
-        });
-    }
-}
-
-struct InterruptReg {
-    timeerr: bool,
-    xpend: bool,
-    sbhit: bool,
-    framestart: bool,
-    gamestart: bool,
-    rfbend: bool,
-    lfbend: bool,
-    scanerr: bool,
-}
-
-impl InterruptReg {
-    fn parse(value: u16) -> Self {
-        Self {
-            timeerr: value & 0x8000 != 0,
-            xpend: value & 0x4000 != 0,
-            sbhit: value & 0x2000 != 0,
-            framestart: value & 0x0010 != 0,
-            gamestart: value & 0x0008 != 0,
-            rfbend: value & 0x0004 != 0,
-            lfbend: value & 0x0002 != 0,
-            scanerr: value & 0x0001 != 0,
-        }
-    }
-
-    fn update(&self, value: &mut u16) -> bool {
-        let new_value = (*value & 0x1fe0)
-            | if self.timeerr { 0x8000 } else { 0x0000 }
-            | if self.xpend { 0x4000 } else { 0x0000 }
-            | if self.sbhit { 0x2000 } else { 0x0000 }
-            | if self.framestart { 0x0010 } else { 0x0000 }
-            | if self.gamestart { 0x0008 } else { 0x0000 }
-            | if self.rfbend { 0x0004 } else { 0x0000 }
-            | if self.lfbend { 0x0002 } else { 0x0000 }
-            | if self.scanerr { 0x0001 } else { 0x0000 };
-        let changed = *value != new_value;
-        *value = new_value;
-        changed
-    }
-}
-
-struct DisplayReg {
-    lock: bool,
-    synce: bool,
-    re: bool,
-    fclk: bool,
-    scanrdy: bool,
-    r1bsy: bool,
-    l1bsy: bool,
-    r0bsy: bool,
-    l0bsy: bool,
-    disp: bool,
-    dprst: bool,
-}
-
-impl DisplayReg {
-    fn parse(value: u16) -> Self {
-        Self {
-            lock: value & 0x0400 != 0,
-            synce: value & 0x0200 != 0,
-            re: value & 0x0100 != 0,
-            fclk: value & 0x0080 != 0,
-            scanrdy: value & 0x0040 != 0,
-            r1bsy: value & 0x0020 != 0,
-            l1bsy: value & 0x0010 != 0,
-            r0bsy: value & 0x0008 != 0,
-            l0bsy: value & 0x0004 != 0,
-            disp: value & 0x0002 != 0,
-            dprst: value & 0x0001 != 0,
-        }
-    }
-
-    fn update(&self, value: &mut u16) -> bool {
-        let new_value = (*value & 0xf800)
-            | if self.lock { 0x0400 } else { 0x0000 }
-            | if self.synce { 0x0200 } else { 0x0000 }
-            | if self.re { 0x0100 } else { 0x0000 }
-            | if self.fclk { 0x0080 } else { 0x0000 }
-            | if self.scanrdy { 0x0040 } else { 0x0000 }
-            | if self.r1bsy { 0x0020 } else { 0x0000 }
-            | if self.l1bsy { 0x0010 } else { 0x0000 }
-            | if self.r0bsy { 0x0008 } else { 0x0000 }
-            | if self.l0bsy { 0x0004 } else { 0x0000 }
-            | if self.disp { 0x0002 } else { 0x0000 }
-            | if self.dprst { 0x0001 } else { 0x0000 };
-        let changed = *value != new_value;
-        *value = new_value;
-        changed
-    }
-}
-
-struct DrawingReg {
-    sbout: bool,
-    sbcount: u8,
-    overtime: bool,
-    f1bsy: bool,
-    f0bsy: bool,
-    xpen: bool,
-    xprst: bool,
-}
-
-impl DrawingReg {
-    fn parse(value: u16) -> Self {
-        Self {
-            sbout: value & 0x8000 != 0,
-            sbcount: (value >> 8) as u8 & 0x1f,
-            overtime: value & 0x0010 != 0,
-            f1bsy: value & 0x0008 != 0,
-            f0bsy: value & 0x0004 != 0,
-            xpen: value & 0x0002 != 0,
-            xprst: value & 0x0001 != 0,
-        }
-    }
-
-    fn update(&self, value: &mut u16) -> bool {
-        let new_value = (*value & 0x60e0)
-            | if self.sbout { 0x8000 } else { 0x0000 }
-            | (((self.sbcount & 0x1f) as u16) << 8)
-            | if self.overtime { 0x0010 } else { 0x0000 }
-            | if self.f1bsy { 0x0008 } else { 0x0000 }
-            | if self.f0bsy { 0x0004 } else { 0x0000 }
-            | if self.xpen { 0x0002 } else { 0x0000 }
-            | if self.xprst { 0x0001 } else { 0x0000 };
-        let changed = *value != new_value;
-        *value = new_value;
-        changed
-    }
-}

src/window/vip/utils.rs

@@ -1,251 +0,0 @@
-use egui::{Color32, Image, ImageSource, Response, Sense, TextureOptions, Ui, Widget};
-
-pub const GENERIC_PALETTE: [u8; 4] = [0, 32, 64, 128];
-
-pub fn shade(brt: u8, color: Color32) -> Color32 {
-    let corrected = if brt > 132 {
-        255.0
-    } else {
-        (brt as f32 * 255.0 / 133.0).round()
-    };
-    color.gamma_multiply(corrected / 255.0)
-}
-
-pub fn generic_palette(color: Color32) -> [Color32; 4] {
-    GENERIC_PALETTE.map(|brt| shade(brt, color))
-}
-
-pub const fn parse_palette(palette: u8) -> [u8; 4] {
-    [
-        0,
-        (palette >> 2) & 0x03,
-        (palette >> 4) & 0x03,
-        (palette >> 6) & 0x03,
-    ]
-}
-
-pub const fn parse_shades(brts: &[u8; 8]) -> [u8; 4] {
-    [
-        0,
-        brts[0],
-        brts[2],
-        brts[0].saturating_add(brts[2]).saturating_add(brts[4]),
-    ]
-}
-
-pub fn parse_brts(brts: &[u16; 3], color: Color32) -> [Color32; 4] {
-    [
-        Color32::BLACK,
-        shade(brts[0] as u8, color),
-        shade(brts[1] as u8, color),
-        shade((brts[0] + brts[1] + brts[2]) as u8, color),
-    ]
-}
-
-pub fn palette_colors(palette: u8, brts: &[u8; 8], color: Color32) -> [Color32; 4] {
-    let colors = parse_shades(brts).map(|s| shade(s, color));
-    parse_palette(palette).map(|p| colors[p as usize])
-}
-
-pub struct Object {
-    pub x: i16,
-    pub lon: bool,
-    pub ron: bool,
-    pub parallax: i16,
-    pub y: i16,
-    pub data: CellData,
-}
-
-impl Object {
-    pub fn parse(object: [u16; 4]) -> Self {
-        let x = ((object[0] & 0x03ff) << 6 >> 6) as i16;
-        let parallax = ((object[1] & 0x03ff) << 6 >> 6) as i16;
-        let lon = object[1] & 0x8000 != 0;
-        let ron = object[1] & 0x4000 != 0;
-        let y = (object[2] & 0x00ff) as i16;
-        // Y is stored as the bottom 8 bits of an i16,
-        // so only sign extend if it's out of range.
-        let y = if y > 224 { y << 8 >> 8 } else { y };
-        let data = CellData::parse(object[3]);
-        Self {
-            x,
-            lon,
-            ron,
-            parallax,
-            y,
-            data,
-        }
-    }
-
-    pub fn update(&self, source: &mut [u16; 4]) -> bool {
-        let mut changed = false;
-
-        let new_x = (self.x as u16 & 0x03ff) | (source[0] & 0xfc00);
-        changed |= source[0] != new_x;
-        source[0] = new_x;
-
-        let new_p = if self.lon { 0x8000 } else { 0x0000 }
-            | if self.ron { 0x4000 } else { 0x0000 }
-            | (self.parallax as u16 & 0x3ff)
-            | (source[1] & 0x3c00);
-        changed |= source[1] != new_p;
-        source[1] = new_p;
-
-        let new_y = (self.y as u16 & 0x00ff) | (source[2] & 0xff00);
-        changed |= source[2] != new_y;
-        source[2] = new_y;
-
-        if self.data.update(&mut source[3]) {
-            changed = true;
-        }
-        changed
-    }
-}
-
-pub struct CellData {
-    pub palette_index: usize,
-    pub hflip: bool,
-    pub vflip: bool,
-    pub char_index: usize,
-}
-
-impl CellData {
-    pub fn parse(cell: u16) -> Self {
-        let char_index = (cell & 0x7ff) as usize;
-        let vflip = cell & 0x1000 != 0;
-        let hflip = cell & 0x2000 != 0;
-        let palette_index = (cell >> 14) as usize;
-        Self {
-            char_index,
-            vflip,
-            hflip,
-            palette_index,
-        }
-    }
-
-    pub fn update(&self, source: &mut u16) -> bool {
-        let new_value = ((self.palette_index as u16) << 14)
-            | if self.hflip { 0x2000 } else { 0x0000 }
-            | if self.vflip { 0x1000 } else { 0x0000 }
-            | (self.char_index as u16 & 0x07ff)
-            | (*source & 0x0800);
-        let changed = *source != new_value;
-        *source = new_value;
-        changed
-    }
-}
-
-pub fn read_char_row(
-    char: &[u16; 8],
-    hflip: bool,
-    vflip: bool,
-    row: usize,
-) -> impl Iterator<Item = u8> {
-    let pixels = if vflip { char[7 - row] } else { char[row] };
-    (0..16).step_by(2).map(move |i| {
-        let pixel = if hflip { 14 - i } else { i };
-        ((pixels >> pixel) & 0x3) as u8
-    })
-}
-
-pub fn read_char_pixel(char: &[u16; 8], hflip: bool, vflip: bool, row: usize, col: usize) -> u8 {
-    let pixels = if vflip { char[7 - row] } else { char[row] };
-    let pixel = if hflip { 7 - col } else { col } << 1;
-    ((pixels >> pixel) & 0x3) as u8
-}
-
-pub struct CharacterGrid<'a> {
-    source: ImageSource<'a>,
-    scale: f32,
-    show_grid: bool,
-    selected: Option<usize>,
-}
-
-impl<'a> CharacterGrid<'a> {
-    pub fn new(source: impl Into<ImageSource<'a>>) -> Self {
-        Self {
-            source: source.into(),
-            scale: 1.0,
-            show_grid: false,
-            selected: None,
-        }
-    }
-
-    pub fn with_scale(self, scale: f32) -> Self {
-        Self { scale, ..self }
-    }
-
-    pub fn with_grid(self, show_grid: bool) -> Self {
-        Self { show_grid, ..self }
-    }
-
-    pub fn with_selected(self, selected: usize) -> Self {
-        Self {
-            selected: Some(selected),
-            ..self
-        }
-    }
-
-    pub fn show(self, ui: &mut Ui) -> Option<usize> {
-        let start_pos = ui.cursor().min;
-        let cell_size = 8.0 * self.scale;
-
-        let res = self.ui(ui);
-
-        let grid_width_cells = ((res.rect.max.x - res.rect.min.x) / cell_size).round() as usize;
-
-        if res.clicked() {
-            let click_pos = res.interact_pointer_pos()?;
-            let grid_pos = (click_pos - start_pos) / cell_size;
-            Some((grid_pos.y as usize * grid_width_cells) + grid_pos.x as usize)
-        } else {
-            None
-        }
-    }
-}
-
-impl Widget for CharacterGrid<'_> {
-    fn ui(self, ui: &mut Ui) -> Response {
-        let image = Image::new(self.source)
-            .fit_to_original_size(self.scale)
-            .texture_options(TextureOptions::NEAREST)
-            .sense(Sense::click());
-        let res = ui.add(image);
-
-        let cell_size = 8.0 * self.scale;
-        let grid_width_cells = ((res.rect.max.x - res.rect.min.x) / cell_size).round() as usize;
-        let grid_height_cells = ((res.rect.max.y - res.rect.min.y) / cell_size).round() as usize;
-
-        let painter = ui.painter_at(res.rect);
-        if self.show_grid {
-            let stroke = ui.style().visuals.widgets.noninteractive.fg_stroke;
-            for x in (1..grid_width_cells).map(|i| (i as f32) * cell_size) {
-                let p1 = (res.rect.min.x + x, res.rect.min.y).into();
-                let p2 = (res.rect.min.x + x, res.rect.max.y).into();
-                painter.line_segment([p1, p2], stroke);
-            }
-            for y in (1..grid_height_cells).map(|i| (i as f32) * cell_size) {
-                let p1 = (res.rect.min.x, res.rect.min.y + y).into();
-                let p2 = (res.rect.max.x, res.rect.min.y + y).into();
-                painter.line_segment([p1, p2], stroke);
-            }
-        }
-        if let Some(selected) = self.selected {
-            let x1 = (selected % grid_width_cells) as f32 * cell_size;
-            let x2 = x1 + cell_size;
-            let y1 = (selected / grid_width_cells) as f32 * cell_size;
-            let y2 = y1 + cell_size;
-            painter.line(
-                vec![
-                    (res.rect.min + (x1, y1).into()),
-                    (res.rect.min + (x2, y1).into()),
-                    (res.rect.min + (x2, y2).into()),
-                    (res.rect.min + (x1, y2).into()),
-                    (res.rect.min + (x1, y1).into()),
-                ],
-                ui.style().visuals.widgets.active.fg_stroke,
-            );
-        }
-        res
-    }
-}