Support reading VBX files in cart

2025-08-07 21:15:30 -04:00
12 changed files with 462 additions and 444 deletions
@@ -43,6 +43,17 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 [[package]]
 name = "aes"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
 "cfg-if",
 "cipher",
 "cpufeatures",
 ]
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -180,6 +191,15 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 [[package]]
 name = "arbitrary"
 version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
 dependencies = [
 "derive_arbitrary",
 ]
 [[package]]
 name = "arboard"
 version = "3.6.0"
@@ -507,6 +527,15 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
 "generic-array",
 ]
 [[package]]
 name = "block2"
 version = "0.5.1"
@@ -576,6 +605,15 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 [[package]]
 name = "bzip2"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bea8dcd42434048e4f7a304411d9273a411f647446c1234a65ce0554923f4cff"
 dependencies = [
 "libbz2-rs-sys",
 ]
 [[package]]
 name = "calloop"
 version = "0.13.0"
@@ -640,6 +678,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 [[package]]
 name = "cipher"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
 "crypto-common",
 "inout",
 ]
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -736,6 +784,12 @@ dependencies = [
 "crossbeam-utils",
 ]
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -828,6 +882,15 @@ dependencies = [
 "windows 0.54.0",
 ]
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
 dependencies = [
 "libc",
 ]
 [[package]]
 name = "crc32fast"
 version = "1.5.0"
@@ -849,6 +912,16 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
 "generic-array",
 "typenum",
 ]
 [[package]]
 name = "cursor-icon"
 version = "1.2.0"
@@ -864,6 +937,43 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
 [[package]]
 name = "deflate64"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b"
 [[package]]
 name = "deranged"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
 "powerfmt",
 ]
 [[package]]
 name = "derive_arbitrary"
 version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
 "block-buffer",
 "crypto-common",
 "subtle",
 ]
 [[package]]
 name = "directories"
 version = "6.0.0"
@@ -1046,12 +1156,6 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 [[package]]
 name = "elf"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55dd888a213fc57e957abf2aa305ee3e8a28dbe05687a251f33b637cd46b0070"
 [[package]]
 name = "emath"
 version = "0.32.0"
@@ -1223,6 +1327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
 "crc32fast",
 "libz-rs-sys",
 "miniz_oxide",
 ]
@@ -1341,6 +1446,16 @@ dependencies = [
 "slab",
 ]
 [[package]]
 name = "generic-array"
 version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
 "typenum",
 "version_check",
 ]
 [[package]]
 name = "gethostname"
 version = "0.4.3"
@@ -1549,6 +1664,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
 [[package]]
 name = "hmac"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
 "digest",
 ]
 [[package]]
 name = "icu_collections"
 version = "2.0.0"
@@ -1699,6 +1823,15 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "inout"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
 dependencies = [
 "generic-array",
 ]
 [[package]]
 name = "io-kit-sys"
 version = "0.4.1"
@@ -1839,7 +1972,6 @@ dependencies = [
 "egui-wgpu",
 "egui-winit",
 "egui_extras",
 "elf",
 "fixed",
 "gilrs",
 "hex",
@@ -1855,6 +1987,7 @@ dependencies = [
 "rubato",
 "serde",
 "serde_json",
 "sha2",
 "thread-priority",
 "tokio",
 "tracing",
@@ -1863,8 +1996,15 @@ dependencies = [
 "windows 0.61.3",
 "winit",
 "winresource",
 "zip",
 ]
 [[package]]
 name = "libbz2-rs-sys"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7"
 [[package]]
 name = "libc"
 version = "0.2.174"
@@ -1881,6 +2021,26 @@ dependencies = [
 "windows-targets 0.53.3",
 ]
 [[package]]
 name = "liblzma"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0791ab7e08ccc8e0ce893f6906eb2703ed8739d8e89b57c0714e71bad09024c8"
 dependencies = [
 "liblzma-sys",
 ]
 [[package]]
 name = "liblzma-sys"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736"
 dependencies = [
 "cc",
 "libc",
 "pkg-config",
 ]
 [[package]]
 name = "libm"
 version = "0.2.15"
@@ -1908,6 +2068,15 @@ dependencies = [
 "pkg-config",
 ]
 [[package]]
 name = "libz-rs-sys"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
 dependencies = [
 "zlib-rs",
 ]
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -2197,6 +2366,12 @@ dependencies = [
 "num-traits",
 ]
 [[package]]
 name = "num-conv"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -2663,6 +2838,16 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
 "digest",
 "hmac",
 ]
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2810,6 +2995,18 @@ dependencies = [
 "zerovec",
 ]
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 [[package]]
 name = "ppmd-rust"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c834641d8ad1b348c9ee86dec3b9840d805acd5f24daa5f90c788951a52ff59b"
 [[package]]
 name = "ppv-lite86"
 version = "0.2.21"
@@ -3224,6 +3421,28 @@ dependencies = [
 "serde",
 ]
 [[package]]
 name = "sha1"
 version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest",
 ]
 [[package]]
 name = "sha2"
 version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
 "cfg-if",
 "cpufeatures",
 "digest",
 ]
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -3397,6 +3616,12 @@ dependencies = [
 "syn",
 ]
 [[package]]
 name = "subtle"
 version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "syn"
 version = "2.0.104"
@@ -3515,6 +3740,25 @@ dependencies = [
 "weezl",
 ]
 [[package]]
 name = "time"
 version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
 "deranged",
 "num-conv",
 "powerfmt",
 "serde",
 "time-core",
 ]
 [[package]]
 name = "time-core"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 [[package]]
 name = "tiny-skia"
 version = "0.11.4"
@@ -5012,6 +5256,26 @@ dependencies = [
 "synstructure",
 ]
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
 "zeroize_derive",
 ]
 [[package]]
 name = "zeroize_derive"
 version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "zerotrie"
 version = "0.2.2"
@@ -5045,6 +5309,79 @@ dependencies = [
 "syn",
 ]
 [[package]]
 name = "zip"
 version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b"
 dependencies = [
 "aes",
 "arbitrary",
 "bzip2",
 "constant_time_eq",
 "crc32fast",
 "deflate64",
 "flate2",
 "getrandom 0.3.3",
 "hmac",
 "indexmap",
 "liblzma",
 "memchr",
 "pbkdf2",
 "ppmd-rust",
 "sha1",
 "time",
 "zeroize",
 "zopfli",
 "zstd",
 ]
 [[package]]
 name = "zlib-rs"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
 [[package]]
 name = "zopfli"
 version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
 dependencies = [
 "bumpalo",
 "crc32fast",
 "log",
 "simd-adler32",
 ]
 [[package]]
 name = "zstd"
 version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
 dependencies = [
 "zstd-safe",
 ]
 [[package]]
 name = "zstd-safe"
 version = "7.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 dependencies = [
 "zstd-sys",
 ]
 [[package]]
 name = "zstd-sys"
 version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
 "cc",
 "pkg-config",
 ]
 [[package]]
 name = "zvariant"
 version = "5.6.0"
@@ -21,7 +21,6 @@ egui_extras = { version = "0.32", features = ["image"] }
 egui-notify = "0.20"
 egui-winit = "0.32"
 egui-wgpu = { version = "0.32", features = ["winit"] }
 elf = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
 hex = "0.4"
@@ -37,12 +36,14 @@ rtrb = "0.3"
 rubato = "0.16"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.10"
 thread-priority = "2"
 tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync", "time"] }
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 wgpu = "25"
 winit = { version = "0.30", features = ["serde"] }
 zip = "4"
 [target.'cfg(windows)'.dependencies]
 windows = { version = "0.61", features = ["Win32_System_Threading"] }
@@ -23,9 +23,7 @@ fn main() -> Result<(), Box<dyn Error>> {
        .define("VB_LITTLE_ENDIAN", None)
        .define("VB_SIGNED_PROPAGATE", None)
        .define("VB_DIV_GENERIC", None)
        .define("VB_DIRECT_EXCEPTION", "on_exception")
        .define("VB_DIRECT_EXECUTE", "on_execute")
        .define("VB_DIRECT_FETCH", "on_fetch")
        .define("VB_DIRECT_FRAME", "on_frame")
        .define("VB_DIRECT_READ", "on_read")
        .define("VB_DIRECT_WRITE", "on_write")
@@ -24,8 +24,8 @@ use crate::{
    persistence::Persistence,
    window::{
        AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
-        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
+        GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, RegisterWindow, TerminalWindow,
-        TerminalWindow, WorldWindow,
+        WorldWindow,
    },
 };
@@ -54,7 +54,6 @@ pub struct Application {
    viewports: HashMap<ViewportId, Viewport>,
    focused: Option<ViewportId>,
    init_debug_port: Option<u16>,
    init_profiling: bool,
 }
 impl Application {
@@ -62,7 +61,6 @@ impl Application {
        client: EmulatorClient,
        proxy: EventLoopProxy<UserEvent>,
        debug_port: Option<u16>,
        profiling: bool,
    ) -> Self {
        let wgpu = WgpuState::new();
        let icon = load_icon().ok().map(Arc::new);
@@ -91,7 +89,6 @@ impl Application {
            viewports: HashMap::new(),
            focused: None,
            init_debug_port: debug_port,
            init_profiling: profiling,
        }
    }
@@ -116,11 +113,6 @@ impl ApplicationHandler<UserEvent> for Application {
            server.launch(port);
            self.open(event_loop, Box::new(server));
        }
        if self.init_profiling {
            let mut profiler = ProfileWindow::new(SimId::Player1, self.client.clone());
            profiler.launch();
            self.open(event_loop, Box::new(profiler));
        }
        let app = GameWindow::new(
            self.client.clone(),
            self.proxy.clone(),
@@ -256,10 +248,6 @@ impl ApplicationHandler<UserEvent> for Application {
                let terminal = TerminalWindow::new(sim_id, &self.client);
                self.open(event_loop, Box::new(terminal));
            }
            UserEvent::OpenProfiler(sim_id) => {
                let profile = ProfileWindow::new(sim_id, self.client.clone());
                self.open(event_loop, Box::new(profile));
            }
            UserEvent::OpenDebugger(sim_id) => {
                let debugger =
                    GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
@@ -534,7 +522,6 @@ pub enum UserEvent {
    OpenFrameBuffers(SimId),
    OpenRegisters(SimId),
    OpenTerminal(SimId),
    OpenProfiler(SimId),
    OpenDebugger(SimId),
    OpenInput,
    OpenHotkeys,
@@ -18,7 +18,7 @@ use tracing::{error, warn};
 use crate::{
    audio::Audio,
-    emulator::{cart::Cart, shrooms_vb_core::SimEvent},
+    emulator::cart::Cart,
    graphics::TextureSink,
    memory::{MemoryRange, MemoryRegion},
 };
@@ -137,7 +137,6 @@ pub struct Emulator {
    state: Arc<Atomic<EmulatorState>>,
    audio_on: Arc<[AtomicBool; 2]>,
    linked: Arc<AtomicBool>,
    profilers: [Option<ProfileSender>; 2],
    renderers: HashMap<SimId, TextureSink>,
    messages: HashMap<SimId, mpsc::Sender<Toast>>,
    debuggers: HashMap<SimId, DebugInfo>,
@@ -165,7 +164,6 @@ impl Emulator {
            state,
            audio_on,
            linked,
            profilers: [None, None],
            renderers: HashMap::new(),
            messages: HashMap::new(),
            debuggers: HashMap::new(),
@@ -220,24 +218,6 @@ impl Emulator {
            self.carts[index] = Some(cart);
            self.sim_state[index].store(SimState::Ready, Ordering::Release);
        }
        let mut profiling = false;
        if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref() {
            if let Some(cart) = self.carts[index].as_ref() {
                if profiler
                    .send(ProfileEvent::Start {
                        file_path: cart.file_path.clone(),
                    })
                    .is_ok()
                {
                    sim.monitor_events(true);
                    profiling = true;
                }
            }
        }
        if !profiling {
            sim.monitor_events(false);
        }
        if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
            self.resume_sims();
        }
@@ -335,11 +315,6 @@ impl Emulator {
        Ok(())
    }
    fn start_profiling(&mut self, sim_id: SimId, sender: ProfileSender) -> Result<()> {
        self.profilers[sim_id.to_index()] = Some(sender);
        self.reset_sim(sim_id, None)
    }
    fn start_debugging(&mut self, sim_id: SimId, sender: DebugSender) {
        if self.sim_state[sim_id.to_index()].load(Ordering::Acquire) != SimState::Ready {
            // Can't debug unless a game is connected
@@ -463,30 +438,12 @@ impl Emulator {
        let p1_running = running && p1_state == SimState::Ready;
        let p2_running = running && p2_state == SimState::Ready;
        let mut idle = !p1_running && !p2_running;
-
+        if p1_running && p2_running {
-        let cycles = self.emulate(p1_running, p2_running);
+            Sim::emulate_many(&mut self.sims);
-
+        } else if p1_running {
-        // if we're profiling, track events
+            self.sims[SimId::Player1.to_index()].emulate();
-        for ((sim, profiler), running) in self
+        } else if p2_running {
-            .sims
+            self.sims[SimId::Player2.to_index()].emulate();
            .iter_mut()
            .zip(self.profilers.iter_mut())
            .zip([p1_running, p2_running])
        {
            if !running {
                continue;
            }
            if let Some(p) = profiler {
                if p.send(ProfileEvent::Update {
                    cycles,
                    event: sim.take_sim_event(),
                })
                .is_err()
                {
                    sim.monitor_events(false);
                    *profiler = None;
                }
            }
        }
        if state == EmulatorState::Stepping {
@@ -513,7 +470,7 @@ impl Emulator {
                let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
                    continue;
                };
-                if let Some(reason) = sim.take_stop_reason() {
+                if let Some(reason) = sim.stop_reason() {
                    let stop_reason = match reason {
                        StopReason::Stepped => DebugStopReason::Trace,
                        StopReason::Watchpoint(watch, address) => {
@@ -572,19 +529,6 @@ impl Emulator {
        idle
    }
    fn emulate(&mut self, p1_running: bool, p2_running: bool) -> u32 {
        const MAX_CYCLES: u32 = 20_000_000;
        let mut cycles = MAX_CYCLES;
        if p1_running && p2_running {
            Sim::emulate_many(&mut self.sims, &mut cycles);
        } else if p1_running {
            self.sims[SimId::Player1.to_index()].emulate(&mut cycles);
        } else if p2_running {
            self.sims[SimId::Player2.to_index()].emulate(&mut cycles);
        }
        MAX_CYCLES - cycles
    }
    fn handle_command(&mut self, command: EmulatorCommand) {
        match command {
            EmulatorCommand::ConnectToSim(sim_id, renderer, messages) => {
@@ -628,11 +572,6 @@ impl Emulator {
                    self.report_error(SimId::Player1, format!("Error setting speed: {error}"));
                }
            }
            EmulatorCommand::StartProfiling(sim_id, profiler) => {
                if let Err(error) = self.start_profiling(sim_id, profiler) {
                    self.report_error(SimId::Player1, format!("Error enaling profiler: {error}"));
                }
            }
            EmulatorCommand::StartDebugging(sim_id, debugger) => {
                self.start_debugging(sim_id, debugger);
            }
@@ -770,7 +709,6 @@ pub enum EmulatorCommand {
    Resume,
    FrameAdvance,
    SetSpeed(f64),
    StartProfiling(SimId, ProfileSender),
    StartDebugging(SimId, DebugSender),
    StopDebugging(SimId),
    DebugInterrupt(SimId),
@@ -812,7 +750,6 @@ pub enum EmulatorState {
    Debugging,
 }
 type ProfileSender = tokio::sync::mpsc::UnboundedSender<ProfileEvent>;
 type DebugSender = tokio::sync::mpsc::UnboundedSender<DebugEvent>;
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -836,16 +773,6 @@ pub enum DebugEvent {
    Stopped(DebugStopReason),
 }
 pub enum ProfileEvent {
    Start {
        file_path: PathBuf,
    },
    Update {
        cycles: u32,
        event: Option<SimEvent>,
    },
 }
 #[derive(Clone)]
 pub struct EmulatorClient {
    queue: mpsc::Sender<EmulatorCommand>,
@@ -1,7 +1,10 @@
-use anyhow::Result;
+use anyhow::{Context, Result, bail};
 use rand::Rng;
 use serde::Deserialize;
 use sha2::Digest;
 use std::{
-    fs::{self, File},
+    ffi::OsStr,
    fs,
    io::{Read, Seek as _, SeekFrom, Write as _},
    path::{Path, PathBuf},
 };
@@ -11,39 +14,52 @@ use crate::emulator::SimId;
 pub struct Cart {
    pub file_path: PathBuf,
    pub rom: Vec<u8>,
-    sram_file: File,
+    sram_file: fs::File,
    pub sram: Vec<u8>,
 }
 impl Cart {
    pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
-        let rom = fs::read(file_path)?;
+        let vbx_extension = OsStr::new("vbx");
-        let rom = try_parse_elf(&rom).unwrap_or(rom);
+        let contents = if file_path.extension() == Some(vbx_extension) {
            read_bundle(file_path)
        } else {
            read_rom(file_path)
        }?;
-        let mut sram_file = File::options()
+        let mut sram_file = fs::File::options()
            .read(true)
            .write(true)
            .create(true)
            .truncate(false)
            .open(sram_path(file_path, sim_id))?;
        let sram_file_size = if contents.sram_small_bus {
            contents.sram_size * 2
        } else {
            contents.sram_size
        };
        let sram = if sram_file.metadata()?.len() == 0 {
            // new SRAM file, randomize the contents
-            let mut sram = vec![0; 16 * 1024];
+            let mut sram = vec![0; sram_file_size];
            let mut rng = rand::rng();
-            for dst in sram.iter_mut().step_by(2) {
+            for dst in sram
                .iter_mut()
                .step_by(if contents.sram_small_bus { 2 } else { 1 })
            {
                *dst = rng.random();
            }
            sram
        } else {
-            let mut sram = Vec::with_capacity(16 * 1024);
+            let mut sram = Vec::with_capacity(sram_file_size);
            sram_file.read_to_end(&mut sram)?;
            sram.resize(sram_file_size, 0);
            sram
        };
        Ok(Cart {
            file_path: file_path.to_path_buf(),
-            rom,
+            rom: contents.rom,
            sram_file,
            sram,
        })
@@ -56,21 +72,79 @@ impl Cart {
    }
 }
-fn try_parse_elf(data: &[u8]) -> Option<Vec<u8>> {
+struct CartContents {
-    let parsed = elf::ElfBytes::<elf::endian::AnyEndian>::minimal_parse(data).ok()?;
+    rom: Vec<u8>,
-    let mut bytes = vec![];
+    sram_size: usize,
-    let mut pstart = None;
+    sram_small_bus: bool,
    for phdr in parsed.segments()? {
        if phdr.p_filesz == 0 {
            continue;
 }
-        let start = pstart.unwrap_or(phdr.p_paddr);
+
-        pstart = Some(start);
+fn read_bundle(file_path: &Path) -> Result<CartContents> {
-        bytes.resize((phdr.p_paddr - start) as usize, 0);
+    let file = fs::File::open(file_path)?;
-        let data = parsed.segment_data(&phdr).ok()?;
+    let mut archive = zip::ZipArchive::new(file).context("invalid VBX")?;
-        bytes.extend_from_slice(data);
+    let manifest_reader = archive
        .by_name("manifest.json")
        .context("manifest.json not found")?;
    let manifest: Manifest =
        serde_json::from_reader(manifest_reader).context("malformed manifest")?;
    let rom = {
        let mut rom_file = archive
            .by_name(&manifest.rom.file)
            .context("ROM file not found")?;
        let mut buffer = Vec::with_capacity(rom_file.size() as usize);
        rom_file
            .read_to_end(&mut buffer)
            .context("could not read ROM")?;
        buffer
    };
    if let Some(hash) = manifest.rom.sha256 {
        let expected_hash = hex::decode(hash)?;
        let actual_hash = sha2::Sha256::digest(&rom);
        if expected_hash[..] != actual_hash[..] {
            bail!("Incorrect ROM hash");
        }
-    Some(bytes)
+    }
    let sram_size = manifest.sram.as_ref().map(|s| s.size).unwrap_or(8192);
    if !sram_size.is_power_of_two() {
        bail!("Invalid SRAM size, must be power of two")
    }
    let sram_small_bus = manifest.sram.and_then(|s| s.bus_width).unwrap_or_default() < 16;
    Ok(CartContents {
        rom,
        sram_size,
        sram_small_bus,
    })
 }
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct Manifest {
    rom: ManifestRom,
    sram: Option<ManifestSram>,
 }
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ManifestRom {
    file: String,
    sha256: Option<String>,
 }
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
 struct ManifestSram {
    size: usize,
    bus_width: Option<usize>,
 }
 fn read_rom(rom_path: &Path) -> Result<CartContents> {
    let rom = fs::read(rom_path)?;
    Ok(CartContents {
        rom,
        sram_size: 8192,
        sram_small_bus: true,
    })
 }
 fn sram_path(file_path: &Path, sim_id: SimId) -> PathBuf {
@@ -71,16 +71,8 @@ pub enum VBWatchpointType {
    Access,
 }
 type OnException = extern "C" fn(sim: *mut VB, cause: *mut u16) -> c_int;
 type OnExecute =
    extern "C" fn(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int;
 type OnFetch = extern "C" fn(
    sim: *mut VB,
    fetch: c_int,
    address: u32,
    value: *mut i32,
    cycles: *mut u32,
 ) -> c_int;
 type OnFrame = extern "C" fn(sim: *mut VB) -> c_int;
 type OnRead = extern "C" fn(
    sim: *mut VB,
@@ -143,15 +135,8 @@ unsafe extern "C" {
    fn vb_set_cart_ram(sim: *mut VB, sram: *mut c_void, size: u32) -> c_int;
    #[link_name = "vbSetCartROM"]
    fn vb_set_cart_rom(sim: *mut VB, rom: *mut c_void, size: u32) -> c_int;
    #[link_name = "vbSetExceptionCallback"]
    fn vb_set_exception_callback(
        sim: *mut VB,
        callback: Option<OnException>,
    ) -> Option<OnException>;
    #[link_name = "vbSetExecuteCallback"]
    fn vb_set_execute_callback(sim: *mut VB, callback: Option<OnExecute>) -> Option<OnExecute>;
    #[link_name = "vbSetFetchCallback"]
    fn vb_set_fetch_callback(sim: *mut VB, callback: Option<OnFetch>) -> Option<OnFetch>;
    #[link_name = "vbSetFrameCallback"]
    fn vb_set_frame_callback(sim: *mut VB, callback: Option<OnFrame>) -> Option<OnFrame>;
    #[link_name = "vbSetKeys"]
@@ -195,21 +180,11 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
 }
 #[unsafe(no_mangle)]
-extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int {
+extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
    // SAFETY: the *mut VB owns its userdata.
    // There is no way for the userdata to be null or otherwise invalid.
    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
    if data.monitor.enabled {
        // SAFETY: length is the length of code, in elements
        let code = unsafe { slice::from_raw_parts(code, length as usize) };
        if data.monitor.detect_event(sim, address, code) {
            // Something interesting will happen after this instruction is run.
            // The on_fetch callback will fire when it does.
            unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
        }
    }
    let mut stopped = data.stop_reason.is_some();
    if data.step_from.is_some_and(|s| s != address) {
        data.step_from = None;
@@ -224,35 +199,6 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
    if stopped { 1 } else { 0 }
 }
 #[unsafe(no_mangle)]
 extern "C" fn on_fetch(
    sim: *mut VB,
    _fetch: c_int,
    _address: u32,
    _value: *mut i32,
    _cycles: *mut u32,
 ) -> c_int {
    // SAFETY: the *mut VB owns its userdata.
    // There is no way for the userdata to be null or otherwise invalid.
    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
    data.monitor.event = data.monitor.queued_event.take();
    unsafe { vb_set_exception_callback(sim, Some(on_exception)) };
    unsafe { vb_set_fetch_callback(sim, None) };
    1
 }
 #[unsafe(no_mangle)]
 extern "C" fn on_exception(sim: *mut VB, cause: *mut u16) -> c_int {
    // SAFETY: the *mut VB owns its userdata.
    // There is no way for the userdata to be null or otherwise invalid.
    let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
    data.monitor.event = data.monitor.queued_event.take();
    data.monitor.queued_event = Some(SimEvent::Interrupt(unsafe { *cause }));
    unsafe { vb_set_exception_callback(sim, None) };
    unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
    if data.monitor.event.is_some() { 1 } else { 0 }
 }
 #[unsafe(no_mangle)]
 extern "C" fn on_read(
    sim: *mut VB,
@@ -314,83 +260,6 @@ extern "C" fn on_write(
    0
 }
 #[allow(dead_code)]
 #[derive(Debug)]
 pub enum SimEvent {
    Call(u32),
    Return,
    Interrupt(u16),
    Reti,
 }
 struct EventMonitor {
    enabled: bool,
    event: Option<SimEvent>,
    queued_event: Option<SimEvent>,
 }
 impl EventMonitor {
    fn new() -> Self {
        Self {
            enabled: false,
            event: None,
            queued_event: None,
        }
    }
    fn detect_event(&mut self, sim: *mut VB, address: u32, code: &[u16]) -> bool {
        self.queued_event = self.do_detect_event(sim, address, code);
        self.queued_event.is_some()
    }
    fn do_detect_event(&self, sim: *mut VB, address: u32, code: &[u16]) -> Option<SimEvent> {
        const JAL_OPCODE: u16 = 0b101011;
        const JMP_OPCODE: u16 = 0b000110;
        const RETI_OPCODE: u16 = 0b011001;
        const fn format_i_reg_1(code: &[u16]) -> u8 {
            (code[0] & 0x1f) as u8
        }
        const fn format_iv_disp(code: &[u16]) -> i32 {
            let value = ((code[0] & 0x3ff) as i32) << 16 | (code[1] as i32);
            value << 6 >> 6
        }
        let opcode = code[0] >> 10;
        if opcode == JAL_OPCODE {
            let disp = format_iv_disp(code);
            if disp != 4 {
                // JAL .+4 is how programs get r31 to a known value for indirect calls
                // (which we detect later.)
                // Any other JAL is a function call.
                return Some(SimEvent::Call(address.wrapping_add_signed(disp)));
            }
        }
        if opcode == JMP_OPCODE {
            let jmp_reg = format_i_reg_1(code);
            if jmp_reg == 31 {
                // JMP[r31] is a return
                return Some(SimEvent::Return);
            }
            let r31 = unsafe { vb_get_program_register(sim, 31) };
            if r31 as u32 == address.wrapping_add(2) {
                // JMP anywhere else, if r31 points to after the JMP, is an indirect call
                let target = unsafe { vb_get_program_register(sim, jmp_reg as u32) };
                return Some(SimEvent::Call(target as u32));
            }
        }
        if opcode == RETI_OPCODE {
            return Some(SimEvent::Reti);
        }
        None
    }
 }
 const AUDIO_CAPACITY_SAMPLES: usize = 834 * 4;
 const AUDIO_CAPACITY_FLOATS: usize = AUDIO_CAPACITY_SAMPLES * 2;
 pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
@@ -398,7 +267,6 @@ pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
 struct VBState {
    frame_seen: bool,
    stop_reason: Option<StopReason>,
    monitor: EventMonitor,
    step_from: Option<u32>,
    breakpoints: Vec<u32>,
    read_watchpoints: AddressSet,
@@ -409,7 +277,6 @@ struct VBState {
 impl VBState {
    fn needs_execute_callback(&self) -> bool {
        self.step_from.is_some()
            || self.monitor.enabled
            || !self.breakpoints.is_empty()
            || !self.read_watchpoints.is_empty()
            || !self.write_watchpoints.is_empty()
@@ -444,7 +311,6 @@ impl Sim {
        let state = VBState {
            frame_seen: false,
            stop_reason: None,
            monitor: EventMonitor::new(),
            step_from: None,
            breakpoints: vec![],
            read_watchpoints: AddressSet::new(),
@@ -466,23 +332,6 @@ impl Sim {
        unsafe { vb_reset(self.sim) };
    }
    pub fn monitor_events(&mut self, enabled: bool) {
        let state = self.get_state();
        state.monitor.enabled = enabled;
        state.monitor.event = None;
        state.monitor.queued_event = None;
        if enabled {
            unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
            unsafe { vb_set_exception_callback(self.sim, Some(on_exception)) };
        } else {
            if !state.needs_execute_callback() {
                unsafe { vb_set_execute_callback(self.sim, None) };
            }
            unsafe { vb_set_exception_callback(self.sim, None) };
            unsafe { vb_set_fetch_callback(self.sim, None) };
        }
    }
    pub fn load_cart(&mut self, mut rom: Vec<u8>, mut sram: Vec<u8>) -> Result<()> {
        self.unload_cart();
@@ -545,14 +394,16 @@ impl Sim {
        unsafe { vb_set_peer(self.sim, ptr::null_mut()) };
    }
-    pub fn emulate(&mut self, cycles: &mut u32) {
+    pub fn emulate(&mut self) {
-        unsafe { vb_emulate(self.sim, cycles) };
+        let mut cycles = 20_000_000;
        unsafe { vb_emulate(self.sim, &mut cycles) };
    }
-    pub fn emulate_many(sims: &mut [Sim], cycles: &mut u32) {
+    pub fn emulate_many(sims: &mut [Sim]) {
        let mut cycles = 20_000_000;
        let count = sims.len() as c_uint;
        let sims = sims.as_mut_ptr().cast();
-        unsafe { vb_emulate_ex(sims, count, cycles) };
+        unsafe { vb_emulate_ex(sims, count, &mut cycles) };
    }
    pub fn read_pixels(&mut self, buffers: &mut [u8]) -> bool {
@@ -781,7 +632,7 @@ impl Sim {
        Some(string)
    }
-    pub fn take_stop_reason(&mut self) -> Option<StopReason> {
+    pub fn stop_reason(&mut self) -> Option<StopReason> {
        let data = self.get_state();
        let reason = data.stop_reason.take();
        if !data.needs_execute_callback() {
@@ -790,11 +641,6 @@ impl Sim {
        reason
    }
    pub fn take_sim_event(&mut self) -> Option<SimEvent> {
        let data = self.get_state();
        data.monitor.event.take()
    }
    fn get_state(&mut self) -> &mut VBState {
        // SAFETY: the *mut VB owns its userdata.
        // There is no way for the userdata to be null or otherwise invalid.
@@ -22,7 +22,6 @@ mod images;
 mod input;
 mod memory;
 mod persistence;
 mod profiler;
 mod window;
 #[derive(Parser)]
@@ -32,9 +31,6 @@ struct Args {
    /// Start a GDB/LLDB debug server on this port.
    #[arg(short, long)]
    debug_port: Option<u16>,
    /// Enable profiling a game
    #[arg(short, long)]
    profile: bool,
 }
 fn init_logger() {
@@ -110,9 +106,6 @@ fn main() -> Result<()> {
        }
        builder = builder.start_paused(true);
    }
    if args.profile {
        builder = builder.start_paused(true)
    }
    ThreadBuilder::default()
        .name("Emulator".to_owned())
@@ -131,11 +124,6 @@ fn main() -> Result<()> {
    let event_loop = EventLoop::with_user_event().build().unwrap();
    event_loop.set_control_flow(ControlFlow::Poll);
    let proxy = event_loop.create_proxy();
-    event_loop.run_app(&mut Application::new(
+    event_loop.run_app(&mut Application::new(client, proxy, args.debug_port))?;
        client,
        proxy,
        args.debug_port,
        args.profile,
    ))?;
    Ok(())
 }
@@ -1,79 +0,0 @@
 use std::{
    sync::{
        Arc,
        atomic::{AtomicBool, Ordering},
    },
    thread,
 };
 use tokio::{select, sync::mpsc};
 use crate::emulator::{EmulatorClient, EmulatorCommand, ProfileEvent, SimId};
 pub struct Profiler {
    sim_id: SimId,
    client: EmulatorClient,
    running: Arc<AtomicBool>,
    killer: Option<oneshot::Sender<()>>,
 }
 impl Profiler {
    pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
        Self {
            sim_id,
            client,
            running: Arc::new(AtomicBool::new(false)),
            killer: None,
        }
    }
    pub fn started(&self) -> bool {
        self.running.load(Ordering::Relaxed)
    }
    pub fn start(&mut self) {
        let sim_id = self.sim_id;
        let client = self.client.clone();
        let running = self.running.clone();
        let (tx, rx) = oneshot::channel();
        self.killer = Some(tx);
        thread::spawn(move || {
            tokio::runtime::Builder::new_current_thread()
                .enable_all()
                .build()
                .unwrap()
                .block_on(async move {
                    select! {
                        _ = run_profile(sim_id, client, running.clone()) => {}
                        _ = rx => {
                            running.store(false, Ordering::Relaxed);
                        }
                    }
                })
        });
    }
    pub fn stop(&mut self) {
        if let Some(killer) = self.killer.take() {
            let _ = killer.send(());
        }
    }
 }
 async fn run_profile(sim_id: SimId, client: EmulatorClient, running: Arc<AtomicBool>) {
    let (profile_sync, mut profile_source) = mpsc::unbounded_channel();
    client.send_command(EmulatorCommand::StartProfiling(sim_id, profile_sync));
    running.store(true, Ordering::Relaxed);
    while let Some(event) = profile_source.recv().await {
        match event {
            ProfileEvent::Start { file_path } => {
                println!("profiling {}", file_path.display());
            }
            ProfileEvent::Update { cycles, event } => {
                println!("update {cycles} {event:#x?}");
            }
        }
    }
    running.store(false, Ordering::Release);
 }
@@ -4,7 +4,6 @@ pub use game::GameWindow;
 pub use gdb::GdbServerWindow;
 pub use hotkeys::HotkeysWindow;
 pub use input::InputWindow;
 pub use profile::ProfileWindow;
 pub use terminal::TerminalWindow;
 pub use vip::{
    BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
@@ -19,7 +18,6 @@ mod game_screen;
 mod gdb;
 mod hotkeys;
 mod input;
 mod profile;
 mod terminal;
 mod utils;
 mod vip;
@@ -228,11 +228,6 @@ impl GameWindow {
                    .send_event(UserEvent::OpenTerminal(self.sim_id))
                    .unwrap();
            }
            if ui.button("Profiler").clicked() {
                self.proxy
                    .send_event(UserEvent::OpenProfiler(self.sim_id))
                    .unwrap();
            }
            if ui.button("GDB Server").clicked() {
                self.proxy
                    .send_event(UserEvent::OpenDebugger(self.sim_id))
@@ -1,54 +0,0 @@
 use egui::{CentralPanel, ViewportBuilder, ViewportId};
 use crate::{
    emulator::{EmulatorClient, SimId},
    profiler::Profiler,
    window::AppWindow,
 };
 pub struct ProfileWindow {
    sim_id: SimId,
    profiler: Profiler,
 }
 impl ProfileWindow {
    pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
        Self {
            sim_id,
            profiler: Profiler::new(sim_id, client),
        }
    }
    pub fn launch(&mut self) {
        self.profiler.start();
    }
 }
 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) {
        CentralPanel::default().show(ctx, |ui| {
            let mut started = self.profiler.started();
            if ui.checkbox(&mut started, "Profiling enabled?").changed() {
                if started {
                    self.profiler.start();
                } else {
                    self.profiler.stop();
                }
            }
        });
    }
 }