badline 0.14.0 → 0.15.1

data/lib/badline/media/program.rb

@@ -2,26 +2,40 @@
 
 module Badline
   module Media
-    # A program loading into a C64 or a C128 once it has booted
-    # (Media.attach). The VIC-20 has its own (Vic20Basic).
+    # A program loading into a C64, a C128 or a 264 series machine once it
+    # has booted (Media.attach). The VIC-20 has its own (Vic20Basic).
     module Program
+      # Where BASIC 3.5 starts on the 264 series.
+      PLUS4_BASIC_START = 0x1001
+
       class << self
         # Loads the program where it says, and RUNs one that loads at the
         # start of BASIC.
         def load(computer, data, autostart:)
           load_addr = computer.load_prg(data)
+          start, text_end, load_end = basic(computer)
           # Run only makes sense for programs at BASIC start, or a byte ahead
-          # of it, where BASIC keeps the zero before its first line. BASIC 7.0
-          # starts at $1C01 and keeps the end of its text at $1210.
-          start, text_end = computer.family == :c128 && computer.mode == :c128 ? [0x1c01, 0x1210] : [BASIC_START, 0x2d]
+          # of it, where BASIC keeps the zero before its first line.
           return unless autostart && (load_addr == start || load_addr == start - 1)
 
           # The end of the program, where BASIC's variables start, and where
           # the KERNAL's LOAD leaves its end address.
           end_addr = load_addr + data.length - 2
-          [text_end, 0xae].each { |pointer| computer.ram.write(pointer, [end_addr & 0xff, end_addr >> 8]) }
+          [text_end, load_end].each { |pointer| computer.ram.write(pointer, [end_addr & 0xff, end_addr >> 8]) }
           computer.type_text("run\r")
         end
+
+        private
+
+        # Where BASIC starts, the pointer to the end of its text and the
+        # KERNAL's end address (EAL). BASIC 7.0 starts at $1C01 and keeps
+        # the end of its text at $1210, and the 264 KERNAL keeps EAL at $9D.
+        def basic(computer)
+          return [PLUS4_BASIC_START, 0x2d, KernalTrap::PLUS4_ZERO_PAGE.end_address] if computer.family == :plus4
+          return [0x1c01, 0x1210, 0xae] if computer.family == :c128 && computer.mode == :c128
+
+          [BASIC_START, 0x2d, 0xae]
+        end
       end
     end
   end

data/lib/badline/media/true_drive.rb

@@ -3,9 +3,10 @@
 module Badline
   module Media
     # Device 8 as a true drive instead of the KERNAL traps: a 1541, or on
-    # the C128 its 1571, or a 1581. Once a true drive is plugged in as
-    # device 8, disk media go into it rather than into the traps, so a LOAD
-    # runs the DOS and every byte crosses the serial bus. A .g64 holds the
+    # the C128 its 1571, or on the Plus/4 a 1551 if it asks for one, or a
+    # 1581. Once a true drive is plugged in as device 8, disk media go into
+    # it rather than into the traps, so a LOAD runs the DOS and every byte
+    # crosses the serial bus or TCBM. A .g64 holds the
     # disk's raw GCR, which only a true drive reads, so it plugs one in
     # when there's none yet. The 1541 reads only .d64 and .g64 images, the
     # 1571 .d71 and .g71 as well, and the 1581 only .d81, so a .d81 swaps
@@ -52,9 +53,10 @@ module Badline
             raise Error, "#{path} is not a #{types.join(', ')} or .d81 image, which the #{name} and the 1581 read"
           end
 
-          (drive || computer.plug_true_drive).insert_image(path, read_only:)
+          drive ||= computer.plug_true_drive
+          drive.insert_image(path, read_only:)
           computer.unmount
-          "Inserted #{path} in the #{name} as device 8"
+          "Inserted #{path} in the #{drive.model_name} as device 8"
         end
 
         private

data/lib/badline/media.rb

@@ -10,6 +10,7 @@ require "badline/media/disk_list"
 require "badline/media/vic20_basic"
 require "badline/media/vic20_cartridge"
 require "badline/media/vic20_media"
+require "badline/media/plus4_media"
 require "badline/media/tune"
 require "badline/media/program"
 
@@ -44,13 +45,14 @@ module Badline
       # An .m3u or .vfl list of disks attaches the first disk it lists
       # (DiskList). Every machine takes each kind of medium the same way,
       # except that the VIC-20 (Vic20Media) has cartridges, programs and a
-      # disk autostart of its own, and takes no .sid tunes. The C128 in C64
-      # mode takes a C64's.
+      # disk autostart of its own, and takes no .sid tunes, and the 264
+      # series loads programs at the start of its BASIC (Program), takes
+      # .crt cartridges and raw .bin ROM images in its two cartridges'
+      # slots (Plus4Media), and no .sid tunes either. The
+      # C128 in C64 mode takes a C64's.
       def attach(computer, path, autostart: true, subtune: nil, **)
         path = DiskList.disk(path)
-        if computer.family == :vic20 && Vic20Media::UNSUPPORTED.include?(File.extname(path).downcase)
-          raise ArgumentError, "#{path} doesn't go in a VIC-20"
-        end
+        refuse_unsupported(computer, path)
 
         BootDisk.attach(computer, path, **) || attach_kind(computer, path, autostart:, subtune:, **)
       end
@@ -89,10 +91,12 @@ module Badline
       # What the medium at `path` is to `computer`, which attach goes by:
       # :true_drive for a disk that goes in a true drive (TrueDrive),
       # :directory, :storage for a disk image or a .t64 that the traps
-      # mount, and otherwise its kind by its extension (Extensions).
+      # mount, :cartridge for a raw ROM image on the 264 series
+      # (Plus4Media), and otherwise its kind by its extension (Extensions).
       def kind(computer, path)
         return :true_drive if TrueDrive.takes?(computer, path)
         return :directory if File.directory?(path)
+        return :cartridge if computer.family == :plus4 && Plus4Media.rom_image?(path)
 
         kind = Extensions.kind(path)
         %i[disk archive].include?(kind) ? :storage : kind
@@ -116,6 +120,16 @@ module Badline
 
       private
 
+      # The VIC-20 and the 264 series have no SID to play a .sid tune on.
+      def refuse_unsupported(computer, path)
+        return unless Vic20Media::UNSUPPORTED.include?(File.extname(path).downcase)
+
+        case computer.family
+        when :vic20 then raise ArgumentError, "#{path} doesn't go in a VIC-20"
+        when :plus4 then raise ArgumentError, "#{path} doesn't go in a Plus/4"
+        end
+      end
+
       def attach_kind(computer, path, autostart:, subtune:, **options)
         disk = options.fetch(:disk, {})
         case kind(computer, path)
@@ -151,25 +165,32 @@ module Badline
         computer.family == :vic20 ? Vic20Media.disk_autostart(yield) : AUTOSTART
       end
 
-      # A VIC-20 cartridge is its ROM chips.
+      # A VIC-20 or 264 series cartridge is its ROM chips. On the 264, the
+      # options' `slot` names the slot a raw ROM image goes in
+      # (Plus4Media.cartridge_chips).
       def attach_cartridge(computer, path, options)
-        if computer.family == :vic20
-          computer.attach_cartridge(Storage::CRTFile.new(path, machine: :vic20).chips)
+        case computer.family
+        when :vic20 then computer.attach_cartridge(Storage::CRTFile.new(path, machine: :vic20).chips)
+        when :plus4 then computer.attach_cartridge(Plus4Media.cartridge_chips(path, slot: options.fetch(:slot, nil)))
         else
           computer.attach_cartridge(C64::Cartridge.from_file(path, **options))
         end
         "Attached cartridge #{path}"
       end
 
-      # A VIC-20 says when the tape was made for another machine
-      # (Vic20Media.tape_message).
+      # A VIC-20 or a 264 says when the tape was made for another machine
+      # (Vic20Media.tape_message, Plus4Media.tape_message).
       def attach_tape(computer, path, autostart:)
         tape = Storage::TAP.new(path)
         computer.datasette.insert(tape)
         computer.datasette.play!
         computer.type_text(TAPE_AUTOSTART) if autostart
         message = "Inserted #{path} in the datasette"
-        computer.family == :vic20 ? Vic20Media.tape_message(tape, message) : message
+        case computer.family
+        when :vic20 then Vic20Media.tape_message(tape, message)
+        when :plus4 then Plus4Media.tape_message(tape, message)
+        else message
+        end
       end
 
       # A VIC-20 has programs of its own (Vic20Media.attach_program).

data/lib/badline/options/family.rb

@@ -30,6 +30,7 @@ module Badline
         case @family
         when :vic20 then VIC20_MODELS
         when :c128 then C128_MODELS
+        when :plus4 then PLUS4_MODELS
         else MODELS
         end
       end

data/lib/badline/options/help.rb

@@ -16,6 +16,16 @@ module Badline
       filter cycle by cycle, which is exact but takes about twice as long.
     TEXT
 
+    # The article for +name+: "an" where it starts with a vowel sound. A
+    # name of letters with a vowel among them is read as a word, and any
+    # other letter by letter, so .sid and .tap take "a", and .m3u and .lnx
+    # "an".
+    def self.article(name)
+      word = name.delete_prefix(".").downcase
+      vowels = word.match?(/\A[a-z]*[aeiou][a-z]*\z/) ? "aeiou" : "aefhilmnorsx8"
+      vowels.include?(word[0]) ? "an" : "a"
+    end
+
     # What --help prints: the usage, then the options this build takes,
     # section by section, laid out as OptionParser did.
     def help
@@ -38,14 +48,19 @@ module Badline
     # The media the window opens, by their extensions (Media::Extensions),
     # wrapped as the banner is.
     def media_kinds
-      text = "Media can be a #{Media::Extensions::PROGRAMS.join('/')} program, a #{listed(%i[disk])} disk image, " \
-             "a #{listed(%i[gcr])} disk image for a true drive, an #{listed(%i[disk_list])} list of disk images, " \
-             "a #{listed(%i[archive])} tape archive, a #{listed(%i[tape])} tape, a #{listed(%i[cartridge])} " \
-             "cartridge, a #{listed(%i[tune])} tune, a .vsf snapshot, or a directory to mount as device 8."
+      text = "Media can be #{listed(Media::Extensions::PROGRAMS)} program, #{listed(%i[disk])} disk image, " \
+             "#{listed(%i[gcr])} disk image for a true drive, #{listed(%i[disk_list])} list of disk images, " \
+             "#{listed(%i[archive])} tape archive, #{listed(%i[tape])} tape, #{listed(%i[cartridge])} " \
+             "cartridge, #{listed(%i[tune])} tune, #{listed(%w[.vsf])} snapshot, or a directory to mount as device 8."
       wrap(text)
     end
 
-    def listed(kinds) = Media::Extensions.of(kinds).join("/")
+    # The extensions of the kinds, or the extensions themselves, after the
+    # article the first takes.
+    def listed(kinds)
+      extensions = kinds.first.is_a?(Symbol) ? Media::Extensions.of(kinds) : kinds
+      "#{Options.article(extensions.first)} #{extensions.join('/')}"
+    end
 
     # The words of `text` in lines of at most 70 characters.
     def wrap(text)
@@ -68,6 +83,7 @@ module Badline
         Usage: #{@program} [c64] [options] [media]
                #{@program} vic20 [options] [media]
                #{@program} c128 [options] [media]
+               #{@program} plus4 [options] [media]
                #{@program} --headless [options] tune.sid
                #{@program} [options] tune.sid --audio-out FILE
                #{@program} sid [options] FILE|DIR...
@@ -76,6 +92,7 @@ module Badline
             c64                              Run a C64, the one --model names (the default)
             vic20                            Run a PAL VIC-20, with the RAM --ram names
             c128                             Run a C128 in C128 mode, the one --model names
+            plus4                            Run a Plus/4 or a C16, the one --model names
             sid                              Play .sid tunes and directories of them
 
         #{media_kinds}
@@ -91,6 +108,14 @@ module Badline
         tune opens in the SID player, as `sid` plays it, unless an option
         of the emulator's window asks for the machine.
 
+        The Plus/4 and the C16 take programs, disks, tapes, and cartridges as
+        .crt files or raw .bin ROM images. A .bin goes in cartridge 1, its
+        low slot for up to 16K and both slots for 32K, and --c1lo, --c1hi,
+        --c2lo and --c2hi put one in the slot they name. Their --true-drive
+        makes device 8 an emulated 1551, on the parallel TCBM cable, and
+        --drive-type 1541 a 1541 on the serial bus instead. There Escape is
+        ESC, Page Down RUN/STOP and F4 HELP.
+
         --headless plays a .sid tune on the host's audio device without the
         window, and --audio-out renders it to 16-bit PCM instead. The
         container follows the file's extension, .wav or .aiff. Played on a
@@ -111,7 +136,8 @@ module Badline
         --at and --script run events once a number of frames has run, as
         in --at 3500:key=space or --at 250,500:screenshot=shot%05d.bmp.
         key=NAME presses a key (space, return, a, f1, run_stop, restore, and
-        on the C128 esc, help, keypad1 and the rest) or a joystick's
+        on the C128 esc, help, keypad1 and the rest, and on the Plus/4
+        esc, help and f1 to f3) or a joystick's
         direction or fire (joy1-up, joy2-fire) for #{Event::HOLD} frames, and
         pushes the C128's caps_lock or forty_eighty, which lock. type=TEXT
         types it, with \\n for RETURN. insert=FILE swaps in a disk, a list's

data/lib/badline/options/option.rb

@@ -4,7 +4,8 @@ module Badline
   class Options
     # One option of the table: its flags and value as the help shows them
     # (`-s, --subtune N`), what it does, the help section it's listed in, the
-    # mode it needs (:window, :headless or :either), and the build that
+    # mode it needs (:window, :headless, :either, or :any_window for the
+    # emulator's window or the SID player's), and the build that
     # takes it (:native, :ruby or :both).
     class Option
       attr_reader :usage, :name, :short, :value, :text, :section, :needs, :build

data/lib/badline/options/table.rb

@@ -14,6 +14,13 @@ module Badline
     # The C128's models, as C128::Model names them.
     C128_MODELS = %w[c128 c128ntsc c128dcr c128dcrntsc].freeze
 
+    # The 264 series' models, as Plus4::Model names them, with the C116 as
+    # another name for the C16.
+    PLUS4_MODELS = %w[plus4 plus4ntsc c16 c16ntsc c116].freeze
+
+    # The true drives --drive-type names for the Plus/4.
+    PLUS4_DRIVE_TYPES = %w[1541 1551].freeze
+
     # The VIC-20 RAM expansions --ram takes, in the order the help lists
     # them.
     RAM_NAMES = %w[unexpanded 3k 8k 16k 24k 32k all].freeze
@@ -35,17 +42,35 @@ module Badline
       Option.new("--sound", "Play the SID through the host's audio device (F10 mutes)",
                  section: "Window options", needs: :window),
       Option.new("--no-sound", "Don't play the SID", section: "Window options", needs: :window, build: :native),
-      Option.new("--true-drive", "Put a true 1541 on device 8 instead of the KERNAL traps, a 1571 on the C128",
+      Option.new("--true-drive", "Put a true 1541 on device 8 instead of the KERNAL traps, a 1571 on the C128, " \
+                                 "a 1551 on the Plus/4",
+                 section: "Window options", needs: :window),
+      Option.new("--drive-type MODEL", "The Plus/4's true drive: 1541 or 1551 (default: 1551); 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(', ')}",
+                                 "C128: #{C128_MODELS.join(', ')}; Plus/4: #{PLUS4_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",
                  section: "Window options", needs: :window),
-      Option.new("--ram SIZE", "VIC-20 RAM expansion: #{RAM_NAMES.join(', ')} (default: unexpanded)",
+      Option.new("--ram SIZE", "VIC-20 RAM expansion: #{RAM_NAMES.join(', ')} (default: unexpanded); " \
+                               "Plus/4 RAM: 16k, 32k or 64k (default: the model's own)",
+                 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)",
+                 section: "Window options", needs: :window),
+      Option.new("--c2lo FILE", "Put a .bin ROM image in cartridge 2's low slot ($8000)",
+                 section: "Window options", needs: :window),
+      Option.new("--c2hi FILE", "Put a .bin ROM image in cartridge 2's high slot ($C000)",
+                 section: "Window options", needs: :window),
+      Option.new("--sid-card MODEL", "Fit the Plus/4 or C16 with a SID card at $FD40: 6581 or 8580",
+                 section: "Window options", needs: :window),
+      Option.new("--sid-card-address ADDRESS", "Put the SID card at fd40 (the default) or fe80",
+                 section: "Window options", needs: :window),
+      Option.new("--ram-expansion NAME", "Fit the Plus/4 or C16 with a RAM expansion: hannes256, hannes1m or csory256",
                  section: "Window options", needs: :window),
       Option.new("--no-vsync", "Pace frames by the timer or the sound instead of the display",
                  section: "Window options", needs: :window),
@@ -68,7 +93,7 @@ module Badline
                  section: "Options without the window", needs: :headless),
       Option.new("--no-tui", "Play without the interactive display, even on a terminal",
                  section: "Options without the window", needs: :headless),
-      Option.new("--frames N", "Quit after N frames", section: "Testing options", needs: :window),
+      Option.new("--frames N", "Quit after N frames", section: "Testing options", needs: :any_window),
       Option.new("--unpaced", "Run as fast as it can, without vsync or pacing",
                  section: "Testing options", needs: :window),
       Option.new("--screenshot FILE", "Save the last frame as a .bmp",

data/lib/badline/options/validation.rb

@@ -8,6 +8,18 @@ module Badline
     module Validation
       private
 
+      def sid_card_for(value)
+        raise Error, "invalid argument: --sid-card #{value}" unless SID_MODELS.key?(value)
+
+        SID_MODELS[value]
+      end
+
+      def sid_card_address_for(value)
+        raise Error, "invalid argument: --sid-card-address #{value}" unless SID_CARD_ADDRESSES.key?(value.downcase)
+
+        SID_CARD_ADDRESSES[value.downcase]
+      end
+
       def sid_model_for(value)
         return if value == "auto"
         raise Error, "invalid argument: --sid #{value}" unless SID_MODELS.key?(value)
@@ -21,6 +33,24 @@ module Badline
         RAM_CONFIGURATIONS[value]
       end
 
+      def plus4_ram(value)
+        raise Error, "invalid argument: --ram #{value}" unless PLUS4_RAM.key?(value)
+
+        PLUS4_RAM[value]
+      end
+
+      def plus4_ram_expansion(value)
+        raise Error, "invalid argument: --ram-expansion #{value}" unless PLUS4_RAM_EXPANSIONS.key?(value)
+
+        PLUS4_RAM_EXPANSIONS[value]
+      end
+
+      def drive_type_for(value)
+        raise Error, "invalid argument: --drive-type #{value}" unless PLUS4_DRIVE_TYPES.include?(value)
+
+        value
+      end
+
       def reu_size(value)
         raise Error, "invalid argument: --reu #{value}" unless REU_SIZES.include?(value)
 
@@ -41,6 +71,8 @@ module Badline
 
       def validate
         validate_family
+        raise Error, "--drive-type needs plus4" unless @drive_type.nil? || @family == :plus4
+
         validate_mode
         validate_models
         validate_numbers
@@ -50,6 +82,7 @@ module Badline
       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?
           raise Error, "no tune given" if tune_paths.empty? && !player_window?
 
           tune_paths.each { |path| validate_tune(path) }
@@ -59,13 +92,12 @@ module Badline
       end
 
       def validate_family
-        raise Error, "the Plus/4 isn't emulated yet" if @family == :plus4
-
         if @family == :vic20
           validate_vic20
         elsif !@ram.nil?
-          raise Error, "--ram needs vic20"
+          raise Error, "--ram needs vic20 or plus4"
         end
+        @family == :plus4 ? validate_plus4 : refuse_plus4_options
         if @family == :c128
           validate_c128
         elsif @c64_mode
@@ -91,6 +123,36 @@ module Badline
         raise Error, "the VIC-20 needs the window" if headless?
       end
 
+      # Only the Plus/4 has cartridge slots for raw ROM images and takes a
+      # SID card and a RAM expansion.
+      def refuse_plus4_options
+        raise Error, "--#{@cartridges.keys.first} needs plus4" unless @cartridges.empty?
+        raise Error, "--sid-card needs plus4" unless @sid_card.nil?
+        raise Error, "--sid-card-address needs plus4" unless @sid_card_address.nil?
+        raise Error, "--ram-expansion needs plus4" unless @ram_expansion.nil?
+      end
+
+      # The Plus/4 runs in the window, without the C64's SID and REU but
+      # with a SID card if asked, its NTSC models have names of their own,
+      # and its cartridge slots take raw ROM images.
+      def validate_plus4
+        raise Error, "--ntsc needs the C64; the NTSC Plus/4 is --model plus4ntsc" if @models.include?("ntsc")
+        raise Error, "--sid needs the C64; the Plus/4's is --sid-card" unless @sid_model.nil?
+        raise Error, "--reu needs the C64" unless @reu.nil?
+        raise Error, "the Plus/4 needs the window" if headless?
+
+        validate_plus4_expansions
+        image = @cartridges.values.find { |path| !File.extname(path).casecmp?(".bin") }
+        raise Error, "not a .bin ROM image: #{image}" unless image.nil?
+      end
+
+      # A RAM expansion goes over 64K, and a SID card's address needs a
+      # card.
+      def validate_plus4_expansions
+        raise Error, "--ram-expansion needs 64k" unless @ram_expansion.nil? || [nil, 64].include?(@ram_kb)
+        raise Error, "--sid-card-address needs --sid-card" unless @sid_card_address.nil? || @sid_card
+      end
+
       # `sid` takes directories as well as tunes.
       def validate_tune(path)
         return if !File.exist?(path) || File.extname(path).casecmp?(".sid")
@@ -120,7 +182,7 @@ module Badline
       end
 
       def validate_paths
-        missing = tune_paths.find { |path| !File.exist?(path) }
+        missing = (tune_paths + @cartridges.values).find { |path| !File.exist?(path) }
         raise Error, "no such file or directory: #{missing}" unless missing.nil?
         raise Error, "no such file or directory: #{@songlengths}" unless @songlengths.nil? || File.exist?(@songlengths)
       end

data/lib/badline/options.rb

@@ -12,9 +12,9 @@ module Badline
   # Either opens the window for any media, or with --headless or
   # --audio-out plays or renders a .sid tune without one. `sid`, given
   # first, plays .sid tunes and directories of them in the terminal.
-  # `c64`, `vic20` or `c128`, given first, names the machine family, and
-  # without one the family is the C64, or the C128 for a program that loads
-  # where C128 BASIC starts. `plus4` is refused until the Plus/4 runs. The native build adds --no-sound and
+  # `c64`, `vic20`, `c128` or `plus4`, given first, names the machine
+  # family, and without one the family is the C64, or the C128 for a program
+  # that loads where C128 BASIC starts. The native build adds --no-sound and
   # --version, and badline-ruby adds --disable-jit.
   #
   # TABLE lists the options, and both the parser and the help read it. It
@@ -48,6 +48,19 @@ module Badline
       "32k" => :"32k", "all" => :all
     }.freeze
 
+    # The Plus/4's RAM sizes as --ram names them, in K.
+    PLUS4_RAM = { "16k" => 16, "32k" => 32, "64k" => 64 }.freeze
+
+    # Where --sid-card-address puts the Plus/4's SID card.
+    SID_CARD_ADDRESSES = { "fd40" => 0xfd40, "fe80" => 0xfe80 }.freeze
+
+    # The Plus/4's RAM expansions as --ram-expansion names them.
+    PLUS4_RAM_EXPANSIONS = { "hannes256" => :hannes256, "hannes1m" => :hannes1m, "csory256" => :csory256 }.freeze
+
+    # The Plus/4's cartridge slots, by the options that fill them and
+    # xplus4's names (Media::Plus4Media::SLOTS).
+    CARTRIDGE_SLOTS = { "--c1lo" => "c1lo", "--c1hi" => "c1hi", "--c2lo" => "c2lo", "--c2hi" => "c2hi" }.freeze
+
     # A Float as OptionParser took one: digits with an optional sign,
     # fraction and exponent.
     DECIMAL = /\A[-+]?(\d+(\.\d+)?|\.\d+)([eE][-+]?\d+)?\z/
@@ -57,14 +70,34 @@ module Badline
     attr_reader :program, :media_path, :tune_paths, :subtune, :sid_model, :reu, :frames, :screenshot, :save_snapshot,
                 :audio_out, :seconds, :songlengths, :filter_chunk, :timeline
 
-    # The machine family to build (Badline::Machine), :c64, :vic20 or
-    # :c128.
+    # The machine family to build (Badline::Machine), :c64, :vic20, :c128
+    # or :plus4.
     attr_reader :family
 
     # The VIC-20's RAM expansion --ram names, a key of
     # Vic20::Bus::RAM_CONFIGURATIONS, or nil without --ram.
     attr_reader :ram
 
+    # The Plus/4's RAM in K --ram names, one of PLUS4_RAM's, or nil without
+    # --ram.
+    attr_reader :ram_kb
+
+    # The Plus/4's cartridge ROM images --c1lo, --c1hi, --c2lo and --c2hi
+    # name, by slot: { "c1lo" => path }.
+    attr_reader :cartridges
+
+    # The SID model of the Plus/4's SID card --sid-card names, :mos6581 or
+    # :mos8580, or nil without one.
+    attr_reader :sid_card
+
+    # Where --sid-card-address puts the Plus/4's SID card, $FD40 without
+    # it.
+    attr_reader :sid_card_address
+
+    # The Plus/4's RAM expansion --ram-expansion names, a key of
+    # Plus4::RAMExpansion::KINDS, or nil without one.
+    attr_reader :ram_expansion
+
     def self.parse(argv, native: false) = new(native:).parse(argv)
 
     # The native build plays the SID in the window unless --no-sound says
@@ -81,9 +114,14 @@ module Badline
       @tune_paths = []
       @subtune = nil
       @sid_model = nil
+      @sid_card = nil
+      @sid_card_address = nil
+      @ram_expansion = nil
       @models = []
       @reu = nil
       @ram = nil
+      @ram_kb = nil
+      @cartridges = {}
       @autostart = true
       @writable = false
       @sound = native
@@ -92,6 +130,7 @@ module Badline
       @vsync = true
       @verbose = false
       @true_drive = false
+      @drive_type = nil
       @screenshot = ""
       @save_snapshot = ""
       @vice = false
@@ -109,6 +148,7 @@ module Badline
       @tui = true
       @all_subtunes = false
       @window_only = []
+      @any_window_only = []
       @headless_only = []
     end
 
@@ -170,7 +210,10 @@ module Badline
 
     def verbose? = @verbose
 
-    def true_drive? = @true_drive
+    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"
 
     # Whether --save-snapshot adds VICE's modules, so x64sc opens it.
     def vice? = @vice
@@ -178,8 +221,8 @@ module Badline
     def jit? = @jit
 
     # The name of the model to build: a C64 Badline::Model names, a VIC-20
-    # of VIC20_MODELS or a C128 of C128_MODELS. --ntsc is short for --model
-    # ntsc.
+    # of VIC20_MODELS, a C128 of C128_MODELS or a Plus/4 of PLUS4_MODELS.
+    # --ntsc is short for --model ntsc.
     def model = @models.first || family_models.first
 
     # Whether --c64 asks the C128 to start in C64 mode, holding C= at
@@ -201,7 +244,8 @@ 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 || @family == :vic20 || headless? || !@window_only.empty? || @media_path.nil?
+      return if @sid_command || %i[vic20 plus4].include?(@family) || headless? || !@window_only.empty?
+      return if @media_path.nil?
 
       @sid_command = File.extname(@media_path).casecmp?(".sid")
     end
@@ -236,9 +280,11 @@ module Badline
       option
     end
 
-    # Notes an option only the window or only the headless player takes.
+    # Notes an option only the window, only a window of either kind, or
+    # only the headless player takes.
     def restrict(option, flag)
       @window_only << flag if option.needs == :window
+      @any_window_only << flag if option.needs == :any_window
       @headless_only << flag if option.needs == :headless
     end
 
@@ -252,9 +298,14 @@ module Badline
       case name
       when "--subtune" then @subtune = number(flag, value)
       when "--sid" then @sid_model = sid_model_for(value)
+      when "--sid-card" then @sid_card = sid_card_for(value)
+      when "--sid-card-address" then @sid_card_address = sid_card_address_for(value)
+      when "--ram-expansion" then @ram_expansion = plus4_ram_expansion(value)
       when "--model" then @models << value
       when "--reu" then @reu = reu_size(value)
-      when "--ram" then @ram = ram_configuration(value)
+      when "--ram" then ram_option(value)
+      when "--drive-type" then @drive_type = drive_type_for(value)
+      when "--c1lo", "--c1hi", "--c2lo", "--c2hi" then @cartridges[CARTRIDGE_SLOTS.fetch(name)] = value
       when "--frames" then @frames = number(flag, value)
       when "--screenshot" then @screenshot = value
       when "--save-snapshot" then @save_snapshot = value
@@ -267,6 +318,15 @@ module Badline
       end
     end
 
+    # --ram names the VIC-20's RAM expansion, or the Plus/4's RAM.
+    def ram_option(value)
+      if @family == :plus4
+        @ram_kb = plus4_ram(value)
+      else
+        @ram = ram_configuration(value)
+      end
+    end
+
     def switch(name)
       case name
       when "--no-autostart" then @autostart = false