jsbeeb 1.13.1 → 1.15.0

package/README.md

@@ -11,6 +11,7 @@ different peripherals.
 ## Table of Contents
 
 - [Keyboard Mappings](#keyboard-mappings)
+- [Remapping Keys](#remapping-keys)
 - [Emulator Shortcuts](#emulator-shortcuts)
 - [Save State and Rewind](#save-state-and-rewind)
 - [Getting Set Up to Run Locally](#getting-set-up-to-run-locally)
@@ -36,6 +37,65 @@ The BBC had a somewhat different-looking keyboard to a modern PC, and so it's us
 To play right now, visit [https://bbc.xania.org/](https://bbc.xania.org/). To load the default disc image (Elite in this
 case), press shift-F12 (which is shift-Break on the BBC).
 
+### Remapping Keys
+
+Plenty of games use keys that are awkward on a modern keyboard: `COPY` (which is `End`, or `fn`+`→` on a Mac), or
+`CAPS LOCK` (which on a Mac toggles rather than acting as a key you hold down). Any host key can be made to press any
+BBC key by adding a `KEY.` parameter to the URL:
+
+```
+KEY.<host key>=<BBC key>
+```
+
+Add one for each key you want to change. For example, Superior Software's Space Invaders fires with `COPY`; this makes
+`Enter` fire instead:
+
+[`https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&KEY.ENTER=COPY`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FSpaceInvaders-Superior.zip&autoboot&KEY.ENTER=COPY)
+
+Superior's Frogger uses `A`/`Z`/`DELETE`/`COPY` to move; this puts it on the arrow keys:
+
+[`https://bbc.xania.org/?disc1=sth:Superior/Frogger-Superior.zip&autoboot&KEY.UP=A&KEY.DOWN=Z&KEY.LEFT=DELETE&KEY.RIGHT=COPY`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FFrogger-Superior.zip&autoboot&KEY.UP=A&KEY.DOWN=Z&KEY.LEFT=DELETE&KEY.RIGHT=COPY)
+
+And Superior's Hunchback steers with `CAPS LOCK` and `CTRL`, which the arrow keys can stand in for:
+
+[`https://bbc.xania.org/?disc1=sth:Superior/Hunchback-Superior.zip&autoboot&KEY.LEFT=CAPSLOCK&KEY.RIGHT=CTRL`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FHunchback-Superior.zip&autoboot&KEY.LEFT=CAPSLOCK&KEY.RIGHT=CTRL)
+
+The **host key** names are jsbeeb's names for the keys on your own keyboard. Most are what you'd expect, but note:
+
+- `ENTER` (the BBC's `RETURN` key is called `ENTER` on the host side)
+- `K0` to `K9` for the number keys, `NUMPAD0` to `NUMPAD9` for the keypad
+- `SHIFT_LEFT` / `SHIFT_RIGHT`, `CTRL_LEFT` / `CTRL_RIGHT`, `ALT_LEFT` / `ALT_RIGHT` to distinguish the two of each
+- `BACK_QUOTE`, `APOSTROPHE`, `SEMICOLON`, `MINUS`, `EQUALS`, `HASH`, `BACKSLASH`, `LEFT_SQUARE_BRACKET`,
+  `RIGHT_SQUARE_BRACKET` for punctuation
+
+The **BBC key** names are:
+
+```
+RETURN COPY DELETE ESCAPE TAB SPACE SHIFT SHIFTLOCK CAPSLOCK CTRL
+LEFT RIGHT UP DOWN
+A-Z, K0-K9 (the number keys), F0-F9 (the red function keys)
+SEMICOLON_PLUS MINUS COMMA PERIOD SLASH AT COLON_STAR HAT_TILDE
+UNDERSCORE_POUND PIPE_BACKSLASH LEFT_SQUARE_BRACKET RIGHT_SQUARE_BRACKET
+
+(and, on the Master's numeric keypad only)
+NUMPAD0-NUMPAD9 NUMPADPLUS NUMPADMINUS NUMPADSLASH NUMPADASTERISK NUMPADCOMMA
+NUMPADHASH NUMPADENTER NUMPAD_DELETE NUMPAD_DECIMAL_POINT
+```
+
+Some things to know:
+
+- Names are case-insensitive, and a remapped key ignores the `SHIFT` state, so `KEY.ENTER=COPY` presses `COPY` whether
+  or not shift is held.
+- Remapping replaces what that host key normally does; in the Space Invaders example above, `Enter` no longer presses
+  `RETURN`.
+- The remapping is applied on top of whichever keyboard layout is selected, and survives changing layout or model.
+- If a name isn't recognised the mapping is skipped, and the emulator says so on startup, naming the parameter that
+  was at fault.
+- On the Atom, use the Atom's own key names (`LOCK`, `UP_DOWN`, `LEFT_RIGHT` and so on) rather than the BBC's.
+
+The definitive lists are `keyCodes` (host) and `BBC` (BBC micro) in [`src/utils.js`](src/utils.js), and `ATOM` in
+[`src/utils_atom.js`](src/utils_atom.js).
+
 ### Emulator Shortcuts
 
 | Shortcut       | Action                          |
@@ -63,6 +123,35 @@ jsbeeb supports both USB/Bluetooth gamepads and mouse-based analogue joystick em
 - X-axis: Left = 65535, Right = 0
 - Y-axis: Up = 65535, Down = 0
 
+A gamepad presses BBC keys, and which key each control presses can be changed from the URL in the same way as
+[remapping the keyboard](#remapping-keys):
+
+```
+GP.<gamepad control>=<BBC key>
+```
+
+By default the D-pad presses the "Snapper" keys (`Z`, `X`, `:`, `/`), the `A` button presses `RETURN` and `Start`
+presses `SPACE`. To play Superior's Space Invaders on a pad, where `COPY` fires:
+
+[`https://bbc.xania.org/?disc1=sth:Superior/SpaceInvaders-Superior.zip&autoboot&GP.FIRE=COPY`](https://bbc.xania.org/?disc1=sth%3ASuperior%2FSpaceInvaders-Superior.zip&autoboot&GP.FIRE=COPY)
+
+The gamepad control names are:
+
+- `FIRE` — every button at once, which is usually what you want for a one-button game
+- `UP` `DOWN` `LEFT` `RIGHT` — both analogue sticks at once, plus one face button each (`UP` is also `A`, `DOWN` is
+  `X`, `LEFT` is `Y`, `RIGHT` is `B`)
+- `UP1` `DOWN1` `LEFT1` `RIGHT1` — the left stick only; `UP2` `DOWN2` … — the right stick only; `UP3` `DOWN3` … — the
+  face buttons only
+- `A` `B` `X` `Y` `START` `BACK` `LB` `RB` `LT` `RT` — individual buttons, by their Xbox 360 names
+- `FIRE1` `FIRE2` — clicking the left and right sticks
+
+The BBC key names are the same as for the keyboard, and digits may be written either way round: `GP.A=1` and `GP.A=K1`
+both press `1`. Unlike `KEY.`, gamepad mappings are BBC-only: there's no Atom equivalent. The D-pad's default mapping
+can't currently be changed.
+
+The older `LEFT=`, `RIGHT=`, `UP=`, `DOWN=` and `FIRE=` parameters (no `GP.` prefix) still work and mean the same
+thing.
+
 ## Getting Set Up to Run Locally
 
 ### Prerequisites
@@ -157,6 +246,8 @@ sudo rpm -i out/dist/jsbeeb-1.0.1.x86_64.rpm
 - `disc1=sth:ZZZ` - loads disc ZZZ from the Stairway to Hell archive
 - `tape=XXX` - loads tape XXX (from the `tapes/` directory)
 - `tape=sth:ZZZ` - loads tape ZZZ from the Stairway to Hell archive
+- `KEY.X=Y` - makes host key `X` press BBC key `Y`, e.g. `KEY.ENTER=COPY`. See
+  [Remapping Keys](#remapping-keys).
 - `patch=P` - applies a memory patch `P`. See below.
 - `loadBasic=X` - loads 'X' (a resource on the webserver) as text, tokenises it and puts it in `PAGE` as if you'd typed
   it in to the emulator
@@ -167,8 +258,12 @@ sudo rpm -i out/dist/jsbeeb-1.0.1.x86_64.rpm
 - `autotype` - types whatever you put after. e.g. `&autotype=PRINT"Matt is cool"%0a` (return is URI escaped to `%0a`)
 - `embed` - Remove the margins around the screen, hide most navigation entries and make the page background
   transparent (intended for use when running within an iframe in a third-party site).
-- `cpuMultiplier=X` speeds up the CPU by a factor of `X`. May be fractional or below one to slow the CPU down. NB disc
-  loads become unreliable with a too-slow CPU, and running too fast might cause the browser to hang.
+- `cpuMultiplier=X` speeds up the CPU by a factor of `X` relative to the peripherals: video, sound and the VIAs keep
+  running at their real-world rates. May be fractional or below one to slow the CPU down. NB disc loads become
+  unreliable with a too-slow CPU, and running too fast might cause the browser to hang.
+- `tubeCpuMultiplier=X` overclocks the second processor by a factor of `X`, which may be fractional. `1`, the default,
+  runs it at the real part's own clock: 3MHz for the 6502 second processor a BBC B takes, 4MHz for the 65C102 Turbo
+  board a Master takes. Below about 2.2MHz the MOS's unhandshaken tube transfers lose data.
 - `sbLeft` / `sbRight` / `sbBottom` - a URL to place left of, right of, or below the cub monitor. The left and right
   should be around 648 high and the bottom image should be around 896 wide. Left and right wider than 300 will run into
   problems on smaller screens; bottom taller than 100 or so similarly.

package/package.json

@@ -7,10 +7,10 @@
   "name": "jsbeeb",
   "description": "Emulate a BBC Micro",
   "repository": "git@github.com:mattgodbolt/jsbeeb.git",
-  "version": "1.13.1",
-  "//": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
+  "version": "1.15.0",
+  "//engines": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=24.15.0"
   },
   "type": "module",
   "main": "./src/app/app.js",
@@ -27,33 +27,37 @@
   ],
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "argparse": "^2.0.1",
+    "argparse": "^3.0.0",
     "bootstrap": "^5.3.8",
     "bootswatch": "^5.3.8",
-    "sharp": "^0.34.5",
+    "sharp": "^0.35.3",
     "smoothie": "^1.36.1"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@vitest/coverage-v8": "^4.0.18",
-    "eslint": "^10.2.0",
+    "eslint": "^10.7.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.5",
-    "globals": "^17.5.0",
+    "eslint-plugin-prettier": "^5.5.6",
+    "globals": "^17.7.0",
     "husky": "^9.1.7",
-    "jsdom": "^29.0.2",
-    "lint-staged": "^16.4.0",
-    "npm-run-all2": "^8.0.4",
-    "pixelmatch": "^7.1.0",
-    "prettier": "^3.8.2",
-    "vite": "^8.0.8",
+    "jsdom": "^30.0.1",
+    "lint-staged": "^17.1.1",
+    "npm-run-all2": "^9.0.2",
+    "pixelmatch": "^7.2.0",
+    "prettier": "^3.9.6",
+    "vite": "^8.1.5",
     "vitest": "^4.0.10"
   },
   "optionalDependencies": {
-    "electron": "^41.2.0",
-    "electron-builder": "^26.8.1",
+    "electron": "^43.2.0",
+    "electron-builder": "^26.15.3",
     "electron-store": "^11.0.2"
   },
+  "//overrides": "brace-expansion forced to the patched version for GHSA-mh99-v99m-4gvg; the electron-builder dependency chain still pins vulnerable versions. Remove once `npm audit` is clean without it.",
+  "overrides": {
+    "brace-expansion": "^5.0.8"
+  },
   "license": "GPL-3.0-or-later",
   "build": {
     "appId": "org.godbolt.bbc",
@@ -108,5 +112,8 @@
       "prettier --write"
     ],
     "*.{md,json,yml,yaml,css,html}": "prettier --write"
+  },
+  "allowScripts": {
+    "electron-winstaller@5.4.0": true
   }
 }

package/src/6502.js

@@ -407,11 +407,14 @@ class Base6502 {
 }
 
 class Tube6502 extends Base6502 {
-    constructor(model, cpu) {
+    constructor(model, cpu, { cpuMultiplier = 1 } = {}) {
         super(model, { cycleAccurate: false });
 
+        if (!(cpuMultiplier > 0)) throw new Error(`Tube CPU multiplier must be positive, got ${cpuMultiplier}`);
+
         this.cycles = 0;
-        this.cpuMultiplier = 2;
+        this.cyclesPerHostCycle = model.clockMhz / cpu.model.clockMhz;
+        this.cpuMultiplier = cpuMultiplier;
         this.romPaged = true;
         this.memory = new Uint8Array(65536);
         this.rom = new Uint8Array(4096);
@@ -424,6 +427,10 @@ class Tube6502 extends Base6502 {
         this.pc = this.readmem(0xfffc) | (this.readmem(0xfffd) << 8);
         this.p.i = true;
         this.s = (this.s - 3) & 0xff; // Simulate 3 dummy pushes during reset
+        // A latched NMI would otherwise survive the reset and be taken on the first instruction
+        // after it, defeating the empty R3 FIFO the ULA seeds for exactly that reason.
+        this._nmiLevel = this._nmiEdge = false;
+        this.takeInt = false;
         this.tube.reset(hard);
     }
 
@@ -472,7 +479,7 @@ class Tube6502 extends Base6502 {
     }
 
     execute(cycles) {
-        this.cycles += (cycles * this.cpuMultiplier) | 0;
+        this.cycles += cycles * this.cyclesPerHostCycle * this.cpuMultiplier;
         if (this.cycles < 3) return;
         while (this.cycles > 0) {
             const opcode = this.readmem(this.pc);
@@ -482,6 +489,46 @@ class Tube6502 extends Base6502 {
         }
     }
 
+    snapshotState({ includeRoms = false } = {}) {
+        return {
+            a: this.a,
+            x: this.x,
+            y: this.y,
+            s: this.s,
+            pc: this.pc,
+            p: this.p.asByte(),
+            nmiLevel: this._nmiLevel,
+            nmiEdge: this._nmiEdge,
+            takeInt: this.takeInt,
+            // The parasite has no scheduler of its own, so this is not relative to any epoch.
+            cycles: this.cycles,
+            romPaged: this.romPaged,
+            memory: this.memory.slice(),
+            rom: includeRoms ? this.rom.slice() : undefined,
+            ula: this.tube.snapshotState(),
+        };
+    }
+
+    restoreState(state) {
+        this.a = state.a;
+        this.x = state.x;
+        this.y = state.y;
+        this.s = state.s;
+        this.pc = state.pc;
+        this.p.setFromByte(state.p);
+        this._nmiLevel = state.nmiLevel;
+        this._nmiEdge = state.nmiEdge;
+        this.takeInt = state.takeInt;
+        this.cycles = state.cycles;
+        this.romPaged = state.romPaged;
+        this.memory.set(state.memory);
+        if (state.rom) this.rom.set(state.rom);
+
+        // After the registers, so the edge-triggered NMI moves from its saved level to the one
+        // the ULA implies: no edge if they agree, and the edge it is owed if they do not.
+        this.tube.restoreState(state.ula);
+    }
+
     async loadOs() {
         console.log("Loading tube rom from roms/" + this.model.os);
         const tubeRom = this.rom;
@@ -620,10 +667,13 @@ export class Cpu6502 extends Base6502 {
         this.cpuMultiplier = this.config.cpuMultiplier;
         this.videoCyclesBatch = this.config.videoCyclesBatch | 0;
         this.peripheralCyclesPerSecond = 2 * 1000 * 1000;
-        this.tube = model.tube ? new Tube6502(model.tube, this) : new FakeTube();
-        if (model.tube && this.config.tubeCpuMultiplier) {
-            this.tube.cpuMultiplier = this.config.tubeCpuMultiplier;
-        }
+        this.hasTube = !!this.config.tube;
+        this.hasMusic5000 = !!this.config.hasMusic5000;
+        this.hasTeletextAdaptor = !!this.config.hasTeletextAdaptor;
+        this.teletextAdaptor = this.hasTeletextAdaptor ? new TeletextAdaptor(this) : null;
+        this.tube = this.hasTube
+            ? new Tube6502(this.config.tube, this, { cpuMultiplier: this.config.tubeCpuMultiplier })
+            : new FakeTube();
         this.music5000PageSel = 0;
         this.econet = econet;
 
@@ -648,7 +698,7 @@ export class Cpu6502 extends Base6502 {
             getGamepads: this.config.getGamepads,
         });
         this.uservia = new via.UserVia(this, this.scheduler, this.model.isMaster, this.config.userPort);
-        this.acia = new Acia(this, this.soundChip.toneGenerator, this.scheduler, this.touchScreen, this.relayNoise);
+        this.acia = new Acia(this, this.soundChip.toneGenerator, this.scheduler, this.relayNoise);
         this.serial = new Serial(this.acia);
         this.adconverter = new Adc(this.sysvia, this.scheduler);
         this.soundChip.setScheduler(this.scheduler);
@@ -799,7 +849,7 @@ export class Cpu6502 extends Base6502 {
 
         switch (addr & ~0x0003) {
             case 0xfc10:
-                if (this.model.hasTeletextAdaptor) return this.teletextAdaptor.read(addr - 0xfc10);
+                if (this.hasTeletextAdaptor) return this.teletextAdaptor.read(addr - 0xfc10);
                 break;
             case 0xfc20:
             case 0xfc24:
@@ -822,7 +872,7 @@ export class Cpu6502 extends Base6502 {
                 // IDE
                 break;
             case 0xfcfc:
-                if (addr === 0xfcff && this.model.hasMusic5000) return this.music5000PageSel;
+                if (addr === 0xfcff && this.hasMusic5000) return this.music5000PageSel;
                 break;
             case 0xfe00:
             case 0xfe04:
@@ -909,7 +959,7 @@ export class Cpu6502 extends Base6502 {
                 return this.tube.read(addr);
         }
 
-        if (this.model.hasMusic5000) {
+        if (this.hasMusic5000) {
             if ((this.music5000PageSel & 0xf0) === 0x30 && (addr & 0xff00) === 0xfd00) {
                 return this.music5000.read(this.music5000PageSel, addr);
             }
@@ -966,14 +1016,14 @@ export class Cpu6502 extends Base6502 {
         addr &= 0xffff;
         b |= 0;
 
-        if (this.model.hasMusic5000 && (addr & 0xff00) === 0xfd00 && (this.music5000PageSel & 0xf0) === 0x30) {
+        if (this.hasMusic5000 && (addr & 0xff00) === 0xfd00 && (this.music5000PageSel & 0xf0) === 0x30) {
             this.music5000.write(this.music5000PageSel, addr, b);
             return;
         }
 
         switch (addr & ~0x0003) {
             case 0xfc10:
-                if (this.model.hasTeletextAdaptor) return this.teletextAdaptor.write(addr - 0xfc10, b);
+                if (this.hasTeletextAdaptor) return this.teletextAdaptor.write(addr - 0xfc10, b);
                 break;
             case 0xfc20:
             case 0xfc24:
@@ -996,7 +1046,7 @@ export class Cpu6502 extends Base6502 {
                 // IDE
                 break;
             case 0xfcfc:
-                if (addr === 0xfcff && this.model.hasMusic5000) {
+                if (addr === 0xfcff && this.hasMusic5000) {
                     this.music5000PageSel = b;
                 }
                 break;
@@ -1183,6 +1233,7 @@ export class Cpu6502 extends Base6502 {
             acia: this.acia.snapshotState(),
             adc: this.adconverter.snapshotState(),
             fdc: this.fdc.snapshotState(),
+            tube: this.hasTube ? this.tube.snapshotState({ includeRoms }) : undefined,
         };
     }
 
@@ -1243,6 +1294,13 @@ export class Cpu6502 extends Base6502 {
         if (state.fdc) {
             this.fdc.restoreState(state.fdc);
         }
+
+        // Tube state (v3+). Rather than leave the parasite running on state the host knows
+        // nothing about, reset it; restoreSnapshot() rejects such a pairing before reaching here.
+        if (this.hasTube) {
+            if (state.tube) this.tube.restoreState(state.tube);
+            else this.tube.reset(true);
+        }
     }
 
     reset(hard) {
@@ -1304,7 +1362,6 @@ export class Cpu6502 extends Base6502 {
         this.adconverter.reset();
 
         this.touchScreen = new TouchScreen(this.scheduler);
-        if (this.model.hasTeletextAdaptor) this.teletextAdaptor = new TeletextAdaptor(this);
         if (this.econet) this.filestore = new Filestore(this, this.econet);
     }
 
@@ -1364,7 +1421,7 @@ export class Cpu6502 extends Base6502 {
     // Builds common code between polltimeSlow and polltimeFast
     buildPolltime() {
         const nop = (_cycles) => {};
-        const tubeStuff = (cycles) => (this.model.tube ? this.tube.execute(cycles) : nop);
+        const tubeStuff = this.hasTube ? (cycles) => this.tube.execute(cycles) : nop;
         const teletextStuff = this.teletextAdaptor ? (cycles) => this.teletextAdaptor.polltime(cycles) : nop;
         const musicStuff = this.music5000 ? (cycles) => this.music5000.polltime(cycles) : nop;
         const econetStuff = this.econet
@@ -1506,7 +1563,7 @@ export class Cpu6502 extends Base6502 {
         if (this.model.os.length) {
             await this.loadOs.apply(this, this.model.os);
         }
-        if (this.model.tube) {
+        if (this.hasTube) {
             await this.tube.loadOs();
         }
         this.reset(true);

package/src/acia.js

@@ -5,10 +5,10 @@
 // http://www.classiccmp.org/dunfield/r/6850.pdf
 
 export class Acia {
-    constructor(cpu, toneGen, scheduler, rs423Handler, relayNoise) {
+    constructor(cpu, toneGen, scheduler, relayNoise) {
         this.cpu = cpu;
         this.toneGen = toneGen;
-        this.rs423Handler = rs423Handler;
+        this.rs423Handler = null;
         this.relayNoise = relayNoise;
 
         this.sr = 0x00;
@@ -22,17 +22,27 @@ export class Acia {
         this.hadDcdHigh = false;
         this.serialReceiveRate = 0;
         this.serialReceiveCyclesPerByte = 0;
+        this.serialTransmitRate = 0;
+        this.serialTransmitCyclesPerByte = 0;
 
         this.setSerialReceive(19200);
+        this.setSerialTransmit(19200);
         this.txCompleteTask = scheduler.newTask(() => {
             this.sr |= 0x02; // set the TDRE
+            this.updateIrq();
         });
         this.runTapeTask = scheduler.newTask(() => this.runTape());
         this.runRs423Task = scheduler.newTask(() => this.runRs423());
     }
 
+    // MC6850: the transmit interrupt is selected by CR6:CR5 = 01 and follows
+    // TDRE, which a high CTS inhibits.
+    txIrq() {
+        return (this.cr & 0x60) === 0x20 && (this.sr & 0x0a) === 0x02;
+    }
+
     updateIrq() {
-        if (this.sr & this.cr & 0x80) {
+        if (this.sr & this.cr & 0x80 || this.txIrq()) {
             this.cpu.interrupt |= 0x04;
         } else {
             this.cpu.interrupt &= ~0x04;
@@ -77,6 +87,7 @@ export class Acia {
             return this.dr;
         } else {
             let result = (this.sr & 0x7f) | (this.sr & this.cr & 0x80);
+            if (this.txIrq()) result |= 0x80;
             // MC6850: "A low CTS indicates that there is a Clear-to-Send
             // from the modem. In the high state, the Transmit Data Register
             // Empty bit is inhibited".
@@ -100,10 +111,7 @@ export class Acia {
     write(addr, val) {
         if (addr & 1) {
             this.sr &= ~0x02;
-            // It's not clear how long this can take; it's when the shift register is loaded.
-            // That could be straight away if not already tx-ing, but as we don't really tx,
-            // be conservative here.
-            this.txCompleteTask.reschedule(2000);
+            this.txCompleteTask.reschedule(this.serialTransmitCyclesPerByte);
             this.updateIrq();
             if (this.rs423Selected && this.rs423Handler) this.rs423Handler.onTransmit(val);
         } else {
@@ -114,6 +122,8 @@ export class Acia {
             } else {
                 this.cr = val;
                 this.setSerialReceive(this.serialReceiveRate);
+                this.setSerialTransmit(this.serialTransmitRate);
+                this.updateIrq();
             }
         }
     }
@@ -212,7 +222,7 @@ export class Acia {
             tapeDcdLineLevel: this.tapeDcdLineLevel,
             hadDcdHigh: this.hadDcdHigh,
             serialReceiveRate: this.serialReceiveRate,
-            serialReceiveCyclesPerByte: this.serialReceiveCyclesPerByte,
+            serialTransmitRate: this.serialTransmitRate,
             txCompleteTaskOffset: this.txCompleteTask.scheduled()
                 ? this.txCompleteTask.expireEpoch - scheduler.epoch
                 : null,
@@ -230,8 +240,10 @@ export class Acia {
         this.tapeCarrierCount = state.tapeCarrierCount;
         this.tapeDcdLineLevel = state.tapeDcdLineLevel;
         this.hadDcdHigh = state.hadDcdHigh;
-        this.serialReceiveRate = state.serialReceiveRate;
-        this.serialReceiveCyclesPerByte = state.serialReceiveCyclesPerByte;
+        // The byte times are derived from the rates and the restored word format, not saved.
+        this.setSerialReceive(state.serialReceiveRate);
+        // Snapshots predating transmit timing have no saved rate.
+        this.setSerialTransmit(state.serialTransmitRate ?? 19200);
         this.updateIrq();
 
         this.txCompleteTask.cancel();
@@ -294,7 +306,8 @@ export class Acia {
                 parityBits = 1;
                 break;
         }
-        return wordLength + stopBits + parityBits;
+        const startBits = 1;
+        return startBits + wordLength + stopBits + parityBits;
     }
 
     rts() {
@@ -307,6 +320,11 @@ export class Acia {
         this.serialReceiveCyclesPerByte = this.secondsToCycles(this.numBitsPerByte() / rate);
     }
 
+    setSerialTransmit(rate) {
+        this.serialTransmitRate = rate;
+        this.serialTransmitCyclesPerByte = this.secondsToCycles(this.numBitsPerByte() / rate);
+    }
+
     runTape() {
         if (this.tape) this.runTapeTask.reschedule(this.tape.poll(this));
     }