jsbeeb 1.24.0 → 1.24.1

package/package.json

@@ -7,7 +7,7 @@
   "name": "jsbeeb",
   "description": "Emulate a BBC Micro",
   "repository": "git@github.com:mattgodbolt/jsbeeb.git",
-  "version": "1.24.0",
+  "version": "1.24.1",
   "//engines": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
   "engines": {
     "node": ">=24.15.0"

package/src/fake6502.js

@@ -1,6 +1,6 @@
 // Fakes out various 6502s for testing purposes.
 
-import { FakeVideo } from "./video.js";
+import { FakeAtomVideo, FakeVideo } from "./video.js";
 import { FakeSoundChip } from "./soundchip.js";
 import { TEST_6502, TEST_65C02, TEST_65C12, tubeModelFor } from "./models.js";
 import { machineSpec, nullIo } from "./machine-spec.js";
@@ -11,7 +11,10 @@ const soundChip = new FakeSoundChip();
 export function fake6502(model, opts = {}) {
     model = model || TEST_6502;
     return new model.Cpu(model, {
-        ...nullIo({ video: opts.video ?? fakeVideo, soundChip: opts.soundChip ?? soundChip }),
+        ...nullIo({
+            video: opts.video ?? (model.isAtom ? new FakeAtomVideo() : fakeVideo),
+            soundChip: opts.soundChip ?? soundChip,
+        }),
         config: machineSpec({
             tube: opts.tube ? tubeModelFor(model) : null,
             tubeCpuMultiplier: opts.tubeCpuMultiplier,

package/src/models.js

@@ -50,8 +50,9 @@ class Model {
         this.stringToKeys = this.isAtom ? stringToATOMKeys : stringToBBCKeys;
         // The OS write-character vector, watched to capture what the machine prints.
         this.wrchvAddress = this.isAtom ? 0x0208 : 0x020e;
-        // Where the machine sits waiting for a key: the Atom kernel's read loop, or BASIC's.
-        this.idleAddress = this.isAtom ? 0xfe94 : isMaster ? 0xe7e6 : 0xe581;
+        // Where the machine sits waiting for a key: the Atom kernel's keyboard scan, which its
+        // line editor calls straight (the OSRDCH entry at $FE94 is only passed at boot), or BASIC's.
+        this.idleAddress = this.isAtom ? 0xfe71 : isMaster ? 0xe7e6 : 0xe581;
         // The Atom ROM polls its keyboard once per VSync, so pasted keys need longer apart.
         this.pasteKeyDelayMs = this.isAtom ? 80 : 50;
         // Two of those 60 Hz scans, 33 ms, with margin: the ROM wants a key seen up

package/src/test-machine.js

@@ -32,32 +32,6 @@ export class TestMachine {
     async initialise() {
         setNodeBasePath(RepoRoot);
         await this.processor.initialise();
-        if (this.model.isAtom) this._startAtomVSync();
-    }
-
-    /**
-     * The Atom ROM's main loop waits for VSync (bit 7 of Port C) to
-     * toggle before scanning the keyboard.  The MC6847 video chip drives
-     * this in the real emulator, but fake6502 doesn't create one, so we
-     * simulate it with a scheduler task at ~60 Hz (NTSC).
-     */
-    _startAtomVSync() {
-        const ppia = this.processor.atomppia;
-        const VsyncPeriod = 16667; // 1 MHz / 60 Hz (NTSC 262-line frame)
-        const VsyncPulse = 800;
-        let inVsync = false;
-        const task = this.processor.scheduler.newTask(() => {
-            if (!inVsync) {
-                ppia.setVBlankInt(1);
-                inVsync = true;
-                task.reschedule(VsyncPulse);
-            } else {
-                ppia.setVBlankInt(0);
-                inVsync = false;
-                task.reschedule(VsyncPeriod - VsyncPulse);
-            }
-        });
-        task.schedule(VsyncPeriod);
     }
 
     /**

package/src/video.js

@@ -1254,3 +1254,29 @@ export class FakeVideo {
 
     restoreState() {}
 }
+
+// The 6847's field as the PPIA sees it: 262 lines at 60Hz, with field sync low
+// for the 32 lines of flyback (see 6847.js).
+const AtomFieldCycles = 16667;
+const AtomFlybackCycles = Math.round((AtomFieldCycles * 32) / 262);
+
+/** No picture, but the field sync the Atom ROM waits on before each keyboard scan. */
+export class FakeAtomVideo extends FakeVideo {
+    reset(cpu) {
+        this.ppia = cpu.atomppia;
+        this.cycles = 0;
+        this.inFlyback = false;
+    }
+
+    polltime(cycles) {
+        this.cycles += cycles;
+        if (!this.inFlyback && this.cycles >= AtomFieldCycles - AtomFlybackCycles) {
+            this.inFlyback = true;
+            this.ppia.setVBlankInt(1);
+        } else if (this.inFlyback && this.cycles >= AtomFieldCycles) {
+            this.inFlyback = false;
+            this.cycles -= AtomFieldCycles;
+            this.ppia.setVBlankInt(0);
+        }
+    }
+}