badline 0.16.1 → 0.18.0

data/lib/badline/roms/README

@@ -100,6 +100,109 @@ https://www.zimmers.net/anonftp/pub/cbm/firmware/drives/old/2031/
 and concatenated.
 SHA-1 c53e180a96649ceb3f421739e8dc66faba7cba44.
 
+8050/fdc-901869-01.rom
+----------------------
+The 6530 of the 8050 and 8250's floppy controller with the DOS 2.7
+mask for MPI mechanisms, 901869-01 (6530-48): the 1 KB ROM the
+controller runs from $FC00-$FFFF. Chips::RRIOT holds it.
+SHA-1 3a9a80f72ce76e5f5c72513f8ef7553212912ae3.
+
+8050/fdc-901885-04.rom
+----------------------
+The same 6530 with the DOS 2.7 mask for Micropolis mechanisms,
+901885-04 (6530-47). It differs from 901869-01 in 104 bytes.
+SHA-1 0dc9a3b60f1b866c63eebd882403532fc59fe57f.
+
+8050/dos-2.7.rom
+----------------
+The 8050 and 8250's DOS 2.7, 16 KB for the interface processor's
+$C000-$FFFF: 901887-01 ($C000-$DFFF, SHA-1
+b10603195f240118fe5fb6c6dfe5c5097463d890) followed by 901888-01
+($E000-$FFFF, SHA-1 2e6c2d7ca934e5c550ad14bd5e9e7749686b7af4). xcbm2
+and xpet with -drive8type 8050 or 8250 run the same 16 KB.
+Drives::Model8050 loads it.
+SHA-1 d50b093828888146596f17ae0df9ef3dfde71b05.
+
+Both downloaded from
+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.
+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.
+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/
+
 Commodore VIC-20 ROMs
 =====================
 
@@ -348,3 +451,177 @@ second half is 901447-10 byte for byte, and its first a DIN set, with
 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
+=====================
+
+Downloaded from
+https://www.zimmers.net/anonftp/pub/cbm/firmware/computers/b/
+for the B series (610, 620, 710 and 720) and the P500 (510). Each BASIC
+is its two 8K chips concatenated, $8000-$9FFF followed by $A000-$BFFF,
+as the PET's are. Nothing maps them yet.
+
+cbm2/kernal-04a.rom
+-------------------
+The B series KERNAL, 901244-04a (kernal.901244-04a.bin), for
+$E000-$FFFF in segment 15. The default, the one VICE runs on every B
+model.
+SHA-1 abb26418b9e1614a8f52bdeee0822d4a96071439.
+
+cbm2/kernal-03b.rom
+-------------------
+The B series KERNAL of the 1983 release, 901244-03b
+(kernal.901244-03b.bin), for $E000-$FFFF in segment 15. Its entry
+points and page 3 vectors are 901244-04a's.
+SHA-1 a624899c236bc4458570144d25aaf0b3be08b2cd.
+
+cbm2/basic128.rom
+-----------------
+BASIC 128 for the 610 and 710, 901243-04a and 901242-04a
+(b128-8000.901243-04a.bin, SHA-1
+08d333208060ee2ce84d4532028d94f71c016b96, and b128-a000.901242-04a.bin,
+SHA-1 7c6de17d46a3343dc597d9b9519cf63037b31908) concatenated, for
+$8000-$BFFF in segment 15. The default, paired with kernal-04a.rom.
+SHA-1 9409f92e167984096fe4d5913714bff6214c3b2d.
+
+cbm2/basic128-02b.rom
+---------------------
+BASIC 128 of the 1983 release, 901243-02b and 901242-02b
+(b128-8000.901243-02b.bin, SHA-1
+625f7337ea972a8bce2bdf2daababc0ed0b3b69b, and b128-a000.901242-02b.bin,
+SHA-1 56e8d2f86bf73ba36b3d3cb84dd75806b66c530a) concatenated, for
+$8000-$BFFF in segment 15. Paired with kernal-03b.rom.
+SHA-1 0da8311666521a1d5d7c80561550f9037f652989.
+
+cbm2/basic256.rom
+-----------------
+BASIC 256 for the 620 and 720, 901241-03 and 901240-03
+(b256-8000.901241-03.bin, SHA-1
+2d46be2cd89594b718cdd0a86d51b6f628343f42, and b256-a000.901240-03.bin,
+SHA-1 0d7f77746290afba8d0abeb87c9caab9a3ad89ce) concatenated, for
+$8000-$BFFF in segment 15. Both KERNALs run it.
+SHA-1 53314b4d565cc405a67a0936b935e6e08955580d.
+
+cbm2/characters-600.rom
+-----------------------
+The 600's character generator, 901237-01 (characters.901237-01.bin),
+4K: two sets of 128 glyphs, 16 bytes each, an 8x8 matrix in the first
+eight rows.
+SHA-1 e63bf18da48e5a53c99ef127c1ae721333d1d102.
+
+cbm2/characters-700.rom
+-----------------------
+The 700's character generator, 901232-01 (characters.901232-01.bin),
+4K: two sets of 128 glyphs, 16 bytes each, an 8x16 matrix. zimmers.net
+also has 901232-02, from a 710, which differs in 139 bytes. xcbm2 runs
+-01 on its 710, and a 710's boot screen painted with it matches xcbm2's
+dot for dot.
+SHA-1 e7f3cbc8e282f79a00c3e95d75c8d725ee3c6287.
+
+cbm2/p500-kernal.rom
+--------------------
+The P500's KERNAL, 901234-02 (kernal.901234-02.bin), for $E000-$FFFF in
+segment 15. The P500's character generator is the C64's,
+character.rom above.
+SHA-1 097197d4d08e0b82e0466a5f1fbd49a24f3d2523.
+
+cbm2/p500-basic.rom
+-------------------
+The P500's BASIC 128, 901236-02 and 901235-02
+(p500-basic-lo.901236-02.bin, SHA-1
+f50240407bade901144f7e9f489fa9c607834eca, and
+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/cbm2_setup.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Badline
+  module Snapshot
+    # How a CBM-II was built: its model's name, one of CBM2::Model::ALL or
+    # CBM2::P500::Model::ALL, its KERNAL, one of the model's KERNALS, its
+    # mains, 50 or 60 Hz, and whether the DRAM refresh takes its cycles,
+    # the arguments CBM2.new or CBM2::P500.new takes.
+    CBM2Setup = Data.define(:model, :kernal, :mains_hz, :refresh)
+
+    class CBM2Setup
+      MODELS = (CBM2::Model::ALL + CBM2::P500::Model::ALL).map(&:name).freeze
+
+      KERNALS = (CBM2::Model::KERNALS.keys + CBM2::P500::Model::KERNALS.keys).freeze
+
+      MAINS = [50, 60].freeze
+
+      # The setup of `machine`.
+      def self.of(machine)
+        new(model: machine.model.name, kernal: machine.kernal, mains_hz: machine.mains_hz, refresh: machine.refresh?)
+      end
+
+      # The model by name, the KERNAL, the mains and the refresh, in a keyed
+      # snapshot module.
+      def write_fields(out)
+        out.text("model", model).text("kernal", kernal).int("mains_hz", mains_hz).bool("dram_refresh", refresh)
+      end
+
+      def self.read_fields(input)
+        model = input.choice("model", MODELS, CBM2::Model::DEFAULT)
+        kernal = input.choice("kernal", KERNALS, "04a")
+        mains_hz = input.int("mains_hz", 50)
+        unless MAINS.include?(mains_hz)
+          raise FormatError, "the snapshot is of a CBM-II at #{mains_hz} Hz, which badline doesn't build"
+        end
+
+        new(model:, kernal:, mains_hz:, refresh: input.bool("dram_refresh", true))
+      end
+
+      # A machine built this way, at power-on.
+      def build
+        return CBM2::P500.new(model:, mains_hz:) if CBM2::P500::Model.include?(model)
+
+        CBM2.new(model:, kernal:, mains_hz:, refresh:)
+      end
+
+      def to_s
+        machine = "#{model} with KERNAL #{kernal} at #{mains_hz} Hz"
+        refresh || CBM2::P500::Model.include?(model) ? machine : "#{machine} without the DRAM refresh"
+      end
+    end
+  end
+end

data/lib/badline/snapshot/container.rb

@@ -38,9 +38,16 @@ module Badline
       PLUS4 = "PLUS4"
       # xpet names its machine PET, for every model.
       PET = "PET"
+      # xcbm2 names its machine CBM-II, for every B series model.
+      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 refuses any other than 1.0.
-      FORMAT_MAJORS = { PET => 1 }.freeze
+      # 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
       GZIP_MAGIC = "\x1f\x8b".b
 
       # The VICE version block, when VICE wrote the file: four version

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

@@ -7,7 +7,8 @@ module Badline
       # its default, with keys that differ only in a unit's number, such as
       # voice1 to voice3, on one row.
       class Markdown
-        NAMES = { "c64" => "C64", "vic20" => "VIC-20", "c128" => "C128", "plus4" => "Plus/4", "pet" => "PET" }.freeze
+        NAMES = { "c64" => "C64", "vic20" => "VIC-20", "c128" => "C128", "plus4" => "Plus/4", "pet" => "PET",
+                  "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
 
@@ -31,7 +32,8 @@ module Badline
           `int & 0x..` are ints cut to the latch's width. A text that lists
           its values takes one of them. An optional int is absent when the
           latch holds nothing. A true drive's modules are named from its
-          device number, `BL-D8` to `BL-D11`, and the SIDs past the first
+          device number, `BL-D8` to `BL-D11`, or to `BL-D15` for an 8050 or
+          an 8250. The SIDs past the first
           are `BL-SID2` onwards, in the order they were fitted. Keys with
           `<N>` stand for each numbered unit. A default of "written only" is
           a key the load doesn't read, or reads only when the snapshot has

data/lib/badline/snapshot/field_doc.rb

@@ -37,8 +37,13 @@ module Badline
       # 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, and a CRTC PET, a 2001, an 8096,
-      # an 8296 with its user port jumpered and a PET with a disk and tapes.
+      # 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, 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),
@@ -51,7 +56,12 @@ module Badline
                       Plus4.new(ram_expansion: :csory256),
                       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.new(model: "8296", characters: "din", jumpers: %w[userport]), pet_with_media,
+                    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")],
+          "kim1" => [KIM1.new, KIM1.new(tty: true, ram: :expanded)]
         }
       end
 
@@ -66,8 +76,54 @@ 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|
+          image = Storage::D64Image.new("", bytes: blank(174_848))
+          machine.plug_true_drive.insert(Drives::Model1541::Disk.decode(image))
+        end
+      end
+
+      # A PET with an 8050 or an 8250 holding a blank disk in drive 0.
+      def self.pet_with_unit(model)
+        image = if model == "8250"
+                  Storage::D82Image.new("", bytes: blank(1_066_496))
+                else
+                  Storage::D80Image.new("", bytes: blank(533_248))
+                end
+        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.
+      def self.cbm2_with_disk
+        CBM2.new.tap { |machine| machine.mount(Storage::D64Image.new("", read_only: true, bytes: blank(174_848))) }
+      end
+
+      # A 610 with an 8K cartridge ROM at $2000.
+      def self.cbm2_with_cartridge
+        chip = Storage::CRTFile::Chip.new(chip_type: 0, bank: 0, address: 0x2000, data: blank(0x2000))
+        CBM2.new.tap { |machine| machine.attach_cartridge([chip]) }
+      end
+
       def self.with_cartridge(type)
         chips = [0x8000, 0xa000].map do |address|
           Storage::CRTFile::Chip.new(chip_type: 2, bank: 0, address:, data: blank(0x2000))

data/lib/badline/snapshot/image.rb

@@ -34,7 +34,15 @@ module Badline
     # of a machine in memory (.of).
     class Image
       MACHINE = "BL-MACHINE"
-      FAMILIES = { "c64" => "C64", "vic20" => "VIC-20", "c128" => "C128", "plus4" => "Plus/4", "pet" => "PET" }.freeze
+      FAMILIES = { "c64" => "C64", "vic20" => "VIC-20", "c128" => "C128", "plus4" => "Plus/4", "pet" => "PET",
+                   "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"
+      }.freeze
 
       attr_reader :container
 
@@ -53,21 +61,39 @@ module Badline
         new(Container.new(computer.save_modules, machine: machine_name(computer)))
       end
 
-      # The snapshot with VICE's modules ahead of the BL-* ones for a C64
-      # or a PET, so x64sc or xpet opens it too. Raises FormatError for a
-      # Plus/4, whose snapshots badline doesn't write for xplus4.
+      # 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
+      # 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_snapshot!
+        computer.settle_for_vice!
         sections = computer.save_modules
         case computer.family
         when :c64 then sections = Vice.export(computer) + sections
         when :pet then sections = Vice::PET.export(computer, sections) + sections
+        when :cbm2 then sections = cbm2_export(computer, sections) + sections
         end
         new(Container.new(sections, machine: machine_name(computer)))
       end
 
+      # xcbm2's or xcbm5x0's modules for a CBM-II.
+      def self.cbm2_export(computer, sections)
+        computer.is_a?(CBM2::P500) ? Vice::P500.export(computer, sections) : Vice::CBM2.export(computer, sections)
+      end
+
+      # The VICE emulator a machine's VICE modules are for.
+      def self.vice_emulator(computer)
+        case machine_name(computer)
+        when Container::PET then "xpet"
+        when Container::CBM2 then "xcbm2"
+        when Container::CBM2_5X0 then "xcbm5x0"
+        else "x64sc"
+        end
+      end
+
       # The machine as VICE's emulators name it.
       def self.machine_name(computer)
         case computer.family
@@ -75,6 +101,8 @@ module Badline
         when :c128 then Container::C128
         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
@@ -87,6 +115,8 @@ module Badline
         when "c128" then C128Setup.read_fields(machine)
         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
@@ -102,16 +132,16 @@ 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 or xpet's. xvic's,
+      # 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
       # 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
-        raise FormatError, "badline reads only its own VIC-20 snapshots, not xvic's" if vic20? && !badline?
-        raise FormatError, "badline reads only its own C128 snapshots, not x128's" if c128? && !badline?
-        raise FormatError, "badline reads only its own Plus/4 snapshots, not xplus4's" if plus4? && !badline?
+        refuse_unread
         return load_xpet(&) if pet? && !badline?
+        return load_xcbm2(&) if cbm2? && !badline?
+        return load_xcbm5x0(&) if p500? && !badline?
         return load_vice(&) unless badline?
 
         modules = Keyed::Modules.new(sections, detached:)
@@ -132,6 +162,13 @@ module Badline
       # Whether the machine is a PET, as the container names it.
       def pet? = @container.machine == Container::PET
 
+      # Whether the machine is a CBM-II's B series, as the container names
+      # it.
+      def cbm2? = @container.machine == Container::CBM2
+
+      # Whether the machine is a P500, as the container names it.
+      def p500? = @container.machine == Container::CBM2_5X0
+
       # Restores `computer` from the snapshot, and returns the Report. The
       # snapshot goes into a new machine first, so one that fails, or is of
       # a machine built another way, leaves `computer` as it was.
@@ -139,6 +176,8 @@ module Badline
         refuse_old_layout
         report = if badline? then restore_modules(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)
                  else Vice::Restore.import(@container, computer)
                  end
         tell(report, &)
@@ -159,6 +198,18 @@ module Badline
         computer
       end
 
+      def load_xcbm2(&)
+        computer = Vice::CBM2.setup(@container).build
+        tell(Vice::CBM2::Restore.apply(@container, computer), &)
+        computer
+      end
+
+      def load_xcbm5x0(&)
+        computer = Vice::P500.setup(@container).build
+        tell(Vice::P500::Restore.apply(@container, computer), &)
+        computer
+      end
+
       # The snapshot goes into a new machine first, so one that fails
       # leaves `computer` as it was.
       def restore_modules(computer)
@@ -175,6 +226,11 @@ module Badline
         report(modules, computer)
       end
 
+      def refuse_unread
+        unread = UNREAD[@container.machine]
+        raise FormatError, "badline reads only its own #{unread}" if unread && !badline?
+      end
+
       # A snapshot from a badline before the keyed modules, which only the
       # version that saved it reads.
       def refuse_old_layout