badline 0.12.1 → 0.13.0

data/doc/snapshots.md

@@ -62,10 +62,7 @@ Every model saves this way, PAL, NTSC, old NTSC and Drean alike, and so
 does a machine with an REU, with its RAM, its registers and a transfer
 part way through. A snapshot only restores in the badline version that
 wrote it, into a machine with the same chip models, region, RAM
-expansion, REU, KERNAL, datasette and board. One saved before badline
-recorded the KERNAL and the datasette restores as a machine with the
-C64's KERNAL and a datasette, and one saved before it recorded the board
-restores on a C64's.
+expansion, REU, KERNAL, datasette and board.
 
 ## The VIC-20
 

data/lib/badline/audio/bare_player.rb

@@ -49,13 +49,13 @@ module Badline
       def initialize(tune, subtune: nil, sid_models: tune.sid_models)
         @tune = tune
         @subtune = (subtune || tune.start_subtune).clamp(1, tune.subtunes) - 1
-        @bus = AddressBus.new(sid_model: sid_models[0])
+        @bus = C64::Bus.new(sid_model: sid_models[0])
         # The CPU port as the KERNAL leaves it, which a PSID tune expects.
         @bus.poke(0x00, 0x2f)
         @bus.poke(0x01, 0x37)
         @bus.poke(VIDEO_STANDARD, tune.ntsc? ? 0 : 1)
         @bus.cia1.timer_a_latch = tune.ntsc? ? NTSC_KERNAL_TIMER : KERNAL_TIMER
-        @cpu = CPU.new(@bus)
+        @cpu = Chips::CPU.new(@bus)
         @sid = @bus.sid
         @stereo = Stereo.new(@bus, tune, sid_models)
         @extras = @stereo.extras
@@ -164,7 +164,7 @@ module Badline
 
       # Tunes live under the ROMs as often as not, so $01 has to bank out
       # whatever covers the routine about to run. An RSID tune banks itself,
-      # and `SIDFile#bank_for` hands back nil for it.
+      # and `SIDTune::File#bank_for` hands back nil for it.
       def dispatch
         bank = @tune.bank_for(@pending)
         @bus.poke(0x01, bank) if bank

data/lib/badline/audio/cli.rb

@@ -49,8 +49,8 @@ module Badline
       def queue
         @queue ||= begin
           paths = @options.tune_paths
-          queue = Media::Queue.new(entries(paths, @options.subtune), all_parts: @options.all_subtunes?,
-                                                                     build: ->(dropped) { entries(dropped) })
+          queue = Queue.new(entries(paths, @options.subtune), all_parts: @options.all_subtunes?,
+                                                              build: ->(dropped) { entries(dropped) })
           raise Error, "no .sid tunes in #{paths.join(', ')}" if queue.empty? && !paths.empty?
 
           queue
@@ -77,7 +77,7 @@ module Badline
       # below the directories, the first starting on `subtune` if given.
       def entries(paths, subtune = nil)
         tunes = []
-        Media::Queue.files(paths, ".sid").each do |path|
+        Queue.files(paths, ".sid").each do |path|
           tunes << QueuedTune.new(path, @options, subtune: tunes.empty? ? subtune : nil)
         end
         tunes
@@ -223,9 +223,9 @@ module Badline
       end
 
       def stil(entry)
-        list = Storage::STIL.locate(entry.path)
-        hvsc_path = list && Storage::HVSC.path(entry.path, list)
-        hvsc_path && (@stil_lists[list] ||= Storage::STIL.new(list)).entry(hvsc_path)
+        list = SIDTune::STIL.locate(entry.path)
+        hvsc_path = list && SIDTune::HVSC.path(entry.path, list)
+        hvsc_path && (@stil_lists[list] ||= SIDTune::STIL.new(list)).entry(hvsc_path)
       end
 
       def progress(done, total)

data/lib/badline/audio/jukebox.rb

@@ -2,7 +2,7 @@
 
 module Badline
   module Audio
-    # Plays a Media::Queue of tunes interactively: the console's keys step
+    # Plays a Audio::Queue of tunes interactively: the console's keys step
     # between tunes and between a tune's subtunes, seek within the subtune, pause,
     # turn the queue's shuffle, loop and all-subtunes modes on and off, and
     # quit, and the status line follows along. Seeking runs the subtune
@@ -10,7 +10,7 @@ module Badline
     # forward, and from the latest of its Checkpoints at or before there to
     # go back, or to go forward when that checkpoint is further on than
     # where the subtune is. A subtune that plays to its end moves on as
-    # Media::Queue#advance says. It stops at the end of the queue, on q, or
+    # Audio::Queue#advance says. It stops at the end of the queue, on q, or
     # on Ctrl-C.
     #
     # `renderer` builds the renderer for an entry's subtune at the sink's

data/lib/badline/audio/machine_player.rb

@@ -17,7 +17,7 @@ module Badline
       def initialize(tune, subtune: nil, sid_models: tune.sid_models)
         @tune = tune
         @subtune = subtune || tune.start_subtune
-        @computer = Computer.new(sid_model: sid_models[0])
+        @computer = C64.new(sid_model: sid_models[0])
         @stereo = Stereo.new(@computer.address_bus, tune, sid_models)
         @extras = @stereo.extras
         @multi = !@extras.empty?
@@ -39,7 +39,7 @@ module Badline
 
       def clock_hz = @computer.region.clock_hz
 
-      # The whole machine, as Computer#snapshot takes it, and the extra SIDs,
+      # The whole machine, as C64#snapshot takes it, and the extra SIDs,
       # once it plays.
       def save_state(out)
         @computer.save_state(out)

data/lib/badline/{media → audio}/queue.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Badline
-  module Media
+  module Audio
     # An ordered list of media files to go through one at a time, such as
     # the tunes of a player. Each entry is a file and the part of it to
     # start on, counting from 1, out of the parts the file holds: a .sid

data/lib/badline/audio/queued_tune.rb

@@ -2,7 +2,7 @@
 
 module Badline
   module Audio
-    # A .sid tune in the player's Media::Queue, read only once the queue or
+    # A .sid tune in the player's Audio::Queue, read only once the queue or
     # the player first asks about it, so a queue of a whole collection
     # starts at once. Its subtunes, SID model and lengths follow the options:
     # --subtune picks the subtune to start on, --sid the model and --seconds the
@@ -11,7 +11,7 @@ module Badline
     #
     # A file that won't read as a tune, or lacks the subtune asked for, gets
     # an #error and a single subtune.
-    class QueuedTune < Media::Queue::Entry
+    class QueuedTune < Queue::Entry
       def initialize(path, options, subtune: nil)
         super(path)
         @options = options
@@ -39,7 +39,7 @@ module Badline
         @error
       end
 
-      def tune = @tune ||= Storage::SIDFile.new(path)
+      def tune = @tune ||= SIDTune::File.new(path)
 
       # Lets go of the tune's data, which #tune reads again if asked.
       def release = @tune = nil
@@ -71,7 +71,7 @@ module Badline
         @parts = tune.subtunes
         @part = @subtune || tune.start_subtune
         @error = "no subtune #{@part}: the tune has #{@parts}" if @part > @parts
-      rescue Storage::SIDFile::FormatError => e
+      rescue SIDTune::File::FormatError => e
         @error = e.message
       end
 
@@ -81,8 +81,8 @@ module Badline
         return @lengths if @lengths_read
 
         @lengths_read = true
-        database = @options.songlengths || Storage::SongLengths.locate(path)
-        @lengths = database && Storage::SongLengths.new(database).lengths(tune.md5)
+        database = @options.songlengths || SIDTune::SongLengths.locate(path)
+        @lengths = database && SIDTune::SongLengths.new(database).lengths(tune.md5)
       end
     end
   end

data/lib/badline/audio/renderer.rb

@@ -50,7 +50,7 @@ module Badline
         @subtune = subtune
         @rate = rate
         @sid_models = sid_models
-        @filter_chunk = SID::FILTER_CHUNK
+        @filter_chunk = Chips::SID::FILTER_CHUNK
         @silent_samples = 0
         @level = 0
         @still = 0
@@ -141,7 +141,7 @@ module Badline
 
         input = Snapshot::StateReader.new(state)
         played = input.int
-        resume(input)
+        restore_player(input)
         record
         player.stereo.sids.each { |sid| sid.load_recording(input) }
         @level = input.int
@@ -159,10 +159,10 @@ module Badline
 
       # Restores the player as it was, then puts back the SID models chosen
       # for this renderer.
-      def resume(input)
+      def restore_player(input)
         sids = player.stereo.sids
         chosen = sids.map(&:model)
-        sids.each { |sid| refit(sid, Snapshot::Setup::SID_MODELS.fetch(input.int)) }
+        sids.each { |sid| refit(sid, Snapshot::C64Setup::SID_MODELS.fetch(input.int)) }
         player.load_state(input)
         sids.each_with_index { |sid, index| refit(sid, chosen[index]) }
       end
@@ -178,7 +178,7 @@ module Badline
         sids = player.stereo.sids
         out = Snapshot::StateWriter.new
         out.int(played)
-        sids.each { |sid| out.int(Snapshot::Setup::SID_MODELS.index(sid.model) || 0) }
+        sids.each { |sid| out.int(Snapshot::C64Setup::SID_MODELS.index(sid.model) || 0) }
         player.save_state(out)
         sids.each { |sid| sid.save_recording(out) }
         out.int(@level).int(@still)

data/lib/badline/audio/stereo.rb

@@ -18,7 +18,7 @@ module Badline
         @sids = [bus.sid]
         @extras = []
         tune.sid_addresses.each do |address|
-          sid = SID.new(model: models[@sids.size], at: address)
+          sid = Chips::SID.new(model: models[@sids.size], at: address)
           bus.add_sid(sid)
           @sids << sid
           @extras << sid

data/lib/badline/c128/{bus_state.rb → bus/saved_state.rb}

@@ -3,7 +3,7 @@
 module Badline
   class C128
     class Bus
-      # The bus's state for a snapshot, as AddressBus::SavedState is the
+      # The bus's state for a snapshot, as C64::Bus::SavedState is the
       # C64's.
       module SavedState
         # The machine's memory, the last access and everything on the bus but

data/lib/badline/c128/bus.rb

@@ -11,7 +11,7 @@ module Badline
     # $FF00-$FF04.
     #
     # In C64 mode the 8721 PLA decodes $01's LORAM, HIRAM and CHAREN and the
-    # cartridge's EXROM and GAME as a C64's does (AddressBus::PLA), and the
+    # cartridge's EXROM and GAME as a C64's does (C64::Bus::PLA), and the
     # MMU answers nowhere.
     #
     # In both modes the RAM is the bank CR picks, with common RAM in bank 0,
@@ -34,8 +34,8 @@ module Badline
     # Colour RAM has two 1K banks (ColorLines).
     class Bus
       include Addressable
-      include AddressBus::PLA
-      include AddressBus::ROMs
+      include C64::Bus::PLA
+      include C64::Bus::ROMs
       include MMUPages
       include IOPages
       include Z80Pages
@@ -48,9 +48,9 @@ module Badline
       PORT_FLOATING = 0b1000_1000
       CAPS_LOCK     = 0b0100_0000
 
-      # The C64's power-on pattern (AddressBus::RAM_POWER_ON) in both 64K
+      # The C64's power-on pattern (C64::Bus::RAM_POWER_ON) in both 64K
       # banks. The C128's own DRAMs' pattern is unmeasured.
-      RAM_POWER_ON = Array.new(2**17) { |addr| AddressBus::RAM_POWER_ON[addr & 0xffff] }.freeze
+      RAM_POWER_ON = Array.new(2**17) { |addr| C64::Bus::RAM_POWER_ON[addr & 0xffff] }.freeze
 
       # The VIC's write side: a write to $D02F also drives the extra
       # keyboard lines K0-K2 onto the keyboard's rows 8-10.
@@ -143,7 +143,7 @@ module Badline
         @on_mode_change = nil
         plug_chips(model, sid_model)
 
-        @datasette = Datasette.new
+        @datasette = Badline::Drives::Datasette.new
         @datasette.on_flag { @cia1.flag! }
         @datasette.on_sense_change { @cpu_port.refresh }
 
@@ -151,11 +151,12 @@ module Badline
         @color_ram = @color_lines.color_ram(1)
         build_z80_pages
         @vic_writes = VICWrites.new(@vic, @control_ports)
-        @open_bus = AddressBus::OpenBus.new(@vic)
+        @open_bus = C64::Bus::OpenBus.new(@vic)
         @configuration_reads = ConfigurationPage.new(@mmu, @open_bus)
         @configuration_writes = ConfigurationPage.new(@mmu, @open_bus)
 
-        @cpu_port = CPUPort.new(@datasette, pullups: PORT_PULLUPS, floating: PORT_FLOATING, caps_lock: CAPS_LOCK)
+        @cpu_port = Chips::CPU::Port.new(@datasette, pullups: PORT_PULLUPS, floating: PORT_FLOATING,
+                                                     caps_lock: CAPS_LOCK)
         @io_port = @cpu_port.status
 
         @read_pages = Array.new(256)
@@ -274,17 +275,17 @@ module Badline
       end
 
       def plug_chips(model, sid_model)
-        @keyboard = Keyboard.new(matrix: KEYBOARD_MATRIX)
-        @joystick1 = Joystick.new
-        @joystick2 = Joystick.new
-        @control_ports = ControlPorts.new(keyboard: @keyboard, joystick1: @joystick1, joystick2: @joystick2)
-        @vic = VIC.new(model: model.vic_model, region: @region)
-        @cia1 = CIA.new(start: 0xdc00, peripheral: @control_ports, model: model.cia_model, region: @region)
-        @cia2 = CIA.new(start: 0xdd00, model: model.cia_model, region: @region)
+        @keyboard = Input::Keyboard.new(matrix: KEYBOARD_MATRIX)
+        @joystick1 = Input::Joystick.new
+        @joystick2 = Input::Joystick.new
+        @control_ports = Input::ControlPorts.new(keyboard: @keyboard, joystick1: @joystick1, joystick2: @joystick2)
+        @vic = Chips::VIC.new(model: model.vic_model, region: @region)
+        @cia1 = Chips::CIA.new(start: 0xdc00, peripheral: @control_ports, model: model.cia_model, region: @region)
+        @cia2 = Chips::CIA.new(start: 0xdd00, model: model.cia_model, region: @region)
         @control_ports.port_a_source = @cia1
         @cia1.on_port_b4_change { |high| @vic.lightpen_level(high) }
-        @sid = SID.new(model: sid_model, pots: @control_ports)
-        @vdc = VDC.new(model: model.vdc_model, ram_kb: model.vdc_ram_kb, clock_hz: @region.clock_hz)
+        @sid = Chips::SID.new(model: sid_model, pots: @control_ports)
+        @vdc = Chips::VDC.new(model: model.vdc_model, ram_kb: model.vdc_ram_kb, clock_hz: @region.clock_hz)
       end
 
       def update_overlays!

data/lib/badline/c128/color_lines.rb

@@ -13,8 +13,8 @@ module Badline
         @cia2 = cia2
         @c64_characters = c64_characters
         @c128_characters = c128_characters
-        @bank0 = ColorMemory.new(vic)
-        @bank1 = ColorMemory.new(vic)
+        @bank0 = C64::ColorMemory.new(vic)
+        @bank1 = C64::ColorMemory.new(vic)
       end
 
       # Colour RAM bank +number+, 0 or 1.

data/lib/badline/c128/cpu.rb

@@ -4,7 +4,7 @@ module Badline
   class C128
     # The C128's 8502, on the C128::Bus, which holds its I/O port.
     class CPU
-      include Badline::CPU::Core
+      include Badline::Chips::CPU::Core
     end
   end
 end

data/lib/badline/c128/drives.rb

@@ -2,13 +2,13 @@
 
 module Badline
   class C128
-    # The true drives on the C128's serial bus: a Drive1541, the C128D's
-    # built-in 1571 (Drive1571) or a 1581 (Drive1581::Slot), each in a
+    # The true drives on the C128's serial bus: a Drives::Model1541, the C128D's
+    # built-in 1571 (Drives::Model1571) or a 1581 (Drives::Model1581::Slot), each in a
     # field of its own, so none makes another's per-cycle call a union.
     module Drives
       attr_reader :drive1571
 
-      # Plugs in a Drive1571, which then runs alongside the C128 on its own
+      # Plugs in a Drives::Model1571, which then runs alongside the C128 on its own
       # clock and talks to it over the serial bus, as attach_drive1541 does
       # for a 1541.
       def attach_drive1571(drive)
@@ -19,7 +19,7 @@ module Badline
         @serial_trap&.device = serial_trap_device
       end
 
-      # Unplugs the Drive1571.
+      # Unplugs the Drives::Model1571.
       def detach_drive1571
         return unless @drive1571
 
@@ -35,14 +35,14 @@ module Badline
       # returns it.
       def plug_true_drive
         detach_drive1581 if drive1581_on_device8?
-        Drive1571.new.tap { |drive| attach_drive1571(drive) }
+        Badline::Drives::Model1571.new.tap { |drive| attach_drive1571(drive) }
       end
 
       private
 
       # The serial bus, with no disk in device 8's traps and no true drive.
       def init_drives
-        @drive = nil
+        @dos = nil
         @serial_trap = nil
         @save_trap = nil
         @drive1541 = nil
@@ -61,7 +61,7 @@ module Badline
       # A 1581 plugged in holds the machine's on_init handlers back until
       # its DOS has booted, which takes longer than the C128 KERNAL's.
       def drive1581_attached
-        @init_threshold = [@init_threshold, Drive1581::BOOT_CYCLES].max if @cycles < @init_threshold
+        @init_threshold = [@init_threshold, Badline::Drives::Model1581::BOOT_CYCLES].max if @cycles < @init_threshold
       end
 
       # Unplugs the 1541 and the 1571 if either is device 8, for a 1581 to
@@ -72,10 +72,10 @@ module Badline
         detach_drive1571 if @drive1571&.device == device
       end
 
-      # A true 1541 (Computer::Attachments#save_serial_bus), then a 1571 and
+      # A true 1541 (C64::Attachments#save_serial_bus), then a 1571 and
       # a 1581.
       def save_serial_bus(out)
-        out.boolean(true).boolean(!@drive1541.nil?)
+        out.boolean(!@drive1541.nil?)
         if @drive1541
           out.int(@drive1541.device)
           @drive1541.save_state(out)
@@ -89,7 +89,6 @@ module Badline
       end
 
       def load_serial_bus(input)
-        input.boolean?
         load_drive1541(input)
         load_drive1571(input)
         load_drive1581(input)
@@ -100,7 +99,7 @@ module Badline
 
         device = input.int
         detach_drive1571 if @drive1571 && @drive1571.device != device
-        attach_drive1571(Drive1571.new(device:)) unless @drive1571
+        attach_drive1571(Badline::Drives::Model1571.new(device:)) unless @drive1571
         @drive1571.load_state(input)
       end
     end

data/lib/badline/c128/fast_serial.rb

@@ -6,7 +6,7 @@ module Badline
     # through buffers MCR's FSDIR turns round. Outwards, the machine pushes
     # the lines the pins pull into the bus as they move. Inwards, CIA 1
     # hears the lines whenever a drive moves its own fast serial pins
-    # (IECBus#on_fast_change).
+    # (Drives::SerialBus#on_fast_change).
     module FastSerial
       private
 
@@ -48,15 +48,15 @@ module Badline
         serial = @cia1.serial
         return 0 unless serial.output?
 
-        low = serial.cnt ? 0 : IECBus::SRQ
-        serial.sp_out ? low : low | IECBus::DATA
+        low = serial.cnt ? 0 : Badline::Drives::SerialBus::SRQ
+        serial.sp_out ? low : low | Badline::Drives::SerialBus::DATA
       end
 
       def hear_fast_serial
         low = @iec_bus.low_lines
         serial = @cia1.serial
-        serial.cnt_in = low.nobits?(IECBus::SRQ)
-        serial.sp_in = low.nobits?(IECBus::DATA)
+        serial.cnt_in = low.nobits?(Badline::Drives::SerialBus::SRQ)
+        serial.sp_in = low.nobits?(Badline::Drives::SerialBus::DATA)
       end
     end
   end

data/lib/badline/c128/mmu_pages.rb

@@ -6,7 +6,7 @@ module Badline
       # What the MMU maps. For the CPU: the RAM bank, common RAM and the
       # pages page 0 and page 1 move to in both modes, and CR's ROMs and I/O
       # in C128 mode. C64 mode lays the PLA's ROMs and I/O over the same RAM
-      # (AddressBus::PLA).
+      # (C64::Bus::PLA).
       module MMUPages
         private
 

data/lib/badline/c128/modes.rb

@@ -33,7 +33,7 @@ module Badline
       def mode_changed
         layout = trap_layout
         @capture_output&.layout = layout
-        if @drive
+        if @dos
           remove_kernal_traps
           install_kernal_traps(layout)
         end
@@ -41,7 +41,7 @@ module Badline
 
         keyboard.release(:cbm)
         @holding_commodore = false
-        @init_threshold = @cycles + Computer::INIT_THRESHOLD if @cycles < @init_threshold
+        @init_threshold = @cycles + C64::INIT_THRESHOLD if @cycles < @init_threshold
       end
 
       # The keyboard buffer of the KERNAL the machine runs: the C64's, or in

data/lib/badline/c128/saved_state.rb

@@ -1,26 +1,17 @@
 # frozen_string_literal: true
 
+require "badline/snapshot/c128_setup"
+
 module Badline
   class C128
-    MARKER = "C128"
-
-    # The model, the SID and the mode it resets into of the machine a State
-    # from #snapshot was taken of, the arguments C128.new takes.
-    def self.setup(state)
-      input = Snapshot::StateReader.new(state)
-      input.marker(MARKER)
-      input.check_stamp
-      SavedState.read_setup(input)
-    end
+    # How the machine a State from #snapshot was taken of was built.
+    def self.setup(state) = Snapshot::C128Setup.from(state)
 
     # A new machine, built as the one a State from #snapshot was taken of,
     # at that state.
-    def self.restored(state)
-      setup = setup(state)
-      new(model: setup[0], sid_model: setup[1], mode: setup[2]).apply_state(state)
-    end
+    def self.restored(state) = setup(state).build.apply_state(state)
 
-    # The whole machine's state for a snapshot, as Computer's: the
+    # The whole machine's state for a snapshot, as C64's: the
     # machine's own latches, FAST and TEST as they last took hold, the bus with its RAM, the MMU, the chips and
     # the VDC, the CPU, the cartridge, the disk device 8 serves through the
     # traps and a true 1541. The serial lines go back into the bus from the
@@ -28,21 +19,6 @@ module Badline
     # joysticks, CAPS LOCK and 40/80 DISPLAY, the traps and callbacks, and
     # which chip renders.
     module SavedState
-      SID_MODELS = %i[mos6581 mos8580].freeze
-      MODES = %i[c64 c128].freeze
-
-      # The model's name, the SID's model and the mode.
-      def self.read_setup(input)
-        name = input.string
-        known = Model::ALL.any? { |model| model.name == name }
-        raise Snapshot::FormatError, "the state names a C128 model badline doesn't know" unless known
-
-        sid_model = SID_MODELS.fetch(input.int)
-        [name, sid_model, MODES.fetch(input.int)]
-      rescue IndexError
-        raise Snapshot::FormatError, "the state names a SID or a mode badline doesn't know"
-      end
-
       # How many more on_init handlers the machine a State was taken of had
       # yet to run than this one has. Nil until the machine is restored.
       attr_reader :init_handlers_lost
@@ -72,8 +48,8 @@ module Badline
       end
 
       def save_state(out)
-        out.marker(MARKER).stamp
-        out.string(@model.name).int(SID_MODELS.index(@sid.model)).int(@c64_built ? 0 : 1)
+        out.marker(Snapshot::C128Setup::MARKER).stamp
+        snapshot_setup.write(out)
         out.int(@cycles).int(@clock_bits).boolean(@nmi_asserted).boolean(@cartridge_nmi).boolean(@restore_pulse)
         out.boolean(!@pending_keys.nil?)
         out.ints(@pending_keys) if @pending_keys
@@ -83,14 +59,14 @@ module Badline
         @cpu.save_state(out)
         @z80.save_state(out)
         out.int(@z80_due).int(@chips_ahead).boolean(@cpu_reset_pending)
-        save_trap_drive(out)
+        save_trap_dos(out)
         save_serial_bus(out)
       end
 
       def load_state(input)
-        input.marker(MARKER)
+        input.marker(Snapshot::C128Setup::MARKER)
         input.check_stamp
-        check_setup(SavedState.read_setup(input))
+        check_setup(Snapshot::C128Setup.read(input))
         @cycles = input.int
         @clock_bits = input.int
         @nmi_asserted = input.boolean?
@@ -105,24 +81,17 @@ module Badline
         push_serial_lines
         @cpu.load_state(input)
         load_z80(input)
-        load_trap_drive(input)
+        load_trap_dos(input)
         load_serial_bus(input)
         push_fast_serial
       end
 
       private
 
-      # The Z80 and which CPU has the bus, which a state from before the
-      # Z80 leaves to the 8502. The bus, restored before it, hands the bus
-      # to its CPU without resetting the 8502.
+      # The Z80 and which CPU has the bus. The bus, restored before it,
+      # hands the bus to its CPU without resetting the 8502.
       def load_z80(input)
         @z80_running = @bus.z80?
-        @z80_turn = @z80_running
-        @z80_due = @z80.cycles
-        @chips_ahead = 0
-        @cpu_reset_pending = false
-        return unless input.schema > 6
-
         @z80.load_state(input)
         @z80_due = input.int
         @chips_ahead = input.int
@@ -130,11 +99,16 @@ module Badline
         @z80_turn = @z80_running || @chips_ahead.positive?
       end
 
+      # How this machine was built.
+      def snapshot_setup
+        Snapshot::C128Setup.new(model: @model.name, sid_model: @sid.model, mode: @c64_built ? :c64 : :c128)
+      end
+
       def check_setup(setup)
-        ours = [@model.name, @sid.model, @c64_built ? :c64 : :c128]
+        ours = snapshot_setup
         return if setup == ours
 
-        raise Snapshot::FormatError, "the state is of a #{setup.join(' with a ')}, not a #{ours.join(' with a ')}"
+        raise Snapshot::FormatError, "the state is of a #{setup}, not a #{ours}"
       end
     end
 

data/lib/badline/c128/z80.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require "badline/z80/core"
+require "badline/chips/z80/core"
 
 module Badline
   class C128
     # The C128's Z80A, on the Z80's side of the C128::Bus.
     class Z80
-      include Badline::Z80::Core
+      include Badline::Chips::Z80::Core
     end
 
     # The Z80's accesses, through the pages C128::Bus lays out for it