badline 0.2.0 → 0.3.0

data/lib/badline/vic/graphics_shifter.rb

@@ -9,7 +9,8 @@ module Badline
     #
     # The byte a group draws loads at pixel XSCROLL. ECM and BMM take hold at
     # pixel 4 as they rise and at pixel 6 as they fall (the 6569's colour
-    # latency). MCM takes hold at pixel 4 for the colour lookup but only at
+    # latency), except that BMM falls at pixel 5 out of any mode but hi-res
+    # bitmap. MCM takes hold at pixel 4 for the colour lookup but only at
     # pixel 7 for how the register is read, where a rising MCM also resets
     # the multicolour flip-flop. An MCM that falls out of the invalid
     # ECM+MCM mode is a pixel later on both counts: the lookup changes at
@@ -67,7 +68,7 @@ module Badline
         case pixel
         when 0 then end_late_read
         when 4 then step_lookup(mode)
-        when 5 then @mode_lookup &= ~1 if @late_mcm
+        when 5 then step_early_fall(mode)
         when 6 then @mode_lookup &= mode | 1
         when 7 then step_read
         end
@@ -78,6 +79,11 @@ module Badline
         @mode_lookup = (@mode_lookup & ~1) | (mode & 1) | (@late_mcm ? 1 : 0) | (mode & ECM_BMM)
       end
 
+      def step_early_fall(mode)
+        @mode_lookup &= ~1 if @late_mcm
+        @mode_lookup &= mode | ~BMM unless @mode_lookup == BMM
+      end
+
       def step_read
         return @late_read = true if @late_mcm
 

data/lib/badline/vic/registers.rb

@@ -53,21 +53,21 @@ module Badline
     #
     # All color registers are 4bit, bits 4-7 always read 1.
     #
-    #   $D020: Border color        - Default: 14, light blue
-    #   $D021: Background color 0  - Default: 6,  blue
-    #   $D022: Background color 1  - Default: 1,  white
-    #   $D023: Background color 2  - Default: 2,  red
-    #   $D024: Background color 3  - Default: 3,  cyan
-    #   $D025: Sprite multicolor 0 - Default: 4,  purple
-    #   $D026: Sprite multicolor 1 - Default: 0,  black
-    #   $D027: Sprite 0 color      - Default: 1,  white
-    #   $D028: Sprite 1 color      - Default: 2,  red
-    #   $D029: Sprite 2 color      - Default: 3,  cyan
-    #   $D02A: Sprite 3 color      - Default: 4,  purple
-    #   $D02B: Sprite 4 color      - Default: 5,  green
-    #   $D02C: Sprite 5 color      - Default: 6,  blue
-    #   $D02D: Sprite 6 color      - Default: 7,  yellow
-    #   $D02E: Sprite 7 color      - Default: 12, medium gray
+    #   $D020: Border color
+    #   $D021: Background color 0
+    #   $D022: Background color 1
+    #   $D023: Background color 2
+    #   $D024: Background color 3
+    #   $D025: Sprite multicolor 0
+    #   $D026: Sprite multicolor 1
+    #   $D027: Sprite 0 color
+    #   $D028: Sprite 1 color
+    #   $D029: Sprite 2 color
+    #   $D02A: Sprite 3 color
+    #   $D02B: Sprite 4 color
+    #   $D02C: Sprite 5 color
+    #   $D02D: Sprite 6 color
+    #   $D02E: Sprite 7 color
     #
     # $D02F-$D03F: Not in use, always reads 0xff
     # $D040-$D3FF: Repeat $D0000 to $D03F every 64 bytes
@@ -77,10 +77,10 @@ module Badline
       # The raw register bytes, for the per-column reads on the hot path.
       attr_reader :bytes
 
+      # Every register powers on as zero, as in VICE.
       def initialize
         @bytes = Array.new(2**6, 0)
         @irq_line = false
-        write_defaults
       end
 
       # True while any enabled latch bit is set in $D019/$D01A. Cached and
@@ -157,17 +157,6 @@ module Badline
       def read_clear(reg)
         @bytes[reg].tap { @bytes[reg] = 0 }
       end
-
-      def write_defaults
-        write_each(0x20, [14, 6, 1, 2, 3, 4, 0, 1, 2, 3, 4, 5, 6, 7, 12])
-        write_each(0x11, [0x1b, 0]) # $D011: DEN=1, RSEL=1, YSCROLL=3
-        write_each(0x16, [0xc8])    # $D016: Text mode, XSCROLL=0
-        write_each(0x19, [0, 0])    # IRQ flags
-      end
-
-      def write_each(addr, values)
-        values.each_with_index { |v, i| @bytes[addr + i] = v }
-      end
     end
   end
 end

data/lib/badline/vic.rb

@@ -57,20 +57,33 @@ module Badline
 
       @width = 504
       @height = 312
+      @columns_per_line = @width / 8
+      @last_line = @height - 1
+      @display = Array.new(@width * @height, 0)
+      @lines = Array.new(@height) { Array.new(@width, 0) }
+      @dirty_lines = Array.new(@height, true)
+      @render = true
+
+      power_on!
+      super()
+    end
 
+    # The VIC has no reset pin, so only a power cycle brings back the
+    # registers, the raster position and the fetch and sprite state it
+    # starts with. The display keeps its buffers, cleared to black.
+    def power_on!
       @registers = VIC::Registers.new
       @register_bytes = @registers.bytes
       @display_state = VIC::DisplayState.new(@registers)
       @sequencer = VIC::Sequencer.new(@width, @registers, @vic_bank)
+      @sequencer.render = @render
       @sprites = VIC::Sprites.new(@registers, @vic_bank, @width)
-      @display = Array.new(@width * @height, 0)
-      @lines = Array.new(@height) { Array.new(@width, 0) }
-      @dirty_lines = Array.new(@height, true)
+      @display.fill(0)
+      @lines.each { |line| line.fill(0) }
+      @dirty_lines.fill(true)
 
       @column = 0
       @rasterline = 0
-      @columns_per_line = @width / 8
-      @last_line = @height - 1
 
       @character_buffer = Array.new(40, 0)
       @color_buffer = Array.new(40, 0)
@@ -87,9 +100,6 @@ module Badline
       @lp_triggered = false
       @lp_low = false
       @raster_match = false
-      @render = true
-
-      super()
     end
 
     def cycle!
@@ -141,7 +151,7 @@ module Badline
     end
 
     def peek(addr)
-      i = index(addr) % (2**6)
+      i = offset_of(addr) % (2**6)
       case i
       when 0x11 then (@registers[0x11] & 0x7f) | ((raster_counter & 0x100) >> 1)
       when 0x12 then raster_counter & 0xff
@@ -151,8 +161,11 @@ module Badline
       end.tap { |value| @sprites.bus_data(@column, value) }
     end
 
+    # The register file as stored, read without a bus access's side effects.
+    def register_file = Array.new(0x40) { |reg| @registers[reg] }
+
     def poke(addr, value)
-      reg = index(addr) % (2**6)
+      reg = offset_of(addr) % (2**6)
       @sprites.bus_data(@column, value)
       log_register_change(reg, value)
       @registers.write(reg, value)

data/lib/badline.rb

@@ -26,6 +26,7 @@ require "badline/cpu"
 require "badline/vic"
 require "badline/keyboard_buffer"
 require "badline/computer"
+require "badline/checkpoint"
 require "badline/storage"
 require "badline/cartridge"
 require "badline/kernal_trap"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -73,6 +73,7 @@ files:
 - lib/badline/audio/playback.rb
 - lib/badline/audio/renderer.rb
 - lib/badline/audio/sdl_sink.rb
+- lib/badline/audio/stream.rb
 - lib/badline/audio/wav.rb
 - lib/badline/cartridge.rb
 - lib/badline/cartridge/action_replay.rb
@@ -101,6 +102,7 @@ files:
 - lib/badline/cartridge/super_games.rb
 - lib/badline/cartridge/westermann.rb
 - lib/badline/cartridge/zaxxon.rb
+- lib/badline/checkpoint.rb
 - lib/badline/chrout_trap.rb
 - lib/badline/cia.rb
 - lib/badline/cia/interrupt_register.rb
@@ -145,6 +147,11 @@ files:
 - lib/badline/kernal_trap.rb
 - lib/badline/kernal_trap/channel.rb
 - lib/badline/kernal_trap/drive.rb
+- lib/badline/kernal_trap/drive/block_commands.rb
+- lib/badline/kernal_trap/drive/channels.rb
+- lib/badline/kernal_trap/drive/memory.rb
+- lib/badline/kernal_trap/drive/parameters.rb
+- lib/badline/kernal_trap/drive/status.rb
 - lib/badline/kernal_trap/file.rb
 - lib/badline/kernal_trap/load.rb
 - lib/badline/kernal_trap/routine.rb
@@ -163,6 +170,7 @@ files:
 - lib/badline/roms/eapi/eapi-am29f040-14
 - lib/badline/roms/kernal.rom
 - lib/badline/sid.rb
+- lib/badline/sid/catch_up.rb
 - lib/badline/sid/decimator.rb
 - lib/badline/sid/envelope.rb
 - lib/badline/sid/filter.rb