badline 0.14.0 → 0.15.1

data/lib/badline/storage/tap.rb

@@ -19,10 +19,12 @@ module Badline
       # The file it was read from, expanded, and the file's bytes.
       attr_reader :version, :platform, :path, :bytes
 
-      # A blank version 1 tape for `platform` (0 C64, 1 VIC-20) at `path`,
-      # written to the host file.
+      # A blank tape for `platform` at `path`, written to the host file: a
+      # version 1 tape for the C64 (0) or the VIC-20 (1), and a version 2
+      # C16 tape for the 264 series (2).
       def self.create(path, platform:)
-        File.binwrite(path, (SIGNATURE + [1, platform, 0, 0, 0, 0, 0, 0]).pack("C*"))
+        header = platform == 2 ? C16_SIGNATURE + [2] : SIGNATURE + [1]
+        File.binwrite(path, (header + [platform, 0, 0, 0, 0, 0, 0]).pack("C*"))
         new(path)
       end
 
@@ -61,15 +63,16 @@ module Badline
       # cycle count for a long one (a lone zero, an overflow, on a version 0
       # tape). A version 2 tape records it as two equal halves.
       def record_pulse(cycles)
-        @bytes.slice!(@pos..)
-        if version == 2
-          half = cycles / 2
-          @bytes.concat(encode(cycles - half))
-          @bytes.concat(encode(half))
-        else
-          @bytes.concat(encode(cycles))
-        end
-        @pos = @end = @bytes.length
+        return record(encode(cycles)) unless version == 2
+
+        half = cycles / 2
+        record(encode(cycles - half) + encode(half))
+      end
+
+      # Records a half wave `cycles` long at the position, in place of the
+      # rest of the tape, as a version 2 tape times them.
+      def record_half_wave(cycles)
+        record(encode(cycles))
       end
 
       # Writes the tape back to its host file, with the data size the
@@ -111,6 +114,12 @@ module Badline
         version.zero? ? OVERFLOW : long_pulse
       end
 
+      def record(times)
+        @bytes.slice!(@pos..)
+        @bytes.concat(times)
+        @pos = @end = @bytes.length
+      end
+
       def encode(cycles)
         units = (cycles + 4) / 8
         return [units] if units.between?(1, 0xff)

data/lib/badline/support/checkpoint.rb

@@ -9,8 +9,9 @@ module Badline
     # interface, so taking a checkpoint leaves the machine as it was.
     #
     # Checkpoint.take digests a C64's components, COMPONENTS.
-    # Vic20Checkpoint and C128Checkpoint digest the other families', each
-    # with a list of its own, which a checkpoint carries as +components+.
+    # Vic20Checkpoint, C128Checkpoint and Plus4Checkpoint digest the other
+    # families', each with a list of its own, which a checkpoint carries as
+    # +components+.
     #
     # Colour RAM is digested as the four bits each cell stores: the upper
     # nibble a CPU read sees comes off the open bus.

data/lib/badline/support/plus4_checkpoint.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Badline
+  module Support
+    # A Checkpoint of a 264 series machine: its CPU, its RAM, the TED's
+    # picture, the TED's registers, timers and beam, its sound, and the
+    # CPU's port with the ROM banks. The sound's voices are run up to the
+    # cycle to read them, which changes nothing they do.
+    module Plus4Checkpoint
+      COMPONENTS = %w[cpu ram display ted sound port].freeze
+
+      def self.take(machine)
+        ram = machine.ram
+        Checkpoint.new(machine.cycles, [
+                         Checkpoint.fnv1a(Checkpoint.cpu_state(machine.cpu)),
+                         Checkpoint.fnv1a(Checkpoint.ram(ram, ram.length)),
+                         Checkpoint.fnv1a(machine.ted.display),
+                         Checkpoint.fnv1a(ted_state(machine.ted)),
+                         Checkpoint.fnv1a(sound_state(machine.sound)),
+                         Checkpoint.fnv1a(port_state(machine))
+                       ], COMPONENTS)
+      end
+
+      def self.parse(line) = Checkpoint.parse(line, COMPONENTS)
+
+      def self.ted_state(ted)
+        Array.new(0x20) { |register| ted.peek(0xff00 + register) } +
+          ted.timer_counts + [ted.line, ted.column, ted.interrupt_flags, ted.cpu_slots]
+      end
+
+      def self.sound_state(sound)
+        [sound.noise, sound.phase(0), sound.phase(1), sound.level, sound.volume, sound.control]
+      end
+
+      def self.port_state(machine)
+        port = machine.port
+        bus = machine.bus
+        [port.ddr, port.data, bus.low_bank, bus.high_bank, bus.rom_selected ? 1 : 0]
+      end
+    end
+  end
+end

data/lib/badline/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -182,6 +182,13 @@ files:
 - lib/badline/chips/sid/waveform/noise_writeback.rb
 - lib/badline/chips/ted.rb
 - lib/badline/chips/ted/beam.rb
+- lib/badline/chips/ted/fetches.rb
+- lib/badline/chips/ted/keyed_state.rb
+- lib/badline/chips/ted/modes.rb
+- lib/badline/chips/ted/palette.rb
+- lib/badline/chips/ted/picture.rb
+- lib/badline/chips/ted/sound.rb
+- lib/badline/chips/ted/sound/output.rb
 - lib/badline/chips/ted/timers.rb
 - lib/badline/chips/tia.rb
 - lib/badline/chips/vdc.rb
@@ -252,6 +259,7 @@ files:
 - lib/badline/drives/engine/idle.rb
 - lib/badline/drives/engine/idle_cpu.rb
 - lib/badline/drives/engine/orbit.rb
+- lib/badline/drives/engine/serial_connection.rb
 - lib/badline/drives/engine/serial_lines.rb
 - lib/badline/drives/engine/sleep.rb
 - lib/badline/drives/engine/vias.rb
@@ -269,6 +277,13 @@ files:
 - lib/badline/drives/model1541/sector_reader.rb
 - lib/badline/drives/model1541/serial_port.rb
 - lib/badline/drives/model1541/track.rb
+- lib/badline/drives/model1551.rb
+- lib/badline/drives/model1551/bus.rb
+- lib/badline/drives/model1551/cable.rb
+- lib/badline/drives/model1551/cpu.rb
+- lib/badline/drives/model1551/keyed_state.rb
+- lib/badline/drives/model1551/port.rb
+- lib/badline/drives/model1551/tia.rb
 - lib/badline/drives/model1571.rb
 - lib/badline/drives/model1571/bus.rb
 - lib/badline/drives/model1571/cpu.rb
@@ -376,6 +391,7 @@ files:
 - lib/badline/media/disk_set.rb
 - lib/badline/media/extensions.rb
 - lib/badline/media/not_disk.rb
+- lib/badline/media/plus4_media.rb
 - lib/badline/media/program.rb
 - lib/badline/media/true_drive.rb
 - lib/badline/media/tune.rb
@@ -393,11 +409,20 @@ files:
 - lib/badline/options/validation.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
 - lib/badline/plus4/cpu_port.rb
 - lib/badline/plus4/keyboard_port.rb
+- lib/badline/plus4/keyed_modules.rb
+- lib/badline/plus4/keyed_parts.rb
+- lib/badline/plus4/keyed_state.rb
 - lib/badline/plus4/model.rb
+- lib/badline/plus4/ram_expansion.rb
+- lib/badline/plus4/sid_card.rb
+- lib/badline/plus4/sound_mix.rb
+- lib/badline/plus4/tcbm_drive.rb
 - lib/badline/plus4/user_port.rb
 - lib/badline/region.rb
 - lib/badline/rom.rb
@@ -409,6 +434,7 @@ files:
 - lib/badline/roms/c64gs.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/eapi/LICENSE.md
@@ -448,6 +474,7 @@ files:
 - lib/badline/snapshot/keyed/report.rb
 - lib/badline/snapshot/keyed/writer.rb
 - lib/badline/snapshot/machine_state.rb
+- lib/badline/snapshot/plus4_setup.rb
 - lib/badline/snapshot/storage_setup.rb
 - lib/badline/snapshot/vic20_setup.rb
 - lib/badline/snapshot/vice.rb
@@ -485,6 +512,7 @@ files:
 - lib/badline/support.rb
 - lib/badline/support/c128_checkpoint.rb
 - lib/badline/support/checkpoint.rb
+- lib/badline/support/plus4_checkpoint.rb
 - lib/badline/support/vic20_checkpoint.rb
 - lib/badline/timing.rb
 - lib/badline/version.rb