jsbeeb 1.11.0 → 1.13.0

package/src/main.js

@@ -7,12 +7,14 @@ import "./jsbeeb.css";
 import * as utils from "./utils.js";
 import { FakeVideo, Video } from "./video.js";
 import { Debugger } from "./web/debug.js";
-import { Cpu6502 } from "./6502.js";
+import { Cpu6502, AtomCpu6502 } from "./6502.js";
+import * as utils_atom from "./utils_atom.js";
+import { LoadSD } from "./mmc.js";
 import { Cmos } from "./cmos.js";
 import { StairwayToHell } from "./sth.js";
 import { GamePad } from "./gamepads.js";
 import * as disc from "./fdc.js";
-import { loadTape, loadTapeFromData } from "./tapes.js";
+import { loadTapeFromData } from "./tapes.js";
 import { GoogleDriveLoader } from "./google-drive.js";
 import * as tokeniser from "./basic-tokenise.js";
 import * as canvasLib from "./canvas.js";
@@ -28,8 +30,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 {
@@ -53,6 +56,21 @@ let discSth;
 let tapeSth;
 let running;
 let model;
+
+// Route tape to the correct interface (ACIA for BBC, PPIA for Atom)
+function setProcessorTape(tape) {
+    if (model.isAtom) {
+        processor.atomppia.setTape(tape);
+    } else {
+        processor.acia.setTape(tape);
+    }
+}
+
+// Convert text to machine-appropriate key sequences (BBC or Atom)
+function stringToMachineKeys(text) {
+    return model.isAtom ? utils_atom.stringToATOMKeys(text) : utils.stringToBBCKeys(text);
+}
+
 const gamepad = new GamePad();
 const availableImages = [
     {
@@ -102,6 +120,7 @@ const paramTypes = {
     coProcessor: ParamTypes.BOOL,
     mouseJoystickEnabled: ParamTypes.BOOL,
     speechOutput: ParamTypes.BOOL,
+    audioDebug: ParamTypes.BOOL,
 
     // Numeric parameters
     speed: ParamTypes.INT,
@@ -119,6 +138,7 @@ const paramTypes = {
     disc1: ParamTypes.STRING,
     disc2: ParamTypes.STRING,
     tape: ParamTypes.STRING,
+    mmc: ParamTypes.STRING,
     keyLayout: ParamTypes.STRING,
     autotype: ParamTypes.STRING,
     displayMode: ParamTypes.STRING,
@@ -141,7 +161,7 @@ let stationId = 101;
 let econet = null;
 
 // Parse disc and tape images from query parameters
-const { discImage: queryDiscImage, secondDiscImage: querySecondDisc } = parseMediaParams(parsedQuery);
+const { discImage: queryDiscImage, secondDiscImage: querySecondDisc, mmcImage } = parseMediaParams(parsedQuery);
 
 // Only assign if values are provided
 if (queryDiscImage) discImage = queryDiscImage;
@@ -259,7 +279,7 @@ const config = new Config(
             updateAdcSources(parsedQuery.mouseJoystickEnabled, parsedQuery.microphoneChannel);
 
             if (changed.microphoneChannel !== undefined) {
-                setupMicrophone().then(() => {});
+                setupMicrophone();
             }
         }
         if (changed.speechOutput !== undefined) {
@@ -319,7 +339,8 @@ if (parsedQuery.cpuMultiplier !== undefined) {
     cpuMultiplier = parsedQuery.cpuMultiplier;
     console.log("CPU multiplier set to " + cpuMultiplier);
 }
-const clocksPerSecond = (cpuMultiplier * 2 * 1000 * 1000) | 0;
+const cpuSpeed = model.isAtom ? 1 * 1000 * 1000 : 2 * 1000 * 1000;
+const clocksPerSecond = (cpuMultiplier * cpuSpeed) | 0;
 const MaxCyclesPerFrame = clocksPerSecond / 10;
 
 let tryGl = true;
@@ -375,23 +396,31 @@ function swapCanvas(newFilterClass) {
 
 let canvas = createCanvasForFilter(displayModeFilter);
 
-video = new Video(model.isMaster, canvas.fb32, function paint(minx, miny, maxx, maxy) {
-    frames++;
-    if (frames < frameSkip) return;
-    frames = 0;
-    canvas.paint(minx, miny, maxx, maxy, this.frameCount);
-});
+video = new Video(
+    model.isMaster,
+    canvas.fb32,
+    function paint(minx, miny, maxx, maxy) {
+        frames++;
+        if (frames < frameSkip) return;
+        frames = 0;
+        canvas.paint(minx, miny, maxx, maxy, this.frameCount);
+    },
+    { isAtom: model.isAtom },
+);
 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,
     audioFilterFreq,
     audioFilterQ,
     noSeek,
+    cpuSpeed,
+    isAtom: model.isAtom,
 });
-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.
@@ -482,7 +511,7 @@ const pastetext = document.getElementById("paste-text");
 pastetext.closest("form").addEventListener("submit", (event) => event.preventDefault());
 pastetext.addEventListener("paste", function (event) {
     const text = event.clipboardData.getData("text/plain");
-    sendRawKeyboardToBBC(utils.stringToBBCKeys(text), true);
+    sendRawKeyboard(stringToMachineKeys(text), true);
 });
 pastetext.addEventListener("dragover", function (event) {
     event.preventDefault();
@@ -492,8 +521,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)
+        setProcessorTape(await loadTapeFromData(file.name, new Uint8Array(arrayBuffer), model.isAtom));
     } else {
         await loadHTMLFile(file);
     }
@@ -501,7 +534,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();
@@ -617,7 +650,8 @@ function checkPrinterWindow() {
     processor.uservia.setca1(true);
 }
 
-processor = new Cpu6502(model, {
+const CpuClass = model.isAtom ? AtomCpu6502 : Cpu6502;
+processor = new CpuClass(model, {
     dbgr,
     video,
     soundChip: audioHandler.soundChip,
@@ -737,12 +771,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 +880,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 +891,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() {
@@ -913,7 +947,7 @@ async function tapeSthClick(item) {
     popupLoading("Loading " + item);
     try {
         const tape = await loadTapeImage(parsedQuery.tape);
-        processor.acia.setTape(tape);
+        setProcessorTape(tape);
         loadingFinished();
     } catch (err) {
         console.error("Error loading tape image:", err);
@@ -1001,9 +1035,9 @@ const sthFilter = document.getElementById("sth-filter");
 sthFilter.addEventListener("change", () => setSthFilter(sthFilter.value));
 sthFilter.addEventListener("keyup", () => setSthFilter(sthFilter.value));
 
-function sendRawKeyboardToBBC(keysToSend, checkCapsAndShiftLocks) {
+function sendRawKeyboard(keysToSend, checkCapsAndShiftLocks) {
     if (keyboard) {
-        keyboard.sendRawKeyboardToBBC(keysToSend, checkCapsAndShiftLocks);
+        keyboard.sendRawKeyboard(keysToSend, checkCapsAndShiftLocks);
     } else {
         console.warn("Tried to send keys before keyboard was initialised");
     }
@@ -1016,39 +1050,39 @@ function autoboot(image) {
     utils.noteEvent("init", "autoboot", image);
 
     // Shift-break simulation, hold SHIFT for 1000ms.
-    sendRawKeyboardToBBC([BBC.SHIFT, 1000], false);
+    sendRawKeyboard([BBC.SHIFT, 1000], false);
 }
 
 function autoBootType(keys) {
     console.log("Auto typing '" + keys + "'");
     utils.noteEvent("init", "autochain");
 
-    const bbcKeys = utils.stringToBBCKeys(keys);
-    sendRawKeyboardToBBC([1000].concat(bbcKeys), false);
+    const bbcKeys = stringToMachineKeys(keys);
+    sendRawKeyboard([1000].concat(bbcKeys), false);
 }
 
 function autoChainTape() {
     console.log("Auto Chaining Tape");
     utils.noteEvent("init", "autochain");
 
-    const bbcKeys = utils.stringToBBCKeys('*TAPE\nCH.""\n');
-    sendRawKeyboardToBBC([1000].concat(bbcKeys), false);
+    const bbcKeys = stringToMachineKeys('*TAPE\nCH.""\n');
+    sendRawKeyboard([1000].concat(bbcKeys), false);
 }
 
 function autoRunTape() {
     console.log("Auto Running Tape");
     utils.noteEvent("init", "autorun");
 
-    const bbcKeys = utils.stringToBBCKeys("*TAPE\n*/\n");
-    sendRawKeyboardToBBC([1000].concat(bbcKeys), false);
+    const bbcKeys = stringToMachineKeys("*TAPE\n*/\n");
+    sendRawKeyboard([1000].concat(bbcKeys), false);
 }
 
 function autoRunBasic() {
     console.log("Auto Running basic");
     utils.noteEvent("init", "autorunbasic");
 
-    const bbcKeys = utils.stringToBBCKeys("RUN\n");
-    sendRawKeyboardToBBC([1000].concat(bbcKeys), false);
+    const bbcKeys = stringToMachineKeys("RUN\n");
+    sendRawKeyboard([1000].concat(bbcKeys), false);
 }
 
 function updateUrl() {
@@ -1168,16 +1202,17 @@ async function loadTapeImage(tapeImage) {
     const split = splitImage(tapeImage);
     tapeImage = split.image;
     const schema = split.schema;
+    const isAtom = model.isAtom;
 
     switch (schema) {
         case "|":
         case "sth":
-            return await loadTapeFromData(tapeImage, await tapeSth.fetch(tapeImage));
+            return await loadTapeFromData(tapeImage, await tapeSth.fetch(tapeImage), isAtom);
 
         case "data": {
             const arr = Array.prototype.map.call(atob(tapeImage), (x) => x.charCodeAt(0));
             const { name, data } = await utils.unzipDiscImage(arr);
-            return await loadTapeFromData(name, data);
+            return await loadTapeFromData(name, data, isAtom);
         }
 
         case "http":
@@ -1192,11 +1227,20 @@ async function loadTapeImage(tapeImage) {
                 tapeData = unzipped.data;
                 tapeImage = unzipped.name;
             }
-            return await loadTapeFromData(tapeImage, tapeData);
+            return await loadTapeFromData(tapeImage, tapeData, isAtom);
         }
 
-        default:
-            return await loadTape("tapes/" + tapeImage);
+        default: {
+            const tapePath = "tapes/" + tapeImage;
+            let tapeData = await utils.loadData(tapePath);
+            let tapeName = tapeImage;
+            if (/\.zip/i.test(tapeName)) {
+                const unzipped = await utils.unzipDiscImage(tapeData);
+                tapeData = unzipped.data;
+                tapeName = unzipped.name;
+            }
+            return await loadTapeFromData(tapeName, tapeData, isAtom);
+        }
     }
 }
 
@@ -1221,8 +1265,14 @@ document.getElementById("tape_load").addEventListener("change", async function (
     const file = evt.target.files[0];
     utils.noteEvent("local", "clickTape"); // NB no filename here
 
-    const binaryData = await readFileAsBinaryString(file);
-    processor.acia.setTape(await loadTapeFromData("local file", binaryData));
+    let tapeData = await readFileAsBinaryString(file);
+    let tapeName = file.name;
+    if (/\.zip/i.test(tapeName)) {
+        const unzipped = await utils.unzipDiscImage(utils.stringToUint8Array(tapeData));
+        tapeData = unzipped.data;
+        tapeName = unzipped.name;
+    }
+    setProcessorTape(await loadTapeFromData(tapeName, tapeData, model.isAtom));
     delete parsedQuery.tape;
     updateUrl();
     bootstrap.Modal.getInstance(document.getElementById("tapes"))?.hide();
@@ -1354,13 +1404,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 +1421,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 +1548,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 +1570,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 +1590,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) {
@@ -1560,13 +1613,58 @@ for (const link of document.querySelectorAll("#tape-menu a")) {
 
         if (type === "rewind") {
             console.log("Rewinding tape to the start");
-            processor.acia.rewindTape();
+            if (model.isAtom) {
+                processor.atomppia.stopTape();
+                processor.atomppia.rewindTape();
+                updateTapeButton();
+            } else {
+                processor.acia.rewindTape();
+            }
         } else {
             console.log("unknown type", type);
         }
     });
 }
 
+const tapePlayStopBtn = document.getElementById("tape-play-stop");
+const tapeControlHeader = document.getElementById("tape-control-header");
+const tapeControlCell = document.getElementById("tape-control-cell");
+
+function updateTapeButton() {
+    if (!model.isAtom) return;
+    const playing = processor.atomppia.motorOn;
+    const label = playing ? "Stop cassette" : "Play cassette";
+    tapePlayStopBtn.textContent = playing ? "\u25A0" : "\u25B6";
+    tapePlayStopBtn.title = label;
+    tapePlayStopBtn.setAttribute("aria-label", label);
+    tapePlayStopBtn.classList.toggle("playing", playing);
+}
+
+function showTapeControl(visible) {
+    const display = visible ? "" : "none";
+    tapeControlHeader.style.display = display;
+    tapeControlCell.style.display = display;
+}
+
+function updateLedVisibility() {
+    const bbcDisplay = model.isAtom ? "none" : "";
+    for (const el of document.querySelectorAll(".bbc-only")) {
+        el.style.display = bbcDisplay;
+    }
+    showTapeControl(model.isAtom);
+}
+
+updateLedVisibility();
+
+tapePlayStopBtn.addEventListener("click", () => {
+    if (processor.atomppia.motorOn) {
+        processor.atomppia.stopTape();
+    } else {
+        processor.atomppia.playTape();
+    }
+    updateTapeButton();
+});
+
 function Light(name) {
     const dom = document.getElementById(name);
     let on = false;
@@ -1585,13 +1683,17 @@ const drive1 = new Light("drive1");
 const network = new Light("networklight");
 
 syncLights = function () {
-    caps.update(processor.sysvia.capsLockLight);
-    shift.update(processor.sysvia.shiftLockLight);
-    drive0.update(processor.fdc.motorOn[0]);
-    drive1.update(processor.fdc.motorOn[1]);
-    cassette.update(processor.acia.motorOn);
-    if (model.hasEconet) {
-        network.update(processor.econet.activityLight());
+    if (model.isAtom) {
+        cassette.update(processor.atomppia.motorOn);
+    } else {
+        caps.update(processor.sysvia.capsLockLight);
+        shift.update(processor.sysvia.shiftLockLight);
+        drive0.update(processor.fdc.motorOn[0]);
+        drive1.update(processor.fdc.motorOn[1]);
+        cassette.update(processor.acia.motorOn);
+        if (model.hasEconet) {
+            network.update(processor.econet.activityLight());
+        }
     }
 };
 
@@ -1626,7 +1728,16 @@ const startPromise = (async () => {
         imageLoads.push(
             (async () => {
                 const tape = await loadTapeImage(parsedQuery.tape);
-                processor.acia.setTape(tape);
+                setProcessorTape(tape);
+            })(),
+        );
+    }
+
+    if (mmcImage && model.isAtom) {
+        imageLoads.push(
+            (async () => {
+                const files = await LoadSD(mmcImage);
+                processor.atommc.SetMMCData(files);
             })(),
         );
     }
@@ -1684,8 +1795,10 @@ const startPromise = (async () => {
     return Promise.all(imageLoads);
 })();
 
-startPromise
-    .then(async () => {
+(async () => {
+    try {
+        await startPromise;
+
         switch (needsAutoboot) {
             case "boot":
                 sthAutoboot.checked = true;
@@ -1726,11 +1839,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);