jsbeeb 1.17.1 → 1.19.0

package/src/utils.js

@@ -1013,7 +1013,10 @@ function loadDataHttp(url) {
         request.open("GET", baseUrl + url, true);
         request.overrideMimeType("text/plain; charset=x-user-defined");
         request.onload = function () {
-            if (request.status !== 200) reject(new Error("Unable to load " + url + ", http code " + request.status));
+            if (request.status !== 200) {
+                reject(new Error("Unable to load " + url + ", http code " + request.status));
+                return;
+            }
             if (typeof request.response !== "string") {
                 resolve(request.response);
             } else {
@@ -1208,6 +1211,7 @@ async function unzipImage(data, knownExtensions) {
 
     let uncompressed = null;
     let loadedFile;
+    const ignored = [];
 
     for (const [filename, fileData] of Object.entries(files)) {
         const match = filename.match(/.*\.([a-z]+)/i);
@@ -1217,6 +1221,7 @@ async function unzipImage(data, knownExtensions) {
         }
         if (uncompressed) {
             console.log("Ignoring", filename, "as already found a file");
+            ignored.push(filename);
             continue;
         }
         loadedFile = filename;
@@ -1228,9 +1233,14 @@ async function unzipImage(data, knownExtensions) {
     }
 
     console.log("Unzipped '" + loadedFile + "'");
-    return { data: uncompressed, name: loadedFile };
+    return { data: uncompressed, name: loadedFile, ignored };
 }
 
+/**
+ * @param {Uint8Array|number[]} data a ZIP archive
+ * @returns {Promise<{data: Uint8Array, name: string, ignored: string[]}>} the one file loaded, and the
+ *     names of any other loadable files the archive held
+ */
 export async function unzipDiscImage(data) {
     return unzipImage(data, knownDiscExtensions);
 }
@@ -1290,4 +1300,11 @@ export class Fifo {
         this._size--;
         return res;
     }
+
+    /** @returns {number[]} pending bytes, oldest first */
+    toArray() {
+        const result = [];
+        for (let i = 0; i < this._size; ++i) result.push(this._buffer[(this._rPtr + i) % this._buffer.length]);
+        return result;
+    }
 }

package/src/via.js

@@ -24,6 +24,10 @@ const ORB = 0x0,
     INT_CB1 = 0x10,
     INT_CB2 = 0x08;
 
+// Pulse mode holds CA2/CB2 low for one 1MHz VIA cycle, here in the scheduler's 2MHz ticks.
+// Figures 3-4 and 3-6 of https://6502.org/documents/datasheets/wdc/wdc_w65c22s_mar_2004.pdf
+const PulseWidthCycles = 2;
+
 class Via {
     constructor(cpu, scheduler, irq) {
         this.cpu = cpu;
@@ -59,6 +63,8 @@ class Via {
         this.t1_pb7 = 0;
 
         this.task = this.scheduler.newTask(() => this._onTimeout());
+        this.ca2PulseTask = this.scheduler.newTask(() => this.setca2(true));
+        this.cb2PulseTask = this.scheduler.newTask(() => this.setcb2(true));
         this.lastPolltime = 0;
     }
 
@@ -72,6 +78,8 @@ class Via {
         this.t1hit = this.t2hit = true;
         this.acr = this.pcr = 0;
         this.t1_pb7 = 1;
+        this.ca2PulseTask.cancel();
+        this.cb2PulseTask.cancel();
         this.updateNextTime();
     }
 
@@ -166,7 +174,7 @@ class Via {
                 } else if (mode === 0x0a) {
                     // Pulse mode
                     this.setca2(false);
-                    this.setca2(true);
+                    this.ca2PulseTask.reschedule(PulseWidthCycles);
                 }
                 break;
 
@@ -193,7 +201,7 @@ class Via {
                 } else if (mode === 0x0a) {
                     // Pulse mode
                     this.setcb2(false);
-                    this.setcb2(true);
+                    this.cb2PulseTask.reschedule(PulseWidthCycles);
                 }
                 break;
 
@@ -408,6 +416,15 @@ class Via {
         this.portBUpdated();
     }
 
+    _taskOffset(task) {
+        return task.scheduled() ? task.expireEpoch - this.scheduler.epoch : null;
+    }
+
+    _restoreTask(task, offset) {
+        if (offset === null || offset === undefined) task.cancel();
+        else task.reschedule(offset);
+    }
+
     snapshotState() {
         return {
             ora: this.ora,
@@ -436,7 +453,9 @@ class Via {
             justhit: this.justhit,
             t1_pb7: this.t1_pb7,
             lastPolltime: this.lastPolltime,
-            taskOffset: this.task.scheduled() ? this.task.expireEpoch - this.scheduler.epoch : null,
+            taskOffset: this._taskOffset(this.task),
+            ca2PulseTaskOffset: this._taskOffset(this.ca2PulseTask),
+            cb2PulseTaskOffset: this._taskOffset(this.cb2PulseTask),
         };
     }
 
@@ -468,11 +487,9 @@ class Via {
         this.t1_pb7 = state.t1_pb7;
         this.lastPolltime = state.lastPolltime;
         this.updateIFR();
-        if (state.taskOffset !== null) {
-            this.task.reschedule(state.taskOffset);
-        } else {
-            this.task.cancel();
-        }
+        this._restoreTask(this.task, state.taskOffset);
+        this._restoreTask(this.ca2PulseTask, state.ca2PulseTaskOffset);
+        this._restoreTask(this.cb2PulseTask, state.cb2PulseTaskOffset);
     }
 
     setca1(level) {

package/src/web/audio-renderer.js

@@ -3,21 +3,26 @@
 const lowPassFilterFreq = sampleRate / 2;
 const RC = 1 / (2 * Math.PI * lowPassFilterFreq);
 
+const InputSampleRate = 4000000.0 / 8;
+const MaxQueuedMs = 250;
+
+const samplesFor = (ms) => (InputSampleRate * ms) / 1000;
+
 class SoundChipProcessor extends AudioWorkletProcessor {
     constructor(...args) {
         super(...args);
 
-        this.inputSampleRate = 4000000.0 / 8;
+        this.inputSampleRate = InputSampleRate;
         this._lastSample = 0;
         this._lastFilteredOutput = 0;
         this.queue = [];
-        this._queueSizeBytes = 0;
+        this._queueSizeSamples = 0;
         this.dropped = 0;
         this.underruns = 0;
         this.targetLatencyMs = 1000 * (1 / 50); // One frame
-        this.startQueueSizeBytes = this.inputSampleRate / this.targetLatencyMs / 2;
+        this.startQueueSizeSamples = samplesFor(this.targetLatencyMs);
         this.running = false;
-        this.maxQueueSizeBytes = this.inputSampleRate * 0.25;
+        this.maxQueueSizeSamples = samplesFor(MaxQueuedMs);
         this.port.onmessage = (event) => {
             // TODO: even better than this, send over register settings/catch up and run the audio work _here_
             this.onBuffer(event.data.time, event.data.buffer);
@@ -47,19 +52,19 @@ class SoundChipProcessor extends AudioWorkletProcessor {
 
     onBuffer(time, buffer) {
         this.queue.push({ offset: 0, time, buffer });
-        this._queueSizeBytes += buffer.length;
+        this._queueSizeSamples += buffer.length;
         this.cleanQueue();
-        if (!this.running && this._queueSizeBytes >= this.startQueueSizeBytes) this.running = true;
+        if (!this.running && this._queueSizeSamples >= this.startQueueSizeSamples) this.running = true;
     }
 
     _shift() {
         const dropped = this.queue.shift();
-        this._queueSizeBytes -= dropped.buffer.length;
+        this._queueSizeSamples -= dropped.buffer.length;
     }
 
     cleanQueue() {
         const maxLatency = this.targetLatencyMs * 2;
-        while (this._queueSizeBytes > this.maxQueueSizeBytes || this._queueAge() > maxLatency) {
+        while (this._queueSizeSamples > this.maxQueueSizeSamples || this._queueAge() > maxLatency) {
             this._shift();
             this.dropped++;
         }

package/tests/test-machine.js

@@ -111,7 +111,9 @@ export class TestMachine {
                     stopped = !this.processor.execute(todo);
                     left -= todo;
                 }
-                if (left && !stopped) {
+                // Not truthiness: a negative or NaN request clamps todo to zero,
+                // so left would never move and the loop never end.
+                if (left > 0 && !stopped) {
                     setTimeout(runAnIter, 0);
                 } else {
                     resolve(stopped);
@@ -136,17 +138,13 @@ export class TestMachine {
         throw new Error(`Cursor did not reach state ${on} in time (cursorOnThisFrame=${video.cursorOnThisFrame})`);
     }
 
-    /**
-     * Run until the teletext flash state reaches the desired phase.
-     * @param {boolean} on - true for flash-on (flashing cells blanked), false for flash-off
-     */
-    async runToFlashState(on) {
+    async runUntilFlashHidden() {
         const teletext = this.processor.video.teletext;
         for (let i = 0; i < 100; i++) {
-            if (teletext.flashOn === on) return;
+            if (teletext.hideFlashing) return;
             await this.runFor(40000);
         }
-        throw new Error(`Flash did not reach state ${on} in time (flashOn=${teletext.flashOn})`);
+        throw new Error("Flashing text did not reach its hidden phase in time");
     }
 
     async runUntilVblank() {