badline 0.17.0 → 0.19.0

data/lib/badline/vic20/port_wiring.rb

@@ -15,6 +15,11 @@ module Badline
     # The datasette's read line pulses VIA 2's CA1, its sense switch reads
     # on VIA 1's PA6, its motor runs while VIA 1's CA2 is low, and VIA 2's
     # PB3 drives its write line, the same pin as a keyboard column.
+    #
+    # VIA 1's PA5 is the VIC's light pen input too, low while the VIA
+    # drives it low or the joystick's fire button is held. The machine
+    # passes it on after each write to a VIA, as it does the serial lines,
+    # and as the fire button moves.
     module PortWiring
       # The lines the machine pulls, as Drives::SerialBus host lines.
       def serial_lines
@@ -30,6 +35,7 @@ module Badline
       def wire_ports
         @datasette.on_flag { tape_pulse }
         @bus.on_via_write { via_written }
+        @joystick1.on_change { pass_lightpen }
         via_written
       end
 
@@ -38,6 +44,11 @@ module Badline
         @iec_bus.host_lines = lines unless lines == @iec_bus.host_lines
         @datasette.motor = !@via1.ca2_output
         @datasette.write_line = @via2.port_b_output.anybits?(0x08)
+        pass_lightpen
+      end
+
+      def pass_lightpen
+        @vic.lightpen_level(@via1.port_a_output.anybits?(0x20) && @joystick1.port_bits.anybits?(0x10))
       end
 
       # A falling edge on the read line, and the line back up.

data/lib/badline/vic20.rb

@@ -11,8 +11,8 @@ require "badline/vic20/keyed_state"
 require "badline/vic20/keyed_modules"
 
 module Badline
-  # The Commodore VIC-20 with the PAL 6561: a 6502 at the VIC's clock, the
-  # VIC-I and two 6522 VIAs. VIA 1, at $9110, pulls NMI, and VIA 2, at
+  # The Commodore VIC-20, with the PAL 6561 or the NTSC 6560: a 6502 at
+  # the VIC's clock, the VIC-I and two 6522 VIAs. VIA 1, at $9110, pulls NMI, and VIA 2, at
   # $9120, pulls IRQ. Nothing else interrupts the CPU, and nothing halts
   # it: the VIC fetches in the half of the cycle the CPU leaves alone.
   #
@@ -34,6 +34,14 @@ module Badline
     # The RAM expansion it was built with, a key of Bus::RAM_CONFIGURATIONS.
     attr_reader :ram_configuration
 
+    # The model it was built as, one of MODELS.
+    attr_reader :model
+
+    # The models, by xvic's names for its video standards: the PAL one with
+    # the 6561 and KERNAL 901486-07, and the NTSC one with the 6560 and
+    # KERNAL 901486-06.
+    MODELS = %w[pal ntsc].freeze
+
     def ram = @bus.ram
 
     # Reads and writes memory as the CPU sees it, through the bus.
@@ -43,6 +51,8 @@ module Badline
 
     def family = :vic20
 
+    def portless_board = nil
+
     # The one control port's joystick, which the front end's second
     # joystick drives too.
     def joystick2 = @joystick1
@@ -50,10 +60,14 @@ module Badline
     # No pot device plugs in yet.
     def control_ports = nil
 
-    # +ram+ names the RAM expansion, one of Bus::RAM_CONFIGURATIONS.
-    def initialize(ram: :unexpanded, debug: false)
+    # +ram+ names the RAM expansion, one of Bus::RAM_CONFIGURATIONS, and
+    # +model+ the model, one of MODELS.
+    def initialize(ram: :unexpanded, model: "pal", debug: false)
       @ram_configuration = ram
-      @vic = Chips::VICI.new
+      @model = model
+      raise ArgumentError, "no VIC-20 model named #{model}" unless MODELS.include?(model)
+
+      @vic = Chips::VICI.new(model == "ntsc" ? Chips::VICI::NTSC : Chips::VICI::PAL)
       @keyboard = Input::Keyboard.new(matrix: KeyboardVIAPorts::MATRIX)
       @joystick1 = Input::Joystick.new
       @iec_bus = Drives::SerialBus.new
@@ -63,15 +77,18 @@ module Badline
       keyboard_ports = KeyboardVIAPorts.new(keyboard: @keyboard, joystick: @joystick1)
       @via2 = Chips::VIA.new(start: 0x9000, peripheral: keyboard_ports)
       keyboard_ports.connect(@via2)
-      @bus = Bus.new(vic: @vic, via1: @via1, via2: @via2, blocks: Bus::RAM_CONFIGURATIONS.fetch(ram))
+      @bus = Bus.new(vic: @vic, via1: @via1, via2: @via2, blocks: Bus::RAM_CONFIGURATIONS.fetch(ram),
+                     kernal: "vic20/kernal-#{model}.rom")
       @vic.connect(@bus)
       @cpu = CPU.new(@bus, debug:)
+      @cpu.power_on!
       @cycles = 0
       @sound = Chips::VICI::Sound.new(self, @vic.profile.clock_hz)
       @vic.sound = @sound
       @nmi_asserted = false
       @init_handlers = []
       @pending_keys = nil
+      @init_keys = nil
       @dos = nil
       @serial_trap = nil
       @save_trap = nil
@@ -109,18 +126,18 @@ module Badline
     # #drain_samples.
     def sound_source = @sound
 
-    # The PAL clock and raster, and the part of the display xvic shows: all
-    # 284 pixels of a line, from line 28, below the VIC's vertical blank.
-    # The VIC draws 4 pixels a cycle, half as many as the C64's VIC-II on
-    # about the same clock, so each pixel shows two window pixels wide, as
-    # xvic draws them.
+    # The VIC's clock and raster, and the part of the display xvic shows:
+    # every pixel of a line, from line 28, below the VIC's vertical blank,
+    # 284 lines on PAL and 233 on NTSC. The VIC draws 4 pixels a cycle,
+    # half as many as the C64's VIC-II on about the same clock, so each
+    # pixel shows two window pixels wide, as xvic draws them.
     def timing
       profile = @vic.profile
       width = profile.cycles_per_line * Chips::VICI::PIXELS_PER_CYCLE
       blanked = profile.blanked_lines
       Timing.new(clock_hz: profile.clock_hz, cycles_per_line: profile.cycles_per_line,
                  lines_per_frame: profile.lines_per_frame,
-                 crop: [0, blanked, width, profile.lines_per_frame - blanked], pixel_width: 2, dots: 1)
+                 crop: [0, blanked, width, profile.shown_lines], pixel_width: 2, dots: 1)
     end
 
     # The RESTORE key pulls VIA 1's CA1 low while it is held. The KERNAL
@@ -167,6 +184,7 @@ module Badline
       @vic.power_on!
       @sound.power_on!
       reset!
+      @cpu.power_on!
     end
 
     private

data/lib/badline.rb

@@ -4,6 +4,7 @@ require "badline/core"
 require "badline/c128"
 require "badline/plus4"
 require "badline/cbm2"
+require "badline/kim1"
 require "badline/options"
 require "badline/data_path"
 require "badline/snapshot"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -47,6 +47,7 @@ files:
 - doc/sid-player.md
 - doc/snapshot-format.md
 - doc/snapshots.md
+- doc/vice.md
 - exe/badline-ruby
 - lib/badline.rb
 - lib/badline/addressable.rb
@@ -194,6 +195,18 @@ files:
 - lib/badline/chips/cpu/traps.rb
 - lib/badline/chips/crtc.rb
 - lib/badline/chips/crtc/keyed_state.rb
+- lib/badline/chips/m6809.rb
+- lib/badline/chips/m6809/arithmetic.rb
+- lib/badline/chips/m6809/bus_steps.rb
+- lib/badline/chips/m6809/core.rb
+- lib/badline/chips/m6809/indexed.rb
+- lib/badline/chips/m6809/interrupts.rb
+- lib/badline/chips/m6809/keyed_state.rb
+- lib/badline/chips/m6809/opcodes.rb
+- lib/badline/chips/m6809/operations.rb
+- lib/badline/chips/m6809/plans.rb
+- lib/badline/chips/m6809/registers.rb
+- lib/badline/chips/m6809/stack.rb
 - lib/badline/chips/pia.rb
 - lib/badline/chips/pia/control_lines.rb
 - lib/badline/chips/pia/keyed_parts.rb
@@ -263,6 +276,7 @@ files:
 - lib/badline/chips/vic/sprites.rb
 - lib/badline/chips/vic_i.rb
 - lib/badline/chips/vic_i/keyed_parts.rb
+- lib/badline/chips/vic_i/light_pen.rb
 - lib/badline/chips/vic_i/painter.rb
 - lib/badline/chips/vic_i/sound.rb
 - lib/badline/chips/vic_i/sound/output.rb
@@ -301,6 +315,8 @@ files:
 - lib/badline/drives/engine/vias.rb
 - lib/badline/drives/engine/watch.rb
 - lib/badline/drives/ieee_bus.rb
+- lib/badline/drives/ieee_models.rb
+- lib/badline/drives/model1001.rb
 - lib/badline/drives/model1541.rb
 - lib/badline/drives/model1541/bus.rb
 - lib/badline/drives/model1541/byte_ready.rb
@@ -349,8 +365,16 @@ files:
 - lib/badline/drives/model2031/ieee_port.rb
 - lib/badline/drives/model2031/keyed_state.rb
 - lib/badline/drives/model2031/parts.rb
+- lib/badline/drives/model4040.rb
+- lib/badline/drives/model4040/disk.rb
+- lib/badline/drives/model4040/ip_bus.rb
+- lib/badline/drives/model4040/keyed_state.rb
+- lib/badline/drives/model4040/mechanism.rb
+- lib/badline/drives/model4040/parts.rb
 - lib/badline/drives/model8050.rb
+- lib/badline/drives/model8050/board.rb
 - lib/badline/drives/model8050/disk.rb
+- lib/badline/drives/model8050/dos_board.rb
 - lib/badline/drives/model8050/fdc_bus.rb
 - lib/badline/drives/model8050/idle.rb
 - lib/badline/drives/model8050/ieee_port.rb
@@ -358,6 +382,13 @@ files:
 - lib/badline/drives/model8050/keyed_state.rb
 - lib/badline/drives/model8050/mechanism.rb
 - lib/badline/drives/model8050/parts.rb
+- lib/badline/drives/model9060.rb
+- lib/badline/drives/model9060/idle.rb
+- lib/badline/drives/model9060/keyed_state.rb
+- lib/badline/drives/model9060/parts.rb
+- lib/badline/drives/model9060/sasi_bus.rb
+- lib/badline/drives/model9060/sasi_commands.rb
+- lib/badline/drives/model9060/sasi_target.rb
 - lib/badline/drives/serial_bus.rb
 - lib/badline/ffi.rb
 - lib/badline/frontend.rb
@@ -372,9 +403,11 @@ files:
 - lib/badline/frontend/frame_report.rb
 - lib/badline/frontend/gamepads.rb
 - lib/badline/frontend/keys.rb
+- lib/badline/frontend/kim1_panel.rb
 - lib/badline/frontend/machine_window.rb
 - lib/badline/frontend/media_slots.rb
 - lib/badline/frontend/menu/confirmation.rb
+- lib/badline/frontend/menu/drive_types.rb
 - lib/badline/frontend/menu/file_browser.rb
 - lib/badline/frontend/menu/menu_dialogs.rb
 - lib/badline/frontend/menu/menu_media.rb
@@ -405,6 +438,7 @@ files:
 - lib/badline/frontend/screenshot.rb
 - lib/badline/frontend/snapshots.rb
 - lib/badline/frontend/sound.rb
+- lib/badline/frontend/teletype_pane.rb
 - lib/badline/frontend/timeline.rb
 - lib/badline/input.rb
 - lib/badline/input/control_ports.rb
@@ -437,10 +471,23 @@ files:
 - lib/badline/kernal_trap/save.rb
 - lib/badline/kernal_trap/serial.rb
 - lib/badline/kernal_trap/steps.rb
+- lib/badline/kim1.rb
+- lib/badline/kim1/bus.rb
+- lib/badline/kim1/cpu.rb
+- lib/badline/kim1/host_terminal.rb
+- lib/badline/kim1/key_entry.rb
+- lib/badline/kim1/keyed_modules.rb
+- lib/badline/kim1/keyed_state.rb
+- lib/badline/kim1/panel.rb
+- lib/badline/kim1/rriots.rb
+- lib/badline/kim1/sound.rb
+- lib/badline/kim1/tape.rb
+- lib/badline/kim1/teletype.rb
 - lib/badline/machine.rb
 - lib/badline/machine/clocking.rb
 - lib/badline/machine/ieee_drives.rb
 - lib/badline/machine/keyboard_buffer.rb
+- lib/badline/machine/line_sound.rb
 - lib/badline/machine/settling.rb
 - lib/badline/media.rb
 - lib/badline/media/boot_disk.rb
@@ -448,6 +495,7 @@ files:
 - lib/badline/media/disk_list.rb
 - lib/badline/media/disk_set.rb
 - lib/badline/media/extensions.rb
+- lib/badline/media/kim1_media.rb
 - lib/badline/media/not_disk.rb
 - lib/badline/media/pet_media.rb
 - lib/badline/media/plus4_media.rb
@@ -485,6 +533,14 @@ files:
 - lib/badline/pet/model.rb
 - lib/badline/pet/rom_sets.rb
 - lib/badline/pet/sound.rb
+- lib/badline/pet/superpet.rb
+- lib/badline/pet/superpet/acia.rb
+- lib/badline/pet/superpet/board.rb
+- lib/badline/pet/superpet/dongle.rb
+- lib/badline/pet/superpet/keyed_modules.rb
+- lib/badline/pet/superpet/keyed_parts.rb
+- lib/badline/pet/superpet/m6809.rb
+- lib/badline/pet/superpet/waterloo_traps.rb
 - lib/badline/pet/via.rb
 - lib/badline/pet/via_ports.rb
 - lib/badline/plus4.rb
@@ -505,9 +561,17 @@ files:
 - lib/badline/plus4/user_port.rb
 - lib/badline/region.rb
 - lib/badline/rom.rb
+- lib/badline/roms/1001/fdc-251257-02a.rom
+- lib/badline/roms/4040/dos-1.2.rom
+- lib/badline/roms/4040/dos-2.1-rev.rom
+- lib/badline/roms/4040/dos-2.1.rom
+- lib/badline/roms/4040/fdc-901466-02.rom
+- lib/badline/roms/4040/fdc-901466-04.rom
 - lib/badline/roms/8050/dos-2.7.rom
 - lib/badline/roms/8050/fdc-901869-01.rom
 - lib/badline/roms/8050/fdc-901885-04.rom
+- lib/badline/roms/9060/dos-3.0.rom
+- lib/badline/roms/9060/sasi-300515-revb.rom
 - lib/badline/roms/README
 - lib/badline/roms/basic.rom
 - lib/badline/roms/c128/basic.rom
@@ -535,10 +599,13 @@ files:
 - lib/badline/roms/kernal-pet64.rom
 - lib/badline/roms/kernal-sx64.rom
 - lib/badline/roms/kernal.rom
+- lib/badline/roms/kim1/6530-002.rom
+- lib/badline/roms/kim1/6530-003.rom
 - lib/badline/roms/pet/basic1.rom
 - lib/badline/roms/pet/basic2.rom
 - lib/badline/roms/pet/basic4.rom
 - lib/badline/roms/pet/characters-din.rom
+- lib/badline/roms/pet/characters-superpet.rom
 - lib/badline/roms/pet/characters1.rom
 - lib/badline/roms/pet/characters2.rom
 - lib/badline/roms/pet/editor1.rom
@@ -555,6 +622,10 @@ files:
 - lib/badline/roms/pet/kernal1.rom
 - lib/badline/roms/pet/kernal2.rom
 - lib/badline/roms/pet/kernal4.rom
+- lib/badline/roms/pet/superpet-a000.rom
+- lib/badline/roms/pet/superpet-c000.rom
+- lib/badline/roms/pet/superpet-e000-50hz.rom
+- lib/badline/roms/pet/superpet-e000.rom
 - lib/badline/roms/plus4/basic.rom
 - lib/badline/roms/plus4/function-high.rom
 - lib/badline/roms/plus4/function-low.rom
@@ -586,6 +657,7 @@ files:
 - lib/badline/snapshot/keyed/recorder.rb
 - lib/badline/snapshot/keyed/report.rb
 - lib/badline/snapshot/keyed/writer.rb
+- lib/badline/snapshot/kim1_setup.rb
 - lib/badline/snapshot/machine_state.rb
 - lib/badline/snapshot/pet_setup.rb
 - lib/badline/snapshot/plus4_setup.rb
@@ -611,6 +683,7 @@ files:
 - lib/badline/snapshot/vice/pet.rb
 - lib/badline/snapshot/vice/pet_cpu.rb
 - lib/badline/snapshot/vice/pet_crtc.rb
+- lib/badline/snapshot/vice/pet_dongle.rb
 - lib/badline/snapshot/vice/pet_drive.rb
 - lib/badline/snapshot/vice/pet_drive8050.rb
 - lib/badline/snapshot/vice/pet_mem.rb
@@ -622,16 +695,23 @@ files:
 - lib/badline/snapshot/vice/reu_fields.rb
 - lib/badline/snapshot/vice/sid_extended.rb
 - lib/badline/snapshot/vice/sid_registers.rb
+- lib/badline/snapshot/vice/vic20.rb
+- lib/badline/snapshot/vice/vic20_cpu.rb
+- lib/badline/snapshot/vice/vic20_mem.rb
+- lib/badline/snapshot/vice/vic20_restore.rb
+- lib/badline/snapshot/vice/vic20_vici.rb
 - lib/badline/snapshot/vice/vicii.rb
 - lib/badline/snapshot/vice/vicii_import.rb
 - lib/badline/status.rb
 - lib/badline/storage.rb
 - lib/badline/storage/crt_file.rb
 - lib/badline/storage/d64_image.rb
+- lib/badline/storage/d67_image.rb
 - lib/badline/storage/d71_image.rb
 - lib/badline/storage/d80_image.rb
 - lib/badline/storage/d81_image.rb
 - lib/badline/storage/d82_image.rb
+- lib/badline/storage/d90_image.rb
 - lib/badline/storage/disk_image.rb
 - lib/badline/storage/disk_image/bam.rb
 - lib/badline/storage/disk_image/catalog.rb
@@ -640,8 +720,10 @@ files:
 - lib/badline/storage/disk_image/writing.rb
 - lib/badline/storage/g64_image.rb
 - lib/badline/storage/host_directory.rb
+- lib/badline/storage/kim_tape.rb
 - lib/badline/storage/listing.rb
 - lib/badline/storage/p00.rb
+- lib/badline/storage/papertape.rb
 - lib/badline/storage/t64.rb
 - lib/badline/storage/tap.rb
 - lib/badline/storage/unavailable.rb
@@ -649,9 +731,11 @@ files:
 - lib/badline/support/c128_checkpoint.rb
 - lib/badline/support/cbm2_checkpoint.rb
 - lib/badline/support/checkpoint.rb
+- lib/badline/support/kim1_checkpoint.rb
 - lib/badline/support/p500_checkpoint.rb
 - lib/badline/support/pet_checkpoint.rb
 - lib/badline/support/plus4_checkpoint.rb
+- lib/badline/support/superpet_checkpoint.rb
 - lib/badline/support/vic20_checkpoint.rb
 - lib/badline/timing.rb
 - lib/badline/version.rb