badline 0.17.0 → 0.18.0

data/lib/badline/options/table.rb

@@ -7,8 +7,7 @@ module Badline
     # The names Badline::Model builds, in the order the help lists them.
     MODELS = %w[c64 c64c ntsc newntsc oldntsc drean sx64 pet64 c64gs ultimax].freeze
 
-    # The VIC-20's models, as xvic names its video standards. Only PAL is
-    # emulated.
+    # The VIC-20's models, as xvic names its video standards.
     VIC20_MODELS = %w[pal ntsc].freeze
 
     # The C128's models, as C128::Model names them.
@@ -20,12 +19,22 @@ module Badline
 
     # The PETs and CBMs, as PET::Model names them, the 8032 first, the
     # default.
-    PET_MODELS = %w[8032 8096 8296 4032 3032 3032b 2001].freeze
+    PET_MODELS = %w[8032 8096 8296 4032 3032 3032b 2001 superpet].freeze
 
     # The CBM-II's B series, as CBM2::Model names them, the 610 first, the
     # default, and the P500, as CBM2::P500::Model names them.
     CBM2_MODELS = %w[610 620 710 720 510 510ntsc].freeze
 
+    # The KIM-1, which has the one model.
+    KIM1_MODELS = %w[kim1].freeze
+
+    # The KIM-1 teletype's rates, as KIM1::Teletype takes them.
+    KIM1_BAUDS = %w[110 300 1200 2400 4800 9600].freeze
+
+    # The KIM-1's RAM as --ram names it, and the names
+    # KIM1::Bus::RAM_CONFIGURATIONS gives it.
+    KIM1_RAM = { "1k" => :"1k", "5k" => :"5k", "expanded" => :expanded }.freeze
+
     # The B series' KERNALs --kernal names, 901244-04a first, the default.
     CBM2_KERNALS = %w[04a 03b].freeze
 
@@ -49,6 +58,22 @@ module Badline
       Option.new("--disable-jit", "Run without enabling YJIT", section: "Options", build: :ruby),
       Option.new("-h, --help", "Show this help", section: "Options"),
       Option.new("--version", "Show the version and what built it", section: "Options", build: :native),
+      Option.new("--tty", "Fit the KIM-1's TTY/KB jumper, so its monitor talks to a teletype: a pane in the " \
+                          "window, or the terminal with --headless",
+                 section: "Options"),
+      Option.new("--baud N", "The KIM-1 teletype's baud: #{KIM1_BAUDS.join(', ')} (default: 9600)",
+                 section: "Options"),
+      Option.new("--tty-load", "Load the KIM-1's .ptp or .pap through its monitor's L command on the teletype, " \
+                               "in real time, instead of straight into RAM; implies --tty",
+                 section: "Options"),
+      Option.new("--load-address ADDR", "Where the KIM-1 loads a .bin, in hex (default: 0200)",
+                 section: "Options"),
+      Option.new("--start-address ADDR", "Where the KIM-1 starts its program, in hex (default: where it loads)",
+                 section: "Options"),
+      Option.new("--ram SIZE", "VIC-20 RAM expansion: #{RAM_NAMES.join(', ')} (default: unexpanded); " \
+                               "Plus/4 RAM: 16k, 32k or 64k; PET RAM: 4k, 8k, 16k or 32k (default: the model's own); " \
+                               "KIM-1 RAM: 1k, 5k or expanded (default: 1k)",
+                 section: "Options"),
       Option.new("--no-autostart", "Boot to READY. instead of running the program",
                  section: "Window options", needs: :window),
       Option.new("--writable", "Let the machine write to disk images, changing their files",
@@ -60,19 +85,20 @@ module Badline
                                  "a 1551 on the Plus/4, a 2031 on the PET or the CBM-II, or for a .d80 or .d82 " \
                                  "an 8050 or 8250",
                  section: "Window options", needs: :window),
-      Option.new("--drive-type MODEL", "The Plus/4's true drive: 1541 or 1551 (default: 1551); implies --true-drive",
+      Option.new("--drive-type MODEL", "The Plus/4's true drive: 1541 or 1551 (default: 1551); the PET's and the " \
+                                       "CBM-II's: #{Drives::IEEEModels::NAMES.join(', ')} (default: 2031); " \
+                                       "implies --true-drive",
                  section: "Window options", needs: :window),
       Option.new("--reu SIZE", "Plug in an REU of SIZE K: 128, 256, 512 (a 1750) or up to 16384",
                  section: "Window options", needs: :window),
-      Option.new("--model NAME", "C64 to run: #{MODELS.join(', ')} (default: #{MODELS.first}); VIC-20: pal; " \
-                                 "C128: #{C128_MODELS.join(', ')}; Plus/4: #{PLUS4_MODELS.join(', ')}; " \
+      Option.new("--model NAME", "C64 to run: #{MODELS.join(', ')} (default: #{MODELS.first}); " \
+                                 "VIC-20: #{VIC20_MODELS.join(', ')}; C128: #{C128_MODELS.join(', ')}; " \
+                                 "Plus/4: #{PLUS4_MODELS.join(', ')}; " \
                                  "PET: #{PET_MODELS.join(', ')}; CBM-II: #{CBM2_MODELS.join(', ')}",
                  section: "Window options", needs: :window),
-      Option.new("--ntsc", "Run an NTSC C64, as --model ntsc does", section: "Window options", needs: :window),
-      Option.new("--c64", "Start the C128 in C64 mode, holding C= at power-on",
+      Option.new("--ntsc", "Run an NTSC C64 or VIC-20, as --model ntsc does",
                  section: "Window options", needs: :window),
-      Option.new("--ram SIZE", "VIC-20 RAM expansion: #{RAM_NAMES.join(', ')} (default: unexpanded); " \
-                               "Plus/4 RAM: 16k, 32k or 64k; PET RAM: 4k, 8k, 16k or 32k (default: the model's own)",
+      Option.new("--c64", "Start the C128 in C64 mode, holding C= at power-on",
                  section: "Window options", needs: :window),
       Option.new("--60hz", "Run a CRTC PET's 60 Hz editor instead of its 50 Hz one, or a CBM-II on 60 Hz mains",
                  section: "Window options", needs: :window),
@@ -90,6 +116,12 @@ module Badline
                                    "$9000 and $A000, userport for the user port's PA0-PA2 to switch in " \
                                    "the RAM under the ROMs",
                  section: "Window options", needs: :window),
+      Option.new("--cpu CPU", "Set the SuperPET's CPU switch: 6502, 6809 or prog, for the system latch to pick " \
+                              "(default: 6502)",
+                 section: "Window options", needs: :window),
+      Option.new("--bank-ram MODE", "Set the SuperPET's bank RAM switch: rw, read for write-protected, or prog, " \
+                                    "for the system latch to pick (default: rw)",
+                 section: "Window options", needs: :window),
       Option.new("--c1lo FILE", "Put a .bin ROM image in the Plus/4's cartridge 1, low slot ($8000)",
                  section: "Window options", needs: :window),
       Option.new("--c1hi FILE", "Put a .bin ROM image in cartridge 1's high slot ($C000)",
@@ -108,7 +140,7 @@ module Badline
                  section: "Window options", needs: :window),
       Option.new("--verbose", "Print the display, sound and gamepad setup and the frame timing",
                  section: "Window options", needs: :window),
-      Option.new("--headless", "Play a .sid tune in the terminal instead of the window",
+      Option.new("--headless", "Play a .sid tune, or run the KIM-1's teletype, in the terminal instead of the window",
                  section: "Options without the window"),
       Option.new("--audio-out FILE", "Render a .sid tune to a .wav or .aiff file",
                  section: "Options without the window"),

data/lib/badline/options/validation.rb

@@ -52,7 +52,9 @@ module Badline
       end
 
       def drive_type_for(value)
-        raise Error, "invalid argument: --drive-type #{value}" unless PLUS4_DRIVE_TYPES.include?(value)
+        unless (PLUS4_DRIVE_TYPES + Drives::IEEEModels::NAMES).include?(value)
+          raise Error, "invalid argument: --drive-type #{value}"
+        end
 
         value
       end
@@ -63,6 +65,12 @@ module Badline
         value
       end
 
+      def baud_for(value)
+        raise Error, "invalid argument: --baud #{value}" unless KIM1_BAUDS.include?(value)
+
+        value.to_i
+      end
+
       def reu_size(value)
         raise Error, "invalid argument: --reu #{value}" unless REU_SIZES.include?(value)
 
@@ -83,7 +91,7 @@ module Badline
 
       def validate
         validate_family
-        raise Error, "--drive-type needs plus4" unless @drive_type.nil? || @family == :plus4
+        validate_drive_type
 
         validate_mode
         validate_models
@@ -91,10 +99,20 @@ module Badline
         validate_paths
       end
 
+      def validate_drive_type
+        return if @drive_type.nil?
+
+        types = @family == :plus4 ? PLUS4_DRIVE_TYPES : Drives::IEEEModels::NAMES
+        return if %i[plus4 pet cbm2].include?(@family) && types.include?(@drive_type)
+
+        raise Error, "--drive-type needs #{PLUS4_DRIVE_TYPES.include?(@drive_type) ? 'plus4' : 'pet or cbm2'}"
+      end
+
       def validate_mode
         if headless?
           raise Error, "#{@window_only.first} needs the window" unless @window_only.empty?
           raise Error, "#{@any_window_only.first} needs the window" unless player_window? || @any_window_only.empty?
+          return if @family == :kim1
           raise Error, "no tune given" if tune_paths.empty? && !player_window?
 
           tune_paths.each { |path| validate_tune(path) }
@@ -105,6 +123,7 @@ module Badline
 
       def validate_family
         ram_option
+        @family == :kim1 ? validate_kim1 : refuse_kim1_options
         validate_vic20 if @family == :vic20
         @family == :plus4 ? validate_plus4 : refuse_plus4_options
         @family == :pet ? validate_pet : refuse_pet_options
@@ -125,7 +144,8 @@ module Badline
         when :vic20 then @ram = ram_configuration(@ram_name)
         when :plus4 then @ram_kb = plus4_ram(@ram_name)
         when :pet then @ram_kb = pet_ram(@ram_name)
-        else raise Error, "--ram needs vic20, plus4 or pet"
+        when :kim1 then @ram = kim1_ram(@ram_name)
+        else raise Error, "--ram needs vic20, plus4, pet or kim1"
         end
       end
 
@@ -137,11 +157,8 @@ module Badline
         raise Error, "the C128 needs the window" if headless?
       end
 
-      # The VIC-20 is a PAL one, in the window, without the C64's SID and
-      # REU.
+      # The VIC-20 runs in the window, without the C64's SID and REU.
       def validate_vic20
-        raise Error, "the NTSC VIC-20 isn't emulated yet" if @models.include?("ntsc")
-
         raise Error, "--sid needs the C64" unless @sid_model.nil?
         raise Error, "--reu needs the C64" unless @reu.nil?
         raise Error, "the VIC-20 needs the window" if headless?
@@ -185,6 +202,8 @@ module Badline
         raise Error, "--editor needs pet" unless @editor.nil?
         raise Error, "--characters needs pet" unless @characters.nil?
         raise Error, "--jumpers needs pet" unless @jumpers.empty?
+        raise Error, "--cpu needs pet --model superpet" unless @cpu.nil?
+        raise Error, "--bank-ram needs pet --model superpet" unless @bank_ram.nil?
       end
 
       # The PET runs in the window, without the C64's SID and REU, at the
@@ -202,7 +221,8 @@ module Badline
       end
 
       # --characters names a character ROM the board takes, --jumpers the
-      # 8296 board's jumpers, and the 8296 has all of its RAM soldered on.
+      # 8296 board's jumpers, and the 8296 has all of its RAM soldered on,
+      # as the SuperPET has besides its bank RAM.
       def validate_pet_board
         unless @characters.nil? || PET::ROMSets.characters(model).include?(@characters)
           raise Error, "the #{model} takes no character ROM #{@characters}"
@@ -211,6 +231,22 @@ module Badline
         unknown = @jumpers.find { |jumper| !PET::ROMSets.jumpers(model).include?(jumper) }
         raise Error, "the #{model} has no jumper #{unknown}" unless unknown.nil?
         raise Error, "the 8296 has 32k of RAM" if model == "8296" && ![nil, 32].include?(@ram_kb)
+        raise Error, "--ram doesn't fit the superpet" if model == "superpet" && !@ram_kb.nil?
+
+        validate_cpu_switch
+      end
+
+      # --cpu and --bank-ram set the SuperPET's switches, which no other
+      # PET has.
+      def validate_cpu_switch
+        validate_switch("--cpu", @cpu, PET::SuperPET::Board::CPU_SWITCH)
+        validate_switch("--bank-ram", @bank_ram, PET::SuperPET::Board::RAM_SWITCH)
+      end
+
+      def validate_switch(flag, value, positions)
+        return if value.nil?
+        raise Error, "#{flag} needs pet --model superpet" unless model == "superpet"
+        raise Error, "invalid argument: #{flag} #{value}" unless positions.include?(value)
       end
 
       # --basic and --editor name ROMs the model's board takes

data/lib/badline/options.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "badline/pet/rom_sets"
+require "badline/drives/ieee_models"
 require "badline/options/option"
 require "badline/options/event"
 require "badline/options/table"
@@ -17,7 +18,7 @@ module Badline
   # the machine family, and without one the family is the C64, the C128
   # for a program that loads where C128 BASIC starts, the PET for an
   # 8050's or 8250's disk or a PET tape, or the CBM-II for a cartridge
-  # signed as its own.
+  # signed as its own. `kim1` runs a MOS KIM-1.
   # The native build adds --no-sound and --version, and badline-ruby adds
   # --disable-jit.
   #
@@ -41,7 +42,7 @@ module Badline
     SID_MODELS = { "6581" => :mos6581, "8580" => :mos8580 }.freeze
 
     # What `sid` leaves out besides the window's options.
-    NOT_FOR_SID = %w[--audio-out].freeze
+    NOT_FOR_SID = %w[--audio-out --tty --baud --tty-load --load-address --start-address --ram].freeze
 
     REU_SIZES = %w[128 256 512 1024 2048 4096 8192 16384].freeze
 
@@ -89,8 +90,17 @@ module Badline
     # The 8296's board jumpers --jumpers names (PET::Bus::Expansion::JUMPERS).
     attr_reader :jumpers
 
+    # The SuperPET's CPU switch, as --cpu sets it: "6502", "6809" or
+    # "prog".
+    def cpu = @cpu || "6502"
+
+    # The SuperPET's bank RAM switch, as --bank-ram sets it: "rw", "read"
+    # or "prog".
+    def bank_ram = @bank_ram || "rw"
+
     # The VIC-20's RAM expansion --ram names, a key of
-    # Vic20::Bus::RAM_CONFIGURATIONS, or nil without --ram.
+    # Vic20::Bus::RAM_CONFIGURATIONS, or the KIM-1's, one of
+    # KIM1::Bus::RAM_CONFIGURATIONS, or nil without --ram.
     attr_reader :ram
 
     # The Plus/4's or the PET's RAM in K --ram names, one of PLUS4_RAM's or
@@ -138,6 +148,7 @@ module Badline
       @ram_kb = nil
       @ram_name = nil
       initialize_pet
+      initialize_kim1
       @kernal = nil
       @cartridges = {}
       @autostart = true
@@ -230,8 +241,9 @@ module Badline
 
     def true_drive? = @true_drive || !@drive_type.nil?
 
-    # The Plus/4's true drive --drive-type names, "1551" without it.
-    def drive_type = @drive_type || "1551"
+    # The true drive --drive-type names: without it, "1551" on the Plus/4
+    # and the 2031 on the PET and the CBM-II.
+    def drive_type = @drive_type || (@family == :plus4 ? "1551" : Drives::IEEEModels::DEFAULT)
 
     # Whether --save-snapshot adds VICE's modules, so x64sc opens it.
     def vice? = @vice
@@ -277,7 +289,7 @@ module Badline
     # A .sid on its own plays in the SID player, as `sid` would, unless an
     # option of the emulator's window asks for the machine.
     def play_lone_tune
-      return if @sid_command || %i[vic20 plus4 pet cbm2].include?(@family) || headless? || !@window_only.empty?
+      return if @sid_command || %i[vic20 plus4 pet cbm2 kim1].include?(@family) || headless? || !@window_only.empty?
       return if @media_path.nil?
 
       @sid_command = File.extname(@media_path).casecmp?(".sid")
@@ -337,7 +349,7 @@ module Badline
       when "--model" then @models << value
       when "--reu" then @reu = reu_size(value)
       when "--ram" then @ram_name = value
-      when "--basic", "--editor", "--characters", "--jumpers" then pet_option(name, value)
+      when "--basic", "--editor", "--characters", "--jumpers", "--cpu", "--bank-ram" then pet_option(name, value)
       when "--drive-type" then @drive_type = drive_type_for(value)
       when "--kernal" then @kernal = kernal_for(value)
       when "--c1lo", "--c1hi", "--c2lo", "--c2hi" then @cartridges[CARTRIDGE_SLOTS.fetch(name)] = value
@@ -349,12 +361,16 @@ module Badline
       when "--seconds" then @seconds = decimal(flag, value)
       when "--songlengths" then @songlengths = value
       when "--rate" then @rate = number(flag, value)
+      when "--baud", "--load-address", "--start-address" then kim1_option(name, flag, value)
       else @filter_chunk = number(flag, value)
       end
     end
 
-    # The PET's frame rate, ROMs and board jumpers, its own until named.
+    # The PET's frame rate, ROMs, board jumpers and the SuperPET's CPU and
+    # bank RAM switches, its own until named.
     def initialize_pet
+      @cpu = nil
+      @bank_ram = nil
       @refresh_hz = nil
       @basic = nil
       @editor = nil
@@ -367,6 +383,8 @@ module Badline
       when "--basic" then @basic = value
       when "--editor" then @editor = value
       when "--characters" then @characters = value
+      when "--cpu" then @cpu = value
+      when "--bank-ram" then @bank_ram = value
       else @jumpers = value.split(",")
       end
     end
@@ -391,6 +409,7 @@ module Badline
       when "--headless" then @headless = true
       when "--quiet" then @quiet = true
       when "--all-subtunes" then @all_subtunes = true
+      when "--tty", "--tty-load" then kim1_switch(name)
       else @tui = false
       end
     end

data/lib/badline/pet/bus.rb

@@ -8,11 +8,12 @@ module Badline
     #
     # $0000-$7FFF - RAM, 4K, 8K, 16K or 32K of it from $0000, then nothing
     # $8000-$8FFF - screen RAM, repeated (Model), then nothing
-    # $9000-$AFFF - two empty ROM sockets
+    # $9000-$AFFF - two empty ROM sockets, or the SuperPET's bank RAM at
+    #               $9000
     # $B000-$DFFF - BASIC 4, or BASIC 1 or 2 from $C000
     # $E000-$E7FF - the screen editor ROM
     # $E800-$E8FF - I/O (IO)
-    # $E900-$EFFF - nothing
+    # $E900-$EFFF - nothing, but the SuperPET's I/O page at $EF00
     # $F000-$FFFF - the KERNAL ROM
     #
     # The data lines hold the last byte they carried, so a read from an
@@ -136,6 +137,7 @@ module Badline
         @user_port = !@expansion.nil? && @expansion.user_port?
         @debug_register = nil
         @io_write_handler = nil
+        @board = nil
         map_pages
       end
 
@@ -174,6 +176,11 @@ module Badline
         @write_pages[addr >> 8].poke(addr, value)
       end
 
+      # #peek and #poke as the SuperPET's 6809 calls them.
+      def read(addr) = peek(addr)
+
+      def write(addr, value) = poke(addr, value)
+
       # Whether the CPU reads the KERNAL ROM at $F000-$FFFF, which an 8096's
       # board covers while its control register turns it on, and an 8296's
       # RAM too.
@@ -185,6 +192,12 @@ module Badline
         map_pages
       end
 
+      # Lays the SuperPET's board (SuperPET::Board) over its pages.
+      def fit_board(board)
+        @board = board
+        map_pages
+      end
+
       # Lays the pages out again, for the board's control register.
       def map_pages
         map(@open_bus, 0x00, 0x100)
@@ -195,6 +208,7 @@ module Badline
         map(@io, 0xe8, 0x01)
         @read_pages.fill(@kernal_rom, 0xf0, 0x10)
         @expansion&.map(@read_pages, @write_pages)
+        @board&.map(@read_pages, @write_pages)
         map_debug_register if @debug_register
       end
 

data/lib/badline/pet/keyboard_ports.rb

@@ -42,8 +42,12 @@ module Badline
 
       attr_reader :keyboard
 
+      # Whether the SuperPET's board pulls the diagnostic sense low.
+      attr_accessor :diagnostic_low
+
       def initialize(keyboard)
         @keyboard = keyboard
+        @diagnostic_low = false
         @pia = nil
         @ieee = nil
         @cassettes = nil
@@ -60,8 +64,11 @@ module Badline
 
       # Port A's other lines: PA4 and PA5 read the cassette sense switches,
       # PA6 the IEEE bus's EOI, and the diagnostic sense on PA7 floats high
-      # with nothing on it.
-      def read_a(_lines) = @ieee.eoi_input & @cassettes.sense_input
+      # with nothing on it but the SuperPET's board, which can pull it low.
+      def read_a(_lines)
+        lines = @ieee.eoi_input & @cassettes.sense_input
+        @diagnostic_low ? lines & 0x7f : lines
+      end
 
       def read_b(lines)
         row = @pia.port_a_output & 0x0f

data/lib/badline/pet/keyed_state.rb

@@ -25,7 +25,9 @@ module Badline
         out.int("cycles", @cycles).bool("vertical_drive", @vertical_drive)
         pending = @pending_keys
         out.ints("host.pending_keys", pending) if pending
+        save_init_keys(out)
         out.int("host.init_pending", @cycles <= @init_threshold ? @init_handlers.length : 0)
+        save_ieee_drive_fields(out)
       end
 
       def load_machine_fields(input)
@@ -33,7 +35,9 @@ module Badline
         @vertical_drive = input.bool("vertical_drive", @vertical_drive)
         pending = input.ints("host.pending_keys", [])
         @pending_keys = pending.empty? ? nil : pending.dup
+        load_init_keys(input)
         @init_handlers_lost = [input.int("host.init_pending", 0) - @init_handlers.length, 0].max
+        load_ieee_drive_fields(input)
       end
     end
 

data/lib/badline/pet/model.rb

@@ -17,7 +17,8 @@ module Badline
     # 1K twice over and the 80-column ones with 2K. The 8296 has 128K of
     # dynamic RAM, the 32K below $8000, the 32K above it, of which the
     # screen is the start and the rest lies under the ROMs, and the 64K
-    # board (Bus::Expansion).
+    # board (Bus::Expansion). The SuperPET is an 8032 with the 901640-01
+    # character ROM, twice the 8032's size, and its own board (SuperPET).
     module Model
       Profile = Data.define(:name, :ram_kb, :basic, :editor_50hz, :editor_60hz, :kernal, :characters, :keyboard,
                             :video, :expansion) do
@@ -28,6 +29,9 @@ module Badline
         # The 8296, whose board decodes its memory in a PLA.
         def cbm8296? = name == "8296"
 
+        # The SuperPET, an 8032 with the Waterloo board (SuperPET).
+        def superpet? = name == "superpet"
+
         # The screen RAM's bytes, and on the 8296 all 32K of RAM from $8000.
         def screen_bytes
           return 0x8000 if cbm8296?
@@ -86,7 +90,12 @@ module Badline
                             kernal: "pet/kernal4.rom", characters: "pet/characters2.rom", keyboard: :business,
                             video: :crtc80, expansion: true)
 
-      ALL = [PET2001, PET3032, PET3032B, PET4032, CBM8032, CBM8096, CBM8296].freeze
+      SUPERPET = Profile.new(name: "superpet", ram_kb: 32, basic: "pet/basic4.rom",
+                             editor_50hz: "pet/editor4-80-b-50hz.rom", editor_60hz: "pet/editor4-80-b-60hz.rom",
+                             kernal: "pet/kernal4.rom", characters: "pet/characters-superpet.rom",
+                             keyboard: :business, video: :crtc80, expansion: false)
+
+      ALL = [PET2001, PET3032, PET3032B, PET4032, CBM8032, CBM8096, CBM8296, SUPERPET].freeze
 
       DEFAULT = "8032"
 

data/lib/badline/pet/rom_sets.rb

@@ -39,6 +39,7 @@ module Badline
         "4032" => { "4" => %w[4-40-n-50hz 4-40-n-60hz] },
         "8032" => { "4" => %w[4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] },
         "8096" => { "4" => %w[4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] },
+        "superpet" => { "4" => %w[4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] },
         "8296" => { "4" => %w[4-80-b-50hz-8296 4-80-b-50hz 4-80-b-50hz-0283 4-80-b-60hz] }
       }.freeze
 

data/lib/badline/pet/sound.rb

@@ -8,121 +8,21 @@ module Badline
     # added. CB2 carries the shift register's bits in its shift-out modes,
     # mode 4's free-running square wave under timer 2 for the bell and most
     # PET music, and the PCR's CB2 output otherwise, held high or low by
-    # hand or floating high as an input.
-    #
-    # The machine calls #cycle! once a cycle while #recording?, from #record
-    # on, so a sound nobody records costs only that check. Each sample is
-    # the share of its cycles CB2 spent high, through the output stage: a
-    # one-pole low-pass at 5 kHz and a one-pole high-pass at 100 Hz, so a
-    # line left high or low settles to silence.
+    # hand or floating high as an input. Machine::LineSound turns it into
+    # samples.
     class Sound
-      LOW_PASS_HZ = 5_000
-      HIGH_PASS_HZ = 100
-
-      # A swing from CB2 low to CB2 high, as a signed 16-bit sample.
-      SCALE = 24_000.0
+      include Machine::LineSound
 
       def initialize(via)
         @via = via
-        @recording = false
-        @high = true
-        @run = 0
-        @rate = 0
-        @clock_hz = 0
-        @remainder = 0
-        @window = 0
-        @left = 0
-        @sum = 0
-        @low = 0.0
-        @drift = 0.0
-        @low_pass = 0.0
-        @high_pass = 0.0
-        @samples = []
+        init_line_sound
       end
 
       def model = :cb2
 
-      attr_reader :recording
-      alias recording? recording
-
-      # Starts collecting the output, averaged down to `rate` samples a
-      # second at `clock_hz` cycles a second, for #drain_samples. The
-      # output stage takes CB2's level now as settled.
-      def record(rate:, clock_hz: 1_000_000)
-        @rate = rate
-        @clock_hz = clock_hz
-        @remainder = 0
-        @window = next_window
-        @left = @window
-        @sum = 0
-        @high = @via.cb2_output
-        @run = 0
-        @low = @drift = @high ? 1.0 : 0.0
-        @low_pass = 1.0 - Math.exp(-2.0 * Math::PI * LOW_PASS_HZ / rate)
-        @high_pass = 1.0 - Math.exp(-2.0 * Math::PI * HIGH_PASS_HZ / rate)
-        @samples = []
-        @recording = true
-      end
-
-      # Takes CB2's level for this cycle, while recording.
-      def cycle!
-        high = @via.cb2_output
-        if high == @high
-          @run += 1
-        else
-          hold(@high, @run)
-          @high = high
-          @run = 1
-        end
-      end
-
-      # The samples closed since the last drain.
-      def drain_samples
-        return [] unless @recording
-
-        hold(@high, @run)
-        @run = 0
-        samples = @samples
-        @samples = []
-        samples
-      end
-
       private
 
-      # Adds `cycles` cycles with CB2 high or low, closing every sample
-      # they finish.
-      def hold(high, cycles)
-        left = @left
-        while cycles >= left
-          @sum += left if high
-          cycles -= left
-          close
-          left = @left
-        end
-        @sum += cycles if high
-        @left = left - cycles
-      end
-
-      def close
-        @low += @low_pass * (@sum.fdiv(@window) - @low)
-        @drift += @high_pass * (@low - @drift)
-        sample = ((@low - @drift) * SCALE).round
-        sample = 32_767 if sample > 32_767
-        sample = -32_768 if sample < -32_768
-        @samples << sample
-        @sum = 0
-        @window = next_window
-        @left = @window
-      end
-
-      # Each window is a whole number of cycles, and they add up to the
-      # clock's cycles over a second.
-      def next_window
-        @remainder += @clock_hz
-        cycles = @remainder / @rate
-        @remainder -= cycles * @rate
-        cycles
-      end
+      def line_high? = @via.cb2_output
     end
   end
 end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Badline
+  class PET
+    class SuperPET < PET
+      # The board's 6551 at $EFF0, the RS-232 port's, on a 1.8432 MHz
+      # crystal, whose IRQ joins the PET's.
+      class ACIA < Chips::ACIA
+      end
+    end
+  end
+end