badline 0.17.0 → 0.19.0

data/lib/badline/roms/README

@@ -128,6 +128,91 @@ https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/old/8050/
 and named by the 8050's parts list
 (https://www.zimmers.net/anonftp/pub/cbm/schematics/drives/old/8050/parts.txt).
 
+1001/fdc-251257-02a.rom
+-----------------------
+The SFD-1001's floppy controller program, 251257-02A: the first 1 KB
+of the 2716 on its 6530 adaptor (251252-01), whose A10 is grounded, so
+the controller runs it from $FC00-$FFFF in place of the 6530's mask.
+Its interface processor runs 8050/dos-2.7.rom, the same 16 KB as
+901887-01 and 901888-01. Drives::Model1001 loads it. The unit's
+mechanism, a Matsushita JU-570-2, has 100 tracks an inch, as its spec
+sheet in the 8250LP and SFD-1001 technical manual gives it, not the 96
+that zimmers.net's description says.
+SHA-1 473664d405942865d46a6e723eb7d3f243584f7a (the whole 2 KB EPROM,
+SHA-1 3b954eb34f7ea088eed1d33ebc6d6e83a3e9be15).
+
+Downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/old/1001/251257-02A.bin
+
+4040/dos-1.2.rom
+----------------
+The 2040's DOS 1.2, the 3040's with DOS 1, 8 KB for the interface
+processor's $E000-$FFFF: 901468-06 ($E000-$EFFF, SHA-1
+4d9658f2e6ff3276e5c6e224611a66ce44b16fc7) followed by 901468-07
+($F000-$FFFF, SHA-1 6a51c7954938439ca8342fc295bda050c06e1791). No DOS
+1.0 image is public, so both DOS 1 units run it, as xpet's 2040 does.
+The 2040 is often listed with DOS 1.0, but this set is 1.2: 901468-07's
+IRQ vector is $E2D6, and VICE-testprogs' vdrive/diskaddrchange.bas
+names the drive whose $FFFF reads $E2 "2040 v1.2". The Commodore ROM
+Genealogy (1980) lists it as the 2040's production set.
+Drives::Model2040 loads it.
+SHA-1 e37b3bfd801eb19dea50cf8b4a6af8613c3520d3.
+
+4040/fdc-901466-02.rom
+----------------------
+The 6530 of the DOS 1 floppy controller, 901466-02, the same 1 KB as
+901466-01, run from $FC00-$FFFF.
+SHA-1 d539858f839f96393f218307df7394362a84a26a.
+
+4040/dos-2.1.rom
+----------------
+DOS 2.1, 12 KB for the interface processor's $D000-$FFFF: 901468-11
+($D000, SHA-1 8415f3159dea73161e0cef7960afa6c76953b6f8), 901468-12
+($E000, SHA-1 e8a94f239082d45f64f01b2d8e488d18fe659cbb) and 901468-13
+($F000, SHA-1 6ada7904ac9d13c3f1c0a8715f9c4be1aa6eb0bb). xpet's 3040
+runs it, and so does Drives::Model3040.
+SHA-1 02bd4b0c8508b3874b95799a9a63caf369c837de.
+
+4040/dos-2.1-rev.rom
+--------------------
+The revised DOS 2.1, 12 KB for $D000-$FFFF: 901468-14 ($D000, SHA-1
+ffb992b82ec913ddff7be964d7527aca3e21580c), 901468-15 ($E000, SHA-1
+f702d6917fe8a798740ba4d467b500944ae7b70a) and 901468-16 ($F000, SHA-1
+04b918cf4adeee8015b43383d3cea7288a7d0aa8). xpet's 4040 runs it, and
+so does Drives::Model4040.
+SHA-1 245abbe76581558d270cdbb6fe55f56748403d8e.
+
+4040/fdc-901466-04.rom
+----------------------
+The 6530 of the DOS 2.1 floppy controller, 901466-04, run from
+$FC00-$FFFF under both DOS 2.1 sets.
+SHA-1 6645fa40b81be1ff7d1384e9b52df06a26ab0bfb.
+
+All downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/old/4040/
+and concatenated in address order.
+
+9060/dos-3.0.rom
+----------------
+The D9060's and D9090's DOS 3.0, 16 KB for the interface processor's
+$C000-$FFFF: 300516 rev C ($C000-$DFFF, SHA-1
+bb1ddb5da94a86266012eca54818aa21dc4cef6a) followed by 300517 rev C
+($E000-$FFFF, SHA-1 4c17d014de48c906871b9b6c7d037d8736b1fd52), the set
+xpet's 9000 runs.
+SHA-1 c48df2cbb0eea656c3243df7ea8bfefcd171b8e8.
+
+9060/sasi-300515-revb.rom
+-------------------------
+The program of the D9060's and D9090's SASI host processor, 300515
+rev B, 2 KB for $F800-$FFFF.
+SHA-1 59dafbd4855083074ba8dc96a04d4daa5b76e0d6.
+
+Both downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/old/9090/
+The harddrives.zip elsewhere on zimmers.net is not the D9060's DOS: it
+is a 1981 prototype DOS for one processor, driving an 8" floppy and an
+8" hard disk.
+
 Commodore VIC-20 ROMs
 =====================
 
@@ -377,6 +462,66 @@ the German letters and the section sign in place of @ [ \ ] and in
 some of the graphics. The CRTC's MA13, bit 5 of R12, picks the half.
 SHA-1 9616f7f18757cccefb702a945f954b644d5b17d1.
 
+Commodore SuperPET ROMs
+=======================
+
+Downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/computers/pet/SuperPET/
+The Waterloo 6809 firmware, as the two-board SuperPET's three 2764s hold
+it. The three-board SuperPET's 2532s and 2516 hold the same bytes, and
+each file below names them. In 6502 mode the SuperPET runs the 8032's
+ROMs above. Nothing maps these yet.
+
+pet/superpet-a000.rom
+---------------------
+The Waterloo ROM for $A000-$BFFF, 970018-12
+(waterloo-a000-bfff.970018-12.bin): 901898-01
+(waterloo-a000.901898-01.bin, SHA-1
+0414b3ab847c8977eb05c2fcc72efcf2f9d92871) followed by 901898-02
+(waterloo-b000.901898-02.bin, SHA-1
+df154939b934d0aeeb376813ec1ba0d43c2a3378).
+SHA-1 dcd18397dd2a691118aaacf2b087d08e3782f81a.
+
+pet/superpet-c000.rom
+---------------------
+The Waterloo ROM for $C000-$DFFF, 970019-12
+(waterloo-c000-dfff.970019-12.bin): 901898-03
+(waterloo-c000.901898-03.bin, SHA-1
+6c5b0cce97068f8841112ba6d5cd8e568b562fa3) followed by 901898-04
+(waterloo-d000.901898-04.bin, SHA-1
+b42a2050a319a1ffca7868a8d8d635fadd37ec37).
+SHA-1 3ac4b9ae895c45630d10cfc9079f5dcbce5eb48e.
+
+pet/superpet-e000.rom
+---------------------
+The Waterloo ROM for $E000-$FFFF, 970020-12
+(waterloo-e000-ffff.970020-12.bin), with the 60 Hz CRTC table: 901897-01
+(waterloo-e000.901897-01.bin, SHA-1
+e8ce8347451a001214a5e71a13081b38b4be23bc) for $E000-$E7FF, 2K of $FF
+where the I/O page sits, and 901898-05 (waterloo-f000.901898-05.bin,
+SHA-1 9b4a5134d20345171e7303445f87c4e0b9addc96) for $F000-$FFFF, which
+ends in the 6809's vectors.
+SHA-1 618992fe0046b670695f5b1d1c168ace9e6b8470.
+
+pet/superpet-e000-50hz.rom
+--------------------------
+The 50 Hz Waterloo ROM for $E000-$FFFF, 970034-12
+(waterloo-e000-ffff-970034-12.bin, from Christian Forstreuter's MMF
+9000, U49). Its $E000-$E7FF is the 50 Hz 901897-01
+(waterloo-e000.901897-x.50Hz.bin, SHA-1
+57f8c3ef305768d9cba9a96d3f7b90d4a3c2daa4), which differs from the 60 Hz
+one in three bytes of the CRTC table, $E0C2, $E0C3 and $E0C5, and the
+rest is superpet-e000.rom's.
+SHA-1 ef6c5e5e9be17b87faed43cf0007f98731d78384.
+
+pet/characters-superpet.rom
+---------------------------
+The SuperPET's 4K character generator, 901640-01
+(characters.901640-01.bin). Its first half is 901447-10 byte for byte,
+and its second holds an ASCII and an APL set. The CRTC's MA13, bit 5 of
+R12, picks the half.
+SHA-1 bf346f11595a3e65e55d6aeeaa2c0cec807b66c7.
+
 Commodore CBM-II ROMs
 =====================
 
@@ -459,3 +604,34 @@ p500-basic-hi.901235-02.bin, SHA-1
 1b9a55f12f8cf025754d8029cc5324b474c35841) concatenated, for
 $8000-$BFFF in segment 15.
 SHA-1 e69531d45f5993f8e53c6bd9ab2a7bc10fe2d02f.
+
+MOS KIM-1 ROMs
+==============
+
+Downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/computers/kim1/
+The files there are the monitor listing assembled with $FF in the
+unused bytes. Real 6530-002 and 6530-003 chips have $00 there, as Hans
+Otten found dumping his own
+(http://retro.hansotten.nl/6502-sbc/kim-1-manuals-and-software/kim_1-roms/),
+so badline zeroes those bytes and keeps the code as it is. Only a
+program that reads unused ROM sees the difference.
+
+kim1/6530-002.rom
+-----------------
+The mask ROM of the 6530-002, U2: the monitor, for $1C00-$1FFF, its
+keypad and display routines, the teletype's and the 6502's vectors.
+6530-002.bin from zimmers.net, SHA-1
+054f7f6989af3a59462ffb0372b6f56f307b5362, with the three bytes at
+$1FF7-$1FF9 zeroed. The result is Otten's dump of a real chip,
+6530-002 fillerbyte00.bin.
+SHA-1 d0b5ceb279303cad219d6609d7db03a120f59ab8.
+
+kim1/6530-003.rom
+-----------------
+The mask ROM of the 6530-003, U3: the cassette routines, for
+$1800-$1BFF. 6530-003.bin from zimmers.net, SHA-1
+60b6e48f35fe4899e29166641bac3e81e3b9d220, with the 356 bytes at
+$1A96-$1BF9 zeroed. The result is Otten's dump of a real chip,
+6530-003 fillerbyte00.bin.
+SHA-1 16caaf9d4c8327e0d3198887499fe30056df3084.

data/lib/badline/snapshot/container.rb

@@ -42,10 +42,13 @@ module Badline
       CBM2 = "CBM-II"
       # xcbm5x0 names its machine CBM-II-5x0, the P500.
       CBM2_5X0 = "CBM-II-5x0"
+      # VICE has no KIM-1, so badline names it.
+      KIM1 = "KIM1"
       # The file format version each machine's VICE emulator reads, where
-      # it isn't FORMAT_MAJOR.0: xpet and xcbm2 refuse any other than 1.0, and
-      # xcbm5x0 writes 0.0.
-      FORMAT_MAJORS = { PET => 1, CBM2 => 1, CBM2_5X0 => 0 }.freeze
+      # it isn't FORMAT_MAJOR.0: xpet and xcbm2 refuse any other than 1.0,
+      # xcbm5x0 writes 0.0, and xvic refuses any other than 3.1.
+      FORMAT_MAJORS = { PET => 1, CBM2 => 1, CBM2_5X0 => 0, VIC20 => 3 }.freeze
+      FORMAT_MINORS = { VIC20 => 1 }.freeze
       GZIP_MAGIC = "\x1f\x8b".b
 
       # The VICE version block, when VICE wrote the file: four version
@@ -75,7 +78,8 @@ module Badline
       def [](name) = @sections.find { |section| section.name == name }
 
       def to_s
-        header = MAGIC + [FORMAT_MAJORS.fetch(@machine, FORMAT_MAJOR), FORMAT_MINOR].pack("CC") + padded(@machine)
+        version = [FORMAT_MAJORS.fetch(@machine, FORMAT_MAJOR), FORMAT_MINORS.fetch(@machine, FORMAT_MINOR)]
+        header = MAGIC + version.pack("CC") + padded(@machine)
         header += VERSION_MAGIC + @vice_version if @vice_version
         header + @sections.map { |section| encode(section) }.join
       end

data/lib/badline/snapshot/field_doc/markdown.rb

@@ -8,7 +8,7 @@ module Badline
       # voice1 to voice3, on one row.
       class Markdown
         NAMES = { "c64" => "C64", "vic20" => "VIC-20", "c128" => "C128", "plus4" => "Plus/4", "pet" => "PET",
-                  "cbm2" => "CBM-II" }.freeze
+                  "cbm2" => "CBM-II", "kim1" => "KIM-1" }.freeze
         TAG_TYPES = { Keyed::INT => "int", Keyed::BOOL => "bool", Keyed::BYTES => "bytes", Keyed::INTS => "ints",
                       Keyed::TEXT => "text" }.freeze
 

data/lib/badline/snapshot/field_doc.rb

@@ -35,18 +35,21 @@ module Badline
       CARTRIDGES = [32, 5, 21, 18, 1, 53].freeze
 
       # The machines the doc is made from: each family at power-on, the C64
-      # with each kind of expansion, cartridge and media, and a second SID,
-      # the 264 series' models, its TCBM interface, cartridge, tape and
-      # true drives, the 1541 and the 1551, a CRTC PET, a 2001, an 8096,
+      # with each kind of expansion, cartridge and media, a second SID and
+      # its sound recording, the 264 series' models, its TCBM interface,
+      # cartridge, tape and true drives, the 1541 and the 1551, a CRTC PET,
+      # a 2001, an 8096,
       # an 8296 with its user port jumpered, a PET with a disk and tapes and
-      # one with a true 2031, one with an 8050 and one with an 8250, and a
-      # 610, a 720, a 610 with a cartridge and one with a disk, and a PAL
-      # and an NTSC 510.
+      # one with a true 2031, one with an 8050, one with an 8250, one with
+      # a 4040 and one with a D9060, a SuperPET in 6809 mode with a disk in
+      # device 8, and a 610, a 720, a 610 with a cartridge and one with a
+      # disk, a PAL and an NTSC 510, and a KIM-1 on its keypad and one
+      # expanded, on a teletype.
       def self.machines
         {
           "c64" => [C64.new, C64.new(ram_expansion: :plus256k), C64.new(reu: 512),
                     *CARTRIDGES.map { |type| with_cartridge(type) }, with_trap_dos, with_tape, with_drive(:d64),
-                    with_drive(:d81), with_extra_sids],
+                    with_drive(:d81), with_extra_sids, with_recording],
           "vic20" => [Vic20.new, with_rom],
           "c128" => [C128.new(mode: :c128), with_drive(:d71)],
           "plus4" => [Plus4.new, Plus4.new(model: "c16"), Plus4.new(tcbm: true), Plus4.new(sid_card: :mos6581),
@@ -55,9 +58,11 @@ module Badline
                       plus4_with_cartridge, plus4_with_tape, plus4_with_drive, plus4_with_drive("1551")],
           "pet" => [PET.new, PET.new(model: "2001"), PET.new(model: "8096"),
                     PET.new(model: "8296", characters: "din", jumpers: %w[userport]), pet_with_media,
-                    pet_with_drive, pet_with_unit("8050"), pet_with_unit("8250")],
+                    pet_with_drive, pet_with_unit("8050"), pet_with_unit("8250"), pet_with_dos2_unit,
+                    pet_with_hard_disk, superpet_with_disk],
           "cbm2" => [CBM2.new, CBM2.new(model: "720", kernal: "03b", mains_hz: 60), cbm2_with_cartridge,
-                     cbm2_with_disk, CBM2::P500.new, CBM2::P500.new(model: "510ntsc")]
+                     cbm2_with_disk, CBM2::P500.new, CBM2::P500.new(model: "510ntsc")],
+          "kim1" => [KIM1.new, KIM1.new(tty: true, ram: :expanded)]
         }
       end
 
@@ -72,6 +77,14 @@ module Badline
         end
       end
 
+      # A SuperPET with its CPU switch at 6809 and a disk in device 8
+      # through the traps.
+      def self.superpet_with_disk
+        PET::SuperPET.new(cpu: "6809").tap do |machine|
+          machine.mount(Storage::D64Image.new("", read_only: true, bytes: blank(174_848)))
+        end
+      end
+
       # A PET with a 2031 holding a blank disk.
       def self.pet_with_drive
         PET.new.tap do |machine|
@@ -87,9 +100,18 @@ module Badline
                 else
                   Storage::D80Image.new("", bytes: blank(533_248))
                 end
-        PET.new.tap { |machine| machine.plug_drive8050(model).insert(Drives::Model8050::Disk.new(image)) }
+        PET.new.tap { |machine| machine.plug_ieee_drive(model).insert(Drives::Model8050::Disk.new(image)) }
       end
 
+      # A PET with a 4040 holding a blank disk in drive 0.
+      def self.pet_with_dos2_unit
+        image = Storage::D64Image.new("", bytes: blank(174_848))
+        PET.new.tap { |machine| machine.plug_ieee_drive("4040").insert(Drives::Model4040::Disk.new(image)) }
+      end
+
+      # A PET with a D9060 and no hard disk in it.
+      def self.pet_with_hard_disk = PET.new.tap { |machine| machine.plug_ieee_drive("9060") }
+
       def self.blank(length) = Array.new(length, 0)
 
       # A 610 with a disk in device 8 through the traps.
@@ -118,6 +140,9 @@ module Badline
         C64.new.tap { |machine| machine.address_bus.add_sid(Chips::SID.new(at: 0xd420)) }
       end
 
+      # A C64 recording its SID's output, as the window does with sound on.
+      def self.with_recording = C64.new.tap { |machine| machine.sound_source.record(rate: 44_100) }
+
       def self.with_trap_dos
         C64.new.tap { |machine| machine.mount(Storage::D64Image.new("", read_only: true, bytes: blank(174_848))) }
       end

data/lib/badline/snapshot/image.rb

@@ -35,13 +35,12 @@ module Badline
     class Image
       MACHINE = "BL-MACHINE"
       FAMILIES = { "c64" => "C64", "vic20" => "VIC-20", "c128" => "C128", "plus4" => "Plus/4", "pet" => "PET",
-                   "cbm2" => "CBM-II" }.freeze
+                   "cbm2" => "CBM-II", "kim1" => "KIM-1" }.freeze
 
       # The snapshots VICE's emulators write that badline doesn't read, by
       # the machine their container names.
       UNREAD = {
-        Container::VIC20 => "VIC-20 snapshots, not xvic's", Container::C128 => "C128 snapshots, not x128's",
-        Container::PLUS4 => "Plus/4 snapshots, not xplus4's"
+        Container::C128 => "C128 snapshots, not x128's", Container::PLUS4 => "Plus/4 snapshots, not xplus4's"
       }.freeze
 
       attr_reader :container
@@ -62,16 +61,18 @@ module Badline
       end
 
       # The snapshot with VICE's modules ahead of the BL-* ones for a C64,
-      # a PET, a CBM-II's B series or a P500, so x64sc, xpet, xcbm2 or
-      # xcbm5x0 opens it too. Raises FormatError for a Plus/4, whose
+      # a VIC-20, a PET, a CBM-II's B series or a P500, so x64sc, xvic,
+      # xpet, xcbm2 or xcbm5x0 opens it too. Raises FormatError for a Plus/4, whose
       # snapshots badline doesn't write for xplus4.
       def self.exported(computer)
         raise FormatError, "badline doesn't export a Plus/4's snapshot for VICE" if computer.family == :plus4
+        raise FormatError, "VICE has no KIM-1 to open a snapshot of one" if computer.family == :kim1
 
         computer.settle_for_vice!
         sections = computer.save_modules
         case computer.family
         when :c64 then sections = Vice.export(computer) + sections
+        when :vic20 then sections = Vice::Vic20.export(computer, sections) + sections
         when :pet then sections = Vice::PET.export(computer, sections) + sections
         when :cbm2 then sections = cbm2_export(computer, sections) + sections
         end
@@ -86,6 +87,7 @@ module Badline
       # The VICE emulator a machine's VICE modules are for.
       def self.vice_emulator(computer)
         case machine_name(computer)
+        when Container::VIC20 then "xvic"
         when Container::PET then "xpet"
         when Container::CBM2 then "xcbm2"
         when Container::CBM2_5X0 then "xcbm5x0"
@@ -101,6 +103,7 @@ module Badline
         when :plus4 then Container::PLUS4
         when :pet then Container::PET
         when :cbm2 then computer.is_a?(CBM2::P500) ? Container::CBM2_5X0 : Container::CBM2
+        when :kim1 then Container::KIM1
         else Container::MACHINE
         end
       end
@@ -114,6 +117,7 @@ module Badline
         when "plus4" then Plus4Setup.read_fields(machine)
         when "pet" then PETSetup.read_fields(machine)
         when "cbm2" then CBM2Setup.read_fields(machine)
+        when "kim1" then KIM1Setup.read_fields(machine)
         else C64Setup.read_fields(machine)
         end
       end
@@ -129,13 +133,14 @@ module Badline
 
       # A new machine, built as the snapshot's was and restored from it. A
       # badline snapshot restores from its BL-* modules alone, and a VICE
-      # one through the modules badline reads, x64sc's, xpet's, xcbm2's or xcbm5x0's. xvic's,
-      # x128's and xplus4's own modules aren't read. Yields a line for
+      # one through the modules badline reads, x64sc's, xvic's, xpet's,
+      # xcbm2's or xcbm5x0's. x128's and xplus4's own modules aren't read. Yields a line for
       # each thing left out, or warns it without a block. `detached`
       # restores it without the host's files (Keyed::Modules).
       def load(detached: false, &)
         refuse_old_layout
         refuse_unread
+        return load_xvic(&) if vic20? && !badline?
         return load_xpet(&) if pet? && !badline?
         return load_xcbm2(&) if cbm2? && !badline?
         return load_xcbm5x0(&) if p500? && !badline?
@@ -172,6 +177,7 @@ module Badline
       def restore(computer, &)
         refuse_old_layout
         report = if badline? then restore_modules(computer)
+                 elsif vic20? then Vice::Vic20::Restore.import(@container, computer)
                  elsif pet? then Vice::PET::Restore.import(@container, computer)
                  elsif cbm2? then Vice::CBM2::Restore.import(@container, computer)
                  elsif p500? then Vice::P500::Restore.import(@container, computer)
@@ -189,6 +195,12 @@ module Badline
         computer
       end
 
+      def load_xvic(&)
+        computer = Vice::Vic20.setup(@container).build
+        tell(Vice::Vic20::Restore.apply(@container, computer), &)
+        computer
+      end
+
       def load_xpet(&)
         computer = Vice::PET.setup(@container).build
         tell(Vice::PET::Restore.apply(@container, computer), &)

data/lib/badline/snapshot/kim1_setup.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Badline
+  module Snapshot
+    # How a KIM-1 was built: its RAM, one of KIM1::Bus::RAM_CONFIGURATIONS
+    # by name, the argument KIM1.new takes. The ROMs are the board's own.
+    KIM1Setup = Data.define(:ram)
+
+    class KIM1Setup
+      RAM = KIM1::Bus::RAM_CONFIGURATIONS.map(&:to_s).freeze
+
+      # The setup of `machine`.
+      def self.of(machine) = new(ram: machine.bus.ram_configuration.to_s)
+
+      # The RAM by name, in a keyed snapshot module.
+      def write_fields(out)
+        out.text("ram", ram)
+      end
+
+      def self.read_fields(input) = new(ram: input.choice("ram", RAM, "1k"))
+
+      # A machine built this way, at power-on.
+      def build = KIM1.new(ram: ram.to_sym)
+
+      def to_s = "KIM-1 with #{ram == 'expanded' ? 'expanded' : ram.upcase} RAM"
+    end
+  end
+end

data/lib/badline/snapshot/pet_setup.rb

@@ -5,9 +5,11 @@ module Badline
     # How a PET was built: its model's name, one of PET::Model::ALL, its
     # RAM below $8000 in K and its editor's frame rate, the arguments
     # PET.new takes, the ROMs it runs by file: BASIC, the editor, the
-    # KERNAL and the characters, and the 8296 board's jumpers, by name and
-    # comma-separated.
-    PETSetup = Data.define(:model, :ram_kb, :refresh_hz, :basic, :editor, :kernal, :characters, :jumpers)
+    # KERNAL and the characters, the 8296 board's jumpers, by name and
+    # comma-separated, and the SuperPET's CPU and RAM switches, as
+    # PET::SuperPET::Board names their positions, empty on the others.
+    PETSetup = Data.define(:model, :ram_kb, :refresh_hz, :basic, :editor, :kernal, :characters, :jumpers,
+                           :cpu_switch, :ram_switch)
 
     class PETSetup
       MODELS = PET::Model::ALL.map(&:name).freeze
@@ -20,20 +22,24 @@ module Badline
         refresh_hz = machine.refresh_hz
         new(model: model.name, ram_kb: machine.ram.length >> 10, refresh_hz:, basic: model.basic,
             editor: model.editor(refresh_hz), kernal: model.kernal, characters: model.characters,
-            jumpers: machine.jumpers.join(","))
+            jumpers: machine.jumpers.join(","), cpu_switch: machine.superpet? ? machine.board.cpu_switch : "",
+            ram_switch: machine.superpet? ? machine.board.ram_switch : "")
       end
 
-      # The model by name, the RAM, the frame rate, the ROMs and the
-      # jumpers where a board has any, in a keyed snapshot module.
+      # The model by name, the RAM, the frame rate, the ROMs, the jumpers
+      # where a board has any and the switches where it has them, in a
+      # keyed snapshot module.
       def write_fields(out)
         out.text("model", model).int("ram_kb", ram_kb).int("refresh_hz", refresh_hz)
         out.text("rom.basic", basic).text("rom.editor", editor).text("rom.kernal", kernal)
         out.text("rom.characters", characters)
         out.text("jumpers", jumpers) unless jumpers.empty?
+        out.text("cpu_switch", cpu_switch).text("ram_switch", ram_switch) unless cpu_switch.empty?
       end
 
-      # A ROM the snapshot doesn't name is the model's own, and a board
-      # without jumpers named has none fitted.
+      # A ROM the snapshot doesn't name is the model's own, a board without
+      # jumpers named has none fitted, and a SuperPET without its switches
+      # named has them at 6502 and R/W.
       def self.read_fields(input)
         profile = PET::Model.named(input.choice("model", MODELS, PET::Model::DEFAULT))
         ram_kb = input.int("ram_kb", profile.ram_kb)
@@ -47,18 +53,27 @@ module Badline
         end
 
         refresh_hz = 60 unless profile.crtc?
+        superpet = profile.superpet?
         new(model: profile.name, ram_kb:, refresh_hz:, basic: input.text("rom.basic", profile.basic),
             editor: input.text("rom.editor", profile.editor(refresh_hz)),
             kernal: input.text("rom.kernal", profile.kernal),
-            characters: input.text("rom.characters", profile.characters), jumpers: input.text("jumpers", ""))
+            characters: input.text("rom.characters", profile.characters), jumpers: input.text("jumpers", ""),
+            cpu_switch: superpet ? input.choice("cpu_switch", PET::SuperPET::Board::CPU_SWITCH, "6502") : "",
+            ram_switch: superpet ? input.choice("ram_switch", PET::SuperPET::Board::RAM_SWITCH, "rw") : "")
       end
 
       # A machine built this way, at power-on, with the BASIC, editor and
       # character ROMs PET::ROMSets names for its ROMs.
       def build
         version = PET::ROMSets::BASICS.find { |_, roms| roms.first == basic }&.first
-        PET.new(model:, ram_kb:, refresh_hz:, basic: version, editor: PET::ROMSets::EDITORS.key(editor),
-                characters: fitted_characters, jumpers: jumpers.split(","))
+        editor_name = PET::ROMSets::EDITORS.key(editor)
+        unless cpu_switch.empty?
+          return PET::SuperPET.new(refresh_hz:, basic: version, editor: editor_name, cpu: cpu_switch,
+                                   bank_ram: ram_switch)
+        end
+
+        PET.new(model:, ram_kb:, refresh_hz:, basic: version, editor: editor_name, characters: fitted_characters,
+                jumpers: jumpers.split(","))
       rescue ArgumentError => e
         raise FormatError, "the snapshot is of a #{self}, which badline doesn't build: #{e.message}"
       end
@@ -68,6 +83,7 @@ module Badline
       def to_s
         text = "#{model} with #{ram_kb}K at #{refresh_hz} Hz"
         text = "#{text} jumpered #{jumpers}" unless jumpers.empty?
+        text = "#{text} with its CPU switch at #{cpu_switch} and RAM switch at #{ram_switch}" unless cpu_switch.empty?
         roms = [basic, editor, kernal, characters]
         profile = PET::Model.named(model)
         stock = [profile.basic, profile.editor(refresh_hz), profile.kernal, profile.characters]

data/lib/badline/snapshot/storage_setup.rb

@@ -13,6 +13,7 @@ module Badline
       T64_ARCHIVE = 4
       D80 = 5
       D82 = 6
+      D67 = 7
 
       module_function
 
@@ -22,6 +23,7 @@ module Badline
         return D81 if image.is_a?(Storage::D81Image)
         return D82 if image.is_a?(Storage::D82Image)
         return D80 if image.is_a?(Storage::D80Image)
+        return D67 if image.is_a?(Storage::D67Image)
 
         raise ArgumentError, "#{image.class} can't go in a snapshot"
       end
@@ -41,7 +43,7 @@ module Badline
         end
       end
 
-      KIND_NAMES = %w[directory d64 d71 d81 t64 d80 d82].freeze
+      KIND_NAMES = %w[directory d64 d71 d81 t64 d80 d82 d67].freeze
 
       # Opens the storage write_fields wrote: the same directory by its
       # path, an archive with the bytes it held, or a disk image with the
@@ -61,6 +63,7 @@ module Badline
         when D71 then Storage::D71Image.new(path, read_only:, bytes:)
         when D80 then Storage::D80Image.new(path, read_only:, bytes:)
         when D82 then Storage::D82Image.new(path, read_only:, bytes:)
+        when D67 then Storage::D67Image.new(path, read_only:, bytes:)
         else Storage::D81Image.new(path, read_only:, bytes:)
         end
       end

data/lib/badline/snapshot/vic20_setup.rb

@@ -3,26 +3,30 @@
 module Badline
   module Snapshot
     # How a VIC-20 was built: its RAM expansion, a key of
-    # Vic20::Bus::RAM_CONFIGURATIONS, the argument Vic20.new takes.
-    Vic20Setup = Data.define(:ram)
+    # Vic20::Bus::RAM_CONFIGURATIONS, and its model, one of Vic20::MODELS,
+    # the arguments Vic20.new takes.
+    Vic20Setup = Data.define(:ram, :model)
 
     class Vic20Setup
       RAM_CONFIGURATIONS = Vic20::Bus::RAM_CONFIGURATIONS.keys.freeze
 
-      # The RAM expansion by name, in a keyed snapshot module.
+      # The RAM expansion and the model by name, in a keyed snapshot module.
+      # A snapshot without a model is of a PAL machine, the only one badline
+      # built before the NTSC one.
       def write_fields(out)
-        out.text("ram", ram.to_s)
+        out.text("ram", ram.to_s).text("model", model)
       end
 
       def self.read_fields(input)
         text = input.choice("ram", RAM_CONFIGURATIONS.map(&:to_s), "unexpanded")
-        new(ram: RAM_CONFIGURATIONS.find { |name| name.to_s == text } || :unexpanded)
+        new(ram: RAM_CONFIGURATIONS.find { |name| name.to_s == text } || :unexpanded,
+            model: input.choice("model", Vic20::MODELS, "pal"))
       end
 
       # A machine built this way, at power-on.
-      def build = Vic20.new(ram:)
+      def build = Vic20.new(ram:, model:)
 
-      def to_s = ram.to_s
+      def to_s = model == "pal" ? ram.to_s : "#{ram} #{model}"
     end
   end
 end