badline 0.13.0 → 0.14.0

data/lib/badline/vic20/bus/keyed_state.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Badline
+  class Vic20
+    class Bus
+      class ColorRAM
+        # The cells in a keyed snapshot module, under `key`.
+        def save_fields(out, key) = out.bytes(key, @cells)
+
+        def load_fields(input, key) = input.bytes_into(key, @cells)
+      end
+
+      # The bytes each side's data lines hold, under `prefix`, and a
+      # cartridge's ROM chips as rom<N>.start and rom<N>.bytes, in a keyed
+      # snapshot module (Snapshot::Keyed). The pages are mapped again once
+      # they are loaded.
+      module KeyedState
+        def save_fields(out, prefix)
+          out.int("#{prefix}data", @data).int("#{prefix}video_data", @video_data)
+        end
+
+        def load_fields(input, prefix)
+          @data = input.byte("#{prefix}data", @data)
+          @video_data = input.byte("#{prefix}video_data", @video_data)
+        end
+
+        # Whether a cartridge's ROM chips are in the expansion blocks.
+        def cartridge? = !@roms.empty?
+
+        def save_rom_fields(out)
+          out.int("roms", @roms.length)
+          @roms.each_with_index do |rom, number|
+            out.int("rom#{number}.start", rom.start)
+            rom.save_fields(out, "rom#{number}.bytes")
+          end
+        end
+
+        def load_rom_fields(input)
+          @roms = []
+          input.int("roms", 0).times do |number|
+            bytes = input.bytes("rom#{number}.bytes", "".b).bytes
+            @roms << ROM.new(bytes, length: bytes.length, start: input.word("rom#{number}.start", 0))
+          end
+        end
+
+        def restored! = map_pages
+      end
+
+      include KeyedState
+    end
+  end
+end

data/lib/badline/vic20/bus.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "badline/vic20/bus/saved_state"
+require "badline/vic20/bus/keyed_state"
 
 module Badline
   class Vic20
@@ -29,7 +29,6 @@ module Badline
     # Writes to ROM and to empty spots go nowhere.
     class Bus
       include Addressable
-      include SavedState
 
       # The pages each expansion block covers, as [first page, count].
       BLOCKS = {

data/lib/badline/vic20/keyed_modules.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Badline
+  class Vic20
+    # The whole machine as keyed snapshot modules (Snapshot::Keyed), in the
+    # order a load applies them, as C64::KeyedModules: BL-MACHINE with the
+    # RAM expansion and the bytes each side's data lines hold under bus.*,
+    # the memories, a cartridge's ROM chips, the VIC with its sound, both
+    # VIAs, the CPU, the datasette, device 8 through the traps and the true
+    # drives.
+    module KeyedModules
+      def save_modules
+        bus = @bus
+        sections = [Snapshot::Keyed.section("BL-MACHINE") do |out|
+          save_machine_fields(out)
+          bus.save_fields(out, "bus.")
+        end]
+        sections << Snapshot::Keyed.section("BL-RAM") { |out| bus.ram.save_fields(out, "ram") }
+        sections << Snapshot::Keyed.section("BL-COLORRAM") { |out| bus.color_ram.save_fields(out, "ram") }
+        sections << Snapshot::Keyed.section("BL-CART") { |out| bus.save_rom_fields(out) } if bus.cartridge?
+        sections << Snapshot::Keyed.section("BL-CPU") { |out| @cpu.save_fields(out) }
+        sections << Snapshot::Keyed.section("BL-VICI") { |out| @vic.save_fields(out) }
+        sections << Snapshot::Keyed.section("BL-VIA1") { |out| @via1.save_fields(out) }
+        sections << Snapshot::Keyed.section("BL-VIA2") { |out| @via2.save_fields(out) }
+        sections << Snapshot::Keyed.section("BL-TAPE") { |out| @datasette.save_fields(out) }
+        sections << Snapshot::Keyed.section("BL-TRAPDOS") { |out| save_trap_dos_fields(out) } if mounted?
+        save_drive_modules(sections)
+      end
+
+      # Raises Snapshot::FormatError for the modules of a VIC-20 with
+      # another RAM expansion.
+      def load_modules(modules)
+        machine = modules.machine
+        check_snapshot_setup(Snapshot::Vic20Setup.read_fields(machine))
+        load_machine_fields(machine)
+        bus = @bus
+        bus.load_fields(machine, "bus.")
+        bus.ram.load_fields(modules.required("BL-RAM"), "ram")
+        bus.color_ram.load_fields(modules.required("BL-COLORRAM"), "ram")
+        bus.load_rom_fields(modules.optional("BL-CART") || Snapshot::Keyed::Reader.new("BL-CART"))
+        bus.restored!
+        @vic.load_fields(modules.required("BL-VICI"))
+        @via1.load_fields(modules.required("BL-VIA1"))
+        @via2.load_fields(modules.required("BL-VIA2"))
+        @cpu.load_fields(modules.required("BL-CPU"))
+        @datasette.load_fields(modules.required("BL-TAPE"))
+        trap_dos = modules.optional("BL-TRAPDOS")
+        trap_dos ? load_trap_dos_fields(trap_dos, detached: modules.detached?) : unmount
+        load_drive_modules(modules)
+        modules_restored!
+        self
+      end
+
+      private
+
+      def modules_restored!
+        @cpu.restored!
+        @vic.restored!
+        @via1.restored!
+        @via2.restored!
+        machine_restored!
+      end
+
+      def check_snapshot_setup(setup)
+        return if setup.ram == @ram_configuration
+
+        raise Snapshot::FormatError, "the snapshot is of a VIC-20 with #{setup.ram} RAM, not #{@ram_configuration}"
+      end
+    end
+
+    include KeyedModules
+  end
+end

data/lib/badline/vic20/keyed_state.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Badline
+  class Vic20
+    # The machine's own fields in a keyed snapshot module (Snapshot::Keyed,
+    # BL-MACHINE): the family, its RAM expansion by name, the cycle count,
+    # the RESTORE key's NMI, and the host's typing still to feed and on_init
+    # handlers still to run under host.*.
+    module KeyedState
+      # How many more on_init handlers the machine a snapshot was taken of had
+      # yet to run than this one has. Nil until the machine is restored.
+      attr_reader :init_handlers_lost
+
+      # Whether a snapshot saves now (Machine::Settling): the CPU between
+      # instructions or jammed.
+      def settled_for_snapshot? = @cpu.boundary? || @cpu.jammed?
+
+      # The sound's voices, run up to this cycle.
+      def settle_chips_for_snapshot = @sound.catch_up!
+
+      def save_machine_fields(out)
+        out.text("family", "vic20").text("written_by", VERSION)
+        Snapshot::Vic20Setup.new(ram: @ram_configuration).write_fields(out)
+        out.int("cycles", @cycles).bool("nmi_asserted", @nmi_asserted)
+        pending = @pending_keys
+        out.ints("host.pending_keys", pending) if pending
+        out.int("host.init_pending", @cycles <= @init_threshold ? @init_handlers.length : 0)
+      end
+
+      def load_machine_fields(input)
+        @cycles = input.int("cycles", @cycles)
+        @nmi_asserted = input.bool("nmi_asserted", @nmi_asserted)
+        pending = input.ints("host.pending_keys", [])
+        @pending_keys = pending.empty? ? nil : pending.dup
+        @init_handlers_lost = [input.int("host.init_pending", 0) - @init_handlers.length, 0].max
+      end
+
+      # The serial bus's lines and the datasette's motor and write line from
+      # the VIAs, once they are loaded.
+      def machine_restored! = via_written
+    end
+
+    include KeyedState
+  end
+end

data/lib/badline/vic20.rb

@@ -6,9 +6,9 @@ require "badline/vic20/cpu"
 require "badline/vic20/keyboard_via_ports"
 require "badline/vic20/port_wiring"
 require "badline/vic20/user_via_ports"
-require "badline/chips/vic_i"
-require "badline/chips/vic_i/sound"
-require "badline/vic20/saved_state"
+require "badline/snapshot/vic20_setup"
+require "badline/vic20/keyed_state"
+require "badline/vic20/keyed_modules"
 
 module Badline
   # The Commodore VIC-20 with the PAL 6561: a 6502 at the VIC's clock, the
@@ -22,11 +22,11 @@ module Badline
   # serves disks through the KERNAL traps or a true 1541.
   class Vic20
     include IntegerHelper
-    include KeyboardBuffer
+    include Machine::KeyboardBuffer
     include Machine::Clocking
+    include Machine::Settling
     include Attachments
     include PortWiring
-    include SavedState
 
     attr_reader :bus, :cpu, :vic, :via1, :via2, :keyboard, :joystick1, :cycles, :init_threshold, :sound,
                 :drive1541, :iec_bus, :datasette

data/lib/badline.rb

@@ -2,6 +2,7 @@
 
 require "badline/core"
 require "badline/c128"
+require "badline/plus4"
 require "badline/options"
 require "badline/data_path"
 require "badline/snapshot"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -45,6 +45,7 @@ files:
 - doc/media.md
 - doc/pinned-behaviour.md
 - doc/sid-player.md
+- doc/snapshot-format.md
 - doc/snapshots.md
 - exe/badline-ruby
 - lib/badline.rb
@@ -68,18 +69,19 @@ files:
 - lib/badline/c128.rb
 - lib/badline/c128/banks.rb
 - lib/badline/c128/bus.rb
-- lib/badline/c128/bus/saved_state.rb
+- lib/badline/c128/bus/keyed_state.rb
 - lib/badline/c128/color_lines.rb
 - lib/badline/c128/cpu.rb
 - lib/badline/c128/drives.rb
 - lib/badline/c128/fast_serial.rb
 - lib/badline/c128/io_pages.rb
+- lib/badline/c128/keyed_modules.rb
+- lib/badline/c128/keyed_state.rb
 - lib/badline/c128/keys.rb
 - lib/badline/c128/mmu.rb
 - lib/badline/c128/mmu_pages.rb
 - lib/badline/c128/model.rb
 - lib/badline/c128/modes.rb
-- lib/badline/c128/saved_state.rb
 - lib/badline/c128/z80.rb
 - lib/badline/c128/z80_pages.rb
 - lib/badline/c128/z80_turns.rb
@@ -91,11 +93,12 @@ files:
 - lib/badline/c64/banked_ram/plus60k.rb
 - lib/badline/c64/banked_ram/unexpanded.rb
 - lib/badline/c64/bus.rb
+- lib/badline/c64/bus/debug_register.rb
 - lib/badline/c64/bus/extra_sids.rb
 - lib/badline/c64/bus/fittings.rb
+- lib/badline/c64/bus/keyed_state.rb
 - lib/badline/c64/bus/pla.rb
 - lib/badline/c64/bus/roms.rb
-- lib/badline/c64/bus/saved_state.rb
 - lib/badline/c64/bus/sid_slots.rb
 - lib/badline/c64/cartridge.rb
 - lib/badline/c64/cartridge/action_replay.rb
@@ -107,22 +110,20 @@ files:
 - lib/badline/c64/cartridge/epyx_fastload.rb
 - lib/badline/c64/cartridge/final_cartridge3.rb
 - lib/badline/c64/cartridge/flash.rb
-- lib/badline/c64/cartridge/flash/saved_state.rb
 - lib/badline/c64/cartridge/freezer.rb
 - lib/badline/c64/cartridge/fun_play.rb
 - lib/badline/c64/cartridge/g_mod2.rb
 - lib/badline/c64/cartridge/game_system.rb
 - lib/badline/c64/cartridge/geo_ram.rb
 - lib/badline/c64/cartridge/kcs_power.rb
+- lib/badline/c64/cartridge/keyed_state.rb
 - lib/badline/c64/cartridge/mach5.rb
 - lib/badline/c64/cartridge/magic_desk.rb
 - lib/badline/c64/cartridge/ocean.rb
 - lib/badline/c64/cartridge/pagefox.rb
 - lib/badline/c64/cartridge/retro_replay.rb
-- lib/badline/c64/cartridge/retro_replay/saved_state.rb
 - lib/badline/c64/cartridge/rex_utility.rb
 - lib/badline/c64/cartridge/rgcd.rb
-- lib/badline/c64/cartridge/saved_state.rb
 - lib/badline/c64/cartridge/simons_basic.rb
 - lib/badline/c64/cartridge/standard.rb
 - lib/badline/c64/cartridge/super_games.rb
@@ -131,20 +132,20 @@ files:
 - lib/badline/c64/color_memory.rb
 - lib/badline/c64/common.rb
 - lib/badline/c64/kernal_traps.rb
+- lib/badline/c64/keyed_modules.rb
+- lib/badline/c64/keyed_state.rb
 - lib/badline/c64/reu.rb
 - lib/badline/c64/reu/dma.rb
-- lib/badline/c64/reu/dma/saved_state.rb
+- lib/badline/c64/reu/keyed_state.rb
 - lib/badline/c64/reu/ram.rb
-- lib/badline/c64/reu/saved_state.rb
 - lib/badline/c64/reu/trigger.rb
-- lib/badline/c64/saved_state.rb
 - lib/badline/c64/true_drives.rb
+- lib/badline/chips.rb
 - lib/badline/chips/cia.rb
 - lib/badline/chips/cia/fast_forward.rb
 - lib/badline/chips/cia/interrupt_register.rb
-- lib/badline/chips/cia/saved_state.rb
+- lib/badline/chips/cia/keyed_parts.rb
 - lib/badline/chips/cia/serial.rb
-- lib/badline/chips/cia/serial/saved_state.rb
 - lib/badline/chips/cia/time_of_day.rb
 - lib/badline/chips/cia/timer.rb
 - lib/badline/chips/cpu.rb
@@ -162,37 +163,38 @@ files:
 - lib/badline/chips/cpu/instruction_set/stack.rb
 - lib/badline/chips/cpu/instruction_set/transfer.rb
 - lib/badline/chips/cpu/interrupts.rb
+- lib/badline/chips/cpu/keyed_state.rb
 - lib/badline/chips/cpu/microcode.rb
 - lib/badline/chips/cpu/operations.rb
 - lib/badline/chips/cpu/port.rb
-- lib/badline/chips/cpu/saved_state.rb
 - lib/badline/chips/cpu/stack_operations.rb
 - lib/badline/chips/cpu/traps.rb
 - lib/badline/chips/sid.rb
 - lib/badline/chips/sid/catch_up.rb
 - lib/badline/chips/sid/decimator.rb
 - lib/badline/chips/sid/envelope.rb
-- lib/badline/chips/sid/envelope/saved_state.rb
 - lib/badline/chips/sid/filter.rb
-- lib/badline/chips/sid/filter/saved_state.rb
-- lib/badline/chips/sid/saved_state.rb
+- lib/badline/chips/sid/keyed_parts.rb
 - lib/badline/chips/sid/voice.rb
 - lib/badline/chips/sid/waveform.rb
 - lib/badline/chips/sid/waveform/combined.rb
 - lib/badline/chips/sid/waveform/fast_forward.rb
 - lib/badline/chips/sid/waveform/noise_writeback.rb
-- lib/badline/chips/sid/waveform/saved_state.rb
+- lib/badline/chips/ted.rb
+- lib/badline/chips/ted/beam.rb
+- lib/badline/chips/ted/timers.rb
+- lib/badline/chips/tia.rb
 - lib/badline/chips/vdc.rb
+- lib/badline/chips/vdc/keyed_parts.rb
 - lib/badline/chips/vdc/memory.rb
 - lib/badline/chips/vdc/painter.rb
 - lib/badline/chips/vdc/raster.rb
-- lib/badline/chips/vdc/saved_state.rb
 - lib/badline/chips/vdc/window.rb
 - lib/badline/chips/via.rb
 - lib/badline/chips/via/control_lines.rb
 - lib/badline/chips/via/fast_forward.rb
 - lib/badline/chips/via/interrupt_register.rb
-- lib/badline/chips/via/saved_state.rb
+- lib/badline/chips/via/keyed_parts.rb
 - lib/badline/chips/via/shift_register.rb
 - lib/badline/chips/via/timer1.rb
 - lib/badline/chips/via/timer2.rb
@@ -204,24 +206,21 @@ files:
 - lib/badline/chips/vic/display_state.rb
 - lib/badline/chips/vic/graphics_mode.rb
 - lib/badline/chips/vic/graphics_shifter.rb
-- lib/badline/chips/vic/graphics_shifter/saved_state.rb
+- lib/badline/chips/vic/keyed_parts.rb
+- lib/badline/chips/vic/keyed_sprites.rb
+- lib/badline/chips/vic/keyed_state.rb
 - lib/badline/chips/vic/register_log.rb
 - lib/badline/chips/vic/registers.rb
-- lib/badline/chips/vic/saved_state.rb
 - lib/badline/chips/vic/sequencer.rb
-- lib/badline/chips/vic/sequencer/saved_state.rb
 - lib/badline/chips/vic/sequencer_output.rb
 - lib/badline/chips/vic/sprite.rb
 - lib/badline/chips/vic/sprite/internal_bus.rb
-- lib/badline/chips/vic/sprite/saved_state.rb
 - lib/badline/chips/vic/sprite/shifter.rb
 - lib/badline/chips/vic/sprite/timing.rb
 - lib/badline/chips/vic/sprites.rb
-- lib/badline/chips/vic/sprites/saved_state.rb
 - lib/badline/chips/vic_i.rb
+- lib/badline/chips/vic_i/keyed_parts.rb
 - lib/badline/chips/vic_i/painter.rb
-- lib/badline/chips/vic_i/painter/saved_state.rb
-- lib/badline/chips/vic_i/saved_state.rb
 - lib/badline/chips/vic_i/sound.rb
 - lib/badline/chips/vic_i/sound/output.rb
 - lib/badline/chips/vic_i/text_window.rb
@@ -237,17 +236,16 @@ files:
 - lib/badline/chips/z80/flags.rb
 - lib/badline/chips/z80/interrupt_acceptance.rb
 - lib/badline/chips/z80/jumps.rb
+- lib/badline/chips/z80/keyed_state.rb
 - lib/badline/chips/z80/loads.rb
 - lib/badline/chips/z80/main_page.rb
 - lib/badline/chips/z80/registers.rb
-- lib/badline/chips/z80/saved_state.rb
 - lib/badline/chips/z80/shifts.rb
-- lib/badline/chrout_trap.rb
 - lib/badline/core.rb
 - lib/badline/data_path.rb
-- lib/badline/debug_register.rb
+- lib/badline/drives.rb
 - lib/badline/drives/datasette.rb
-- lib/badline/drives/datasette/saved_state.rb
+- lib/badline/drives/datasette/keyed_state.rb
 - lib/badline/drives/engine.rb
 - lib/badline/drives/engine/core.rb
 - lib/badline/drives/engine/fast_serial.rb
@@ -263,20 +261,18 @@ files:
 - lib/badline/drives/model1541/byte_ready.rb
 - lib/badline/drives/model1541/cpu.rb
 - lib/badline/drives/model1541/disk.rb
-- lib/badline/drives/model1541/disk/saved_state.rb
 - lib/badline/drives/model1541/disk_via.rb
 - lib/badline/drives/model1541/gcr.rb
+- lib/badline/drives/model1541/keyed_state.rb
 - lib/badline/drives/model1541/mechanism.rb
-- lib/badline/drives/model1541/mechanism/saved_state.rb
 - lib/badline/drives/model1541/rotation.rb
-- lib/badline/drives/model1541/saved_state.rb
 - lib/badline/drives/model1541/sector_reader.rb
 - lib/badline/drives/model1541/serial_port.rb
 - lib/badline/drives/model1541/track.rb
 - lib/badline/drives/model1571.rb
 - lib/badline/drives/model1571/bus.rb
 - lib/badline/drives/model1571/cpu.rb
-- lib/badline/drives/model1571/saved_state.rb
+- lib/badline/drives/model1571/keyed_state.rb
 - lib/badline/drives/model1571/serial_port.rb
 - lib/badline/drives/model1571/serial_via.rb
 - lib/badline/drives/model1571/wd1770.rb
@@ -284,16 +280,14 @@ files:
 - lib/badline/drives/model1581/bus.rb
 - lib/badline/drives/model1581/cpu.rb
 - lib/badline/drives/model1581/disk.rb
-- lib/badline/drives/model1581/disk/saved_state.rb
+- lib/badline/drives/model1581/keyed_state.rb
 - lib/badline/drives/model1581/mechanism.rb
-- lib/badline/drives/model1581/saved_state.rb
 - lib/badline/drives/model1581/serial_port.rb
 - lib/badline/drives/model1581/slot.rb
 - lib/badline/drives/model1581/track.rb
 - lib/badline/drives/model1581/track_bytes.rb
 - lib/badline/drives/model1581/wd1772.rb
 - lib/badline/drives/model1581/wd1772/registers.rb
-- lib/badline/drives/model1581/wd1772/saved_state.rb
 - lib/badline/drives/model1581/wd1772/sector_writes.rb
 - lib/badline/drives/model1581/wd1772/sectors.rb
 - lib/badline/drives/model1581/wd1772/stepping.rb
@@ -350,10 +344,12 @@ files:
 - lib/badline/input/control_ports.rb
 - lib/badline/input/joystick.rb
 - lib/badline/input/keyboard.rb
+- lib/badline/input/matrix_typist.rb
 - lib/badline/input/mouse1351.rb
 - lib/badline/input/paddles.rb
 - lib/badline/integer_helper.rb
 - lib/badline/kernal_trap.rb
+- lib/badline/kernal_trap/chrout.rb
 - lib/badline/kernal_trap/dos.rb
 - lib/badline/kernal_trap/dos/block_commands.rb
 - lib/badline/kernal_trap/dos/channel.rb
@@ -364,14 +360,16 @@ files:
 - lib/badline/kernal_trap/dos/write_file.rb
 - lib/badline/kernal_trap/dos/writes.rb
 - lib/badline/kernal_trap/file_routine.rb
+- lib/badline/kernal_trap/keyed_state.rb
 - lib/badline/kernal_trap/layout.rb
 - lib/badline/kernal_trap/load.rb
 - lib/badline/kernal_trap/routine.rb
 - lib/badline/kernal_trap/save.rb
 - lib/badline/kernal_trap/serial.rb
-- lib/badline/keyboard_buffer.rb
 - lib/badline/machine.rb
 - lib/badline/machine/clocking.rb
+- lib/badline/machine/keyboard_buffer.rb
+- lib/badline/machine/settling.rb
 - lib/badline/media.rb
 - lib/badline/media/boot_disk.rb
 - lib/badline/media/disk_list.rb
@@ -393,6 +391,14 @@ files:
 - lib/badline/options/option.rb
 - lib/badline/options/table.rb
 - lib/badline/options/validation.rb
+- lib/badline/plus4.rb
+- lib/badline/plus4/acia.rb
+- lib/badline/plus4/bus.rb
+- lib/badline/plus4/cpu.rb
+- lib/badline/plus4/cpu_port.rb
+- lib/badline/plus4/keyboard_port.rb
+- lib/badline/plus4/model.rb
+- lib/badline/plus4/user_port.rb
 - lib/badline/region.rb
 - lib/badline/rom.rb
 - lib/badline/roms/README
@@ -411,6 +417,11 @@ files:
 - lib/badline/roms/kernal-pet64.rom
 - lib/badline/roms/kernal-sx64.rom
 - lib/badline/roms/kernal.rom
+- lib/badline/roms/plus4/basic.rom
+- lib/badline/roms/plus4/function-high.rom
+- lib/badline/roms/plus4/function-low.rom
+- lib/badline/roms/plus4/kernal-ntsc.rom
+- lib/badline/roms/plus4/kernal-pal.rom
 - lib/badline/roms/vic20/basic.rom
 - lib/badline/roms/vic20/character.rom
 - lib/badline/roms/vic20/kernal-ntsc.rom
@@ -426,10 +437,17 @@ files:
 - lib/badline/snapshot/c128_setup.rb
 - lib/badline/snapshot/c64_setup.rb
 - lib/badline/snapshot/container.rb
+- lib/badline/snapshot/field_doc.rb
+- lib/badline/snapshot/field_doc/markdown.rb
 - lib/badline/snapshot/image.rb
+- lib/badline/snapshot/keyed.rb
+- lib/badline/snapshot/keyed/cursor.rb
+- lib/badline/snapshot/keyed/modules.rb
+- lib/badline/snapshot/keyed/reader.rb
+- lib/badline/snapshot/keyed/recorder.rb
+- lib/badline/snapshot/keyed/report.rb
+- lib/badline/snapshot/keyed/writer.rb
 - lib/badline/snapshot/machine_state.rb
-- lib/badline/snapshot/setup.rb
-- lib/badline/snapshot/state.rb
 - lib/badline/snapshot/storage_setup.rb
 - lib/badline/snapshot/vic20_setup.rb
 - lib/badline/snapshot/vice.rb
@@ -473,11 +491,12 @@ files:
 - lib/badline/vic20.rb
 - lib/badline/vic20/attachments.rb
 - lib/badline/vic20/bus.rb
-- lib/badline/vic20/bus/saved_state.rb
+- lib/badline/vic20/bus/keyed_state.rb
 - lib/badline/vic20/cpu.rb
 - lib/badline/vic20/keyboard_via_ports.rb
+- lib/badline/vic20/keyed_modules.rb
+- lib/badline/vic20/keyed_state.rb
 - lib/badline/vic20/port_wiring.rb
-- lib/badline/vic20/saved_state.rb
 - lib/badline/vic20/user_via_ports.rb
 - packaging/homebrew/badline.rb
 homepage: https://github.com/elektronaut/badline

data/lib/badline/c128/bus/saved_state.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Badline
-  class C128
-    class Bus
-      # 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
-        # the keyboard, the joysticks, the pot devices and CAPS LOCK, which the
-        # host holds. A cartridge is already in the port, built from its setup.
-        def save_state(out)
-          out.marker("C128 BUS")
-          out.int(@cpu_port.ddr).int(@cpu_port.data).int(@cpu_port.floating).int(@address).int(@data)
-          @mmu.save_state(out)
-          @ram.save_state(out)
-          @color_lines.color_ram(0).save_state(out)
-          @color_lines.color_ram(1).save_state(out)
-          @cartridge&.save_state(out)
-          @datasette.save_state(out)
-          @vic.save_state(out)
-          @cia1.save_state(out)
-          @cia2.save_state(out)
-          @sid.save_state(out)
-          @vdc.save_state(out)
-        end
-
-        def load_state(input)
-          input.marker("C128 BUS")
-          ddr = input.int
-          data = input.int
-          floating = input.int
-          @address = input.int
-          @data = input.int
-          @mmu.load_state(input)
-          @ram.load_state(input)
-          @color_lines.color_ram(0).load_state(input)
-          @color_lines.color_ram(1).load_state(input)
-          @cartridge&.load_state(input)
-          @datasette.load_state(input)
-          @cpu_port.load(ddr, data, floating)
-          update_overlays!
-          @vic.load_state(input)
-          @control_ports.extra_rows = 0xf8 | @vic.extra_keyboard_lines
-          @cia1.load_state(input)
-          @cia2.load_state(input)
-          @sid.load_state(input)
-          @vdc.load_state(input)
-        end
-      end
-    end
-  end
-end