badline 0.15.0 → 0.16.0

data/doc/snapshot-format.md

@@ -22,16 +22,16 @@ key only some of them have names them.
 
 ## BL-MACHINE
 
-Written by the C64, VIC-20, C128, Plus/4.
+Written by the C64, VIC-20, C128, Plus/4, PET.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `family` | text: c64 vic20 c128 plus4 | "c64" |
+| `family` | text: c64 vic20 c128 plus4 pet | "c64" |
 | `region` | text: pal ntsc ntscold drean | C64: "pal" |
 | `vic_model` | text: mos6569 mos8565 mos8566 mos8564 | C64: "mos6569" |
 | `cia_model` | text: mos6526 mos6526a | C64: "mos6526" |
 | `sid_model` | text: mos6581 mos8580 | C64: "mos6581"; C128: "mos6581" |
-| `ram_expansion` | text: none plus60k plus256k | C64: "none" |
+| `ram_expansion` | text: none plus60k plus256k | C64: "none"; Plus/4: "none" |
 | `reu_kb` | int | C64: 0 |
 | `kernal` | text: c64 sx64 pet64 gs | C64: "c64" |
 | `datasette` | bool | C64: true |
@@ -49,7 +49,7 @@ Written by the C64, VIC-20, C128, Plus/4.
 | `ram` | text: unexpanded 3k 8k 16k 24k 32k all | VIC-20: "unexpanded" |
 | `bus.data` | byte | VIC-20: 253; C128: 255 |
 | `bus.video_data` | byte | VIC-20: 0 |
-| `model` | text: c128 c128ntsc c128dcr c128dcrntsc | C128: "c128"; Plus/4: "plus4" |
+| `model` | text: c128 c128ntsc c128dcr c128dcrntsc | C128: "c128"; Plus/4: "plus4"; PET: "8032" |
 | `mode` | text: c64 c128 | C128: "c64" |
 | `bus.address` | word | C128: 65533 |
 | `clock_bits` | int | C128: 0 |
@@ -61,20 +61,32 @@ Written by the C64, VIC-20, C128, Plus/4.
 | `host.typist.code` | int, optional | C128: absent |
 | `host.typist.wait` | int | C128: 0 |
 | `host.typist.typing` | bool | C128: false |
-| `ram_kb` | int | Plus/4: 64 or 16 |
+| `ram_kb` | int | Plus/4: 64 or 16; PET: 32 or 8 |
+| `sid_card` | text: none mos6581 mos8580 | Plus/4: "none" |
 | `tcbm` | bool | Plus/4: false |
+| `sid_card_address` | int | Plus/4: 64832 |
+| `host.true_drive_model` | text: 1541 1551 | Plus/4: "1551" |
+| `refresh_hz` | int | PET: 50 or 60 |
+| `rom.basic` | text | PET: "pet/basic4.rom" or "pet/basic1.rom" |
+| `rom.editor` | text | PET: "pet/editor4-80-b-50hz.rom" or "pet/editor1.rom" |
+| `rom.kernal` | text | PET: "pet/kernal4.rom" or "pet/kernal1.rom" |
+| `rom.characters` | text | PET: "pet/characters2.rom" or "pet/characters1.rom" |
+| `vertical_drive` | bool | PET: true |
 
 ## BL-RAM
 
-Written by the C64, VIC-20, C128, Plus/4.
+Written by the C64, VIC-20, C128, Plus/4, PET.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `ram` | bytes | C64: 65536 values; VIC-20: 49152 values; C128: 131072 values; Plus/4: 65536 × 0 or 16384 × 0 |
+| `ram` | bytes | C64: 65536 values; VIC-20: 49152 values; C128: 131072 values; Plus/4: 65536 × 0 or 16384 × 0; PET: 32768 × 0 or 8192 × 0 |
 | `bus.low_bank` | int & 0x3 | Plus/4: 0 |
 | `bus.high_bank` | int & 0x3 | Plus/4: 0 |
 | `bus.rom_selected` | bool | Plus/4: true |
-| `bus.data` | byte | Plus/4: 255 |
+| `bus.data` | byte | Plus/4: 255; PET: 253 |
+| `screen` | bytes | PET: 2048 × 0 or 1024 × 0 |
+| `expansion.control` | byte | PET: 0 |
+| `expansion.ram` | bytes | PET: 65536 × 0 |
 
 ## BL-COLORRAM
 
@@ -87,14 +99,14 @@ Written by the C64, VIC-20, C128.
 
 ## BL-CPU
 
-Written by the C64, C128, Plus/4, VIC-20.
+Written by the C64, C128, Plus/4, VIC-20, PET.
 
 | Key | Type | Default |
 | --- | --- | --- |
 | `port.ddr` | byte | C64: 0; C128: 0; Plus/4: 0 |
 | `port.data` | byte | C64: 0; C128: 0; Plus/4: 0 |
 | `port.floating` | byte | C64: 0; C128: 0 |
-| `pc` | word | C64: 64738; VIC-20: 64802; C128: 65341; Plus/4: 65526 |
+| `pc` | word | C64: 64738; VIC-20: 64802; C128: 65341; Plus/4: 65526; PET: 64790 or 64824 |
 | `sp` | byte | 255 |
 | `a` | byte | 0 |
 | `x` | byte | 0 |
@@ -376,7 +388,7 @@ Written by the C64, C128.
 
 ## BL-SID
 
-Written by the C64, C128.
+Written by the C64, C128, Plus/4.
 
 | Key | Type | Default |
 | --- | --- | --- |
@@ -424,6 +436,9 @@ Written by the C64, VIC-20, C128, Plus/4.
 | `playing` | bool | false |
 | `motor` | bool | false |
 | `countdown` | int | 0 |
+| `recording` | bool | false |
+| `since` | int | 0 |
+| `write_high` | bool | C64: false; VIC-20: true; C128: false; Plus/4: true |
 | `rise_at` | int | 0 |
 | `low_recorded` | bool | false |
 | `tape.bytes` | bytes | [] |
@@ -432,13 +447,16 @@ Written by the C64, VIC-20, C128, Plus/4.
 
 ## BL-RAMEXP
 
-Written by the C64.
+Written by the C64, Plus/4.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `d100` | byte | 0 |
-| `locked` | bool | false |
-| `bank<N>` | bytes | 65536 × 0 |
+| `d100` | byte | C64: 0 |
+| `locked` | bool | C64: false |
+| `bank<N>` | bytes | C64: 65536 × 0 |
+| `control` | byte | Plus/4: 255 |
+| `csory_latch` | byte | Plus/4: 0 |
+| `ram` | bytes | Plus/4: 196608 × 0 |
 
 ## BL-REU
 
@@ -524,6 +542,7 @@ Written by the C64, VIC-20, Plus/4.
 | `active` | bool | C64: true |
 | `ram` | bytes | C64: 8192 × 0 |
 | `ram<N>.data` | bytes | C64: 8192 × 0 |
+| `name` | text | VIC-20: "" |
 | `roms` | int | VIC-20: 0 |
 | `rom0.bytes` | bytes | VIC-20: [] |
 | `rom0.start` | word | VIC-20: 0 |
@@ -534,11 +553,11 @@ Written by the C64, VIC-20, Plus/4.
 
 ## BL-TRAPDOS
 
-Written by the C64.
+Written by the C64, PET.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `storage.kind` | text: directory d64 d71 d81 t64 | "directory" |
+| `storage.kind` | text: directory d64 d71 d81 t64 d80 d82 | "directory" |
 | `storage.path` | text | "" |
 | `storage.bytes` | bytes | [] |
 | `storage.read_only` | bool | false |
@@ -554,13 +573,19 @@ Written by the C64.
 | `status.error` | ints | [] |
 | `status.bytes` | bytes | [] |
 | `channels` | ints | [] |
-| `serial.listening` | bool | false |
-| `serial.talking` | bool | false |
-| `serial.listen_channel` | int, optional | absent |
-| `serial.talk_channel` | int, optional | absent |
-| `serial.frame` | int | 240 |
-| `serial.buffer` | bytes | [] |
-| `save.saving` | bool | false |
+| `serial.listening` | bool | C64: false |
+| `serial.talking` | bool | C64: false |
+| `serial.listen_channel` | int, optional | C64: absent |
+| `serial.talk_channel` | int, optional | C64: absent |
+| `serial.frame` | int | C64: 240 |
+| `serial.buffer` | bytes | C64: [] |
+| `save.saving` | bool | C64: false |
+| `ieee.listening` | bool | PET: false |
+| `ieee.talking` | bool | PET: false |
+| `ieee.listen_channel` | int, optional | PET: absent |
+| `ieee.talk_channel` | int, optional | PET: absent |
+| `ieee.frame` | int | PET: 240 |
+| `ieee.buffer` | bytes | PET: [] |
 
 ## BL-D8
 
@@ -568,12 +593,14 @@ Written by the C64, C128, Plus/4.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `model` | text: 1541 1571 1581 | C64: "1541" or "1581"; C128: "1541" or "1571"; Plus/4: "1541" |
+| `model` | text: 1541 1551 1571 1581 | C64: "1541" or "1581"; C128: "1541" or "1571"; Plus/4: "1541" or "1551" |
 | `phase` | int | 0 |
 | `cycles` | int | 0 |
 | `so_pending` | bool | false |
 | `serial.host` | int | C64: 255; C128: 255; Plus/4: 0 |
 | `atn` | bool | C64: true |
+| `irq_timer` | int | Plus/4: 16660 |
+| `latched_byte` | byte | Plus/4: 0 |
 
 ## BL-D8-RAM
 
@@ -581,7 +608,7 @@ Written by the C64, C128, Plus/4.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `data` | byte | C64: 234 or 175; C128: 234; Plus/4: 234 |
+| `data` | byte | C64: 234 or 175; C128: 234; Plus/4: 234 or 233 |
 | `ram` | bytes | C64: 2048 × 0 or 8192 × 0; C128: 2048 × 0; Plus/4: 2048 × 0 |
 
 ## BL-D8-VIA1
@@ -686,7 +713,7 @@ Written by the C64, C128, Plus/4.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `pc` | word | C64: 60064 or 44836; C128: 60064; Plus/4: 60064 |
+| `pc` | word | C64: 60064 or 44836; C128: 60064; Plus/4: 60064 or 59829 |
 | `sp` | byte | 255 |
 | `a` | byte | 0 |
 | `x` | byte | 0 |
@@ -727,10 +754,10 @@ Written by the C64, C128, Plus/4.
 
 | Key | Type | Default |
 | --- | --- | --- |
-| `half_track` | int | C64: 35; C128: 37; Plus/4: 35 |
+| `half_track` | int | C64: 35; C128: 37; Plus/4: 35 or 36 |
 | `slip` | int & 0x3 | C64: 0; C128: 2; Plus/4: 0 |
 | `side` | int | C64: 0 or 1; C128: 85; Plus/4: 0 |
-| `zone` | int & 0x3 | 3 |
+| `zone` | int & 0x3 | C64: 3; C128: 3; Plus/4: 3 or 0 |
 | `time` | int | 0 |
 | `read_clock_in` | int | 2097152 |
 | `clocks` | int | 0 |
@@ -738,8 +765,8 @@ Written by the C64, C128, Plus/4.
 | `ones` | int | 0 |
 | `bits` | int | 0 |
 | `write_shift` | int | 0 |
-| `motor` | bool | C64: true or false; C128: true; Plus/4: true |
-| `led` | bool | true |
+| `motor` | bool | C64: true or false; C128: true; Plus/4: true or false |
+| `led` | bool | C64: true; C128: true; Plus/4: true or false |
 | `sync` | bool | false |
 | `byte_ready` | bool | false |
 | `byte_latched` | bool | false |
@@ -1175,6 +1202,15 @@ Written by the Plus/4.
 | --- | --- | --- |
 | `command` | byte | 0 |
 | `control` | byte | 0 |
+| `errors` | int & 0x7 | 0 |
+| `receiver_full` | bool | false |
+| `transmitter_empty` | bool | true |
+| `irq` | bool | false |
+| `receive_data` | byte | 0 |
+| `transmit_data` | byte | 0 |
+| `shifting` | int | -1 |
+| `transmit_remainder` | int | 0 |
+| `transmit_at` | int, optional | absent |
 
 ## BL-TIA1
 
@@ -1195,3 +1231,210 @@ Written by the Plus/4.
 | `ports` | ints | [0, 0, 0] |
 | `directions` | ints | [0, 0, 0] |
 | `inputs` | ints | [0, 0, 0] |
+
+## BL-D8-PORT
+
+Written by the Plus/4.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `ddr` | byte | 0 |
+| `data` | byte | 0 |
+
+## BL-D8-TIA
+
+Written by the Plus/4.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `ports` | ints | [0, 0, 0] |
+| `directions` | ints | [0, 0, 0] |
+| `inputs` | ints | [255, 255, 255] |
+
+## BL-D8-HOSTTIA
+
+Written by the Plus/4.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `ports` | ints | [0, 0, 0] |
+| `directions` | ints | [0, 0, 0] |
+| `inputs` | ints | [255, 3, 192] |
+
+## BL-PIA1
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `ora` | byte | 0 |
+| `orb` | byte | 0 |
+| `ddra` | byte | 0 |
+| `ddrb` | byte | 0 |
+| `ca.control` | int & 0x3f | 0 |
+| `ca.c1_high` | bool | true |
+| `ca.c2_high` | bool | true |
+| `ca.c1_flag` | bool | false |
+| `ca.c2_flag` | bool | false |
+| `ca.handshake_low` | bool | false |
+| `ca.pulse` | int & 0x3 | 0 |
+| `cb.control` | int & 0x3f | 0 |
+| `cb.c1_high` | bool | true |
+| `cb.c2_high` | bool | true |
+| `cb.c1_flag` | bool | false |
+| `cb.c2_flag` | bool | false |
+| `cb.handshake_low` | bool | false |
+| `cb.pulse` | int & 0x3 | 0 |
+
+## BL-PIA2
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `ora` | byte | 0 |
+| `orb` | byte | 0 |
+| `ddra` | byte | 0 |
+| `ddrb` | byte | 0 |
+| `ca.control` | int & 0x3f | 0 |
+| `ca.c1_high` | bool | true |
+| `ca.c2_high` | bool | true |
+| `ca.c1_flag` | bool | false |
+| `ca.c2_flag` | bool | false |
+| `ca.handshake_low` | bool | false |
+| `ca.pulse` | int & 0x3 | 0 |
+| `cb.control` | int & 0x3f | 0 |
+| `cb.c1_high` | bool | true |
+| `cb.c2_high` | bool | true |
+| `cb.c1_flag` | bool | false |
+| `cb.c2_flag` | bool | false |
+| `cb.handshake_low` | bool | false |
+| `cb.pulse` | int & 0x3 | 0 |
+
+## BL-VIA
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `ora` | byte | 0 |
+| `orb` | byte | 0 |
+| `ddra` | byte | 0 |
+| `ddrb` | byte | 0 |
+| `latch_a` | byte | 255 |
+| `latch_b` | byte | 255 |
+| `acr` | byte | 0 |
+| `pcr` | byte | 0 |
+| `pb6_high` | bool | true |
+| `t<N>.counter` | word | 65535 |
+| `t1.latch` | word | 65535 |
+| `t<N>.hold` | bool | false |
+| `t1.reload` | bool | false |
+| `t<N>.armed` | bool | false |
+| `t1.pb7` | bool | true |
+| `t2.latch_low` | byte | 255 |
+| `t2.low_reload` | bool | false |
+| `t2.low_underflowed` | bool | false |
+| `t2.count_pulses` | bool | false |
+| `t2.counting_pulses` | bool | false |
+| `sr.mode` | int & 0x7 | 0 |
+| `sr.data` | byte | 0 |
+| `sr.bits` | int | 0 |
+| `sr.delay` | int | 0 |
+| `sr.clock` | bool | true |
+| `sr.cb2` | bool | true |
+| `sr.cb2_input` | bool | true |
+| `ifr.flags` | int & 0x7f | 0 |
+| `ifr.enable` | int & 0x7f | 0 |
+| `ca.control` | int & 0xf | 0 |
+| `ca.c1_high` | bool | true |
+| `ca.c2_high` | bool | true |
+| `ca.handshake_low` | bool | false |
+| `ca.pulse` | int | 0 |
+| `ca.c2_output` | bool | true |
+| `cb.control` | int & 0xf | 0 |
+| `cb.c1_high` | bool | true |
+| `cb.c2_high` | bool | true |
+| `cb.handshake_low` | bool | false |
+| `cb.pulse` | int | 0 |
+| `cb.c2_output` | bool | true |
+
+## BL-CRTC
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `registers` | bytes | 18 × 0 |
+| `selected` | int & 0x1f | 0 |
+| `column` | byte | 0 |
+| `since_hsync` | int | 0 |
+| `line` | int & 0x1f | 0 |
+| `row` | int & 0x7f | 0 |
+| `vsync_lines` | int | 16 |
+| `adjusting` | bool | false |
+| `row_display` | bool | false |
+| `column_display` | bool | true |
+| `row_start` | int & 0x3fff | 0 |
+| `address` | int & 0x3fff | 0 |
+
+## BL-VIDEO
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `displayed` | int | 0 |
+| `frame_displayed` | int | 0 |
+| `line_shown` | bool | false |
+| `y` | int | 136 |
+| `from_y` | int | 136 |
+| `to_y` | int | 136 |
+| `shown_from` | int | 36 |
+| `shown_to` | int | 37 |
+| `on_canvas` | bool | true |
+| `origin` | int | 336 |
+| `from` | int | 704 |
+| `to` | int | -704 |
+| `canvas.dots` | bytes | 192192 × 0 or 83328 × 0 |
+| `canvas.painted` | ints | 48048 × 0 or 20832 × 0 |
+| `canvas.span_from` | ints | 273 × 0 or 217 × 0 |
+| `canvas.span_to` | ints | 273 × 0 or 217 × 0 |
+| `column` | int | 0 |
+| `line` | int | 0 |
+
+## BL-TAPE1
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `playing` | bool | false |
+| `motor` | bool | false |
+| `countdown` | int | 0 |
+| `recording` | bool | false |
+| `since` | int | 0 |
+| `write_high` | bool | true |
+| `rise_at` | int | 0 |
+| `low_recorded` | bool | false |
+| `tape.bytes` | bytes | [] |
+| `tape.path` | text | "" |
+| `tape.position` | int | 0 |
+
+## BL-TAPE2
+
+Written by the PET.
+
+| Key | Type | Default |
+| --- | --- | --- |
+| `playing` | bool | false |
+| `motor` | bool | false |
+| `countdown` | int | 0 |
+| `recording` | bool | false |
+| `since` | int | 0 |
+| `write_high` | bool | true |
+| `rise_at` | int | 0 |
+| `low_recorded` | bool | false |
+| `tape.bytes` | bytes | [] |
+| `tape.path` | text | "" |
+| `tape.position` | int | 0 |

data/doc/snapshots.md

@@ -140,6 +140,20 @@ KERNAL and function ROMs come with the model. Its file names its machine
 doesn't open it, and badline doesn't open xplus4's. `--vice` and
 `computer.export_snapshot(path)` refuse a Plus/4.
 
+## The PET
+
+Every PET and CBM model saves and restores the same way. A snapshot of
+one holds its RAM, the screen RAM, an 8096's 64K board with its control
+register, both PIAs, the VIA, the CPU, the CRTC on the boards that have
+one, the picture with where the video is in its frame, the tapes in both
+datasettes with their places on them, and the disk or directory device 8
+serves through the IEEE-488 traps. It restores into a machine of the same
+model with the same RAM, the same editor frame rate and the same ROMs,
+which come with the model. Its file names its machine `PET`, as xpet's
+do, and holds only badline's modules, so xpet doesn't open it, and
+badline doesn't open xpet's. `--vice` and
+`computer.export_snapshot(path)` refuse a PET.
+
 ## VICE
 
 Snapshots use VICE's `.vsf` format, and badline's own modules are named

data/exe/badline-ruby

@@ -39,7 +39,7 @@ if options.headless?
   console = if options.player_window?
               lambda do |input:, output:|
                 load_sdl
-                Badline::Frontend::PlayerController.new(input:, output:)
+                Badline::Frontend::PlayerController.new(input:, output:, frames: options.frames)
               end
             else
               Badline::Audio::Console.method(:new)

data/lib/badline/audio/machine_player.rb

@@ -19,8 +19,6 @@ module Badline
         @subtune = subtune || tune.start_subtune
         @computer = C64.new(sid_model: sid_models[0])
         @stereo = Stereo.new(@computer.address_bus, tune, sid_models)
-        @extras = @stereo.extras
-        @multi = !@extras.empty?
         region = @computer.region
         @frame_cycles = region.cycles_per_line * region.lines_per_frame
         @injected = false
@@ -30,7 +28,7 @@ module Badline
       def start
         @computer.on_init { inject }
         @computer.cpu.install_trap(@tune.entry_address) { begin_playing }
-        step until @started || @computer.cycles > START_LIMIT
+        @computer.cycle! until @started || @computer.cycles > START_LIMIT
       end
 
       attr_reader :stereo
@@ -56,23 +54,13 @@ module Badline
       # Returns the cycles advanced.
       def frame(budget, &)
         cycles = [budget, @frame_cycles].min
-        if @multi
-          cycles.times { step }
-        else
-          cycles.times { @computer.cycle! }
-        end
+        cycles.times { @computer.cycle! }
         @stereo.mix(&)
         cycles
       end
 
       private
 
-      # The extra SIDs clock ahead of the CPU, as the machine's own does.
-      def step
-        @extras.each(&:cycle!) if @multi
-        @computer.cycle!
-      end
-
       def inject
         @computer.ram.write(@tune.load_address, @tune.data)
         @tune.boot_memory(subtune: @subtune).each { |address, bytes| @computer.ram.write(address, bytes) }

data/lib/badline/c64/common.rb

@@ -10,7 +10,7 @@ module Badline
       def timing
         region = address_bus.region
         Timing.new(clock_hz: region.clock_hz, cycles_per_line: region.cycles_per_line,
-                   lines_per_frame: region.lines_per_frame, crop: region.crop, pixel_width: 1)
+                   lines_per_frame: region.lines_per_frame, crop: region.crop, pixel_width: 1, dots: 1)
       end
 
       def load_prg(data)

data/lib/badline/c64/true_drives.rb

@@ -9,7 +9,7 @@ module Badline
       include Drives::Model1581::Slot
 
       # The true drive models a snapshot names.
-      DRIVE_MODELS = %w[1541 1571 1581].freeze
+      DRIVE_MODELS = %w[1541 1551 1571 1581].freeze
 
       # Plugs in a Drives::Model1541, which then runs alongside the machine on its
       # own clock and talks to it over the serial bus. The serial traps stop
@@ -44,6 +44,7 @@ module Badline
         drive1581 = @drive1581
         drive1581&.save_modules(sections, "BL-D#{drive1581.device}")
         save_drive1571_modules(sections)
+        save_drive1551_modules(sections)
         sections
       end
 
@@ -63,6 +64,7 @@ module Badline
         detach_drive1541 unless models.include?("1541")
         detach_drive1581 unless models.include?("1581")
         detach_drive1571 unless models.include?("1571")
+        detach_drive1551 unless models.include?("1551")
       end
 
       # Unplugs the Drives::Model1541, leaving the serial bus with nothing on it.
@@ -91,6 +93,7 @@ module Badline
         case model
         when "1581" then load_drive1581_modules(modules, input, device)
         when "1571" then load_drive1571_modules(modules, input, device)
+        when "1551" then load_drive1551_modules(modules, input, device)
         else load_drive1541_modules(modules, input, device)
         end
       end
@@ -115,6 +118,15 @@ module Badline
       end
 
       def detach_drive1571 = nil
+
+      # The 264 series' 1551, which only the Plus/4 has (Plus4::TCBMDrive).
+      def save_drive1551_modules(sections) = sections
+
+      def load_drive1551_modules(_modules, input, _device)
+        input.adjust("a 1551 doesn't plug into this machine, left out")
+      end
+
+      def detach_drive1551 = nil
     end
   end
 end

data/lib/badline/c64.rb

@@ -68,6 +68,7 @@ module Badline
       @cia1 = @address_bus.cia1
       @cia2 = @address_bus.cia2
       @sid = @address_bus.sid
+      @extra_sids = @address_bus.extra_sids
       @datasette = @address_bus.datasette
       @cycles = 0
       @nmi_asserted = false
@@ -100,6 +101,7 @@ module Badline
       @cia1.cycle!
       @cia2.cycle!
       @sid.cycle!
+      clock_extra_sids unless @extra_sids.empty?
       @datasette.cycle!
 
       @cpu.irq = @cia1.interrupted? || @vic.interrupted? || @reu_irq
@@ -202,6 +204,10 @@ module Badline
       reu
     end
 
+    # The SIDs fitted past the first, which clock ahead of the CPU as the
+    # first does.
+    def clock_extra_sids = @extra_sids.each(&:cycle!)
+
     # BA halts the CPU on a read cycle, and so does an REU holding the bus
     # for a transfer.
     def clock_cpu

data/lib/badline/chips/crtc/keyed_state.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Badline
+  module Chips
+    class CRTC
+      # The CRTC's fields in a keyed snapshot module (Snapshot::Keyed): the
+      # registers, the one selected, and the counters: the character, the
+      # characters since horizontal sync, the line, the row, the lines of
+      # vertical sync left, whether the frame is in its vertical adjust,
+      # whether the row and the character show, and the memory address with
+      # the row's start. The output restores its own state.
+      module KeyedState
+        def save_fields(out)
+          out.bytes("registers", @registers).int("selected", @selected).int("column", @column)
+          out.int("since_hsync", @since_hsync).int("line", @line).int("row", @row).int("vsync_lines", @vsync_lines)
+          out.bool("adjusting", @adjusting).bool("row_display", @row_display).bool("column_display", @column_display)
+          out.int("row_start", @row_start).int("address", @address)
+        end
+
+        def load_fields(input)
+          input.bytes_into("registers", @registers)
+          MASKS.each_with_index { |mask, index| @registers[index] &= mask }
+          @selected = input.masked("selected", @selected, 0x1f)
+          @column = input.byte("column", @column)
+          @since_hsync = input.int("since_hsync", @since_hsync)
+          @line = input.masked("line", @line, 0x1f)
+          @row = input.masked("row", @row, 0x7f)
+          @vsync_lines = input.int("vsync_lines", @vsync_lines)
+          load_flag_fields(input)
+          @row_start = input.masked("row_start", @row_start, 0x3fff)
+          @address = input.masked("address", @address, 0x3fff)
+        end
+
+        private
+
+        def load_flag_fields(input)
+          @adjusting = input.bool("adjusting", @adjusting)
+          @row_display = input.bool("row_display", @row_display)
+          @column_display = input.bool("column_display", @column_display)
+        end
+      end
+
+      include KeyedState
+    end
+  end
+end