badline 0.11.1 → 0.12.1

data/lib/badline/vic20/saved_state.rb

@@ -78,6 +78,7 @@ module Badline
         @datasette.save_state(out)
         save_trap_drive(out)
         save_drive1541(out)
+        save_drive1581(out)
       end
 
       def load_state(input)
@@ -99,31 +100,11 @@ module Badline
         @datasette.load_state(input)
         load_trap_drive(input)
         load_drive1541(input)
+        load_drive1581(input)
       end
 
       private
 
-      # The disk device 8 serves through the traps, with its channels.
-      def save_trap_drive(out)
-        out.boolean(!@drive.nil?)
-        return unless @drive
-
-        @drive.save_state(out)
-        @serial_trap.save_state(out)
-        @save_trap.save_state(out)
-      end
-
-      def load_trap_drive(input)
-        return unmount unless input.boolean?
-
-        storage = Storage.reopen(input)
-        unmount
-        mount(storage)
-        @drive.load_state(input)
-        @serial_trap.load_state(input)
-        @save_trap.load_state(input)
-      end
-
       # A true 1541 on the serial bus, with its device number.
       def save_drive1541(out)
         out.boolean(!@drive1541.nil?)
@@ -133,15 +114,6 @@ module Badline
         @drive1541.save_state(out)
       end
 
-      def load_drive1541(input)
-        return detach_drive1541 unless input.boolean?
-
-        device = input.int
-        detach_drive1541 if @drive1541 && @drive1541.device != device
-        attach_drive1541(Drive1541.new(device:)) unless @drive1541
-        @drive1541.load_state(input)
-      end
-
       def check_ram(ram)
         return if ram == @ram_configuration
 

data/lib/badline/vic20.rb

@@ -23,6 +23,7 @@ module Badline
   class Vic20
     include IntegerHelper
     include KeyboardBuffer
+    include Machine::Clocking
     include Attachments
     include PortWiring
     include SavedState
@@ -33,10 +34,6 @@ module Badline
     # The RAM expansion it was built with, a key of Bus::RAM_CONFIGURATIONS.
     attr_reader :ram_configuration
 
-    # The path of the disk or directory device 8 serves through the traps
-    # (Attachments), or an empty one.
-    def mounted_path = @drive.nil? ? "" : @drive.path
-
     def ram = @bus.ram
 
     def family = :vic20
@@ -75,6 +72,7 @@ module Badline
       @save_trap = nil
       @capture_output = nil
       @drive1541 = nil
+      @drive1581 = nil
       @init_threshold = boot_cycles
       wire_ports
     end
@@ -94,35 +92,11 @@ module Badline
       drive_nmi
       @cpu.cycle!
       @drive1541&.host_cycle!
+      @drive1581&.host_cycle!
 
       @cycles += 1
     end
 
-    # Runs `count` cycles, one #cycle! after another.
-    def run_cycles(count)
-      i = 0
-      while i < count
-        cycle!
-        i += 1
-      end
-    end
-
-    # Runs cycles until the block returns true or the cycle count passes
-    # `limit`, checking before each cycle.
-    def run_until(limit)
-      cycle! until yield || @cycles > limit
-    end
-
-    # Runs the block once the KERNAL has booted (see init_threshold), or
-    # now if it has.
-    def on_init(&block)
-      if @cycles < @init_threshold
-        @init_handlers << block
-      else
-        block.call
-      end
-    end
-
     # The chip whose #display a front end shows.
     def video = @vic
 
@@ -176,6 +150,7 @@ module Badline
       via_written
       @drive&.reset!
       @drive1541&.reset!
+      @drive1581&.reset!
       @nmi_asserted = false
       @cpu.reset!
     end
@@ -189,10 +164,6 @@ module Badline
       reset!
     end
 
-    def inspect
-      "#<#{self.class.name} cycles=#{@cycles} cpu=(#{@cpu.inspect})>"
-    end
-
     private
 
     # The cycle by which the KERNAL has booted and BASIC printed READY,
@@ -212,9 +183,5 @@ module Badline
       @cpu.nmi = true if nmi && !@nmi_asserted
       @nmi_asserted = nmi
     end
-
-    def handle_init
-      @init_handlers.each(&:call)
-    end
   end
 end

data/lib/badline/z80/core.rb

@@ -14,6 +14,7 @@ require "badline/z80/extended_page"
 require "badline/z80/block_transfers"
 require "badline/z80/block_io"
 require "badline/z80/interrupt_acceptance"
+require "badline/z80/saved_state"
 
 module Badline
   class Z80
@@ -42,6 +43,7 @@ module Badline
       include BlockTransfers
       include BlockIO
       include InterruptAcceptance
+      include SavedState
 
       attr_reader :bus, :cycles, :nmi
       attr_accessor :int

data/lib/badline/z80/saved_state.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Badline
+  class Z80
+    # The registers, the T-state count and the interrupt latches for a
+    # snapshot, taken between instructions.
+    module SavedState
+      def save_state(out)
+        out.marker("Z80")
+        out.int(@a).int(@f).int(@b).int(@c).int(@d).int(@e).int(@h).int(@l)
+        out.int(@af_alt).int(@bc_alt).int(@de_alt).int(@hl_alt)
+        out.int(@i).int(@r).int(@pc).int(@sp).int(@ix).int(@iy).int(@wz).int(@q).int(@last_q).int(@im)
+        out.int(@cycles)
+        out.boolean(@iff1).boolean(@iff2).boolean(@halted).boolean(@after_ei).boolean(@after_ld_a_ir)
+        out.boolean(@int).boolean(@nmi).boolean(@nmi_pending)
+      end
+
+      def load_state(input)
+        input.marker("Z80")
+        load_main_registers(input)
+        @af_alt = input.int
+        @bc_alt = input.int
+        @de_alt = input.int
+        @hl_alt = input.int
+        load_special_registers(input)
+        @cycles = input.int
+        load_latches(input)
+        @prefix = 0
+      end
+
+      private
+
+      def load_main_registers(input)
+        @a = input.int
+        @f = input.int
+        @b = input.int
+        @c = input.int
+        @d = input.int
+        @e = input.int
+        @h = input.int
+        @l = input.int
+      end
+
+      def load_special_registers(input)
+        @i = input.int
+        @r = input.int
+        @pc = input.int
+        @sp = input.int
+        @ix = input.int
+        @iy = input.int
+        @wz = input.int
+        @q = input.int
+        @last_q = input.int
+        @im = input.int
+      end
+
+      def load_latches(input)
+        @iff1 = input.boolean?
+        @iff2 = input.boolean?
+        @halted = input.boolean?
+        @after_ei = input.boolean?
+        @after_ld_a_ir = input.boolean?
+        @int = input.boolean?
+        @nmi = input.boolean?
+        @nmi_pending = input.boolean?
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.1
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -79,6 +79,7 @@ files:
 - lib/badline/c128/cpu.rb
 - lib/badline/c128/drives.rb
 - lib/badline/c128/fast_serial.rb
+- lib/badline/c128/io_pages.rb
 - lib/badline/c128/keys.rb
 - lib/badline/c128/mmu.rb
 - lib/badline/c128/mmu_pages.rb
@@ -90,6 +91,9 @@ files:
 - lib/badline/c128/vdc/painter.rb
 - lib/badline/c128/vdc/raster.rb
 - lib/badline/c128/vdc/window.rb
+- lib/badline/c128/z80.rb
+- lib/badline/c128/z80_pages.rb
+- lib/badline/c128/z80_turns.rb
 - lib/badline/cartridge.rb
 - lib/badline/cartridge/action_replay.rb
 - lib/badline/cartridge/atomic_power.rb
@@ -129,8 +133,10 @@ files:
 - lib/badline/color_memory.rb
 - lib/badline/computer.rb
 - lib/badline/computer/attachments.rb
+- lib/badline/computer/common.rb
 - lib/badline/computer/kernal_traps.rb
 - lib/badline/computer/saved_state.rb
+- lib/badline/computer/true_drives.rb
 - lib/badline/control_ports.rb
 - lib/badline/core.rb
 - lib/badline/cpu.rb
@@ -141,17 +147,19 @@ files:
 - lib/badline/cpu/operations.rb
 - lib/badline/cpu/saved_state.rb
 - lib/badline/cpu/stack_operations.rb
-- lib/badline/cycleable.rb
+- lib/badline/cpu_port.rb
 - lib/badline/data_path.rb
 - lib/badline/datasette.rb
 - lib/badline/debug_register.rb
 - lib/badline/drive.rb
 - lib/badline/drive/core.rb
+- lib/badline/drive/fast_serial.rb
 - lib/badline/drive/idle.rb
 - lib/badline/drive/idle_cpu.rb
 - lib/badline/drive/orbit.rb
 - lib/badline/drive/serial_lines.rb
 - lib/badline/drive/sleep.rb
+- lib/badline/drive/vias.rb
 - lib/badline/drive/watch.rb
 - lib/badline/drive1541.rb
 - lib/badline/drive1541/bus.rb
@@ -173,48 +181,70 @@ files:
 - lib/badline/drive1571/serial_port.rb
 - lib/badline/drive1571/serial_via.rb
 - lib/badline/drive1571/wd1770.rb
+- lib/badline/drive1581.rb
+- lib/badline/drive1581/bus.rb
+- lib/badline/drive1581/cpu.rb
+- lib/badline/drive1581/disk.rb
+- lib/badline/drive1581/disk_state.rb
+- lib/badline/drive1581/mechanism.rb
+- lib/badline/drive1581/serial_port.rb
+- lib/badline/drive1581/slot.rb
+- lib/badline/drive1581/track.rb
+- lib/badline/drive1581/track_bytes.rb
+- lib/badline/drive1581/wd1772.rb
+- lib/badline/drive1581/wd1772/registers.rb
+- lib/badline/drive1581/wd1772/sector_writes.rb
+- lib/badline/drive1581/wd1772/sectors.rb
+- lib/badline/drive1581/wd1772/state.rb
+- lib/badline/drive1581/wd1772/stepping.rb
+- lib/badline/drive1581/wd1772/tracks.rb
+- lib/badline/drive1581/wd1772/turn.rb
 - lib/badline/ffi.rb
 - lib/badline/frontend.rb
 - lib/badline/frontend/app.rb
+- lib/badline/frontend/audio_device.rb
 - lib/badline/frontend/audio_sink.rb
 - lib/badline/frontend/boot.rb
 - lib/badline/frontend/buttons.rb
-- lib/badline/frontend/confirmation.rb
 - lib/badline/frontend/controls.rb
 - lib/badline/frontend/drive_led.rb
-- lib/badline/frontend/file_browser.rb
-- lib/badline/frontend/filter_view.rb
 - lib/badline/frontend/frame_rate.rb
 - lib/badline/frontend/frame_report.rb
 - lib/badline/frontend/gamepads.rb
-- lib/badline/frontend/info_view.rb
 - lib/badline/frontend/keys.rb
 - lib/badline/frontend/machine_window.rb
-- lib/badline/frontend/menu_dialogs.rb
-- lib/badline/frontend/menu_media.rb
-- lib/badline/frontend/menu_pages.rb
-- lib/badline/frontend/menu_ports.rb
-- lib/badline/frontend/name_field.rb
+- lib/badline/frontend/media_slots.rb
+- lib/badline/frontend/menu/confirmation.rb
+- lib/badline/frontend/menu/file_browser.rb
+- lib/badline/frontend/menu/menu_dialogs.rb
+- lib/badline/frontend/menu/menu_media.rb
+- lib/badline/frontend/menu/menu_pages.rb
+- lib/badline/frontend/menu/menu_ports.rb
+- lib/badline/frontend/menu/name_field.rb
+- lib/badline/frontend/menu/pause_menu.rb
+- lib/badline/frontend/menu/theme.rb
 - lib/badline/frontend/pacer.rb
 - lib/badline/frontend/pad_port.rb
 - lib/badline/frontend/painter.rb
-- lib/badline/frontend/pause_menu.rb
-- lib/badline/frontend/player_commands.rb
-- lib/badline/frontend/player_footer.rb
-- lib/badline/frontend/player_header.rb
-- lib/badline/frontend/player_screen.rb
-- lib/badline/frontend/player_state.rb
-- lib/badline/frontend/player_window.rb
-- lib/badline/frontend/scope.rb
+- lib/badline/frontend/player/filter_view.rb
+- lib/badline/frontend/player/info_view.rb
+- lib/badline/frontend/player/player_commands.rb
+- lib/badline/frontend/player/player_controller.rb
+- lib/badline/frontend/player/player_footer.rb
+- lib/badline/frontend/player/player_header.rb
+- lib/badline/frontend/player/player_screen.rb
+- lib/badline/frontend/player/player_state.rb
+- lib/badline/frontend/player/scope.rb
+- lib/badline/frontend/player/sid_history.rb
+- lib/badline/frontend/player/sid_view.rb
+- lib/badline/frontend/player/theme.rb
+- lib/badline/frontend/player/visualizer_view.rb
 - lib/badline/frontend/screen.rb
 - lib/badline/frontend/screens.rb
 - lib/badline/frontend/screenshot.rb
-- lib/badline/frontend/sid_history.rb
-- lib/badline/frontend/sid_view.rb
 - lib/badline/frontend/snapshots.rb
 - lib/badline/frontend/sound.rb
 - lib/badline/frontend/timeline.rb
-- lib/badline/frontend/visualizer_view.rb
 - lib/badline/iec_bus.rb
 - lib/badline/input.rb
 - lib/badline/input/mouse1351.rb
@@ -242,7 +272,7 @@ files:
 - lib/badline/kernal_trap/drive/status.rb
 - lib/badline/kernal_trap/drive/write_file.rb
 - lib/badline/kernal_trap/drive/writes.rb
-- lib/badline/kernal_trap/file.rb
+- lib/badline/kernal_trap/file_routine.rb
 - lib/badline/kernal_trap/layout.rb
 - lib/badline/kernal_trap/load.rb
 - lib/badline/kernal_trap/routine.rb
@@ -251,11 +281,17 @@ files:
 - lib/badline/keyboard.rb
 - lib/badline/keyboard_buffer.rb
 - lib/badline/machine.rb
+- lib/badline/machine/clocking.rb
 - lib/badline/media.rb
+- lib/badline/media/boot_disk.rb
 - lib/badline/media/disk_list.rb
 - lib/badline/media/disk_set.rb
+- lib/badline/media/extensions.rb
+- lib/badline/media/not_disk.rb
+- lib/badline/media/program.rb
 - lib/badline/media/queue.rb
 - lib/badline/media/true_drive.rb
+- lib/badline/media/tune.rb
 - lib/badline/media/vic20_basic.rb
 - lib/badline/media/vic20_cartridge.rb
 - lib/badline/media/vic20_media.rb
@@ -290,6 +326,7 @@ files:
 - lib/badline/roms/character.rom
 - lib/badline/roms/dos1541.rom
 - lib/badline/roms/dos1571.rom
+- lib/badline/roms/dos1581.rom
 - lib/badline/roms/eapi/LICENSE.md
 - lib/badline/roms/eapi/README
 - lib/badline/roms/eapi/eapi-am29f040-14
@@ -416,6 +453,7 @@ files:
 - lib/badline/z80/loads.rb
 - lib/badline/z80/main_page.rb
 - lib/badline/z80/registers.rb
+- lib/badline/z80/saved_state.rb
 - lib/badline/z80/shifts.rb
 - packaging/homebrew/badline.rb
 homepage: https://github.com/elektronaut/badline

data/lib/badline/cycleable.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Badline
-  class Cycleable
-    attr_reader :cycles
-
-    def initialize
-      @loop = Fiber.new { loop { main_loop } }
-      @cycles = 0
-      @pending_write = false
-    end
-
-    def cycle!
-      @loop.resume
-      nil
-    end
-
-    def pending_write? = @pending_write
-
-    private
-
-    def cycle(write: false)
-      @pending_write = write
-      Fiber.yield
-      poll
-      result = yield if block_given?
-      @cycles += 1
-      @pending_write = false
-      result
-    end
-
-    def poll; end
-
-    def main_loop
-      Fiber.yield
-    end
-  end
-end