badline 0.4.1 → 0.5.0

data/lib/badline/via/timer1.rb

@@ -66,6 +66,36 @@ module Badline
         @counter == 0xffff && timeout(free_run)
       end
 
+      # How many cycles the timer can run without setting its flag: until
+      # an armed timer's timeout, and forever for an unarmed one, whose
+      # timeouts only reload the counter. None while an armed timer loads
+      # or reloads.
+      def quiet_cycles
+        return FastForward::QUIET unless @armed
+        return 0 if @hold || @reload
+
+        @counter
+      end
+
+      # Runs +cycles+ cycles at once, as many as quiet_cycles allows. An
+      # unarmed timer goes round its period of latch + 2 cycles: the
+      # timeout at $FFFF, the reload, and latch down to 0.
+      def fast_forward(cycles)
+        if @hold || @reload
+          cycle!(false)
+          cycles -= 1
+        end
+        return @counter -= cycles if cycles <= @counter
+
+        phase = (cycles - @counter - 1) % (@latch + 2)
+        @reload = phase.zero?
+        @counter = @reload ? 0xffff : @latch - phase + 1
+      end
+
+      # What the counter and PB7 don't hold, for comparing the timer at two
+      # points.
+      def state = [@latch, @armed]
+
       private
 
       # The counter reloads either way. Armed, PB7 inverts and the flag

data/lib/badline/via/timer2.rb

@@ -63,6 +63,31 @@ module Badline
       # A falling edge on PB6. Returns true when it sets the flag.
       def pulse! = @counting_pulses && decrement
 
+      # How many cycles the timer can run without setting its flag, taken
+      # without the shift register clocking off it: until an armed timer
+      # underflows, and forever for one counting pulses or unarmed, which
+      # only rolls on. None while a load or a switch of mode is under way.
+      def quiet_cycles
+        return 0 if @hold || @counting_pulses != @count_pulses
+        return FastForward::QUIET if @counting_pulses || !@armed
+
+        @counter
+      end
+
+      # Runs +cycles+ cycles at once, as many as quiet_cycles allows. The
+      # low byte's underflow is set when the last cycle took it from $00.
+      def fast_forward(cycles)
+        @low_underflowed = false
+        return if @counting_pulses
+
+        @counter = (@counter - cycles) & 0xffff
+        @low_underflowed = @counter.allbits?(0xff)
+      end
+
+      # What the counter and the low byte's underflow don't hold, for
+      # comparing the timer at two points.
+      def state = [@latch_low, @armed, @hold, @low_reload, @count_pulses, @counting_pulses]
+
       private
 
       # A cycle while counting pulses, or held after a load or a low byte

data/lib/badline/via.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "badline/via/control_lines"
+require "badline/via/fast_forward"
 require "badline/via/interrupt_register"
 require "badline/via/shift_register"
 require "badline/via/timer1"
@@ -16,6 +17,7 @@ module Badline
   # feed the counter.
   class VIA
     include Addressable
+    include FastForward
 
     attr_reader :start, :peripheral, :shift_register, :acr, :pcr
 

data/lib/badline/vic/display_state.rb

@@ -12,10 +12,6 @@ module Badline
       LAST_LINE  = 0xf7 # 247
       COLUMNS_PER_ROW = 40
 
-      # The last column of a rasterline already compares against the line
-      # about to start, the same wrap the raster IRQ latch uses.
-      WRAP_COLUMN = 62
-
       # AEC follows BA three cycles later; the c-accesses before it read
       # the bus the CPU still drives.
       BA_DELAY = 3
@@ -32,12 +28,16 @@ module Badline
       LOAD_COLUMN = 12
       RC_COLUMN = 56
 
-      GRAPHICS_COLUMNS = Array.new(63) { |column| column.between?(GRAPHICS_FIRST, GRAPHICS_LAST) }.freeze
+      GRAPHICS_COLUMNS = Array.new(65) { |column| column.between?(GRAPHICS_FIRST, GRAPHICS_LAST) }.freeze
 
       attr_reader :vc_base, :vc, :vmli, :rc
 
-      def initialize(registers)
+      # The wrap column is the last column of a rasterline, 62 on the 6569,
+      # which already compares against the line about to start, the same
+      # wrap the raster IRQ latch uses.
+      def initialize(registers, wrap_column = 62)
         @registers = registers
+        @wrap_column = wrap_column
         @vc_base = 0
         @vc = 0
         @vmli = 0
@@ -77,7 +77,7 @@ module Badline
 
       # Returns true when this compare opened display state.
       def cycle(rasterline, column)
-        match = column == WRAP_COLUMN ? wrap_match(rasterline + 1) : line_match
+        match = column == @wrap_column ? wrap_match(rasterline + 1) : line_match
         @matched = match
         opened = false
         if match

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

@@ -10,12 +10,15 @@ module Badline
       # the CPU reads or writes a VIC register in that cycle, and the middle
       # one is the idle fetch at $3fff (sbsprf24's readme).
       class InternalBus
-        # The columns of a raster line.
-        attr_reader :columns
+        # The columns of a raster line, and where the region puts the
+        # sprites in it.
+        attr_reader :columns, :timing
 
-        def initialize(bank, columns)
+        def initialize(bank, timing)
           @bank = bank
-          @columns = columns
+          @timing = timing
+          @columns = timing.columns
+          @sprite_cycle = timing.sprite_cycle
           @lines = 0
           @ghost = 0xff
           @value = Array.new(columns, 0xff)
@@ -37,10 +40,11 @@ module Badline
           @line[column] = column.zero? ? @lines + 1 : @lines
         end
 
-        # The row sprite `index` (3-7) fetched this line, in Bauer cycles
-        # 2n-5 and 2n-4.
+        # The row sprite `index` (3-7) fetched this line, in the phi2 halves
+        # of the two cycles from its p-access: Bauer cycles 2n-5 and 2n-4 on
+        # the 6569.
         def row(index)
-          column = (2 * index) - 6
+          column = (@sprite_cycle + (2 * index) - 1) % @columns
           (phi2(column) << 16) | (@ghost << 8) | phi2(column + 1)
         end
 

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

@@ -6,18 +6,13 @@ module Badline
       # The X comparator and the 24-bit shift register behind it: where a
       # line fires the sprite, and the pixels each firing shifts out.
       module Shifter
-        EMPTY = [].freeze
-
         private
 
         # The first pixel of every comparator match along the line. Writes to
         # $d000/$d010 move the compare value mid-line, so a sprite can miss
         # its match entirely and pick up a later one, a second one, or none.
         def comparator_hits(log)
-          unless log
-            match = compare_x(@registers)
-            return match ? [(match + 1) % @width] : EMPTY
-          end
+          return compare_x(@registers) unless log
 
           hits = []
           log.rewind
@@ -25,8 +20,10 @@ module Badline
           from = 0
           while from < @width
             upto = [log.next_x, @width].min
-            match = compare_x(log)
-            hits << ((match + 1) % @width) if match && match >= from && match < upto
+            compare_x(log).each do |start|
+              match = (start - 1) % @width
+              hits << start if match >= from && match < upto
+            end
             break if upto >= @width
 
             from = upto
@@ -35,15 +32,13 @@ module Badline
           hits
         end
 
-        # The VIC's X counter only runs to 503, so the eight coordinates above
-        # it never match and the sprite stays dark — the gap the spritegap
-        # tests find at $1f8.
+        # The pixels the sprite starts at, one past each comparator match.
+        # The 6569's X counter only runs to 503, so the eight coordinates
+        # above it never match and the sprite stays dark — the gap the
+        # spritegap tests find at $1f8.
         def compare_x(view)
           msb = view[0x10].anybits?(@bit) ? 0x100 : 0
-          xpos = msb | view[index * 2]
-          return if xpos >= @width
-
-          (xpos + COMPARE_OFFSET) % @width
+          @timing.x_pixels[msb | view[index * 2]]
         end
 
         # Pixels from the X match to the next reload.

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Badline
+  class VIC < Cycleable
+    class Sprite
+      # = Timing
+      #
+      # Where a region puts the sprites in the line: the cycles of their
+      # fetches and of the display compare, the pixels those land on, and
+      # the raster pixels the X counter reads each coordinate at. Where the
+      # 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.
+        HOLD_AT = 0x188
+        HOLD_BASE = 0x184
+
+        attr_reader :columns, :sprite_cycle, :display_off_x, :x_pixels
+
+        def initialize(region)
+          @columns = region.cycles_per_line
+          @sprite_cycle = region.sprite_cycle
+          @shift = region.sprite_cycle - Region::PAL.sprite_cycle
+          @display_off_x = DISPLAY_OFF_X + (8 * (region.sprite_display_cycle - Region::PAL.sprite_display_cycle))
+          @x_pixels = Timing.x_pixels(@columns * 8, region.x_hold)
+        end
+
+        # The column BA falls in for a sprite's own fetch: 55 for sprite 0 on
+        # the 6569, and two later for each sprite after it.
+        def ba_column(index) = 55 + @shift + (2 * index)
+
+        # The raster pixel of a sprite's reload, counted from the start of
+        # the line it is fetched on, so past the end of it for sprites 3-7
+        # on the 6569.
+        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.
+        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)
+        end
+
+        # The raster pixels at which the X counter reads each coordinate, 512
+        # lists. A sprite starts at one where its X matches. On the 6569 the
+        # coordinates past 503 have none.
+        def self.x_pixels(width, hold)
+          pixels = Array.new(512) { [] }
+          width.times { |pixel| pixels[xpos(pixel, width, hold)] << pixel }
+          pixels.each(&:freeze).freeze
+        end
+      end
+    end
+  end
+end

data/lib/badline/vic/sprite.rb

@@ -2,6 +2,7 @@
 
 require "badline/vic/sprite/internal_bus"
 require "badline/vic/sprite/shifter"
+require "badline/vic/sprite/timing"
 
 module Badline
   class VIC < Cycleable
@@ -22,9 +23,6 @@ module Badline
       LAST_MCBASE = 63
       MC_MASK = 0x3f
 
-      # The X comparator matches the pixel before the sprite's first one.
-      COMPARE_OFFSET = X_OFFSET - 1
-
       # 24 bits at two pixels each, plus slack for a mid-sprite expansion
       # change stretching the tail.
       MAX_SPAN = 64
@@ -48,7 +46,8 @@ module Badline
 
       # On the line of its last row, a sprite whose DMA ended at cycle 16
       # loses its display at cycle 58, so no hit from this pixel on starts
-      # it (spritegap3). One already shifting runs on.
+      # it (spritegap3). One already shifting runs on. A region whose
+      # display compare falls later moves it with the compare.
       DISPLAY_OFF_X = 460
 
       include Shifter
@@ -63,6 +62,7 @@ module Badline
         @bank = bank
         @bus = bus
         @width = bus.columns * 8
+        @timing = bus.timing
         @bit = 1 << index
         @dma = false
         @display_on = false
@@ -78,8 +78,9 @@ module Badline
         @reload_codes = Array.new(MAX_SPAN + RELOAD_HOLD, 0)
         @reload_leftmost = 0
         @reload_span = 0
-        @reload_x = (RELOAD_X + (RELOAD_STEP * index)) % @width
-        @reload_next_line = RELOAD_X + (RELOAD_STEP * index) < @width
+        reload = @timing.reload_x(index)
+        @reload_x = reload % @width
+        @reload_next_line = reload < @width
         @sr = 0
         @latch = 0
         @mc_flop = false
@@ -157,9 +158,10 @@ module Badline
       # MCBASE, and returns true. Display is enabled separately in cycle 58,
       # so the rows render from the following line on.
       #
-      # On the VIC's side, BA falls at the sprite's own column — 55 for
-      # sprite 0, two later for each sprite after it, a column behind the
-      # window the CPU sees in VIC::SPRITE_BA_WINDOWS — or two columns after
+      # On the VIC's side, BA falls at the sprite's own column
+      # (Timing#ba_column) — 55 for sprite 0 on the 6569, two later for each
+      # sprite after it, a column behind the window the CPU sees
+      # (VIC#layout_columns) — or two columns after
       # this compare, whichever is later. AEC follows three columns on, and
       # the first of the three s-accesses runs in the column it arrives in:
       # a DMA starting on the second compare therefore loses that access for
@@ -168,7 +170,7 @@ module Badline
       def check_dma(line, column)
         return false if @dma || !enabled? || !y_match?(line)
 
-        @first_byte_lost = column + 2 > 55 + (2 * index)
+        @first_byte_lost = column + 2 > @timing.ba_column(index)
         @dma = true
         @mcbase = 0
         @exp_ff = true
@@ -229,7 +231,7 @@ module Badline
         return unless @row_ready || @prev_bits || reload_bits
 
         log = nil if log.nil? || log.empty?
-        @stop_x = @dma ? nil : DISPLAY_OFF_X
+        @stop_x = @dma ? nil : @timing.display_off_x
         comparator_hits(log).each { |start| sequence_hit(log, start, reload_bits) }
       end
 
@@ -261,7 +263,7 @@ module Badline
       def blind_fetch
         @bits = @bus.row(index)
         @row_ready = true
-        @show_from = DISPLAY_OFF_X
+        @show_from = @timing.display_off_x
       end
 
       def code_at(raster_x, leftmost, span, codes)

data/lib/badline/vic/sprites.rb

@@ -31,12 +31,12 @@ module Badline
       # sooner than the 6569's.
       WRITE_DELAY_8565 = WRITE_DELAY.dup.tap { |delays| delays[0x1c] = SEQUENCER_DELAY - 1 }.freeze
 
-      def initialize(registers, bank, width, model: :mos6569)
+      def initialize(registers, bank, width, model: :mos6569, region: Region::PAL)
         @registers = registers
         @write_delay = model == :mos8565 ? WRITE_DELAY_8565 : WRITE_DELAY
         @bank = bank
         @width = width
-        @bus = Sprite::InternalBus.new(bank, width / 8)
+        @bus = Sprite::InternalBus.new(bank, Sprite::Timing.new(region))
         @sprites = Array.new(8) { |i| Sprite.new(i, registers, bank, @bus, model:) }
         @collisions = Collisions.new(registers, width)
         @hits = @collisions.hits

data/lib/badline/vic.rb

@@ -46,16 +46,31 @@ module Badline
     FETCH_HOLD = 0x20
     FETCH_HOLD_ROM = 0x60
 
-    # The columns carrying a hook, besides the line's last column, which
-    # starts the vertical border for the line after it.
-    HOOKS = [14, 15, 53, 54, 57].freeze
+    # The hooks a column can carry, as bits: MCBASE, the left border
+    # compare with the end of the sprite, the sprite DMA compare, the
+    # expansion flip-flop, the sprite display compare, and the start of the
+    # vertical border for the line after the last column.
+    HOOK_MCBASE = 1
+    HOOK_LEFT = 2
+    HOOK_DMA = 4
+    HOOK_EXPANSION = 8
+    HOOK_DISPLAY = 16
+    HOOK_LAST = 32
+
+    # On the 6569 the DMA compares fall in columns 53 and 54 and the
+    # display compare in column 57. A region whose sprite fetches run later
+    # moves them with the fetches (Region::Profile#sprite_cycle).
+    DMA_COLUMN = 53
+    EXPANSION_COLUMN = 54
 
     # BA falls three columns ahead of each sprite's pair of s-accesses, and
     # the five-column windows step two columns apart from sprite 0 at column
-    # 54. From sprite 3 on they reach past the end of the line, so each is
-    # split: the tail columns fall on the line whose cycle 55/56 compare
-    # started the fetch, the head columns on the line after it.
-    SPRITE_BA_WINDOWS = Array.new(8) { |n| (54 + (2 * n))..(58 + (2 * n)) }.freeze
+    # 54 on the 6569, a column later where the fetches are. From sprite 3 on
+    # they reach past the end of the line, so each is split: the tail
+    # columns fall on the line whose DMA compare started the fetch, the head
+    # columns on the line after it.
+    SPRITE_BA_FIRST = 54
+    SPRITE_BA_LENGTH = 5
 
     def initialize(address_bus = nil, debug: false, model: :mos6569, region: Region::PAL)
       raise ArgumentError, "unknown VIC-II model #{model}" unless MODELS.include?(model)
@@ -72,6 +87,8 @@ module Badline
       @debug = debug
 
       @columns_per_line = region.cycles_per_line
+      @sprite_cycle = region.sprite_cycle
+      @sprite_shift = region.sprite_cycle - Region::PAL.sprite_cycle
       @width = @columns_per_line * 8
       @height = region.lines_per_frame
       @last_column = @columns_per_line - 1
@@ -94,10 +111,10 @@ module Badline
     def power_on!
       @registers = VIC::Registers.new
       @register_bytes = @registers.bytes
-      @display_state = VIC::DisplayState.new(@registers)
+      @display_state = VIC::DisplayState.new(@registers, @last_column)
       @sequencer = VIC::Sequencer.new(@width, @registers, @vic_bank, model: @model, region: @region)
       @sequencer.render = @render
-      @sprites = VIC::Sprites.new(@registers, @vic_bank, @width, model: @model)
+      @sprites = VIC::Sprites.new(@registers, @vic_bank, @width, model: @model, region: @region)
       @display.fill(0)
       @lines.each { |line| line.fill(0) }
       @dirty_lines.fill(true)
@@ -132,7 +149,8 @@ module Badline
 
       fetch_character_data! if dma_active?
 
-      column_hooks if @hook_columns[@column]
+      hooks = @hook_columns[@column]
+      column_hooks(hooks) if hooks
 
       @column += 1
       if @column == @columns_per_line
@@ -149,19 +167,18 @@ module Badline
     # ahead of Bauer's numbering — two for MCBASE, the DMA compares and the
     # expansion flip-flop, which the `spriteenable` and `spritecrunch`
     # references place a column earlier still. Guarded in
-    # #cycle! so an ordinary column pays two compares rather than the
+    # #cycle! so an ordinary column pays an array read rather than the
     # dispatch.
-    def column_hooks
-      case @column
-      when 14 then @sprites.advance_mcbase
-      when 15
+    def column_hooks(hooks)
+      @sprites.advance_mcbase if hooks.anybits?(HOOK_MCBASE)
+      if hooks.anybits?(HOOK_LEFT)
         @sequencer.left_compare_vertical_border
         finish_sprite_mcbase
-      when 53 then check_sprite_dma
-      when 54 then check_dma_and_toggle_expansion
-      when 57 then @sprites.check_display(@rasterline)
-      when @last_column then @sequencer.start_vertical_border(@rasterline == @last_line ? 0 : @rasterline + 1)
       end
+      check_sprite_dma if hooks.anybits?(HOOK_DMA)
+      @sprites.toggle_expansion if hooks.anybits?(HOOK_EXPANSION)
+      @sprites.check_display(@rasterline) if hooks.anybits?(HOOK_DISPLAY)
+      @sequencer.start_vertical_border(@rasterline == @last_line ? 0 : @rasterline + 1) if hooks.anybits?(HOOK_LAST)
     end
 
     # The IRQ line is held asserted while any enabled latch bit is set in
@@ -210,6 +227,16 @@ module Badline
         @column > DisplayState::DMA_FIRST && @column <= DisplayState::DMA_LAST + 1
     end
 
+    # BA as an REU's DMA sees it. On the line whose raster matches sprite
+    # 0's Y, where the sprite's DMA starts, the REU doesn't see BA fall on
+    # the first cycle of the sprite's window. Pinned by
+    # REU/bonzai/spritetiming.
+    def reu_ba_low?
+      return false if @column == SPRITE_BA_FIRST + @sprite_shift && sprite_zero_starting?
+
+      ba_low?
+    end
+
     # Light pen input level (CIA1 PB4). A falling edge triggers the latch.
     def lightpen_level(high)
       @lp_low = !high
@@ -233,7 +260,7 @@ module Badline
       end
       return if line == @last_line && column.positive?
 
-      vic_x = ((column * 8) - Sprite::X_OFFSET) % @width
+      vic_x = Sprite::Timing.xpos(column * 8, @width, @region.x_hold)
       latch_lightpen((vic_x >> 1) + @lightpen_extra, line)
     end
 
@@ -302,24 +329,27 @@ module Badline
       @sprites.log_change(reg, old, value, beam_x)
     end
 
-    # Bauer cycles 1-10 and 58-63 are sprite p- and s-accesses, 11-15
-    # refresh, 16-55 g-accesses and 56-57 idle. @column has already
-    # advanced, so it is the Bauer cycle less one.
+    # On the 6569 Bauer cycles 1-10 and 58-63 are sprite p- and s-accesses,
+    # 11-15 refresh, 16-55 g-accesses and 56-57 idle. Where the sprite
+    # fetches start later, the idle cycles before them grow, and on the
+    # 6567R8 cycle 10 idles too. @column has already advanced, so it is the
+    # Bauer cycle less one.
     def phi1_address
       cycle = @column + 1
-      if cycle < 11 || cycle > 57
-        sprite_phi1_address((cycle - 58) % 63)
-      elsif cycle < 16
+      slot = (cycle - @sprite_cycle) % @columns_per_line
+      if slot < 16
+        sprite_phi1_address(slot)
+      elsif cycle.between?(11, 15)
         0x3f00 | ((0xff - (5 * @rasterline) - (cycle - 11)) & 0xff)
-      elsif cycle < 56
+      elsif cycle.between?(16, 55)
         graphics_phi1_address
       else
         0x3fff
       end
     end
 
-    # Each sprite takes two cycles from Bauer 58, the p-access and then the
-    # middle s-access.
+    # Each sprite takes two cycles from sprite 0's, the p-access and then
+    # the middle s-access.
     def sprite_phi1_address(slot)
       n = slot >> 1
       return @registers.screen_base + 0x3f8 + n if slot.even?
@@ -357,11 +387,6 @@ module Badline
       rebuild_sprite_ba if @sprites.stopped_dma?
     end
 
-    def check_dma_and_toggle_expansion
-      check_sprite_dma
-      @sprites.toggle_expansion
-    end
-
     # The trigger re-arms at the start of each frame; if the pen line is
     # still low, the latch retriggers immediately with a fixed LPX of $d1.
     def start_lightpen_frame
@@ -378,6 +403,10 @@ module Badline
       @registers.latch_irq!(LIGHTPEN_IRQ)
     end
 
+    def sprite_zero_starting?
+      @registers[0x15].anybits?(0x01) && @registers[0x01] == (@rasterline & 0xff)
+    end
+
     def rebuild_sprite_ba
       @sprite_ba.fill(false)
       8.times do |n|
@@ -389,13 +418,31 @@ module Badline
     end
 
     # Splits the sprite BA windows at the end of the line and marks the hook
-    # columns, for a line of the region's length. The marks let an ordinary
-    # column cost one array read instead of the dispatch.
+    # columns, for a line of the region's length: 14, 15, 53, 54 and 57, and
+    # the line's last column, which starts the vertical border for the line
+    # after it. The marks let an ordinary column cost one array read instead
+    # of the dispatch.
     def layout_columns
       last = @last_column
-      @sprite_ba_tail = SPRITE_BA_WINDOWS.map { |w| w.select { |c| c <= last } }.freeze
-      @sprite_ba_head = SPRITE_BA_WINDOWS.map { |w| w.filter_map { |c| c - last - 1 if c > last } }.freeze
-      @hook_columns = Array.new(@columns_per_line) { |c| c == last || HOOKS.include?(c) }.freeze
+      windows = Array.new(8) do |n|
+        first = SPRITE_BA_FIRST + @sprite_shift + (2 * n)
+        first...(first + SPRITE_BA_LENGTH)
+      end
+      @sprite_ba_tail = windows.map { |w| w.select { |c| c <= last } }.freeze
+      @sprite_ba_head = windows.map { |w| w.filter_map { |c| c - last - 1 if c > last } }.freeze
+      @hook_columns = layout_hooks.map { |hooks| hooks unless hooks.zero? }.freeze
+    end
+
+    def layout_hooks
+      hooks = Array.new(@columns_per_line, 0)
+      hooks[14] |= HOOK_MCBASE
+      hooks[15] |= HOOK_LEFT
+      hooks[DMA_COLUMN + @sprite_shift] |= HOOK_DMA
+      hooks[DMA_COLUMN + @sprite_shift + 1] |= HOOK_DMA
+      hooks[EXPANSION_COLUMN] |= HOOK_EXPANSION
+      hooks[@region.sprite_display_cycle - 1] |= HOOK_DISPLAY
+      hooks[@last_column] |= HOOK_LAST
+      hooks
     end
 
     # Runs this column's g-access and draws the one from GRAPHICS_DELAY

data/lib/badline.rb

@@ -24,11 +24,14 @@ 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"