badline 0.8.0 → 0.9.0

data/lib/badline/storage/unavailable.rb

@@ -2,7 +2,7 @@
 
 module Badline
   module Storage
-    # Stands in for a directory or archive a detached restore leaves out
+    # Stands in for a directory a detached restore leaves out
     # (Snapshot::StateReader): it finds no files and refuses every write
     # as a write-protected disk does.
     class Unavailable

data/lib/badline/storage.rb

@@ -45,16 +45,16 @@ module Badline
     T64_ARCHIVE = 4
 
     class << self
-      # Opens the storage a save_setup wrote: the same directory or archive
-      # by its path, or a disk image with the bytes it held, writes and
-      # all. A detached reader gets the image write-protected, and
-      # Unavailable for a directory or archive.
+      # Opens the storage a save_setup wrote: the same directory by its
+      # path, an archive with the bytes it held, or a disk image with the
+      # bytes it held, writes and all. A detached reader gets the image
+      # write-protected, and Unavailable for a directory.
       def reopen(input)
         kind = input.int
         path = input.string
         case kind
         when HOST_DIRECTORY then input.detached? ? Unavailable.new : HostDirectory.new(path)
-        when T64_ARCHIVE then input.detached? ? Unavailable.new : T64.new(path)
+        when T64_ARCHIVE then T64.new(path, bytes: input.blob)
         else reopen_image(kind, path, input)
         end
       end

data/lib/badline/version.rb

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

data/lib/badline/vic/sprite/timing.rb

@@ -11,10 +11,9 @@ module Badline
       # fetches or the compare run a cycle later than on the 6569, what
       # hangs off them moves 8 pixels with them.
       class Timing
-        # The X counter's value where it holds on a raster of more than 512
-        # pixels, and the four values it repeats from there.
+        # The X counter's value where it steps back on a raster of more than
+        # 512 pixels, to run over the eight values below it again.
         HOLD_AT = 0x188
-        HOLD_BASE = 0x184
 
         attr_reader :columns, :sprite_cycle, :display_off_x, :x_pixels
 
@@ -36,14 +35,11 @@ module Badline
         def reload_x(index) = RELOAD_X + (8 * @shift) + (RELOAD_STEP * index)
 
         # The X counter at a raster pixel: X_OFFSET behind it, wrapping at
-        # the end of the line, less the pixels it held for past HOLD_AT,
-        # where it ran over $184-$187 again instead.
+        # the end of the line, less the pixels it held for from HOLD_AT on,
+        # where it ran over $180-$187 a second time.
         def self.xpos(pixel, width, hold)
           count = (pixel - X_OFFSET) % width
-          return count if count < HOLD_AT
-          return count - hold if count >= HOLD_AT + hold
-
-          HOLD_BASE + ((count - HOLD_AT) % 4)
+          count < HOLD_AT ? count : count - hold
         end
 
         # The raster pixels at which the X counter reads each coordinate, 512

data/lib/badline/vic/sprite.rb

@@ -37,8 +37,9 @@ module Badline
       # The s-accesses reload the shift register partway through the line,
       # at raster pixel 459 for sprite 0 and 16 later for each sprite after
       # it. A sprite still shifting there loses the rest of its row, and the
-      # comparator is ignored for the twelve pixels from it (the spritescan
-      # dump). Its output holds the last pixel for seven, through K+6
+      # comparator is ignored for the twelve pixels from it, running on into
+      # the next line from a reload near the end of this one (the spritescan
+      # dumps). Its output holds the last pixel for seven, through K+6
       # (spritefetchbug).
       RELOAD_X = 459
       RELOAD_STEP = 16
@@ -275,7 +276,7 @@ module Badline
       end
 
       def sequence_hit(log, start, reload_bits)
-        return if (@stop_x && start >= @stop_x) || start < @show_from
+        return if (@stop_x && start >= @stop_x) || start < @show_from || start < @reload_x + RELOAD_DEAD - @width
 
         if start < @reload_x
           sequence_early(log, start)

data/lib/badline.rb

@@ -1,43 +1,7 @@
 # frozen_string_literal: true
 
-require "badline/version"
+require "badline/core"
 require "badline/options"
-require "badline/integer_helper"
-require "badline/region"
-require "badline/addressable"
-require "badline/memory"
-require "badline/color_memory"
-require "badline/rom"
-require "badline/ram_expansion"
-require "badline/address_bus"
-require "badline/instruction"
-require "badline/instruction_set"
-require "badline/status"
-require "badline/keyboard"
-require "badline/joystick"
-require "badline/control_ports"
-require "badline/input"
-require "badline/cycleable"
-require "badline/datasette"
-require "badline/time_of_day"
-require "badline/cia"
-require "badline/via"
-require "badline/sid"
-require "badline/debug_register"
-require "badline/reu"
-require "badline/interrupts"
-require "badline/traps"
-require "badline/cpu"
-require "badline/vic"
-require "badline/keyboard_buffer"
-require "badline/iec_bus"
-require "badline/drive1541"
-require "badline/computer"
-require "badline/checkpoint"
-require "badline/storage"
-require "badline/cartridge"
-require "badline/kernal_trap"
-require "badline/chrout_trap"
-require "badline/media"
+require "badline/data_path"
 require "badline/snapshot"
 require "badline/audio"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -50,6 +50,7 @@ files:
 - lib/badline.rb
 - lib/badline/address_bus.rb
 - lib/badline/address_bus/extra_sids.rb
+- lib/badline/address_bus/roms.rb
 - lib/badline/address_bus/saved_state.rb
 - lib/badline/address_bus/sid_slots.rb
 - lib/badline/address_bus/ultimax_pages.rb
@@ -57,6 +58,7 @@ files:
 - lib/badline/audio.rb
 - lib/badline/audio/aiff.rb
 - lib/badline/audio/bare_player.rb
+- lib/badline/audio/checkpoints.rb
 - lib/badline/audio/cli.rb
 - lib/badline/audio/console.rb
 - lib/badline/audio/jukebox.rb
@@ -108,6 +110,7 @@ files:
 - lib/badline/computer/attachments.rb
 - lib/badline/computer/saved_state.rb
 - lib/badline/control_ports.rb
+- lib/badline/core.rb
 - lib/badline/cpu.rb
 - lib/badline/cpu/addressing.rb
 - lib/badline/cpu/boundary.rb
@@ -117,6 +120,7 @@ files:
 - lib/badline/cpu/saved_state.rb
 - lib/badline/cpu/stack_operations.rb
 - lib/badline/cycleable.rb
+- lib/badline/data_path.rb
 - lib/badline/datasette.rb
 - lib/badline/debug_register.rb
 - lib/badline/drive1541.rb
@@ -154,6 +158,7 @@ files:
 - lib/badline/frontend/menu_dialogs.rb
 - lib/badline/frontend/menu_media.rb
 - lib/badline/frontend/menu_pages.rb
+- lib/badline/frontend/name_field.rb
 - lib/badline/frontend/pacer.rb
 - lib/badline/frontend/pad_port.rb
 - lib/badline/frontend/painter.rb
@@ -208,10 +213,12 @@ files:
 - lib/badline/keyboard.rb
 - lib/badline/keyboard_buffer.rb
 - lib/badline/media.rb
+- lib/badline/media/disk_list.rb
 - lib/badline/media/disk_set.rb
 - lib/badline/media/queue.rb
 - lib/badline/media/true_drive.rb
 - lib/badline/memory.rb
+- lib/badline/model.rb
 - lib/badline/options.rb
 - lib/badline/options/event.rb
 - lib/badline/options/help.rb
@@ -238,6 +245,7 @@ files:
 - lib/badline/roms/eapi/LICENSE.md
 - lib/badline/roms/eapi/README
 - lib/badline/roms/eapi/eapi-am29f040-14
+- lib/badline/roms/kernal-sx64.rom
 - lib/badline/roms/kernal.rom
 - lib/badline/sdl.rb
 - lib/badline/sid.rb
@@ -266,6 +274,7 @@ files:
 - lib/badline/snapshot/vice/main_cpu.rb
 - lib/badline/snapshot/vice/peripherals.rb
 - lib/badline/snapshot/vice/restore.rb
+- lib/badline/snapshot/vice/reu1764.rb
 - lib/badline/snapshot/vice/sid_extended.rb
 - lib/badline/snapshot/vice/sid_registers.rb
 - lib/badline/snapshot/vice/vicii.rb