jsbeeb 1.11.0 → 1.12.0

package/README.md

@@ -177,7 +177,7 @@ sudo rpm -i out/dist/jsbeeb-1.0.1.x86_64.rpm
   Doesn't support the sth: pseudo URL unlike `disc` and `tape`, but if given a ZIP file will attempt to use the `.rom`
   file assumed to be within.
 - (mostly internal use) `logFdcCommands`, `logFdcStateChanges` - turn on logging in the disc controller.
-- `audioDebug=true` turns on some audio debug graphs.
+- `audioDebug` - show audio queue stats chart.
 
 ## Patches
 

package/package.json

@@ -7,7 +7,7 @@
   "name": "jsbeeb",
   "description": "Emulate a BBC Micro",
   "repository": "git@github.com:mattgodbolt/jsbeeb.git",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "//": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
   "engines": {
     "node": ">=22.12.0"
@@ -30,7 +30,6 @@
     "argparse": "^2.0.1",
     "bootstrap": "^5.3.8",
     "bootswatch": "^5.3.8",
-    "event-emitter-es6": "^1.1.5",
     "sharp": "^0.34.5",
     "smoothie": "^1.36.1"
   },

package/src/6502.js

@@ -1208,6 +1208,13 @@ export class Cpu6502 extends Base6502 {
         if (state.roms) {
             this.ramRomOs.set(state.roms.slice(0, 16 * 16384), this.romOffset);
         }
+        // Selectively overwrite individual sideways RAM banks (e.g. from BeebEm UEF import)
+        // without touching ROM banks that jsbeeb has already loaded.
+        if (state.swRamBanks) {
+            for (const [bank, data] of Object.entries(state.swRamBanks)) {
+                this.ramRomOs.set(data.slice(0, 16384), this.romOffset + Number(bank) * 16384);
+            }
+        }
         this.videoDisplayPage = state.videoDisplayPage;
         this.music5000PageSel = state.music5000PageSel;
 

package/src/app/app.js

@@ -242,7 +242,7 @@ const template = [
                     const result = await dialog.showOpenDialog(browserWindow, {
                         title: "Load emulator state",
                         filters: [
-                            { name: "Snapshot files", extensions: ["gz", "json", "snp"] },
+                            { name: "Snapshot files", extensions: ["gz", "json", "snp", "uef"] },
                             { name: "All files", extensions: ["*"] },
                         ],
                         properties: ["openFile"],

package/src/app/electron.js

@@ -55,11 +55,11 @@ function init(args) {
 
     // Save settings when they change
     if (config) {
-        config.on("settings-changed", (settings) => {
-            api.saveSettings(settings);
+        config.addEventListener("settings-changed", (e) => {
+            api.saveSettings(e.detail);
         });
-        config.on("media-changed", (media) => {
-            api.saveSettings(media);
+        config.addEventListener("media-changed", (e) => {
+            api.saveSettings(e.detail);
         });
     }
 }

package/src/bem-snapshot.js

@@ -5,6 +5,8 @@ import { decompress } from "./utils.js";
 // v1 (BEMSNAP1): Fixed-size 327,885 byte packed struct. Reference: beebjit state.c
 // v3 (BEMSNAP3): Section-based with key+size headers, zlib-compressed memory. Reference: b-em savestate.c
 
+import { volumeTable, buildVideoState, buildSnapshot } from "./snapshot-helpers.js";
+
 const BemV1Size = 327885;
 
 // v1 struct offsets
@@ -114,7 +116,7 @@ function convertViaState(bemVia, ic32) {
         t2l: bemVia.t2l,
         t1c: bemVia.t1c,
         t2c: bemVia.t2c,
-        t1hit: !!bemVia.t1hit,
+        t1hit: bemVia.acr & 0x40 ? false : !!bemVia.t1hit,
         t2hit: !!bemVia.t2hit,
         portapins: 0xff,
         portbpins: 0xff,
@@ -135,17 +137,6 @@ function convertViaState(bemVia, ic32) {
     return result;
 }
 
-// Volume lookup table matching soundchip.js
-const volumeTable = new Float32Array(16);
-(() => {
-    let f = 1.0;
-    for (let i = 0; i < 15; ++i) {
-        volumeTable[i] = f / 4;
-        f *= Math.pow(10, -0.1);
-    }
-    volumeTable[15] = 0;
-})();
-
 function convertSoundState(snLatch, snCount, snStat, snVol, snNoise, snShift) {
     const registers = new Uint16Array(4);
     const counter = new Float32Array(4);
@@ -181,178 +172,6 @@ function convertSoundState(snLatch, snCount, snStat, snVol, snNoise, snShift) {
     };
 }
 
-function buildVideoState(ulaControl, ulaPalette, crtcRegs, nulaCollook, crtcCounters) {
-    const regs = new Uint8Array(32);
-    regs.set(crtcRegs.slice(0, 18));
-    const actualPal = new Uint8Array(16);
-    for (let i = 0; i < 16; i++) actualPal[i] = ulaPalette[i] & 0x0f;
-
-    // Use NULA collook if provided, otherwise use default BBC palette
-    const collook =
-        nulaCollook ||
-        new Int32Array([
-            0xff000000, 0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff, 0xff000000,
-            0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff,
-        ]);
-
-    // Compute ulaPal from actualPal + collook, matching jsbeeb's Ula._recomputeUlaPal
-    const flashEnabled = !!(ulaControl & 1);
-    const defaultFlash = new Uint8Array([1, 1, 1, 1, 1, 1, 1, 1]);
-    const flash = defaultFlash;
-    const ulaPal = new Int32Array(16);
-    for (let i = 0; i < 16; i++) {
-        const palVal = actualPal[i];
-        let colour = collook[(palVal & 0xf) ^ 7];
-        if (palVal & 8 && flashEnabled && flash[(palVal & 7) ^ 7]) {
-            colour = collook[palVal & 0xf];
-        }
-        ulaPal[i] = colour;
-    }
-
-    return {
-        regs,
-        bitmapX: 0,
-        bitmapY: 0,
-        oddClock: false,
-        frameCount: 0,
-        doEvenFrameLogic: false,
-        isEvenRender: true,
-        lastRenderWasEven: false,
-        firstScanline: true,
-        inHSync: false,
-        inVSync: false,
-        hadVSyncThisRow: false,
-        checkVertAdjust: false,
-        endOfMainLatched: false,
-        endOfVertAdjustLatched: false,
-        endOfFrameLatched: false,
-        inVertAdjust: false,
-        inDummyRaster: false,
-        hpulseWidth: regs[3] & 0x0f,
-        vpulseWidth: (regs[3] & 0xf0) >>> 4,
-        hpulseCounter: 0,
-        vpulseCounter: 0,
-        dispEnabled: 0x3f,
-        horizCounter: crtcCounters ? crtcCounters.hc : 0,
-        vertCounter: crtcCounters ? crtcCounters.vc : 0,
-        scanlineCounter: crtcCounters ? crtcCounters.sc : 0,
-        vertAdjustCounter: 0,
-        addr: crtcCounters ? crtcCounters.ma : (regs[13] | (regs[12] << 8)) & 0x3fff,
-        lineStartAddr: crtcCounters ? crtcCounters.maback : (regs[13] | (regs[12] << 8)) & 0x3fff,
-        nextLineStartAddr: crtcCounters ? crtcCounters.maback : (regs[13] | (regs[12] << 8)) & 0x3fff,
-        ulactrl: ulaControl,
-        pixelsPerChar: ulaControl & 0x10 ? 8 : 16,
-        halfClock: !(ulaControl & 0x10),
-        ulaMode: (ulaControl >>> 2) & 3,
-        teletextMode: !!(ulaControl & 2),
-        displayEnableSkew: Math.min((regs[8] & 0x30) >>> 4, 2),
-        ulaPal,
-        actualPal,
-        cursorOn: false,
-        cursorOff: false,
-        cursorOnThisFrame: false,
-        cursorDrawIndex: 0,
-        cursorPos: (regs[15] | (regs[14] << 8)) & 0x3fff,
-        interlacedSyncAndVideo: (regs[8] & 3) === 3,
-        screenSubtract: 0,
-        ula: {
-            collook: collook.slice(),
-            flash: new Uint8Array([1, 1, 1, 1, 1, 1, 1, 1]),
-            paletteWriteFlag: false,
-            paletteFirstByte: 0,
-            paletteMode: 0,
-            horizontalOffset: 0,
-            leftBlank: 0,
-            disabled: false,
-            attributeMode: 0,
-            attributeText: 0,
-        },
-        crtc: { curReg: 0 },
-        teletext: {
-            prevCol: 0,
-            col: 7,
-            bg: 0,
-            sep: false,
-            dbl: false,
-            oldDbl: false,
-            secondHalfOfDouble: false,
-            wasDbl: false,
-            gfx: false,
-            flash: false,
-            flashOn: false,
-            flashTime: 0,
-            heldChar: 0,
-            holdChar: false,
-            dataQueue: [0, 0, 0, 0],
-            scanlineCounter: 0,
-            levelDEW: false,
-            levelDISPTMG: false,
-            levelRA0: false,
-            nextGlyphs: "normal",
-            curGlyphs: "normal",
-            heldGlyphs: "normal",
-        },
-    };
-}
-
-const DefaultAcia = {
-    sr: 0x02,
-    cr: 0x00,
-    dr: 0x00,
-    rs423Selected: false,
-    motorOn: false,
-    tapeCarrierCount: 0,
-    tapeDcdLineLevel: false,
-    hadDcdHigh: false,
-    serialReceiveRate: 19200,
-    serialReceiveCyclesPerByte: 0,
-    txCompleteTaskOffset: null,
-    runTapeTaskOffset: null,
-    runRs423TaskOffset: null,
-};
-
-const DefaultAdc = { status: 0x40, low: 0x00, high: 0x00, taskOffset: null };
-
-function buildSnapshot(modelName, cpuState, ram, roms, sysvia, uservia, video, soundChip) {
-    return {
-        format: "jsbeeb-snapshot",
-        version: 1,
-        model: modelName,
-        timestamp: new Date().toISOString(),
-        importedFrom: "b-em",
-        state: {
-            a: cpuState.a,
-            x: cpuState.x,
-            y: cpuState.y,
-            s: cpuState.s,
-            pc: cpuState.pc,
-            p: cpuState.flags | 0x30,
-            nmiLevel: !!cpuState.nmi,
-            nmiEdge: false,
-            halted: false,
-            takeInt: false,
-            romsel: cpuState.fe30 ?? 0,
-            acccon: cpuState.fe34 ?? 0,
-            videoDisplayPage: 0,
-            currentCycles: 0,
-            targetCycles: 0,
-            cycleSeconds: 0,
-            peripheralCycles: 0,
-            videoCycles: 0,
-            music5000PageSel: 0,
-            ram,
-            roms,
-            scheduler: { epoch: 0 },
-            sysvia,
-            uservia,
-            video,
-            soundChip,
-            acia: { ...DefaultAcia },
-            adc: { ...DefaultAdc },
-        },
-    };
-}
-
 // ── V1 parser (BEMSNAP1, fixed struct) ──────────────────────────────
 
 function parseBemV1(buffer) {
@@ -402,6 +221,7 @@ function parseBemV1(buffer) {
     const snShift = view.getUint16(soundOff + 53, true);
 
     return buildSnapshot(
+        "b-em",
         "B",
         cpuState,
         ram,
@@ -637,6 +457,7 @@ function finishV3Parse(modelName, cpuState, ram, roms, sections) {
     }
 
     return buildSnapshot(
+        "b-em",
         modelName,
         cpuState,
         ram,

package/src/config.js

@@ -1,9 +1,8 @@
 "use strict";
-import EventEmitter from "event-emitter-es6";
-import { findModel } from "./models.js";
+import { allModels, findModel } from "./models.js";
 import { getFilterForMode } from "./canvas.js";
 
-export class Config extends EventEmitter {
+export class Config extends EventTarget {
     constructor(onChange, onClose) {
         super();
         this.onChange = onChange;
@@ -25,16 +24,28 @@ export class Config extends EventEmitter {
         configuration.addEventListener("hide.bs.modal", () => {
             this.onClose(this.changed);
             if (Object.keys(this.changed).length > 0) {
-                this.emit("settings-changed", this.changed);
+                this.dispatchEvent(new CustomEvent("settings-changed", { detail: this.changed }));
             }
         });
 
-        for (const link of document.querySelectorAll(".model-menu a")) {
-            link.addEventListener("click", (e) => {
-                this.changed.model = e.target.dataset.target;
-                this.setDropdownText(e.target.textContent);
-            });
+        const modelMenu = document.querySelector(".model-menu");
+        for (const model of allModels) {
+            if (model.synonyms.length === 0) continue; // skip non-selectable models (e.g. Tube65C02)
+            const li = document.createElement("li");
+            const a = document.createElement("a");
+            a.href = "#";
+            a.className = "dropdown-item";
+            a.dataset.target = model.synonyms[0];
+            a.textContent = model.name;
+            li.appendChild(a);
+            modelMenu.appendChild(li);
         }
+        modelMenu.addEventListener("click", (e) => {
+            const link = e.target.closest("a[data-target]");
+            if (!link) return;
+            this.changed.model = link.dataset.target;
+            this.setDropdownText(link.textContent);
+        });
 
         document.getElementById("65c02").addEventListener("click", () => {
             this.changed.coProcessor = document.getElementById("65c02").checked;

package/src/keyboard.js

@@ -1,6 +1,5 @@
 "use strict";
 import * as utils from "./utils.js";
-import EventEmitter from "event-emitter-es6";
 
 const isMac = typeof window !== "undefined" && /^Mac/i.test(window.navigator?.platform || "");
 
@@ -15,7 +14,7 @@ const isMac = typeof window !== "undefined" && /^Mac/i.test(window.navigator?.pl
 /**
  * Keyboard class that handles all keyboard related functionality
  */
-export class Keyboard extends EventEmitter {
+export class Keyboard extends EventTarget {
     /**
      * Create a new Keyboard instance with specified configuration
      * @param {KeyboardConfig} config - The configuration object
@@ -182,7 +181,7 @@ export class Keyboard extends EventEmitter {
         // Handle debugger 'g' key press
         if (this.dbgr.enabled() && code === LOWERCASE_G) {
             this.dbgr.hide();
-            this.emit("resume");
+            this.dispatchEvent(new Event("resume"));
             return;
         }
 
@@ -193,7 +192,7 @@ export class Keyboard extends EventEmitter {
                 return;
             } else if (code === LOWERCASE_N) {
                 this.requestStep();
-                this.emit("resume");
+                this.dispatchEvent(new Event("resume"));
                 return;
             }
         }
@@ -247,7 +246,7 @@ export class Keyboard extends EventEmitter {
      */
     _handleSpecialKeys(code) {
         if (code === utils.keyCodes.F12 || code === utils.keyCodes.BREAK) {
-            this.emit("break", true);
+            this.dispatchEvent(new CustomEvent("break", { detail: true }));
             this.processor.setReset(true);
             return true;
         } else if (isMac && code === utils.keyCodes.CAPSLOCK) {
@@ -278,7 +277,7 @@ export class Keyboard extends EventEmitter {
 
         // Handle special key cases
         if (code === utils.keyCodes.F12 || code === utils.keyCodes.BREAK) {
-            this.emit("break", false);
+            this.dispatchEvent(new CustomEvent("break", { detail: false }));
             this.processor.setReset(false);
             return;
         } else if (isMac && code === utils.keyCodes.CAPSLOCK) {
@@ -308,14 +307,18 @@ export class Keyboard extends EventEmitter {
         setTimeout(() => this.processor.sysvia.keyUp(utils.keyCodes.CAPSLOCK), CAPS_LOCK_DELAY);
 
         if (isMac && window.localStorage && !window.localStorage.getItem("warnedAboutRubbishMacs")) {
-            this.emit("showError", {
-                context: "handling caps lock on Mac OS X",
-                error: `Mac OS X does not generate key up events for caps lock presses. 
-                jsbeeb can only simulate a 'tap' of the caps lock key. This means it doesn't work well for games 
-                that use caps lock for left or fire, as we can't tell if it's being held down. If you need to play 
+            this.dispatchEvent(
+                new CustomEvent("showError", {
+                    detail: {
+                        context: "handling caps lock on Mac OS X",
+                        error: `Mac OS X does not generate key up events for caps lock presses.
+                jsbeeb can only simulate a 'tap' of the caps lock key. This means it doesn't work well for games
+                that use caps lock for left or fire, as we can't tell if it's being held down. If you need to play
                 such a game, please see the documentation about remapping keys.
                 Close this window to continue (you won't see this error again)`,
-            });
+                    },
+                }),
+            );
             window.localStorage.setItem("warnedAboutRubbishMacs", "true");
         }
     }
@@ -437,7 +440,7 @@ export class Keyboard extends EventEmitter {
      */
     pauseEmulation() {
         this.pauseEmu = true;
-        this.emit("pause");
+        this.dispatchEvent(new Event("pause"));
     }
 
     /**
@@ -445,6 +448,6 @@ export class Keyboard extends EventEmitter {
      */
     resumeEmulation() {
         this.pauseEmu = false;
-        this.emit("resume");
+        this.dispatchEvent(new Event("resume"));
     }
 }

package/src/main.js

@@ -28,8 +28,9 @@ import { MicrophoneInput } from "./microphone-input.js";
 import { SpeechOutput } from "./speech-output.js";
 import { MouseJoystickSource } from "./mouse-joystick-source.js";
 import { getFilterForMode } from "./canvas.js";
-import { createSnapshot, restoreSnapshot, snapshotToJSON, snapshotFromJSON, modelsCompatible } from "./snapshot.js";
+import { createSnapshot, restoreSnapshot, snapshotToJSON, snapshotFromJSON, isSameModel } from "./snapshot.js";
 import { isBemSnapshot, parseBemSnapshot } from "./bem-snapshot.js";
+import { isUefSnapshot, parseUefSnapshot } from "./uef-snapshot.js";
 import { RewindBuffer } from "./rewind.js";
 import { RewindUI } from "./rewind-ui.js";
 import {
@@ -102,6 +103,7 @@ const paramTypes = {
     coProcessor: ParamTypes.BOOL,
     mouseJoystickEnabled: ParamTypes.BOOL,
     speechOutput: ParamTypes.BOOL,
+    audioDebug: ParamTypes.BOOL,
 
     // Numeric parameters
     speed: ParamTypes.INT,
@@ -259,7 +261,7 @@ const config = new Config(
             updateAdcSources(parsedQuery.mouseJoystickEnabled, parsedQuery.microphoneChannel);
 
             if (changed.microphoneChannel !== undefined) {
-                setupMicrophone().then(() => {});
+                setupMicrophone();
             }
         }
         if (changed.speechOutput !== undefined) {
@@ -383,7 +385,9 @@ video = new Video(model.isMaster, canvas.fb32, function paint(minx, miny, maxx,
 });
 if (parsedQuery.fakeVideo !== undefined) video = new FakeVideo();
 
-const audioStatsNode = document.getElementById("audio-stats");
+const audioStatsEl = document.getElementById("audio-stats");
+if (audioStatsEl) audioStatsEl.hidden = !parsedQuery.audioDebug;
+const audioStatsNode = parsedQuery.audioDebug ? audioStatsEl : null;
 const audioHandler = new AudioHandler({
     warningNode: document.getElementById("audio-warning"),
     statsNode: audioStatsNode,
@@ -391,7 +395,6 @@ const audioHandler = new AudioHandler({
     audioFilterQ,
     noSeek,
 });
-if (!parsedQuery.audioDebug) audioStatsNode.style.display = "none";
 // Firefox will report that audio is suspended even when it will
 // start playing without user interaction, so we need to delay a
 // little to get a reliable indication.
@@ -492,8 +495,12 @@ pastetext.addEventListener("dragover", function (event) {
 pastetext.addEventListener("drop", async function (event) {
     utils.noteEvent("local", "drop");
     const file = event.dataTransfer.files[0];
-    if (isSnapshotFile(file.name)) {
-        await loadStateFromFile(file);
+    const arrayBuffer = await file.arrayBuffer();
+    if (isSnapshotFile(file.name, arrayBuffer)) {
+        await loadStateFromFile(file, arrayBuffer);
+    } else if (file.name.toLowerCase().endsWith(".uef")) {
+        // Regular UEF tape image (not a BeebEm save state)
+        processor.acia.setTape(loadTapeFromData(file.name, new Uint8Array(arrayBuffer)));
     } else {
         await loadHTMLFile(file);
     }
@@ -501,7 +508,7 @@ pastetext.addEventListener("drop", async function (event) {
 
 const cubMonitor = document.getElementById("cub-monitor");
 function onCubMouseEvent(evt) {
-    audioHandler.tryResume().then(() => {});
+    audioHandler.tryResume();
     if (document.activeElement !== document.body) document.activeElement.blur();
     const cubRect = cubMonitor.getBoundingClientRect();
     const screenRect = screenCanvas.getBoundingClientRect();
@@ -737,12 +744,12 @@ keyboard = new Keyboard({
     keyLayout,
     dbgr,
 });
-keyboard.on("showError", ({ context, error }) => showError(context, error));
-keyboard.on("pause", () => stop(false));
-keyboard.on("resume", () => go());
-keyboard.on("break", (pressed) => {
+keyboard.addEventListener("showError", (e) => showError(e.detail.context, e.detail.error));
+keyboard.addEventListener("pause", () => stop(false));
+keyboard.addEventListener("resume", () => go());
+keyboard.addEventListener("break", (e) => {
     // F12/Break: Reset processor
-    if (pressed) utils.noteEvent("keyboard", "press", "break");
+    if (e.detail) utils.noteEvent("keyboard", "press", "break");
 });
 
 // Register default key handlers
@@ -846,8 +853,8 @@ keyboard.registerKeyHandler(
 
 // Setup key handlers
 document.addEventListener("keydown", (evt) => {
-    audioHandler.tryResume().then(() => {});
-    ensureMicrophoneRunning().then(() => {});
+    audioHandler.tryResume();
+    ensureMicrophoneRunning();
     keyboard.keyDown(evt);
 });
 document.addEventListener("keypress", (evt) => keyboard.keyPress(evt));
@@ -857,19 +864,19 @@ function setDisc1Image(name) {
     delete parsedQuery.disc;
     parsedQuery.disc1 = name;
     updateUrl();
-    config.emit("media-changed", { disc1: name });
+    config.dispatchEvent(new CustomEvent("media-changed", { detail: { disc1: name } }));
 }
 
 function setDisc2Image(name) {
     parsedQuery.disc2 = name;
     updateUrl();
-    config.emit("media-changed", { disc2: name });
+    config.dispatchEvent(new CustomEvent("media-changed", { detail: { disc2: name } }));
 }
 
 function setTapeImage(name) {
     parsedQuery.tape = name;
     updateUrl();
-    config.emit("media-changed", { tape: name });
+    config.dispatchEvent(new CustomEvent("media-changed", { detail: { tape: name } }));
 }
 
 function sthClearList() {
@@ -1354,13 +1361,12 @@ googleDriveEl.addEventListener("show.bs.modal", async function () {
         row.classList.remove("template");
         dbList.appendChild(row);
         row.querySelector(".name").textContent = item.name;
-        row.addEventListener("click", function () {
+        row.addEventListener("click", async function () {
             utils.noteEvent("google-drive", "click", item.name);
             setDisc1Image(`gd:${item.id}/${item.name}`);
-            gdLoad(item).then(function (ssd) {
-                processor.fdc.loadDisc(0, ssd);
-            });
             googleDriveModal.hide();
+            const ssd = await gdLoad(item);
+            if (ssd) processor.fdc.loadDisc(0, ssd);
         });
     }
 });
@@ -1372,13 +1378,11 @@ for (const image of availableImages) {
     discList.appendChild(elem);
     elem.querySelector(".name").textContent = image.name;
     elem.querySelector(".description").textContent = image.desc;
-    elem.addEventListener("click", function () {
+    elem.addEventListener("click", async function () {
         utils.noteEvent("images", "click", image.file);
         setDisc1Image(image.file);
-        loadDiscImage(parsedQuery.disc1).then(function (disc) {
-            processor.fdc.loadDisc(0, disc);
-        });
         $discsModal.hide();
+        processor.fdc.loadDisc(0, await loadDiscImage(parsedQuery.disc1));
     });
 }
 
@@ -1501,14 +1505,16 @@ document.getElementById("save-state").addEventListener("click", async function (
     if (wasRunning) go();
 });
 
-async function loadStateFromFile(file) {
+async function loadStateFromFile(file, preReadBuffer) {
     const wasRunning = running;
     if (running) stop(false);
     try {
-        const arrayBuffer = await file.arrayBuffer();
+        const arrayBuffer = preReadBuffer || (await file.arrayBuffer());
         let snapshot;
         if (isBemSnapshot(arrayBuffer)) {
             snapshot = await parseBemSnapshot(arrayBuffer);
+        } else if (isUefSnapshot(arrayBuffer)) {
+            snapshot = parseUefSnapshot(arrayBuffer);
         } else {
             // Detect gzip (magic bytes 0x1f 0x8b) or plain JSON
             const bytes = new Uint8Array(arrayBuffer);
@@ -1521,7 +1527,7 @@ async function loadStateFromFile(file) {
             }
             snapshot = snapshotFromJSON(text);
         }
-        if (!modelsCompatible(snapshot.model, model.name)) {
+        if (!isSameModel(snapshot.model, model.name)) {
             // Model mismatch: stash state and reload with correct model
             sessionStorage.setItem("jsbeeb-pending-state", snapshotToJSON(snapshot));
             const newQuery = { ...parsedQuery, model: snapshot.model };
@@ -1541,9 +1547,13 @@ async function loadStateFromFile(file) {
     if (wasRunning) go();
 }
 
-function isSnapshotFile(filename) {
+function isSnapshotFile(filename, arrayBuffer) {
     const lower = filename.toLowerCase();
-    return lower.endsWith(".snp") || lower.endsWith(".json") || lower.endsWith(".json.gz") || lower.endsWith(".gz");
+    if (lower.endsWith(".snp") || lower.endsWith(".json") || lower.endsWith(".json.gz") || lower.endsWith(".gz"))
+        return true;
+    // .uef can be either a BeebEm save state or a regular tape image - check content
+    if (lower.endsWith(".uef") && arrayBuffer) return isUefSnapshot(arrayBuffer);
+    return false;
 }
 
 document.getElementById("load-state").addEventListener("change", async function (event) {
@@ -1684,8 +1694,10 @@ const startPromise = (async () => {
     return Promise.all(imageLoads);
 })();
 
-startPromise
-    .then(async () => {
+(async () => {
+    try {
+        await startPromise;
+
         switch (needsAutoboot) {
             case "boot":
                 sthAutoboot.checked = true;
@@ -1726,11 +1738,11 @@ startPromise
         }
 
         go();
-    })
-    .catch((error) => {
+    } catch (error) {
         console.error("Error initialising emulator:", error);
         showError("initialising", error);
-    });
+    }
+})();
 
 const aysEl = document.getElementById("are-you-sure");
 const aysModal = new bootstrap.Modal(aysEl);