jsbeeb 1.22.4 → 1.24.0

package/src/fake6502.js

@@ -1,40 +1,24 @@
 // Fakes out various 6502s for testing purposes.
-"use strict";
 
 import { FakeVideo } from "./video.js";
 import { FakeSoundChip } from "./soundchip.js";
 import { TEST_6502, TEST_65C02, TEST_65C12, tubeModelFor } from "./models.js";
-import { FakeDdNoise } from "./ddnoise.js";
-import { FakeRelayNoise } from "./relaynoise.js";
-import { Cpu6502, AtomCpu6502 } from "./6502.js";
-import { Cmos } from "./cmos.js";
-import { FakeMusic5000 } from "./music5000.js";
+import { machineSpec, nullIo } from "./machine-spec.js";
 
 const fakeVideo = new FakeVideo();
 const soundChip = new FakeSoundChip();
-const dbgr = {
-    setCpu: () => {},
-};
 
-export function fake6502(model, opts) {
-    opts = opts || {};
+export function fake6502(model, opts = {}) {
     model = model || TEST_6502;
-    const CpuClass = model.isAtom ? AtomCpu6502 : Cpu6502;
-    return new CpuClass(model, {
-        dbgr,
-        video: opts.video || fakeVideo,
-        soundChip: opts.soundChip || soundChip,
-        ddNoise: new FakeDdNoise(),
-        relayNoise: new FakeRelayNoise(),
-        music5000: new FakeMusic5000(),
-        cmos: new Cmos(),
-        cycleAccurate: opts.cycleAccurate,
-        config: {
+    return new model.Cpu(model, {
+        ...nullIo({ video: opts.video ?? fakeVideo, soundChip: opts.soundChip ?? soundChip }),
+        config: machineSpec({
             tube: opts.tube ? tubeModelFor(model) : null,
             tubeCpuMultiplier: opts.tubeCpuMultiplier,
             cpuMultiplier: opts.cpuMultiplier,
             hasTeletextAdaptor: opts.hasTeletextAdaptor,
-        },
+        }),
+        cycleAccurate: opts.cycleAccurate,
     });
 }
 

package/src/fdc.js

@@ -10,11 +10,12 @@ import {
     toSsdOrDsd,
 } from "./disc.js";
 import { loadHfe, sniffHfeLayout, toHfe } from "./disc-hfe.js";
-import * as utils from "./utils.js";
+import { stringToUint8Array } from "./binary.js";
+import { loadData } from "./loader.js";
 
 export function load(name) {
-    console.log("Loading disc from " + name); // todo support zip files
-    return utils.loadData(name);
+    console.log("Loading disc from " + name);
+    return loadData(name);
 }
 
 /**
@@ -185,7 +186,7 @@ const hfeDiscType = new DiscType({
 const adlDiscType = new DiscType({
     extension: ".adl",
     loader: (disc, data, _onChange) => {
-        // TODO handle onChange
+        // TODO(#822) handle onChange
         return loadAdf(disc, data, true);
     },
     saver: (_data) => {
@@ -200,7 +201,7 @@ const adlDiscType = new DiscType({
 const adfDiscType = new DiscType({
     extension: ".adf",
     loader: (disc, data, _onChange) => {
-        // TODO handle onChange
+        // TODO(#822) handle onChange
         return loadAdf(disc, data, false);
     },
     saver: (_data) => {
@@ -265,15 +266,14 @@ function is40TrackLayout(discType, data, name, layout) {
 
 /**
  * Create a disc object of the appropriate type based on the file name
- * @param {Object} fdc - The FDC controller object
  * @param {string} name - The file name with extension
  * @param {string|Uint8Array} stringData - The disc image data as string or Uint8Array
- * @param {function(Uint8Array): void} onChange - Optional callback when disc content changes
+ * @param {function(Uint8Array): void} [onChange] - called when disc content changes
  * @param {string} [layout] - one of DiscLayout; by default the image is asked what it is
  * @returns {Disc} The loaded disc object
  */
-export function discFor(fdc, name, stringData, onChange, layout = DiscLayout.auto) {
-    const data = typeof stringData !== "string" ? stringData : utils.stringToUint8Array(stringData);
+export function discFor(name, stringData, onChange, layout = DiscLayout.auto) {
+    const data = typeof stringData !== "string" ? stringData : stringToUint8Array(stringData);
     const discType = guessDiscTypeFromName(name);
     const config = new DiscConfig();
     config.expandTo80 = is40TrackLayout(discType, data, name, layout);
@@ -288,45 +288,3 @@ export function discFor(fdc, name, stringData, onChange, layout = DiscLayout.aut
     disc.setOriginalImageCrc32(data instanceof Uint8Array ? data : new Uint8Array(data));
     return disc;
 }
-
-/**
- * Create or open a disc held in the browser's local storage.
- * @param {Object} fdc - The FDC controller object
- * @param {string} name - The file name with extension
- * @param {string} [layout] - one of DiscLayout; by default the image is asked what it is
- * @param {function(*): void} [onSaveError] - called with whatever was thrown, the first time a write
- *   cannot be stored
- * @returns {Disc} The loaded disc object
- */
-export function localDisc(fdc, name, layout = DiscLayout.auto, onSaveError = () => {}) {
-    const discName = "disc_" + name;
-    let data;
-    const dataString = window.localStorage[discName];
-    if (!dataString) {
-        console.log("Creating browser-local disc " + name);
-        const discType = guessDiscTypeFromName(name);
-        if (!discType.byteSize) {
-            throw new Error(`Cannot create blank disc of type ${discType.extension} - unknown size`);
-        }
-        data = new Uint8Array(discType.byteSize);
-        if (discType.supportsCatalogue) {
-            discType.setDiscName(data, name);
-        }
-    } else {
-        console.log("Loading browser-local disc " + name);
-        data = utils.stringToUint8Array(dataString);
-    }
-    let reportedSaveError = false;
-    const onChange = (data) => {
-        try {
-            const str = utils.uint8ArrayToString(data);
-            window.localStorage.setItem(discName, str);
-        } catch (e) {
-            console.log(`Unable to save browser-local disc ${name}: ${e}`);
-            if (reportedSaveError) return;
-            reportedSaveError = true;
-            onSaveError(e);
-        }
-    };
-    return discFor(fdc, name, data, onChange, layout);
-}

package/src/filestore.js

@@ -1,10 +1,8 @@
 // Level-3 file server emulator ported from FSEM2
 // https://github.com/mmbeeb/FSEM
 
-"use strict";
-
 import { ReceiveBlock, EconetPacket } from "./econet.js";
-import * as utils from "./utils.js";
+import { loadData } from "./loader.js";
 
 export class Filestore {
     constructor(cpu, econet) {
@@ -306,22 +304,17 @@ export class Filestore {
         }
     }
 
-    reset() {
+    /** Resolves once the filestore code and its disc are loaded and in place. */
+    async reset() {
         console.log("Filestore: initialisation");
 
-        const filestoreRef = this;
-        utils.loadData("econet/L3FS.dat").then(function (data) {
-            filestoreRef.l3fs = data;
-            for (let i = 0; i < data.length; i++) {
-                filestoreRef.ram[0x400 + i] = data[i];
-            }
-            filestoreRef.PC = 0x400;
-            filestoreRef.SP = 0xff;
-            filestoreRef.A = 1;
-        });
-        utils.loadData("econet/scsi.dat").then(function (data) {
-            filestoreRef.scsi = data;
-        });
+        const [code, disc] = await Promise.all([loadData("econet/L3FS.dat"), loadData("econet/scsi.dat")]);
+        this.l3fs = code;
+        this.ram.set(code, 0x400);
+        this.PC = 0x400;
+        this.SP = 0xff;
+        this.A = 1;
+        this.scsi = disc;
     }
 
     polltime(cycles) {

package/src/hex.js

@@ -0,0 +1,38 @@
+export function parseAddr(s) {
+    if (s[0] === "$" || s[0] === "&") return parseInt(s.substring(1), 16);
+    if (s.indexOf("0x") === 0) return parseInt(s.substring(2), 16);
+    return parseInt(s, 16);
+}
+
+export function hexbyte(value) {
+    return ((value >>> 4) & 0xf).toString(16) + (value & 0xf).toString(16);
+}
+
+export function hexword(value) {
+    return hexbyte(value >>> 8) + hexbyte(value & 0xff);
+}
+
+export function hd(reader, start, end, opts) {
+    opts = opts || {};
+    const width = opts.width || 16;
+    const gap = opts.gap === undefined ? 8 : opts.gap;
+    const res = [];
+    let str = "";
+    let j = 0;
+    for (let i = start; i < end; ++i) {
+        str += " ";
+        str += hexbyte(reader(i));
+        if (++j === gap) str += " ";
+        if (j === width) {
+            res.push(str);
+            str = "";
+            j = 0;
+        }
+    }
+    if (str) res.push(str);
+    let joined = "";
+    for (let i = 0; i < res.length; ++i) {
+        joined += hexword(start + i * width) + " :" + res[i] + "\n";
+    }
+    return joined;
+}

package/src/index.js

@@ -0,0 +1,11 @@
+/**
+ * What jsbeeb offers a program that is not the web page: a machine to drive
+ * headless, the session the MCP server wraps around it, the models, and the
+ * pieces that describe and feed a machine. Electron starts from src/app/app.js
+ * through package.json's main; the page starts from src/main.js.
+ */
+export { MachineSession } from "./machine-session.js";
+export { TestMachine } from "./test-machine.js";
+export { allModels, findModel } from "./models.js";
+export { machineSpec, nullIo } from "./machine-spec.js";
+export { MediaResolver } from "./media-resolver.js";

package/src/intel-fdc.js

@@ -9,7 +9,7 @@ import { Disc, IbmDiscFormat } from "./disc.js";
 import { BaseDiscDrive, DiscDrive } from "./disc-drive.js";
 // eslint-disable-next-line no-unused-vars
 import { Scheduler } from "./scheduler.js";
-import * as utils from "./utils.js";
+import { hexbyte, hexword } from "./hex.js";
 
 // TODOs remaining for intel-fdc and related functionality
 // - support loading other disc formats
@@ -343,7 +343,7 @@ export class IntelFdc {
         // aka. late DMA, which will abort the command while NMI is asserted. We
         // therefore need to de-assert NMI so that the NMI for command completion
         // isn't lost.
-        // TODO(matt) - we don't model NMIs properly here, each device should have its own nmi line
+        // TODO(#1058) we don't model NMIs properly here, each device should have its own nmi line
         this._cpu.NMI(false);
     }
 
@@ -400,7 +400,7 @@ export class IntelFdc {
             case Address.unknown_read_3:
                 return this._regs[Registers.internalCountLsb];
             default:
-                throw new Error(`"Unexpected read of addr ${utils.hexword(addr)}"`);
+                throw new Error(`"Unexpected read of addr ${hexword(addr)}"`);
         }
     }
 
@@ -443,7 +443,7 @@ export class IntelFdc {
                 break;
             case 3:
             default:
-                this._log(`Not supported: ${utils.hexword(addr)}=${utils.hexbyte(val)}`);
+                this._log(`Not supported: ${hexword(addr)}=${hexbyte(val)}`);
         }
     }
 
@@ -516,7 +516,7 @@ export class IntelFdc {
             const data = this._mmioData;
             const pulses = IbmDiscFormat.fmTo2usPulses(clocks, data);
             if (clocks !== 0xff && clocks !== IbmDiscFormat.markClockPattern)
-                this._log(`writing unusual clocks=${utils.hexbyte(clocks)} data=${utils.hexbyte(data)}`);
+                this._log(`writing unusual clocks=${hexbyte(clocks)} data=${hexbyte(data)}`);
             this._currentDrive.writePulses(pulses);
         }
 
@@ -1058,7 +1058,7 @@ export class IntelFdc {
             status |= StatusFlag.resultReady;
         }
 
-        // TODO: "command register full", bit value 0x40, isn't understood. In
+        // TODO(#1060) "command register full", bit value 0x40, isn't understood. In
         // particular, the mode register (shared with the status register we
         // believe) is set to 0xC1 in typical operation. This would seem to raise
         // 0x40 after it has been lowered at command register acceptance. However,
@@ -1073,9 +1073,7 @@ export class IntelFdc {
     _commandWritten(command) {
         const status = this.internalStatus;
         if (status & StatusFlag.busy) {
-            this._log(
-                `command ${utils.hexbyte(command)} while busy with ${utils.hexbyte(this._regs[Registers.internalCommand])}`,
-            );
+            this._log(`command ${hexbyte(command)} while busy with ${hexbyte(this._regs[Registers.internalCommand])}`);
         }
 
         // Set command.
@@ -1125,7 +1123,7 @@ export class IntelFdc {
                 break;
             }
             case ParamAccept.specify: {
-                this._logCommand(`specify param ${utils.hexbyte(param)}`);
+                this._logCommand(`specify param ${hexbyte(param)}`);
                 this._writeRegister(this._regs[Registers.internalPointer], param);
                 ++this._regs[Registers.internalPointer];
                 if (--this._regs[Registers.internalParamCount] === 0) {
@@ -1155,7 +1153,7 @@ export class IntelFdc {
             case Registers.mmioData & 0x07:
                 return this._mmioData;
             default:
-                this._log(`direct read from MMIO register ${utils.hexbyte(reg)}`);
+                this._log(`direct read from MMIO register ${hexbyte(reg)}`);
                 break;
         }
         return 0;
@@ -1185,7 +1183,7 @@ export class IntelFdc {
                 this._mmioData = val;
                 break;
             default:
-                this._log(`direct write to MMIO register ${utils.hexbyte(reg)}`);
+                this._log(`direct write to MMIO register ${hexbyte(reg)}`);
                 break;
         }
     }
@@ -1430,13 +1428,13 @@ export class IntelFdc {
         commandReg &= ~(DriveOut.selectFlags | 0x03);
         this._regs[Registers.internalCommand] = commandReg;
         this._logCommand(
-            `command ${utils.hexbyte(origCommand & 0x3f)} ` +
-                `sel ${utils.hexbyte(selectBits)} ` +
-                `params ${utils.hexbyte(this._regs[Registers.internalParam_1])} ` +
-                `${utils.hexbyte(this._regs[Registers.internalParam_2])} ` +
-                `${utils.hexbyte(this._regs[Registers.internalParam_3])} ` +
-                `${utils.hexbyte(this._regs[Registers.internalParam_4])} ` +
-                `${utils.hexbyte(this._regs[Registers.internalParam_5])} ` +
+            `command ${hexbyte(origCommand & 0x3f)} ` +
+                `sel ${hexbyte(selectBits)} ` +
+                `params ${hexbyte(this._regs[Registers.internalParam_1])} ` +
+                `${hexbyte(this._regs[Registers.internalParam_2])} ` +
+                `${hexbyte(this._regs[Registers.internalParam_3])} ` +
+                `${hexbyte(this._regs[Registers.internalParam_4])} ` +
+                `${hexbyte(this._regs[Registers.internalParam_5])} ` +
                 `ptrk ${this._currentDrive ? this._currentDrive.track : -1} ` +
                 `hpos ${this._currentDrive ? this._currentDrive.headPosition : -1}`,
         );
@@ -1631,7 +1629,7 @@ export class IntelFdc {
 
     _lowerBusyAndLog() {
         this._statusLower(StatusFlag.busy);
-        this._logCommand(`status ${utils.hexbyte(this._status)} result ${utils.hexbyte(this._result)}`);
+        this._logCommand(`status ${hexbyte(this._status)} result ${hexbyte(this._result)}`);
     }
 
     _spinDown() {

package/src/jsbeeb.css

@@ -560,6 +560,39 @@ small {
   flex: none;
 }
 
+#header-bar .navbar-brand img {
+  display: block;
+}
+
+#header-bar [data-icon] > svg {
+  width: 1.15em;
+  height: 1.15em;
+  vertical-align: -0.2em;
+}
+
+/* Shrunk, the menu list wraps onto a second row; the promo yields instead, by truncating. */
+#header-bar .navbar-nav {
+  flex-shrink: 0;
+}
+
+#header-bar .navbar-text {
+  flex: 0 1 auto;
+  min-width: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+#paste-form {
+  flex: 1 0 6rem;
+  min-width: 0;
+  max-width: 14rem;
+}
+
+#paste-text {
+  min-width: 0;
+}
+
 /* The only item in the header with no bound on its width, so it is the one that yields. */
 #disc-name {
   flex: 1;

package/src/{utils_atom.js → keymap-atom.js}

@@ -1,21 +1,4 @@
-import { keyCodes, userKeymap } from "./utils.js";
-
-// Detect keyboard layout locally — mirrors the logic in utils.js but avoids
-// importing the non-exported isUKlayout. Should be replaced with an import
-// if utils.js ever exports it.
-function detectKeyboardLayout() {
-    if (typeof navigator === "undefined") return "UK";
-    if (typeof localStorage !== "undefined" && localStorage.keyboardLayout) {
-        return localStorage.keyboardLayout === "US" ? "US" : "UK";
-    }
-    if (navigator.language) {
-        if (navigator.language.toLowerCase() === "en-gb") return "UK";
-        if (navigator.language.toLowerCase() === "en-us") return "US";
-    }
-    return "UK";
-}
-
-const isUKlayout = detectKeyboardLayout() === "UK";
+import { detectKeyboardLayout, keyCodes, userKeymap } from "./keymap.js";
 
 // ATOM
 
@@ -228,6 +211,7 @@ export function stringToATOMKeys(str) {
 }
 
 export function getKeyMapAtom(keyLayout) {
+    const isUKlayout = detectKeyboardLayout() === "UK";
     const keys2 = [];
 
     // shift pressed