badline 0.16.0 → 0.17.0

data/lib/badline/storage/disk_image/formatting.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Badline
+  module Storage
+    class DiskImage
+      # The DOS's N command. With an ID it formats the disk: every block of
+      # the tracks the BAM covers is cleared, and the header, the BAM and an
+      # empty directory are written. Without one it only clears the disk:
+      # the header takes the new name and keeps its ID and whatever else it
+      # held, the BAM marks every block free, and the directory's first
+      # block is emptied. Either way the header, the BAM's blocks and the
+      # first directory block stay in use. Each format says where these go.
+      module Formatting
+        # The disk's ID, as the header holds it.
+        def disk_id = sector_at(*header_block)[header_name + Catalog::HEADER_ID, 2]
+
+        # Formats the disk under the name, or with no ID clears it.
+        def format(name, id = nil)
+          update_image do
+            full = !id.nil?
+            put_sector(*header_block, []) if full
+            id = (id || disk_id).first(2)
+            write_header(name, id)
+            clear_blocks if full
+            headers = bam_headers(id)
+            headers.each { |track, sector, bytes| write_at(track, sector, 0, bytes) }
+            put_sector(directory_track, directory_sector, [0, 0xff])
+            bam_tracks.each { |track| free_track(track) }
+            [header_block, *headers.map { |track, sector, _| [track, sector] }, [directory_track, directory_sector]]
+              .each { |block| mark(*block, false) }
+          end
+        end
+
+        private
+
+        # Every block the BAM covers but the header.
+        def clear_blocks
+          bam_tracks.each do |track|
+            (0...sectors_in(track)).each do |sector|
+              put_sector(track, sector, []) unless [track, sector] == header_block
+            end
+          end
+        end
+
+        # The link to the next block, the format's letter, the name, the ID
+        # and the DOS type, each field after the name set off with shifted
+        # spaces.
+        def write_header(name, id)
+          write_at(*header_block, 0, [*header_link, dos_type.getbyte(1), 0])
+          write_at(*header_block, header_name,
+                   encode_name(name) + [NAME_PADDING, NAME_PADDING] + id + [NAME_PADDING] +
+                   dos_type.bytes + Array.new(header_tail, NAME_PADDING))
+        end
+
+        # A free track counts its sectors and sets a bit for each.
+        def free_track(track)
+          count = sectors_in(track)
+          bits = (1 << count) - 1
+          @bytes[count_offset(track)] = count
+          bitmap_size.times { |i| @bytes[bitmap_offset(track) + i] = (bits >> (8 * i)) & 0xff }
+        end
+
+        def write_at(track, sector, offset, bytes)
+          @bytes[sector_offset(track, sector) + offset, bytes.length] = bytes
+        end
+      end
+    end
+  end
+end

data/lib/badline/storage/disk_image/writing.rb

@@ -51,6 +51,39 @@ module Badline
           files.length
         end
 
+        # Gives a file a new name in its directory entry. A missing file
+        # fails as FILE NOT FOUND, and a new name already on the disk as
+        # FILE EXISTS.
+        def rename(old_name, new_name)
+          entry = existing_entry(old_name)
+          raise WriteError, WriteError::FILE_EXISTS if entry_named(new_name)
+
+          update_image { @bytes[entry[:offset] + 5, Directory::NAME_LENGTH] = encode_name(new_name) }
+        end
+
+        # Writes a new file holding the files named, one after another, as
+        # the type of the first. A missing file fails as FILE NOT FOUND, and
+        # a new name already on the disk as FILE EXISTS.
+        def copy(new_name, names)
+          sources = names.map { |name| existing_entry(name) }
+          raise WriteError, WriteError::FILE_EXISTS if entry_named(new_name)
+
+          bytes = sources.flat_map { |entry| read_chain(entry[:track], entry[:sector]) }
+          update_image { add_file(new_name, bytes, sources.first[:type]) }
+        end
+
+        # Adds the files named to the end of a SEQ file. A missing file fails
+        # as FILE NOT FOUND, and a file of another type as FILE TYPE
+        # MISMATCH.
+        def concat(name, names)
+          entry = existing_entry(name)
+          sources = names.map { |source| existing_entry(source) }
+          raise WriteError, WriteError::FILE_TYPE_MISMATCH unless entry[:type] == :seq
+
+          bytes = [entry, *sources].flat_map { |source| read_chain(source[:track], source[:sector]) }
+          update_image { rewrite(entry, bytes, :seq) }
+        end
+
         # Raw block access for the DOS `U2` command. A block that the error
         # table marks bad reads cleanly once written.
         def write_block(track, sector, data)
@@ -81,6 +114,8 @@ module Badline
 
         private
 
+        def existing_entry(name) = entry_named(name) || raise(WriteError, WriteError::FILE_NOT_FOUND)
+
         def update_image
           raise WriteError, WriteError::WRITE_PROTECT_ON unless writable?
 

data/lib/badline/storage/disk_image.rb

@@ -3,6 +3,7 @@
 require "badline/storage/disk_image/bam"
 require "badline/storage/disk_image/catalog"
 require "badline/storage/disk_image/directory"
+require "badline/storage/disk_image/formatting"
 require "badline/storage/disk_image/writing"
 
 module Badline
@@ -15,6 +16,7 @@ module Badline
       include Bam
       include Catalog
       include Directory
+      include Formatting
       include Writing
 
       SECTOR_SIZE = 256

data/lib/badline/storage.rb

@@ -24,6 +24,7 @@ module Badline
       WRITE_PROTECT_ON = 26
       FILE_NOT_FOUND = 62
       FILE_EXISTS = 63
+      FILE_TYPE_MISMATCH = 64
       DISK_FULL = 72
 
       attr_reader :code

data/lib/badline/support/cbm2_checkpoint.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Badline
+  module Support
+    # A Checkpoint of a CBM-II: its CPU with both segment registers, the
+    # 2K of segment 15's RAM, the RAM board's segments, the screen RAM, the
+    # picture, the CRTC's registers and counters, the CIA, the ACIA's
+    # registers and both TPIs.
+    module CBM2Checkpoint
+      COMPONENTS = %w[cpu ram segments screen display crtc cia acia tpi1 tpi2].freeze
+
+      def self.take(machine)
+        bus = machine.bus
+        Checkpoint.new(machine.cycles, [
+                         Checkpoint.fnv1a(Checkpoint.cpu_state(machine.cpu) +
+                                          [bus.execution_segment, bus.indirect_segment]),
+                         Checkpoint.fnv1a(Checkpoint.ram(bus.ram, 0x800)),
+                         Checkpoint.fnv1a(segments(bus)),
+                         Checkpoint.fnv1a(Array.new(0x800) { |offset| bus.screen.peek(0xd000 + offset) }),
+                         Checkpoint.fnv1a(machine.video.display),
+                         Checkpoint.fnv1a(crtc_state(machine.crtc)),
+                         Checkpoint.fnv1a(Checkpoint.cia_state(machine.cia)),
+                         Checkpoint.fnv1a(acia_state(machine.acia)),
+                         Checkpoint.fnv1a(tpi_state(machine.tpi1)),
+                         Checkpoint.fnv1a(tpi_state(machine.tpi2))
+                       ], COMPONENTS)
+      end
+
+      def self.parse(line) = Checkpoint.parse(line, COMPONENTS)
+
+      # Every byte of the segments the RAM board fills, segment by segment.
+      def self.segments(bus)
+        bytes = []
+        bus.segment_ram.each { |memory| bytes.concat(Checkpoint.ram(memory, 0x10000)) if memory }
+        bytes
+      end
+
+      def self.crtc_state(crtc) = crtc.registers + [crtc.column, crtc.line, crtc.row]
+
+      def self.acia_state(acia) = [acia.command, acia.control, acia.status]
+
+      def self.tpi_state(tpi)
+        [tpi.port_a_output, tpi.port_b_output, tpi.port_c_output, tpi.latches, tpi.mask, tpi.control,
+         tpi.irq? ? 1 : 0, *tpi.stack]
+      end
+    end
+  end
+end

data/lib/badline/support/p500_checkpoint.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Badline
+  module Support
+    # A Checkpoint of a P500: its CPU with both segment registers, the 2K
+    # of segment 15's RAM, segments 0 and 1, the static video matrix, the
+    # colour RAM's nibbles, the picture, the VIC's registers and beam, the
+    # SID's registers, the CIA, the ACIA's registers and both TPIs, the
+    # last three as CBM2Checkpoint digests them.
+    module P500Checkpoint
+      COMPONENTS = %w[cpu ram segments screen color_ram display vic sid cia acia tpi1 tpi2].freeze
+
+      def self.take(machine)
+        bus = machine.bus
+        Checkpoint.new(machine.cycles, [
+                         Checkpoint.fnv1a(Checkpoint.cpu_state(machine.cpu) +
+                                          [bus.execution_segment, bus.indirect_segment]),
+                         Checkpoint.fnv1a(Checkpoint.ram(bus.ram, 0x800)),
+                         Checkpoint.fnv1a(CBM2Checkpoint.segments(bus)),
+                         Checkpoint.fnv1a(Array.new(0x400) { |offset| bus.screen.peek(0xd000 + offset) }),
+                         Checkpoint.fnv1a(Checkpoint.color_ram(machine.color_ram, 0xd400)),
+                         Checkpoint.fnv1a(machine.vic.display),
+                         Checkpoint.fnv1a(Checkpoint.vic_state(machine.vic)),
+                         Checkpoint.fnv1a(Array.new(0x20) { |reg| machine.sid.register(reg) }),
+                         Checkpoint.fnv1a(Checkpoint.cia_state(machine.cia)),
+                         Checkpoint.fnv1a(CBM2Checkpoint.acia_state(machine.acia)),
+                         Checkpoint.fnv1a(CBM2Checkpoint.tpi_state(machine.tpi1)),
+                         Checkpoint.fnv1a(CBM2Checkpoint.tpi_state(machine.tpi2))
+                       ], COMPONENTS)
+      end
+
+      def self.parse(line) = Checkpoint.parse(line, COMPONENTS)
+    end
+  end
+end

data/lib/badline/version.rb

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

data/lib/badline.rb

@@ -3,6 +3,7 @@
 require "badline/core"
 require "badline/c128"
 require "badline/plus4"
+require "badline/cbm2"
 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.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -140,7 +140,30 @@ files:
 - lib/badline/c64/reu/ram.rb
 - lib/badline/c64/reu/trigger.rb
 - lib/badline/c64/true_drives.rb
+- lib/badline/cbm2.rb
+- lib/badline/cbm2/acia.rb
+- lib/badline/cbm2/bus.rb
+- lib/badline/cbm2/cpu.rb
+- lib/badline/cbm2/crtc_video.rb
+- lib/badline/cbm2/ieee_drive.rb
+- lib/badline/cbm2/ieee_layout.rb
+- lib/badline/cbm2/ieee_ports.rb
+- lib/badline/cbm2/ieee_traps.rb
+- lib/badline/cbm2/keyboard_ports.rb
+- lib/badline/cbm2/keyed_modules.rb
+- lib/badline/cbm2/keyed_state.rb
+- lib/badline/cbm2/model.rb
+- lib/badline/cbm2/p500.rb
+- lib/badline/cbm2/p500/control_ports.rb
+- lib/badline/cbm2/p500/ieee_layout.rb
+- lib/badline/cbm2/p500/keyed_state.rb
+- lib/badline/cbm2/p500/model.rb
+- lib/badline/cbm2/p500/pages.rb
+- lib/badline/cbm2/sid_page.rb
 - lib/badline/chips.rb
+- lib/badline/chips/acia.rb
+- lib/badline/chips/acia/frames.rb
+- lib/badline/chips/acia/keyed_state.rb
 - lib/badline/chips/cia.rb
 - lib/badline/chips/cia/fast_forward.rb
 - lib/badline/chips/cia/interrupt_register.rb
@@ -174,6 +197,12 @@ files:
 - lib/badline/chips/pia.rb
 - lib/badline/chips/pia/control_lines.rb
 - lib/badline/chips/pia/keyed_parts.rb
+- lib/badline/chips/riot.rb
+- lib/badline/chips/riot/fast_forward.rb
+- lib/badline/chips/riot/keyed_parts.rb
+- lib/badline/chips/riot/timer.rb
+- lib/badline/chips/rriot.rb
+- lib/badline/chips/rriot/keyed_state.rb
 - lib/badline/chips/sid.rb
 - lib/badline/chips/sid/catch_up.rb
 - lib/badline/chips/sid/decimator.rb
@@ -196,6 +225,8 @@ files:
 - lib/badline/chips/ted/sound/output.rb
 - lib/badline/chips/ted/timers.rb
 - lib/badline/chips/tia.rb
+- lib/badline/chips/tpi.rb
+- lib/badline/chips/tpi/keyed_state.rb
 - lib/badline/chips/vdc.rb
 - lib/badline/chips/vdc/keyed_parts.rb
 - lib/badline/chips/vdc/memory.rb
@@ -314,6 +345,19 @@ 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/model8050.rb
+- lib/badline/drives/model8050/disk.rb
+- lib/badline/drives/model8050/fdc_bus.rb
+- lib/badline/drives/model8050/idle.rb
+- lib/badline/drives/model8050/ieee_port.rb
+- lib/badline/drives/model8050/ip_bus.rb
+- lib/badline/drives/model8050/keyed_state.rb
+- lib/badline/drives/model8050/mechanism.rb
+- lib/badline/drives/model8050/parts.rb
 - lib/badline/drives/serial_bus.rb
 - lib/badline/ffi.rb
 - lib/badline/frontend.rb
@@ -376,6 +420,7 @@ files:
 - lib/badline/kernal_trap/dos/block_commands.rb
 - lib/badline/kernal_trap/dos/channel.rb
 - lib/badline/kernal_trap/dos/channels.rb
+- lib/badline/kernal_trap/dos/disk_commands.rb
 - lib/badline/kernal_trap/dos/memory.rb
 - lib/badline/kernal_trap/dos/parameters.rb
 - lib/badline/kernal_trap/dos/status.rb
@@ -394,10 +439,12 @@ files:
 - lib/badline/kernal_trap/steps.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/settling.rb
 - lib/badline/media.rb
 - lib/badline/media/boot_disk.rb
+- lib/badline/media/cbm2_media.rb
 - lib/badline/media/disk_list.rb
 - lib/badline/media/disk_set.rb
 - lib/badline/media/extensions.rb
@@ -428,6 +475,7 @@ files:
 - 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
@@ -441,7 +489,6 @@ files:
 - lib/badline/pet/via_ports.rb
 - lib/badline/plus4.rb
 - lib/badline/plus4/acia.rb
-- lib/badline/plus4/acia/frames.rb
 - lib/badline/plus4/bus.rb
 - lib/badline/plus4/cassette_sense.rb
 - lib/badline/plus4/cpu.rb
@@ -458,17 +505,30 @@ files:
 - lib/badline/plus4/user_port.rb
 - lib/badline/region.rb
 - lib/badline/rom.rb
+- 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/README
 - lib/badline/roms/basic.rom
 - lib/badline/roms/c128/basic.rom
 - lib/badline/roms/c128/character.rom
 - lib/badline/roms/c128/kernal.rom
 - lib/badline/roms/c64gs.rom
+- lib/badline/roms/cbm2/basic128-02b.rom
+- lib/badline/roms/cbm2/basic128.rom
+- lib/badline/roms/cbm2/basic256.rom
+- lib/badline/roms/cbm2/characters-600.rom
+- lib/badline/roms/cbm2/characters-700.rom
+- lib/badline/roms/cbm2/kernal-03b.rom
+- lib/badline/roms/cbm2/kernal-04a.rom
+- lib/badline/roms/cbm2/p500-basic.rom
+- lib/badline/roms/cbm2/p500-kernal.rom
 - lib/badline/roms/character.rom
 - lib/badline/roms/dos1541.rom
 - 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
@@ -478,6 +538,7 @@ files:
 - 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
@@ -486,6 +547,7 @@ files:
 - 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
@@ -512,6 +574,7 @@ files:
 - lib/badline/snapshot.rb
 - lib/badline/snapshot/c128_setup.rb
 - lib/badline/snapshot/c64_setup.rb
+- lib/badline/snapshot/cbm2_setup.rb
 - lib/badline/snapshot/container.rb
 - lib/badline/snapshot/field_doc.rb
 - lib/badline/snapshot/field_doc/markdown.rb
@@ -530,11 +593,30 @@ files:
 - lib/badline/snapshot/vic20_setup.rb
 - lib/badline/snapshot/vice.rb
 - lib/badline/snapshot/vice/c64_mem.rb
+- lib/badline/snapshot/vice/cbm2.rb
+- lib/badline/snapshot/vice/cbm2_acia.rb
+- lib/badline/snapshot/vice/cbm2_crtc.rb
+- lib/badline/snapshot/vice/cbm2_mains.rb
+- lib/badline/snapshot/vice/cbm2_mem.rb
+- lib/badline/snapshot/vice/cbm2_restore.rb
+- lib/badline/snapshot/vice/cbm2_tpi.rb
 - lib/badline/snapshot/vice/cias.rb
 - lib/badline/snapshot/vice/cias_import.rb
 - lib/badline/snapshot/vice/fields.rb
 - lib/badline/snapshot/vice/main_cpu.rb
+- lib/badline/snapshot/vice/p500.rb
+- lib/badline/snapshot/vice/p500_restore.rb
+- lib/badline/snapshot/vice/p500_vicii.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_drive.rb
+- lib/badline/snapshot/vice/pet_drive8050.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
@@ -554,6 +636,7 @@ files:
 - lib/badline/storage/disk_image/bam.rb
 - lib/badline/storage/disk_image/catalog.rb
 - lib/badline/storage/disk_image/directory.rb
+- lib/badline/storage/disk_image/formatting.rb
 - lib/badline/storage/disk_image/writing.rb
 - lib/badline/storage/g64_image.rb
 - lib/badline/storage/host_directory.rb
@@ -564,7 +647,9 @@ files:
 - lib/badline/storage/unavailable.rb
 - lib/badline/support.rb
 - lib/badline/support/c128_checkpoint.rb
+- lib/badline/support/cbm2_checkpoint.rb
 - lib/badline/support/checkpoint.rb
+- lib/badline/support/p500_checkpoint.rb
 - lib/badline/support/pet_checkpoint.rb
 - lib/badline/support/plus4_checkpoint.rb
 - lib/badline/support/vic20_checkpoint.rb