jsbeeb 1.14.0 → 1.16.0

package/src/main.js

@@ -7,7 +7,7 @@ import "./jsbeeb.css";
 import * as utils from "./utils.js";
 import { FakeVideo, Video } from "./video.js";
 import { Debugger } from "./web/debug.js";
-import { Cpu6502, AtomCpu6502, DefaultTubeCpuMultiplier } 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";
@@ -19,7 +19,7 @@ import { GoogleDriveLoader } from "./google-drive.js";
 import * as tokeniser from "./basic-tokenise.js";
 import * as canvasLib from "./canvas.js";
 import { Config } from "./config.js";
-import { TubeModel } from "./models.js";
+import { tubeModelFor } from "./models.js";
 import { initialise as electron } from "./app/electron.js";
 import { AudioHandler } from "./web/audio-handler.js";
 import { Econet } from "./econet.js";
@@ -44,6 +44,8 @@ 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 { DiscVisualiser } from "./disc-visualiser.js";
+import { downloadBlob } from "./dom-utils.js";
 import {
     buildUrlFromParams,
     guessModelFromHostname,
@@ -51,7 +53,7 @@ import {
     parseMediaParams,
     parseQueryString,
     processAutobootParams,
-    processKeyboardParams,
+    processInputParams,
 } from "./url-params.js";
 
 let processor;
@@ -138,7 +140,7 @@ const paramTypes = {
     audiofilterfreq: ParamTypes.FLOAT,
     audiofilterq: ParamTypes.FLOAT,
     cpuMultiplier: ParamTypes.FLOAT,
-    tubeCpuMultiplier: ParamTypes.INT,
+    tubeCpuMultiplier: ParamTypes.FLOAT,
     microphoneChannel: ParamTypes.INT,
 
     // String parameters (these are the default but listed for clarity)
@@ -176,9 +178,6 @@ const { discImage: queryDiscImage, secondDiscImage: querySecondDisc, mmcImage }
 if (queryDiscImage) discImage = queryDiscImage;
 if (querySecondDisc) secondDiscImage = querySecondDisc;
 
-// Process keyboard mappings
-parsedQuery = processKeyboardParams(parsedQuery, BBC, keyCodes, utils.userKeymap, gamepad);
-
 // Handle specific query parameters
 if (Array.isArray(parsedQuery.rom)) {
     parsedQuery.rom.forEach((romPath) => {
@@ -234,9 +233,10 @@ speechOutput.enabled = !!parsedQuery.speechOutput;
 const config = new Config(
     function onChange(changed) {
         if (changed.displayMode) {
-            displayModeFilter = getFilterForMode(changed.displayMode);
+            // swapCanvas settles displayModeFilter on whatever was really
+            // built, so take the picture from that rather than the request.
+            swapCanvas(getFilterForMode(changed.displayMode));
             setCrtPic(displayModeFilter);
-            swapCanvas(displayModeFilter);
             // Trigger window resize to recalculate layout with new dimensions
             window.dispatchEvent(new Event("resize"));
         }
@@ -284,7 +284,7 @@ config.mapLegacyModels(parsedQuery);
 
 config.setModel(parsedQuery.model || guessModelFromHostname(window.location.hostname));
 config.setKeyLayout(keyLayout);
-config.setTubeCpuMultiplier(parsedQuery.tubeCpuMultiplier || DefaultTubeCpuMultiplier);
+config.setTubeCpuMultiplier(parsedQuery.tubeCpuMultiplier || 1);
 config.setMicrophoneChannel(parsedQuery.microphoneChannel);
 config.setCheckboxes({
     coProcessor: !!parsedQuery.coProcessor,
@@ -299,13 +299,22 @@ config.setDisplayMode(displayMode);
 
 model = config.model;
 
+// Must come after we know the model, to validate names against those of the hardware.
+const keyMappingWarnings = processInputParams(
+    parsedQuery,
+    model.isAtom ? utils_atom.ATOM : BBC,
+    keyCodes,
+    utils.userKeymap,
+    gamepad,
+);
+
 // Depends on the config.setX calls above having applied the URL parameters.
 const emulationConfig = {
     keyLayout,
     cpuMultiplier,
     tubeCpuMultiplier: config.tubeCpuMultiplier,
     videoCyclesBatch: parsedQuery.videoCyclesBatch,
-    tube: config.coProcessor ? TubeModel : null,
+    tube: config.coProcessor ? tubeModelFor(config.model) : null,
     hasMusic5000: config.hasMusic5000,
     hasTeletextAdaptor: config.hasTeletextAdaptor,
     // ROM order determines sideways bank allocation, and the fittings' ROMs claim banks
@@ -345,7 +354,7 @@ sbBind(document.querySelector(".sidebar.bottom"), parsedQuery.sbBottom, function
 });
 
 if (cpuMultiplier !== 1) console.log(`CPU multiplier set to ${cpuMultiplier}`);
-const cpuSpeed = model.isAtom ? 1 * 1000 * 1000 : 2 * 1000 * 1000;
+const cpuSpeed = model.cyclesPerSecond;
 const clocksPerSecond = (cpuMultiplier * cpuSpeed) | 0;
 const MaxCyclesPerFrame = clocksPerSecond / 10;
 
@@ -374,12 +383,29 @@ function showError(context, error) {
     errorDialogModal.show();
 }
 
+if (keyMappingWarnings.length) {
+    showError("applying the key mappings in the URL", keyMappingWarnings.join(" "));
+}
+
 function createCanvasForFilter(filterClass) {
+    // Not `config`: that is the emulator's live configuration object, declared
+    // at module scope and used throughout this file.
+    const displayConfig = filterClass.getDisplayConfig();
+    // Each mode says how many pixels it wants to draw into. Set this before
+    // creating the context, which fixes its initial viewport.
+    screenCanvas.width = displayConfig.canvasWidth;
+    screenCanvas.height = displayConfig.canvasHeight;
+
     const newCanvas = tryGl ? canvasLib.bestCanvas(screenCanvas, filterClass) : new canvasLib.Canvas(screenCanvas);
 
-    if (filterClass.requiresGl() && !newCanvas.isWebGl()) {
-        const config = filterClass.getDisplayConfig();
-        showError(`enabling ${config.name} mode`, `${config.name} requires WebGL. Using standard display instead.`);
+    // Test which filter was actually built, not merely whether we got WebGL: a
+    // filter can decline a context that works perfectly well for other modes,
+    // in which case bestCanvas quietly gives us an unfiltered GL canvas.
+    if (newCanvas.filterClass !== filterClass) {
+        showError(
+            `enabling ${displayConfig.name} mode`,
+            `${displayConfig.name} is not available on this device. Using standard display instead.`,
+        );
     }
 
     return newCanvas;
@@ -387,20 +413,33 @@ function createCanvasForFilter(filterClass) {
 
 let displayModeFilter = canvasLib.getFilterForMode(parsedQuery.displayMode || "rgb");
 function swapCanvas(newFilterClass) {
+    const oldCanvas = canvas;
     const newCanvas = createCanvasForFilter(newFilterClass);
+    // Carry the picture over; the buffers differ in height, so copy what fits.
+    newCanvas.fb32.set(oldCanvas.fb32.subarray(0, newCanvas.fb32.length));
+    // Only once the replacement exists, so a failure to build it leaves the
+    // display we already had. The two share a GL context but no GL objects.
+    oldCanvas.dispose();
     video.fb32 = newCanvas.fb32;
     video.paint_ext = function paint(minx, miny, maxx, maxy) {
         frames++;
         if (frames < frameSkip) return;
         frames = 0;
-        newCanvas.paint(minx, miny, maxx, maxy, this.frameCount);
+        newCanvas.paint(minx, miny, maxx, maxy, { frameCount: this.frameCount, lineGrid: this.lineGrid });
     };
     canvas = newCanvas;
-    displayModeFilter = newFilterClass;
+    // Follow the filter we ended up with, not the one we asked for: everything
+    // downstream — the monitor picture, the canvas geometry, how large a
+    // drawing buffer to ask for — comes from its display config.
+    displayModeFilter = newCanvas.filterClass;
+    // Nothing else will redraw: the mode is changed from a modal, which stops
+    // the emulator.
+    video.paint();
     window.setTimeout(() => window.dispatchEvent(new Event("resize")), 1);
 }
 
 let canvas = createCanvasForFilter(displayModeFilter);
+displayModeFilter = canvas.filterClass;
 
 video = new Video(
     model.isMaster,
@@ -409,7 +448,7 @@ video = new Video(
         frames++;
         if (frames < frameSkip) return;
         frames = 0;
-        canvas.paint(minx, miny, maxx, maxy, this.frameCount);
+        canvas.paint(minx, miny, maxx, maxy, { frameCount: this.frameCount, lineGrid: this.lineGrid });
     },
     { isAtom: model.isAtom },
 );
@@ -471,18 +510,8 @@ function replaceOrAddExtension(name, newExt) {
  * @param {string} extension - The file extension to use
  */
 function downloadDriveData(data, name, extension) {
-    const a = document.createElement("a");
-    document.body.appendChild(a);
-    a.style = "display: none";
-
-    const fileName = replaceOrAddExtension(name, extension);
     const blob = new Blob([data], { type: "application/octet-stream" });
-    const url = window.URL.createObjectURL(blob);
-
-    a.href = url;
-    a.download = fileName;
-    a.click();
-    window.URL.revokeObjectURL(url);
+    downloadBlob(blob, replaceOrAddExtension(name, extension));
 }
 
 async function loadHTMLFile(file) {
@@ -532,7 +561,7 @@ pastetext.addEventListener("drop", async function (event) {
         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));
+        setProcessorTape(await loadTapeFromData(file.name, new Uint8Array(arrayBuffer), model));
     } else {
         await loadHTMLFile(file);
     }
@@ -618,7 +647,7 @@ window.addEventListener("beforeunload", function (event) {
 });
 
 if (config.hasEconet) {
-    econet = new Econet(stationId);
+    econet = new Econet(stationId, model.cyclesPerSecond);
 } else {
     document.getElementById("fsmenuitem").style.display = "none";
 }
@@ -667,6 +696,8 @@ processor = new CpuClass(model, {
     econet,
 });
 
+processor.teletextAdaptor?.addEventListener("showError", (e) => showError(e.detail.context, e.detail.error));
+
 // Create input sources
 const gamepadSource = new GamepadSource(emulationConfig.getGamepads);
 // Create MicrophoneInput but don't enable by default
@@ -681,18 +712,16 @@ const mouseJoystickSource = new MouseJoystickSource(screenCanvas);
 /**
  * Attach an RS-423 composite handler to the ACIA that combines the touchscreen
  * (which sends position data to the BBC) with the speech output (which speaks
- * text the BBC sends out).  Call this once after processor.initialise() and
- * again whenever speechOutput.enabled changes.
+ * text the BBC sends out).
  */
 function setupRs423Handler() {
-    const touchScreen = processor.touchScreen;
     processor.acia.setRs423Handler({
         onTransmit(val) {
-            touchScreen.onTransmit(val);
+            processor.touchScreen.onTransmit(val);
             speechOutput.onTransmit(val);
         },
         tryReceive(rts) {
-            return touchScreen.tryReceive(rts);
+            return processor.touchScreen.tryReceive(rts);
         },
     });
 }
@@ -1206,17 +1235,16 @@ 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), isAtom);
+            return await loadTapeFromData(tapeImage, await tapeSth.fetch(tapeImage), model);
 
         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, isAtom);
+            return await loadTapeFromData(name, data, model);
         }
 
         case "http":
@@ -1231,7 +1259,7 @@ async function loadTapeImage(tapeImage) {
                 tapeData = unzipped.data;
                 tapeImage = unzipped.name;
             }
-            return await loadTapeFromData(tapeImage, tapeData, isAtom);
+            return await loadTapeFromData(tapeImage, tapeData, model);
         }
 
         default: {
@@ -1243,7 +1271,7 @@ async function loadTapeImage(tapeImage) {
                 tapeData = unzipped.data;
                 tapeName = unzipped.name;
             }
-            return await loadTapeFromData(tapeName, tapeData, isAtom);
+            return await loadTapeFromData(tapeName, tapeData, model);
         }
     }
 }
@@ -1276,7 +1304,7 @@ document.getElementById("tape_load").addEventListener("change", async function (
         tapeData = unzipped.data;
         tapeName = unzipped.name;
     }
-    setProcessorTape(await loadTapeFromData(tapeName, tapeData, model.isAtom));
+    setProcessorTape(await loadTapeFromData(tapeName, tapeData, model));
     delete parsedQuery.tape;
     updateUrl();
     bootstrap.Modal.getInstance(document.getElementById("tapes"))?.hide();
@@ -1445,7 +1473,12 @@ document.querySelector("#google-drive form").addEventListener("submit", async fu
     let data;
     if (document.querySelector("#google-drive .create-from-existing").checked) {
         const discType = disc.guessDiscTypeFromName(name);
-        data = discType.saver(processor.fdc.drives[0].disc);
+        try {
+            data = discType.saver(processor.fdc.drives[0].disc);
+        } catch (e) {
+            loadingFinished(`Create failed: ${e.message}`);
+            return;
+        }
         name = replaceOrAddExtension(name, discType.extension);
         console.log(`Saving existing disc: ${name}`);
     } else {
@@ -1474,11 +1507,15 @@ document.querySelector("#google-drive form").addEventListener("submit", async fu
 
 document.getElementById("download-drive-link").addEventListener("click", function () {
     const disc = processor.fdc.drives[0].disc;
-    const data = toSsdOrDsd(disc);
-    const name = disc.name;
-    const extension = disc.isDoubleSided ? ".dsd" : ".ssd";
-
-    downloadDriveData(data, name, extension);
+    const save = (options) =>
+        downloadDriveData(toSsdOrDsd(disc, options), disc.name, disc.isDoubleSided ? ".dsd" : ".ssd");
+    try {
+        save();
+    } catch (e) {
+        areYouSure(`${e.message} Save anyway, losing what will not fit?`, "Save anyway", "Cancel", () =>
+            save({ force: true }),
+        );
+    }
 });
 
 document.getElementById("download-drive-hfe-link").addEventListener("click", function () {
@@ -1539,13 +1576,8 @@ document.getElementById("save-state").addEventListener("click", async function (
         const snapshot = createSnapshot(processor, model, Object.keys(media).length > 0 ? media : undefined);
         const json = snapshotToJSON(snapshot);
         const blob = await compressBlob(new Blob([json]));
-        const url = URL.createObjectURL(blob);
         const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
-        const a = document.createElement("a");
-        a.href = url;
-        a.download = `jsbeeb-${model.name}-${timestamp}.json.gz`;
-        a.click();
-        URL.revokeObjectURL(url);
+        downloadBlob(blob, `jsbeeb-${model.name}-${timestamp}.json.gz`);
     } catch (e) {
         showError("saving state", e);
     }
@@ -1935,7 +1967,7 @@ function VirtualSpeedUpdater() {
         if (this.cycles) {
             const thisMHz = this.cycles / this.time / 1000;
             this.v.textContent = thisMHz.toFixed(1);
-            if (this.cycles >= 10 * 2 * 1000 * 1000) {
+            if (this.cycles >= 10 * cpuSpeed) {
                 this.cycles = this.time = 0;
             }
             this.header.style.color = this.speedy ? "red" : "white";
@@ -1963,6 +1995,9 @@ rewindUI = new RewindUI({
 });
 rewindUI.updateButtonState();
 
+if (processor.fdc) new DiscVisualiser({ fdc: processor.fdc });
+else document.getElementById("disc-visualiser-open").classList.add("disabled");
+
 function draw(now) {
     if (!running) {
         last = 0;
@@ -2078,6 +2113,9 @@ function stop(debug) {
     updateDebugButtons();
 }
 
+/** Steps the drawing buffer grows in, as a multiple of the base canvas size. */
+const CanvasScaleStep = 0.25;
+
 (function () {
     const resizeCubMonitor = document.getElementById("cub-monitor");
     const resizeCubMonitorPic = document.getElementById("cub-monitor-pic");
@@ -2130,6 +2168,25 @@ function stop(debug) {
         resizeCubMonitor.style.width = width + "px";
         resizeCubMonitorPic.style.height = height + "px";
         resizeCubMonitorPic.style.width = width + "px";
+        // A mode that reconstructs detail wants to draw at the size it will be
+        // seen at, up to the limit it asks for. Drawing more than the display
+        // can show costs fragments and buys nothing, and for an expensive
+        // shader that is the difference between comfortable and not.
+        if (displayConfig.maxCanvasScale) {
+            const wanted = (finalCanvasWidth * (window.devicePixelRatio || 1)) / displayConfig.canvasWidth;
+            // Quantised, because resize fires continuously while a window is
+            // dragged and every distinct value reallocates the drawing buffer.
+            const quantised = Math.round(wanted / CanvasScaleStep) * CanvasScaleStep;
+            const scale = Math.min(displayConfig.maxCanvasScale, Math.max(1, quantised));
+            const backingWidth = Math.round(displayConfig.canvasWidth * scale);
+            if (screenCanvas.width !== backingWidth) {
+                screenCanvas.width = backingWidth;
+                screenCanvas.height = Math.round(displayConfig.canvasHeight * scale);
+                // Resizing threw the drawing buffer away.
+                video.paint();
+            }
+        }
+
         screenCanvas.style.width = finalCanvasWidth + "px";
         screenCanvas.style.height = finalCanvasHeight + "px";
         screenCanvas.style.left = canvasOrigLeft * containerScale + "px";

package/src/models.js

@@ -19,10 +19,12 @@ const CpuModel = Object.freeze({
  * to any number of machines without one session's settings leaking into the next.
  */
 class Model {
-    constructor({ name, synonyms, os, cpuModel, isMaster, isAtom, swram, fdc, cmosOverride, banks } = {}) {
+    constructor({ name, synonyms, os, cpuModel, isMaster, isAtom, swram, fdc, cmosOverride, banks, clockMhz } = {}) {
+        if (!(clockMhz > 0)) throw new Error(`Model ${name} has no clock speed`);
         this.name = name;
         this.synonyms = synonyms;
         this.os = os;
+        this.clockMhz = clockMhz;
         this.banks = banks;
         this._cpuModel = cpuModel;
         this.isMaster = isMaster;
@@ -33,6 +35,15 @@ class Model {
         this.cmosOverride = cmosOverride;
     }
 
+    /**
+     * How many CPU cycles this machine runs in a second. Everything that
+     * converts between real time and emulated cycles should ask here rather
+     * than assuming a clock speed.
+     */
+    get cyclesPerSecond() {
+        return this.clockMhz * 1000 * 1000;
+    }
+
     get nmos() {
         return this._cpuModel === CpuModel.MOS6502;
     }
@@ -72,6 +83,7 @@ function atomModel({ name, synonyms, os, banks }) {
         os,
         cpuModel: CpuModel.MOS6502,
         isMaster: false,
+        clockMhz: 1,
         isAtom: true,
         swram: beebSwram,
         fdc: NoiseAwareIntelFdc,
@@ -124,6 +136,7 @@ export const allModels = [
         os: ["os.rom", "BASIC.ROM", "b/DFS-1.2.rom"],
         cpuModel: CpuModel.MOS6502,
         isMaster: false,
+        clockMhz: 2,
         swram: beebSwram,
         fdc: NoiseAwareIntelFdc,
     }),
@@ -133,6 +146,7 @@ export const allModels = [
         os: ["os.rom", "BASIC.ROM", "b/DFS-0.9.rom"],
         cpuModel: CpuModel.MOS6502,
         isMaster: false,
+        clockMhz: 2,
         swram: beebSwram,
         fdc: NoiseAwareIntelFdc,
     }),
@@ -142,6 +156,7 @@ export const allModels = [
         os: ["os.rom", "BASIC.ROM", "b1770/dfs1770.rom", "b1770/zADFS.ROM"],
         cpuModel: CpuModel.MOS6502,
         isMaster: false,
+        clockMhz: 2,
         swram: beebSwram,
         fdc: NoiseAwareWdFdc,
     }),
@@ -152,6 +167,7 @@ export const allModels = [
         os: ["os.rom", "BASIC.ROM", "b1770/zADFS.ROM", "b1770/dfs1770.rom"],
         cpuModel: CpuModel.MOS6502,
         isMaster: false,
+        clockMhz: 2,
         swram: beebSwram,
         fdc: NoiseAwareWdFdc,
     }),
@@ -161,6 +177,7 @@ export const allModels = [
         os: ["master/mos3.20"],
         cpuModel: CpuModel.CMOS65C12,
         isMaster: true,
+        clockMhz: 2,
         swram: masterSwram,
         fdc: NoiseAwareWdFdc,
         cmosOverride: pickDfs,
@@ -171,6 +188,7 @@ export const allModels = [
         os: ["master/mos3.20"],
         cpuModel: CpuModel.CMOS65C12,
         isMaster: true,
+        clockMhz: 2,
         swram: masterSwram,
         fdc: NoiseAwareWdFdc,
         cmosOverride: pickAdfs,
@@ -181,6 +199,7 @@ export const allModels = [
         os: ["master/mos3.20"],
         cpuModel: CpuModel.CMOS65C12,
         isMaster: true,
+        clockMhz: 2,
         swram: masterSwram,
         fdc: NoiseAwareWdFdc,
         cmosOverride: pickAnfs,
@@ -210,13 +229,25 @@ export const allModels = [
         synonyms: ["Atom-DOS"],
         os: ["atom/Atom_Kernel.rom", "atom/Atom_DOS.rom", "atom/Atom_FloatingPoint.rom", "atom/Atom_Basic.rom"],
     }),
-    // Although this can not be explicitly selected as a model, it is required by the configuration builder later
+    // Neither can be selected as a model: they are fitted to one, by the configuration builder later.
     new Model({
         name: "Tube65C02",
         synonyms: [],
         os: ["tube/6502Tube.rom"],
+        // The production wedge's GTE 65SC02 has no Rockwell bit instructions.
+        cpuModel: CpuModel.CMOS65C12,
+        isMaster: false,
+        clockMhz: 3,
+    }),
+    new Model({
+        name: "Tube65C102",
+        synonyms: [],
+        os: ["tube/65C102Tube.rom"],
+        // Boards are reported with both Rockwell and GTE parts, so keep the superset of the two
+        // until #756 lets the fitted co-processor be chosen.
         cpuModel: CpuModel.CMOS65C02,
         isMaster: false,
+        clockMhz: 4,
     }),
 ];
 
@@ -236,6 +267,7 @@ export const TEST_6502 = new Model({
     name: "TEST",
     synonyms: ["TEST"],
     os: [],
+    clockMhz: 2,
     cpuModel: CpuModel.MOS6502,
     isMaster: false,
     swram: beebSwram,
@@ -246,6 +278,7 @@ export const TEST_65C02 = new Model({
     name: "TEST",
     synonyms: ["TEST"],
     os: [],
+    clockMhz: 2,
     cpuModel: CpuModel.CMOS65C02,
     isMaster: false,
     swram: masterSwram,
@@ -256,6 +289,7 @@ export const TEST_65C12 = new Model({
     name: "TEST",
     synonyms: ["TEST"],
     os: [],
+    clockMhz: 2,
     cpuModel: CpuModel.CMOS65C12,
     isMaster: false,
     swram: masterSwram,
@@ -265,6 +299,7 @@ TEST_65C12.isTest = true;
 
 export const basicOnly = new Model({
     name: "Basic only",
+    clockMhz: 2,
     synonyms: ["Basic only"],
     os: ["master/mos3.20"],
     cpuModel: CpuModel.CMOS65C12,
@@ -274,11 +309,18 @@ export const basicOnly = new Model({
 });
 
 /**
- * The only second processor jsbeeb emulates. Machine-building code passes this as the
- * emulation config's `tube`, so that 6502.js needn't import this module and close an
- * import cycle via the FDC modules.
+ * The second processors jsbeeb emulates: the external 3MHz box, and the Master Turbo's
+ * internal 4MHz board. Machine-building code passes one of these as the emulation config's
+ * `tube`, so that 6502.js needn't import this module and close an import cycle via the FDC
+ * modules.
  */
 export const TubeModel = findModel("Tube65C02");
+export const TurboTubeModel = findModel("Tube65C102");
+
+/** @returns {Model} the second processor sold for this machine: the Turbo board for a Master. */
+export function tubeModelFor(model) {
+    return model.isMaster ? TurboTubeModel : TubeModel;
+}
 
 // After the isTest assignments above, so those still apply.
 for (const model of [...allModels, TEST_6502, TEST_65C02, TEST_65C12, basicOnly]) {

package/src/serial.js

@@ -20,6 +20,7 @@ export class Serial {
         this.transmitRate = val & 0x07;
         this.receiveRate = (val >>> 3) & 0x07;
         this.acia.setSerialReceive(table[this.receiveRate]);
+        this.acia.setSerialTransmit(table[this.transmitRate]);
         this.acia.setMotor(!!(val & 0x80));
         this.acia.selectRs423(!!(val & 0x40));
     }

package/src/snapshot-helpers.js

@@ -25,7 +25,7 @@ export const DefaultAcia = {
     tapeDcdLineLevel: false,
     hadDcdHigh: false,
     serialReceiveRate: 19200,
-    serialReceiveCyclesPerByte: 0,
+    serialTransmitRate: 19200,
     txCompleteTaskOffset: null,
     runTapeTaskOffset: null,
     runRs423TaskOffset: null,

package/src/sth.js

@@ -2,30 +2,33 @@
 
 import * as utils from "./utils.js";
 
-const catalogUrl = "reclist.php?sort=name&filter=.zip";
-const sthArchive = "www.stairwaytohell.com/bbc/archive";
+// Always https, whatever the page was loaded over: the mirror redirects plain
+// http, so following the page's protocol would cost a redirect on every request
+// when developing over http, and Electron reports "file:" anyway.
+const mirrorBase = "https://bbc.xania.org/archive/sth";
 
-async function _fetchAndParseCatalog(url) {
+async function _fetchManifest(url) {
     const response = await fetch(url);
     if (!response.ok) {
-        throw new Error("Network response was not ok");
+        throw new Error(`Network response was not ok (${response.status})`);
     }
-    const parser = new DOMParser();
-    const doc = parser.parseFromString(await response.text(), "text/html");
-    const result = [];
-    doc.querySelectorAll("tr td:nth-child(3) a").forEach((link) => {
-        const href = link.getAttribute("href");
-        if (href.indexOf(".zip") > 0) result.push(href);
-    });
-    result.sort();
-    return result;
+    const data = await response.json();
+    if (!Array.isArray(data?.files)) {
+        throw new Error("Invalid manifest: missing files array");
+    }
+    return data.files.map((f) => f.path).sort();
+}
+
+// Each path component is encoded individually so slashes survive but special
+// characters in filenames (e.g. brackets in "Daxis[droids]-demo.zip") don't
+// produce a malformed URL.
+function encodePath(path) {
+    return path.split("/").map(encodeURIComponent).join("/");
 }
 
 export class StairwayToHell {
     constructor(onStart, onCat, onError, tape) {
-        // Use https explicitly - document.location.protocol is 'file:' in Electron
-        const protocol = document.location.protocol === "file:" ? "https:" : document.location.protocol;
-        this._baseUrl = `${protocol}//${sthArchive}/${tape ? "tape" : "disk"}images/`;
+        this._baseUrl = `${mirrorBase}/${tape ? "tape" : "disk"}images/`;
         this._catalog = [];
         this._onStart = onStart;
         this._onCat = onCat;
@@ -36,7 +39,7 @@ export class StairwayToHell {
         this._onStart();
         if (this._catalog.length === 0) {
             try {
-                this._catalog = await _fetchAndParseCatalog(this._baseUrl + catalogUrl);
+                this._catalog = await _fetchManifest(this._baseUrl + "manifest.json");
             } catch (error) {
                 console.error("Failed to fetch catalog:", error);
                 if (this._onError) this._onError();
@@ -47,7 +50,7 @@ export class StairwayToHell {
     }
 
     async fetch(file) {
-        const name = this._baseUrl + file;
+        const name = this._baseUrl + encodePath(file);
         console.log("Loading ZIP from " + name);
         const response = await fetch(name);
         if (!response.ok) throw new Error("Network response was not ok");