badline 0.18.0 → 0.19.0

data/lib/badline/drives/model8050/idle.rb

@@ -21,10 +21,10 @@ module Badline
       # volatile), makes the pass repeatable. Once both processors have a
       # repeatable pass, with the motors off, no head stepping, no disk
       # going in or out and no interrupt pulled, the unit sleeps:
-      # host_cycle! only counts the cycles it owes, until one of the chips'
-      # counters is due to pull IRQ (quiet_cycles), the controller moves a
-      # line of the bus, or something outside reads or changes the unit
-      # (settle!).
+      # host_cycle! only counts host cycles, until the one in which a chip's
+      # counter is due to pull IRQ (quiet_cycles), until the controller
+      # moves a line of the bus (host_written!), or until something outside
+      # reads or changes the unit (settle!).
       #
       # Waking runs the counters on in bulk, counts off each processor's
       # whole passes, and runs the rest of a pass on that processor alone.
@@ -32,8 +32,21 @@ module Badline
       # order the two run in doesn't matter. Then the unit runs cycle by
       # cycle again. Woken by a counter, it keeps the passes it found, and
       # sleeps again as soon as both repeat: the IP's, which the timer's
-      # interrupt doesn't reach, at once, and the FDC's a pass after its
-      # interrupt. Woken from outside, it finds both afresh.
+      # interrupt doesn't reach, at once, and the FDC's once it is back at
+      # its loop's start where its last pass proved to repeat but for the
+      # bytes the interrupt changed (fdc_pass_found). Woken from outside, it
+      # finds both afresh.
+      #
+      # Woken by a counter on the FDC's side, as the 6530's timer wakes the
+      # controller every 5 ms, the unit wakes only the FDC's side, as the
+      # board does: the FDC with its VIA, its 6530 and the drives run cycle
+      # by cycle (fdc_step) through the interrupt, and the IP owes its
+      # cycles. The two sides meet only in the common RAM, and the IP's
+      # pass reads none of the FDC's chips, so while no write changes the
+      # common RAM, the IP's pass runs on as it did. The IP catches up on its
+      # passes as the unit falls asleep again, as soon as a write changes
+      # the common RAM, before a counter on its side is due to pull its IRQ,
+      # and when something outside reads or changes the unit.
       module Idle
         IP_LOOP = 0xc5a1
         FDC_LOOP = 0xfc17
@@ -48,10 +61,17 @@ module Badline
 
         def asleep? = @asleep
 
+        # Whether the unit, or the IP's side of it, owes cycles.
+        def dozing? = @asleep || @fdc_alone
+
         # Brings the unit up to the present, cycle for cycle, and drops the
         # passes it found, since whoever called may change it.
         def settle!
-          wake! if @asleep
+          if @asleep
+            wake!
+            @asleep = false
+          end
+          join_ip if @fdc_alone
           forget_passes
         end
 
@@ -65,6 +85,13 @@ module Badline
           @asleep = false
           @owed = 0
           @budget = 0
+          @fdc_alone = false
+          @ip_owed = 0
+          @ip_budget = 0
+          @alone_changes = 0
+          @planned = false
+          @slept = 0
+          @wake_at = 0
           forget_passes
         end
 
@@ -73,13 +100,53 @@ module Badline
           @fdc_mark = nil
           @ip_pass = nil
           @fdc_pass = nil
+          @fdc_proof = nil
         end
 
         # A cycle owed while asleep, which wakes the unit once the budget
-        # is spent.
+        # is spent: the FDC's side alone if the IP's counters leave it
+        # room.
         def owe_cycle
           @owed += 1
-          wake! if @owed >= @budget
+          return if @owed < @budget
+
+          wake!
+          wake_fdc unless @asleep
+        end
+
+        # The FDC's side runs on alone while the IP owes its cycles.
+        def wake_fdc
+          budget = [@data_riot.quiet_cycles, @control_riot.quiet_cycles].min
+          return if budget < 2 || @ip_pass.nil? || @fdc_alone
+
+          @fdc_alone = true
+          @ip_owed = 0
+          @ip_budget = budget
+          @alone_changes = common_changes
+        end
+
+        # A cycle of the FDC's side alone, the IP owing it. A write that
+        # changed the common RAM, or the IP's counters coming due, has the
+        # IP catch up and the unit run whole again.
+        def fdc_alone_cycle
+          fdc_step
+          @ip_owed += 1
+          return join_ip if common_changes != @alone_changes || @ip_owed >= @ip_budget
+
+          fdc = @fdc_cpu
+          @fdc_pass = nil if fdc.irq
+          fdc_pass_found if fdc.program_counter == @fdc_loop && fdc.boundary?
+        end
+
+        # Runs the IP's side over the cycles it owes, its counters in bulk
+        # and its passes, and the unit whole from then on.
+        def join_ip
+          owed = @ip_owed
+          @fdc_alone = false
+          @ip_owed = 0
+          @data_riot.fast_forward(owed)
+          @control_riot.fast_forward(owed)
+          skip(@ip_cpu, @ip_pass, @ip_mark, owed)
         end
 
         # Looks for the loops' starts after a cycle run awake. An interrupt
@@ -101,12 +168,44 @@ module Badline
           fall_asleep if @ip_pass && @fdc_pass
         end
 
+        # The FDC is at its loop's start. A pass that repeated is kept as a
+        # proof with the bytes of the 6530's RAM it touched: from a state
+        # that differs from the proof's only in other bytes, as the timer's
+        # interrupt leaves it, the pass runs the same way and repeats too.
         def fdc_pass_found
-          state = fdc_state
-          @fdc_pass = repeated(@fdc_mark, state, @fdc_cpu, @fdc_bus.volatile)
+          registers = fdc_state
+          ram = @rriot.ram.dup
+          state = [registers, ram]
+          bus = @fdc_bus
+          touched = bus.ram_touched
+          pass = repeated(@fdc_mark, state, @fdc_cpu, bus.volatile)
+          if pass
+            @fdc_proof = [registers, ram, touched, pass]
+          elsif proven?(registers, ram)
+            pass = @fdc_proof[3]
+          end
+          @fdc_pass = pass
           @fdc_mark = [state, @fdc_cpu.cycles, @fdc_cpu.instructions]
-          @fdc_bus.volatile = false
-          fall_asleep if @ip_pass && @fdc_pass
+          bus.volatile = false
+          bus.ram_touched = 0
+          fall_asleep if @ip_pass && pass
+        end
+
+        # Whether the FDC stands where the proof's pass started, but for
+        # bytes of the 6530's RAM the pass didn't touch.
+        def proven?(registers, ram)
+          proof = @fdc_proof
+          return false if proof.nil? || proof[0] != registers
+
+          start = proof[1]
+          touched = proof[2]
+          index = 0
+          while index < 64
+            return false if touched.anybits?(1 << (index >> 1)) && start[index] != ram[index]
+
+            index += 1
+          end
+          true
         end
 
         # The pass since +mark+ as [cycles, instructions] if it left the
@@ -118,6 +217,7 @@ module Badline
         end
 
         def fall_asleep
+          join_ip if @fdc_alone
           return unless @mechanism.quiet? && !@ip_cpu.irq && !@fdc_cpu.irq
 
           budget = quiet_cycles
@@ -136,18 +236,30 @@ module Badline
         # Runs the cycles owed: the counters in bulk, then each processor's
         # whole passes and the rest of a pass.
         def wake!
+          owe_slept
           owed = @owed
           @asleep = false
           @owed = 0
-          return if owed.zero?
+          quiet = [owed, @budget].min
+          skip_passes(quiet) if quiet.positive?
+          (owed - quiet).times { @asleep ? owe_cycle : run_cycle }
+        end
 
-          @data_riot.fast_forward(owed)
-          @control_riot.fast_forward(owed)
-          @rriot.fast_forward(owed)
-          @via.fast_forward(owed)
-          skip(@ip_cpu, @ip_pass, @ip_mark, owed)
-          skip(@fdc_cpu, @fdc_pass, @fdc_mark, owed)
-          @cycles += owed
+        def skip_passes(cycles)
+          @data_riot.fast_forward(cycles)
+          @control_riot.fast_forward(cycles)
+          @rriot.fast_forward(cycles)
+          @via.fast_forward(cycles)
+          skip(@ip_cpu, @ip_pass, @ip_mark, cycles)
+          skip(@fdc_cpu, @fdc_pass, @fdc_mark, cycles)
+          @cycles += cycles
+        end
+
+        # The budget is spent: the unit wakes, its FDC's side alone if it
+        # can.
+        def doze
+          wake!
+          wake_fdc unless @asleep
         end
 
         # Counts off the processor's whole passes, moving its mark on with
@@ -167,10 +279,11 @@ module Badline
           [*@ip_cpu.idle_state, *@data_riot.idle_state, *@control_riot.idle_state, @ip_bus.data, common_changes]
         end
 
-        # What the FDC sees: its CPU, the VIA and the 6530 but for their
-        # counters, its bus's last byte, the drives and the common RAM.
+        # What the FDC sees but the 6530's RAM: its CPU, the VIA and the
+        # 6530's ports and timer but for their counters, its bus's last
+        # byte, the drives and the common RAM.
         def fdc_state
-          [*@fdc_cpu.idle_state, *@via.idle_state, *@rriot.idle_state, @fdc_bus.data, *@mechanism.idle_state,
+          [*@fdc_cpu.idle_state, *@via.idle_state, *@rriot.port_state, @fdc_bus.data, *@mechanism.idle_state,
            common_changes]
         end
 

data/lib/badline/drives/model8050.rb

@@ -61,7 +61,9 @@ module Badline
         build_ip(dos_rom || ROM.load("8050/dos-2.7.rom", 0xc000))
         build_fdc(fdc_rom || ROM.read("8050/fdc-901869-01.rom"))
         @ip_cpu = IPCPU.new(@ip_bus)
+        @ip_cpu.power_on!
         @fdc_cpu = FDCCPU.new(@fdc_bus)
+        @fdc_cpu.power_on!
         init_idle(Idle::IP_LOOP, Idle::FDC_LOOP)
         @ieee_bus.attach(self)
       end
@@ -118,6 +120,18 @@ module Badline
         @fdc_cpu.cycle!
         @cycles += 1
       end
+
+      # One cycle of the FDC's side alone, as step runs it (Idle).
+      def fdc_step
+        so = @mechanism.take_so
+        @mechanism.cycle!
+        @via.cycle!
+        @rriot.cycle!
+        @fdc_cpu.irq = @via.irq? || @rriot.irq?
+        @fdc_cpu.so! if so
+        @fdc_cpu.cycle!
+        @cycles += 1
+      end
     end
 
     # The 8250: the 8050's board driving double-sided mechanisms, 154 tracks

data/lib/badline/drives/model9060/idle.rb

@@ -19,7 +19,10 @@ module Badline
       # the pass repeatable. Once both are, with the hard disk's controller
       # idle and no interrupt pulled, the unit sleeps until a counter is due
       # to pull IRQ, the IEEE-488 controller moves a line, or something
-      # outside reads or changes the unit (settle!).
+      # outside reads or changes the unit (settle!). Asleep, a host cycle
+      # only counts towards the one planned for the counter
+      # (DOSBoard#plan_sleep), and a moved line wakes the unit as the
+      # controller pushes it (DOSBoard#host_written!).
       module Idle
         IP_LOOP = 0xc131
         SASI_LOOP = 0xf8f1
@@ -34,6 +37,9 @@ module Badline
 
         def asleep? = @asleep
 
+        # Whether the unit owes cycles.
+        def dozing? = @asleep
+
         # Brings the unit up to the present, cycle for cycle, and drops the
         # passes it found, since whoever called may change it.
         def settle!
@@ -48,6 +54,9 @@ module Badline
           @asleep = false
           @owed = 0
           @budget = 0
+          @planned = false
+          @slept = 0
+          @wake_at = 0
           forget_passes
         end
 
@@ -110,19 +119,30 @@ module Badline
           [@data_riot.quiet_cycles, @control_riot.quiet_cycles, @via.quiet_cycles].min
         end
 
+        # The budget is spent (DOSBoard#slept_through?).
+        def doze = wake!
+
+        # Runs the cycles owed: the counters in bulk, then each processor's
+        # whole passes and the rest of a pass, and on a host cycle that ran
+        # past the budget, the rest cycle by cycle.
         def wake!
+          owe_slept
           owed = @owed
           @asleep = false
           @owed = 0
-          return if owed.zero?
-
-          @data_riot.fast_forward(owed)
-          @control_riot.fast_forward(owed)
-          @via.fast_forward(owed)
-          @target.fast_forward(owed)
-          skip(@ip_cpu, @ip_pass, @ip_mark, owed)
-          skip(@sasi_cpu, @sasi_pass, @sasi_mark, owed)
-          @cycles += owed
+          quiet = [owed, @budget].min
+          skip_passes(quiet) if quiet.positive?
+          (owed - quiet).times { @asleep ? owe_cycle : run_cycle }
+        end
+
+        def skip_passes(cycles)
+          @data_riot.fast_forward(cycles)
+          @control_riot.fast_forward(cycles)
+          @via.fast_forward(cycles)
+          @target.fast_forward(cycles)
+          skip(@ip_cpu, @ip_pass, @ip_mark, cycles)
+          skip(@sasi_cpu, @sasi_pass, @sasi_mark, cycles)
+          @cycles += cycles
         end
 
         def skip(cpu, pass, mark, owed)

data/lib/badline/drives/model9060.rb

@@ -86,7 +86,9 @@ module Badline
         build_ip(dos_rom || ROM.load("9060/dos-3.0.rom", 0xc000))
         build_sasi(sasi_rom || ROM.read("9060/sasi-300515-revb.rom"))
         @ip_cpu = Model8050::IPCPU.new(@ip_bus)
+        @ip_cpu.power_on!
         @sasi_cpu = SASICPU.new(@sasi_bus)
+        @sasi_cpu.power_on!
         init_idle
         @ieee_bus.attach(self)
       end

data/lib/badline/input/joystick.rb

@@ -11,16 +11,29 @@ module Badline
 
       def initialize
         @port_bits = 0xff
+        @change_handler = nil
+      end
+
+      # Register a handler called after a press or a release. On the VIC-20,
+      # this passes the fire button on to the VIC's light pen input.
+      def on_change(&handler)
+        @change_handler = handler
       end
 
       def press(direction)
         bit = DIRECTIONS[direction]
-        @port_bits &= ~(1 << bit) if bit
+        return unless bit
+
+        @port_bits &= ~(1 << bit)
+        @change_handler&.call
       end
 
       def release(direction)
         bit = DIRECTIONS[direction]
-        @port_bits |= 1 << bit if bit
+        return unless bit
+
+        @port_bits |= 1 << bit
+        @change_handler&.call
       end
     end
   end

data/lib/badline/kim1/tape.rb

@@ -8,7 +8,9 @@ module Badline
     # Recording, it puts each change of PB7, which DUMPT ($1800) toggles as
     # a square wave, on the tape as a crossing, in place of whatever was
     # on the tape from there on. Stopping a recording writes the tape to
-    # its file.
+    # its file. DUMPT's half periods run 135 to 139 cycles for the 3,700 Hz
+    # tone and 203 to 209 for the 2,400 Hz one, a bit taking about 7.38 ms,
+    # where the User Manual's figure E-1 gives 7.452.
     #
     # Nothing on the board starts or stops the deck: the tape moves while
     # PLAY or RECORD is down, a microsecond, a cycle, at a time.

data/lib/badline/kim1.rb

@@ -48,6 +48,8 @@ module Badline
 
     def family = :kim1
 
+    def portless_board = nil
+
     def ram = @bus.ram
 
     # Reads and writes memory as the CPU sees it, through the bus.
@@ -68,6 +70,7 @@ module Badline
       @panel.connect(@u2)
       @bus = Bus.new(@u2, @u3, ram: ram || :"1k")
       @cpu = CPU.new(@bus)
+      @cpu.power_on!
       @sst = false
       @irq_wired = false
       @sound = Sound.new(@u2, @u3)
@@ -158,6 +161,7 @@ module Badline
     def power_cycle!
       @bus.power_on!
       reset!
+      @cpu.power_on!
     end
 
     # ST: an edge on NMI.

data/lib/badline/machine.rb

@@ -70,6 +70,9 @@ module Badline
   # +mounted?+, +datasette+, +true_drive+, nil, +install_debug_register+
   # and +capture_output+, and besides +model_label+ and +ram_kb+.
   #
+  # Every machine answers +portless_board+, nil unless it's a C64 whose
+  # board has no serial port for device 8 (C64#portless_board).
+  #
   # Each machine includes Machine::Clocking for the clocking part.
   module Machine
     # Media the machine named doesn't take.

data/lib/badline/media/true_drive.rb

@@ -30,9 +30,19 @@ module Badline
         # Plugs the machine's true drive in as device 8, unless one is there
         # already, and returns it.
         def plug(computer)
+          refuse_portless(computer, "A true drive")
           drive(computer) || computer.plug_true_drive
         end
 
+        # Raises Machine::Unsupported over `what`, a disk or a drive, on a
+        # C64 whose board has no serial port to plug a drive into.
+        def refuse_portless(computer, what)
+          board = computer.portless_board
+          return if board.nil?
+
+          raise Machine::Unsupported, "#{what} needs the serial port, and #{board} has none"
+        end
+
         # The true drive on device 8, or nil.
         def drive(computer)
           drive = computer.true_drive

data/lib/badline/media/vic20_media.rb

@@ -41,11 +41,13 @@ module Badline
         end
 
         # The program at `path`, or the first on the disk or in the
-        # directory there, or nil.
+        # directory there, or nil, as for a disk with no program on it.
         def first_program(path)
           kind = Extensions.kind(path)
-          if File.directory?(path) || %i[disk archive].include?(kind)
+          if File.directory?(path) || %i[disk archive ieee_disk].include?(kind)
             Media.open_storage(path).read_file("*")
+          elsif kind == :hard_disk
+            Storage::D90Image.new(path, read_only: true).read_file("*")
           elsif File.file?(path) && !%i[tune cartridge tape gcr].include?(kind)
             Media.program_bytes(path)
           end

data/lib/badline/media.rb

@@ -80,6 +80,7 @@ module Badline
       # read, raise TrueDrive::Error, an ArgumentError. Anything else
       # raises NotDisk.
       def insert_disk(computer, path, read_only: false)
+        TrueDrive.refuse_portless(computer, path)
         return TrueDrive.insert(computer, path, read_only:) if TrueDrive.takes?(computer, path)
 
         raise NotDisk, "#{path} is not a disk image or a directory" unless disk?(path)
@@ -134,9 +135,12 @@ module Badline
 
       # The VIC-20 and the 264 series have no SID to play a .sid tune on,
       # only the PET and the CBM-II have the IEEE-488 drive a .d80, .d82
-      # or .d90 goes in, and only the KIM-1 reads papertape.
+      # or .d90 goes in, and only the KIM-1 reads papertape. The C64GS and
+      # the MAX Machine have no serial port for what goes in device 8.
       def refuse_unsupported(computer, path)
         family = computer.family
+        device8 = File.directory?(path) || Extensions::DEVICE8.include?(File.extname(path).downcase)
+        TrueDrive.refuse_portless(computer, path) if device8
         raise Machine::Unsupported, "#{path} needs a KIM-1" if Extensions.kind(path) == :papertape
         if %i[ieee_disk hard_disk].include?(Extensions.kind(path)) && !%i[pet cbm2].include?(family)
           raise ArgumentError, "#{path} needs a PET's or a CBM-II's IEEE-488 drive"

data/lib/badline/memory.rb

@@ -46,10 +46,8 @@ module Badline
     end
 
     def zero_fill(initial)
-      array = initial.dup
-      0.upto(length - 1) do |i|
-        array[i] ||= blank_value
-      end
+      array = Array.new(length, blank_value)
+      initial.each_with_index { |v, i| array[i] = v.to_i unless v.nil? }
       array
     end
   end

data/lib/badline/options/table.rb

@@ -164,7 +164,7 @@ module Badline
                  section: "Testing options", needs: :window),
       Option.new("--save-snapshot FILE", "Save the machine as a .vsf snapshot after the last frame",
                  section: "Testing options", needs: :window),
-      Option.new("--vice", "Add VICE's modules to --save-snapshot's C64, PET or CBM-II snapshot",
+      Option.new("--vice", "Add VICE's modules to --save-snapshot's C64, VIC-20, PET or CBM-II snapshot",
                  section: "Testing options", needs: :window),
       Option.new("--at FRAME:EVENT", "Run EVENT once FRAME frames have run (see above)",
                  section: "Testing options", needs: :window),

data/lib/badline/pet/superpet/dongle.rb

@@ -64,15 +64,26 @@ module Badline
           end
         end
 
+        # The registers as they stand once a shift waiting has happened.
+        def settled_registers
+          registers = @registers.dup
+          shift_registers(registers) if @shift_at != NONE
+          registers
+        end
+
         private
 
         def shift
           @shift_at = NONE
+          shift_registers(@registers)
+        end
+
+        def shift_registers(registers)
           incoming = @latch ^ FEEDBACK ^ 0xff
           8.times do |bit|
-            register = @registers[bit]
+            register = registers[bit]
             stage = (register ^ (incoming >> bit)) & 1
-            @registers[bit] = (register >> 1) | (stage << (LENGTHS[bit] - 1))
+            registers[bit] = (register >> 1) | (stage << (LENGTHS[bit] - 1))
           end
         end
       end

data/lib/badline/pet/superpet.rb

@@ -26,6 +26,11 @@ module Badline
     # 324037 schematic one-shots gate the 6809's RES), and the other stops
     # where it is. The PET's IRQ line, the ACIA's with it, reaches both.
     #
+    # The Waterloo ROMs hold only the menu, setup and the monitor. The
+    # menu loads every language, microBASIC, microAPL, FORTRAN, Pascal,
+    # COBOL, the editor and the development package, from disk into RAM,
+    # so 6809 mode needs a disk on device 8 to run one.
+    #
     # In 6809 mode device 8 answers through traps on the Waterloo ROM's
     # IEEE-488 routines (WaterlooTraps) as well as the KERNAL's, from the
     # same disk, or a true drive on the bus answers. type_text types

data/lib/badline/pet.rb

@@ -75,6 +75,8 @@ module Badline
 
     def family = :pet
 
+    def portless_board = nil
+
     # The datasette on cassette port #1, where a tape goes in (Cassettes).
     def datasette = @cassettes.datasette1
 
@@ -129,6 +131,7 @@ module Badline
         ieee.lines_written
       end
       @cpu = CPU.new(@bus, debug:)
+      @cpu.power_on!
       @cycles = 0
       @init_handlers = []
       @pending_keys = nil
@@ -222,6 +225,7 @@ module Badline
     def power_cycle!
       @bus.power_on!
       reset!
+      @cpu.power_on!
     end
 
     # Puts a program file's bytes where its first two say, through the bus,

data/lib/badline/plus4.rb

@@ -67,6 +67,8 @@ module Badline
 
     def family = :plus4
 
+    def portless_board = nil
+
     # The joysticks reach the TED's keyboard latch, so there are no C64
     # control ports to plug a pot device into.
     def control_ports = nil
@@ -139,6 +141,7 @@ module Badline
       @tias = tcbm ? [Chips::TIA.new, Chips::TIA.new] : []
       @bus.plug_tcbm(drive8: @tias[0], drive9: @tias[1]) if tcbm
       @cpu = CPU.new(@bus, debug:)
+      @cpu.power_on!
       @sound = Chips::TED::Sound.new(self, @model.ted.clock_hz)
       @ted.sound = @sound
       @sound_mix = @sid_card ? SoundMix.new(@sound, @sid_card) : nil
@@ -202,6 +205,7 @@ module Badline
       @ted.power_on!
       @sound.power_on!
       reset!
+      @cpu.power_on!
     end
 
     # The ACIA's IRQ line, and the cycle it next has something to do at.

data/lib/badline/roms/README

@@ -134,7 +134,10 @@ 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.
+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).
 
@@ -148,6 +151,10 @@ 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.
 
@@ -202,6 +209,9 @@ 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
 =====================

data/lib/badline/snapshot/container.rb

@@ -45,9 +45,10 @@ module Badline
       # 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
@@ -77,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