badline 0.15.1 → 0.16.1

data/lib/badline/timing.rb

@@ -5,8 +5,9 @@ module Badline
   #
   # What a front end needs to run a machine's frames and show them: the CPU
   # clock, the raster's cycles per line and lines per frame, and the
-  # [left, top, width, height] of the raster it shows, and how many of the
-  # window's square pixels wide each of its pixels shows. Each machine
-  # derives it from its region.
-  Timing = Data.define(:clock_hz, :cycles_per_line, :lines_per_frame, :crop, :pixel_width)
+  # [left, top, width, height] of the raster it shows, how many of the
+  # window's square pixels wide each of its pixels shows, and how many of
+  # its pixels share one window pixel, as an 80-column screen's dots do.
+  # Each machine derives it from its region.
+  Timing = Data.define(:clock_hz, :cycles_per_line, :lines_per_frame, :crop, :pixel_width, :dots)
 end

data/lib/badline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Badline
-  VERSION = "0.15.1"
+  VERSION = "0.16.1"
 end

data/lib/badline/vic20/attachments.rb

@@ -23,12 +23,17 @@ module Badline
       # Puts a cartridge's ROM chips, each a CRTFile::Chip with its address
       # and bytes, into their blocks, and switches the machine off and on,
       # as a cartridge goes in with the power off. The KERNAL then starts
-      # the cartridge in BLK5 that signs itself with A0CBM.
-      def attach_cartridge(chips)
+      # the cartridge in BLK5 that signs itself with A0CBM. +name+ is the
+      # name it goes by (#cartridge_name).
+      def attach_cartridge(chips, name = "")
         chips.each { |chip| @bus.map_rom(chip.address, chip.data) }
+        @bus.cartridge_name = name
         power_cycle!
       end
 
+      # The name of the cartridge in the expansion blocks, or an empty one.
+      def cartridge_name = @bus.cartridge_name
+
       private
 
       # The VIC-20's KERNAL, which the traps stand in for.

data/lib/badline/vic20/bus/keyed_state.rb

@@ -11,9 +11,9 @@ module Badline
       end
 
       # The bytes each side's data lines hold, under `prefix`, and a
-      # cartridge's ROM chips as rom<N>.start and rom<N>.bytes, in a keyed
-      # snapshot module (Snapshot::Keyed). The pages are mapped again once
-      # they are loaded.
+      # cartridge's name and its ROM chips as rom<N>.start and rom<N>.bytes,
+      # in a keyed snapshot module (Snapshot::Keyed). The pages are mapped
+      # again once they are loaded.
       module KeyedState
         def save_fields(out, prefix)
           out.int("#{prefix}data", @data).int("#{prefix}video_data", @video_data)
@@ -28,7 +28,7 @@ module Badline
         def cartridge? = !@roms.empty?
 
         def save_rom_fields(out)
-          out.int("roms", @roms.length)
+          out.text("name", @cartridge_name).int("roms", @roms.length)
           @roms.each_with_index do |rom, number|
             out.int("rom#{number}.start", rom.start)
             rom.save_fields(out, "rom#{number}.bytes")
@@ -37,6 +37,7 @@ module Badline
 
         def load_rom_fields(input)
           @roms = []
+          @cartridge_name = input.text("name", "")
           input.int("roms", 0).times do |number|
             bytes = input.bytes("rom#{number}.bytes", "".b).bytes
             @roms << ROM.new(bytes, length: bytes.length, start: input.word("rom#{number}.start", 0))

data/lib/badline/vic20/bus.rb

@@ -160,6 +160,10 @@ module Badline
       # The last byte on the V-bus.
       attr_reader :video_data
 
+      # The name of the cartridge whose ROM chips are in the expansion
+      # blocks, or an empty one.
+      attr_accessor :cartridge_name
+
       # +vic+, +via1+ and +via2+ are the chips in I/O 0, each answering
       # peek and poke with the CPU's address. +blocks+ names the expansion
       # blocks that hold RAM (BLOCKS), and +kernal+ the KERNAL ROM's file.
@@ -177,6 +181,7 @@ module Badline
         @read_pages = Array.new(256, @open_bus)
         @write_pages = Array.new(256, @open_bus)
         @roms = []
+        @cartridge_name = ""
         @debug_register = nil
         @via_write_handler = nil
         self.blocks = blocks

data/lib/badline/vic20.rb

@@ -120,7 +120,7 @@ module Badline
       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)
+                 crop: [0, blanked, width, profile.lines_per_frame - blanked], pixel_width: 2, dots: 1)
     end
 
     # The RESTORE key pulls VIA 1's CA1 low while it is held. The KERNAL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.1
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -169,6 +169,11 @@ files:
 - lib/badline/chips/cpu/port.rb
 - lib/badline/chips/cpu/stack_operations.rb
 - lib/badline/chips/cpu/traps.rb
+- lib/badline/chips/crtc.rb
+- lib/badline/chips/crtc/keyed_state.rb
+- lib/badline/chips/pia.rb
+- lib/badline/chips/pia/control_lines.rb
+- lib/badline/chips/pia/keyed_parts.rb
 - lib/badline/chips/sid.rb
 - lib/badline/chips/sid/catch_up.rb
 - lib/badline/chips/sid/decimator.rb
@@ -264,6 +269,7 @@ files:
 - lib/badline/drives/engine/sleep.rb
 - lib/badline/drives/engine/vias.rb
 - lib/badline/drives/engine/watch.rb
+- lib/badline/drives/ieee_bus.rb
 - lib/badline/drives/model1541.rb
 - lib/badline/drives/model1541/bus.rb
 - lib/badline/drives/model1541/byte_ready.rb
@@ -308,6 +314,10 @@ files:
 - lib/badline/drives/model1581/wd1772/stepping.rb
 - lib/badline/drives/model1581/wd1772/tracks.rb
 - lib/badline/drives/model1581/wd1772/turn.rb
+- lib/badline/drives/model2031.rb
+- lib/badline/drives/model2031/ieee_port.rb
+- lib/badline/drives/model2031/keyed_state.rb
+- lib/badline/drives/model2031/parts.rb
 - lib/badline/drives/serial_bus.rb
 - lib/badline/ffi.rb
 - lib/badline/frontend.rb
@@ -336,6 +346,7 @@ files:
 - lib/badline/frontend/pacer.rb
 - lib/badline/frontend/pad_port.rb
 - lib/badline/frontend/painter.rb
+- lib/badline/frontend/pet_keyboard.rb
 - lib/badline/frontend/player/filter_view.rb
 - lib/badline/frontend/player/info_view.rb
 - lib/badline/frontend/player/player_commands.rb
@@ -375,12 +386,16 @@ files:
 - lib/badline/kernal_trap/dos/write_file.rb
 - lib/badline/kernal_trap/dos/writes.rb
 - lib/badline/kernal_trap/file_routine.rb
+- lib/badline/kernal_trap/frames.rb
+- lib/badline/kernal_trap/ieee.rb
+- lib/badline/kernal_trap/ieee_layout.rb
 - lib/badline/kernal_trap/keyed_state.rb
 - lib/badline/kernal_trap/layout.rb
 - lib/badline/kernal_trap/load.rb
 - lib/badline/kernal_trap/routine.rb
 - lib/badline/kernal_trap/save.rb
 - lib/badline/kernal_trap/serial.rb
+- lib/badline/kernal_trap/steps.rb
 - lib/badline/machine.rb
 - lib/badline/machine/clocking.rb
 - lib/badline/machine/keyboard_buffer.rb
@@ -391,6 +406,7 @@ files:
 - lib/badline/media/disk_set.rb
 - lib/badline/media/extensions.rb
 - lib/badline/media/not_disk.rb
+- lib/badline/media/pet_media.rb
 - lib/badline/media/plus4_media.rb
 - lib/badline/media/program.rb
 - lib/badline/media/true_drive.rb
@@ -407,6 +423,27 @@ files:
 - lib/badline/options/option.rb
 - lib/badline/options/table.rb
 - lib/badline/options/validation.rb
+- lib/badline/pet.rb
+- lib/badline/pet/bus.rb
+- lib/badline/pet/bus/expansion.rb
+- lib/badline/pet/canvas.rb
+- lib/badline/pet/cassettes.rb
+- lib/badline/pet/characters.rb
+- lib/badline/pet/cpu.rb
+- lib/badline/pet/crtc_video.rb
+- lib/badline/pet/discrete_video.rb
+- lib/badline/pet/ieee_drive.rb
+- lib/badline/pet/ieee_ports.rb
+- lib/badline/pet/ieee_traps.rb
+- lib/badline/pet/keyboard_ports.rb
+- lib/badline/pet/keyed_modules.rb
+- lib/badline/pet/keyed_parts.rb
+- lib/badline/pet/keyed_state.rb
+- lib/badline/pet/model.rb
+- lib/badline/pet/rom_sets.rb
+- lib/badline/pet/sound.rb
+- lib/badline/pet/via.rb
+- lib/badline/pet/via_ports.rb
 - lib/badline/plus4.rb
 - lib/badline/plus4/acia.rb
 - lib/badline/plus4/acia/frames.rb
@@ -437,12 +474,33 @@ files:
 - lib/badline/roms/dos1551.rom
 - lib/badline/roms/dos1571.rom
 - lib/badline/roms/dos1581.rom
+- lib/badline/roms/dos2031.rom
 - lib/badline/roms/eapi/LICENSE.md
 - lib/badline/roms/eapi/README
 - lib/badline/roms/eapi/eapi-am29f040-14
 - lib/badline/roms/kernal-pet64.rom
 - lib/badline/roms/kernal-sx64.rom
 - lib/badline/roms/kernal.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/characters1.rom
+- lib/badline/roms/pet/characters2.rom
+- lib/badline/roms/pet/editor1.rom
+- lib/badline/roms/pet/editor2-b.rom
+- lib/badline/roms/pet/editor2-n.rom
+- lib/badline/roms/pet/editor4-40-n-50hz.rom
+- lib/badline/roms/pet/editor4-40-n-60hz.rom
+- lib/badline/roms/pet/editor4-80-b-50hz-0283.rom
+- lib/badline/roms/pet/editor4-80-b-50hz-8296.rom
+- lib/badline/roms/pet/editor4-80-b-50hz.rom
+- lib/badline/roms/pet/editor4-80-b-60hz.rom
+- lib/badline/roms/pet/editor4-b.rom
+- lib/badline/roms/pet/editor4-n.rom
+- lib/badline/roms/pet/kernal1.rom
+- lib/badline/roms/pet/kernal2.rom
+- lib/badline/roms/pet/kernal4.rom
 - lib/badline/roms/plus4/basic.rom
 - lib/badline/roms/plus4/function-high.rom
 - lib/badline/roms/plus4/function-low.rom
@@ -474,6 +532,7 @@ files:
 - lib/badline/snapshot/keyed/report.rb
 - lib/badline/snapshot/keyed/writer.rb
 - lib/badline/snapshot/machine_state.rb
+- lib/badline/snapshot/pet_setup.rb
 - lib/badline/snapshot/plus4_setup.rb
 - lib/badline/snapshot/storage_setup.rb
 - lib/badline/snapshot/vic20_setup.rb
@@ -484,6 +543,13 @@ files:
 - lib/badline/snapshot/vice/fields.rb
 - lib/badline/snapshot/vice/main_cpu.rb
 - lib/badline/snapshot/vice/peripherals.rb
+- 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_mem.rb
+- lib/badline/snapshot/vice/pet_pias.rb
+- lib/badline/snapshot/vice/pet_restore.rb
+- lib/badline/snapshot/vice/pet_via.rb
 - lib/badline/snapshot/vice/restore.rb
 - lib/badline/snapshot/vice/reu1764.rb
 - lib/badline/snapshot/vice/reu_fields.rb
@@ -496,7 +562,9 @@ files:
 - lib/badline/storage/crt_file.rb
 - lib/badline/storage/d64_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/disk_image.rb
 - lib/badline/storage/disk_image/bam.rb
 - lib/badline/storage/disk_image/catalog.rb
@@ -512,6 +580,7 @@ files:
 - lib/badline/support.rb
 - lib/badline/support/c128_checkpoint.rb
 - lib/badline/support/checkpoint.rb
+- lib/badline/support/pet_checkpoint.rb
 - lib/badline/support/plus4_checkpoint.rb
 - lib/badline/support/vic20_checkpoint.rb
 - lib/badline/timing.rb