badline 0.10.0 → 0.11.0

data/lib/badline/vic.rb

@@ -24,9 +24,29 @@ module Badline
       0x8a8a8a, 0xb3ec91, 0x867ade, 0xb3b3b3
     ].freeze
 
+    # The sixteen colours' luminances, out of 32, as Philip Timmermann
+    # (Pepto) measured them on the 6569.
+    LUMINANCES = [0, 32, 10, 20, 12, 16, 8, 24, 12, 8, 16, 10, 15, 24, 15, 20].freeze
+
+    # The sixteen colours on a green monochrome monitor, which shows only
+    # their luminance, as the PET 64's does.
+    GREEN_PALETTE = LUMINANCES.map do |luminance|
+      green = luminance * 255 / 32
+      ((green / 4) << 16) | (green << 8) | (green / 4)
+    end.freeze
+
     attr_reader :display, :width, :height, :vic_bank, :column,
                 :rasterline, :dirty_lines, :model, :region
 
+    # The RGB colours #display's palette indices stand for: PALETTE, or
+    # GREEN_PALETTE on a monochrome monitor.
+    attr_accessor :palette
+
+    # The line of #display the beam draws, which is the raster line unless
+    # the VIC-IIe's TEST bit has moved the raster counter on since the
+    # last vertical sync (#test_step!).
+    attr_reader :output_line
+
     # The parts a VICE snapshot reads and sets.
     attr_reader :registers, :display_state, :sequencer, :sprites, :character_buffer, :color_buffer,
                 :fetch_d011
@@ -71,6 +91,11 @@ module Badline
     HOOK_DISPLAY = 16
     HOOK_LAST = 32
 
+    # The vertical sync starts this many lines into the vertical blank,
+    # and lasts VSYNC_LINES.
+    VSYNC_DELAY = 3
+    VSYNC_LINES = 3
+
     # 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).
@@ -94,6 +119,7 @@ module Badline
       @iie = %i[mos8566 mos8564].include?(model)
       @core = model == :mos6569 ? :mos6569 : :mos8565
       @region = region
+      @palette = PALETTE
       @lightpen_extra = @core == :mos8565 ? 1 : 2
       @grey_dots = @core == :mos8565
       @delayed_fetch = @core == :mos8565
@@ -109,6 +135,7 @@ module Badline
       @height = region.lines_per_frame
       @last_column = @columns_per_line - 1
       @last_line = @height - 1
+      @vsync_line = region.vblank[0] + VSYNC_DELAY
       layout_columns
       @blank_columns = Array.new(@columns_per_line) { |column| Region.blanked?(column, region.hblank) }.freeze
       @blank_lines = Array.new(@height) { |line| Region.blanked?(line, region.vblank) }.freeze
@@ -137,6 +164,7 @@ module Badline
 
       @column = 0
       @rasterline = 0
+      @output_line = 0
 
       @character_buffer = Array.new(40, 0)
       @color_buffer = Array.new(40, 0)
@@ -153,11 +181,13 @@ module Badline
       @lp_triggered = false
       @lp_low = false
       @raster_match = false
+      @test_wrap = false
     end
 
     # Everything the VIC holds between cycles: the beam, the fetch and
     # g-access pipeline, the light pen and raster latches, the finished
-    # lines, the registers and the display, sequencer and sprite logic.
+    # lines, on the VIC-IIe the display line and the TEST bit's wrap, the
+    # registers and the display, sequencer and sprite logic.
     # Whether it renders is the host's, and every line comes back dirty so
     # a front end repaints.
     def save_state(out)
@@ -168,6 +198,7 @@ module Badline
       out.int(@vic_bank.lines)
       out.blob(@character_buffer).blob(@color_buffer).booleans(@sprite_ba)
       @lines.each { |line| out.blob(line) }
+      out.int(@output_line).boolean(@test_wrap) if @iie
       @registers.save_state(out)
       @display_state.save_state(out)
       @sequencer.save_state(out)
@@ -179,6 +210,7 @@ module Badline
       load_beam(input)
       load_buffers(input)
       load_lines(input)
+      load_test_state(input) if @iie
       @registers.load_state(input)
       @display_state.load_state(input)
       @sequencer.load_state(input)
@@ -202,6 +234,7 @@ module Badline
       if @column == @columns_per_line
         finish_line!
         @column = 0
+        step_output_line
         @rasterline = @rasterline == @last_line ? 0 : @rasterline + 1
         check_raster_irq!(@rasterline.zero? ? @last_line : @rasterline)
       end
@@ -239,6 +272,57 @@ module Badline
     def fast? = @registers.fast?
     def test? = @registers.test?
 
+    # $D030's FAST and TEST bits as bits 0 and 1, which the C128 reads once
+    # a cycle.
+    def clock_bits = @registers.clock_bits
+
+    # Whether the cycle just run was one of the five refresh cycles, Bauer's
+    # 11-15, whose phi1 half the VIC keeps in the VIC-IIe's FAST mode.
+    # @column has already advanced, so it is the Bauer cycle less one.
+    def refresh_cycle? = @column.between?(10, 14)
+
+    # In the VIC-IIe's FAST mode the 8502 drives the bus in both halves of
+    # the cycle, and the VIC's accesses in the cycle just run latched what
+    # it put there. The g-access, or the idle access, took the byte of
+    # phi1. A c-access took the byte of phi2 as one made before AEC does
+    # (#fetch_character_data!): $ff for the video matrix, unless the CPU
+    # was reading or writing the VIC's own registers, and the byte's low
+    # nibble for colour. AEC can't follow BA down while the CPU runs at
+    # 2 MHz, so on a bad line it falls three cycles after FAST mode ends.
+    def take_cpu_bus(phi1, phi2, register_access)
+      slot = @g_tick
+      @g_data[slot] = phi1 unless @g_kind[slot] == G_BLANK
+      display_state = @display_state
+      display_state.keep_bus(@column)
+      return unless display_state.fetching?(@column.zero? ? @last_column : @column - 1)
+
+      vmli = display_state.vmli
+      @character_buffer[vmli] = register_access ? phi2 : 0xff
+      @color_buffer[vmli] = phi2 & 0x0f
+    end
+
+    # The VIC-IIe's TEST bit clocks the raster counter in every cycle, and
+    # the C128 calls this ahead of each cycle the bit is set in. The line's
+    # last cycle, whose own step it falls in with, adds nothing more. The
+    # counter takes two steps from the frame's last line to line 0, as line
+    # 0 reads the last line for its first cycle.
+    def test_step!
+      return if @column == @last_column
+
+      if @rasterline == @last_line
+        @test_wrap = !@test_wrap
+        return if @test_wrap
+
+        @rasterline = 0
+        @display_state.new_frame
+      else
+        @test_wrap = false
+        @rasterline += 1
+      end
+      @display_state.raster_step(@rasterline)
+      check_raster_irq!
+    end
+
     def peek(addr)
       i = offset_of(addr) % (2**6)
       case i
@@ -347,7 +431,7 @@ module Badline
 
     # Puts the beam at the start of `line`.
     def restore_line(line)
-      @rasterline = line
+      @rasterline = @output_line = line
       @column = 0
     end
 
@@ -380,13 +464,11 @@ module Badline
       @dirty_lines.fill(false)
     end
 
-    def palette = PALETTE
-
     private
 
     def load_beam(input)
       @column = input.int
-      @rasterline = input.int
+      @rasterline = @output_line = input.int
       @cycles = input.int
       @pending_write = input.boolean?
       @g_tick = input.int
@@ -407,6 +489,13 @@ module Badline
       input.booleans_into(@sprite_ba)
     end
 
+    # The VIC-IIe's display line and TEST wrap, which only its TEST bit
+    # moves off the raster line.
+    def load_test_state(input)
+      @output_line = input.int
+      @test_wrap = input.boolean?
+    end
+
     # The display is the finished lines one after another.
     def load_lines(input)
       @lines.each_with_index do |line, number|
@@ -649,7 +738,7 @@ module Badline
     # or not there is a line to draw — then composite the active sprites
     # over the finished background and copy the line into the frame display.
     def finish_line!
-      return @sprites.finish_line(nil, @sequencer.fg) if vblank? || !@render
+      return finish_blank_line if vblank? || !@render
 
       composite = @sprites.active?
       @sequencer.apply_color_patches
@@ -658,12 +747,38 @@ module Badline
       @sequencer.apply_border if composite
 
       colors = @sequencer.colors
-      line = @lines[@rasterline]
+      output_line = @output_line
+      line = @lines[output_line]
       return if line == colors
 
       line[0, @width] = colors
-      @display[@rasterline * @width, @width] = colors
-      @dirty_lines[@rasterline] = true
+      @display[output_line * @width, @width] = colors
+      @dirty_lines[output_line] = true
+    end
+
+    # A blanked line paints nothing, and is never shown unless the TEST
+    # bit has moved the beam off the raster line, where it shows black.
+    def finish_blank_line
+      @sprites.finish_line(nil, @sequencer.fg)
+      return if @output_line == @rasterline || !@render
+
+      line = @output_line
+      @lines[line].fill(0)
+      @display.fill(0, line * @width, @width)
+      @dirty_lines[line] = true
+    end
+
+    # The display line the beam draws next follows the one before it, and
+    # a line that ends in the vertical sync puts it back on the raster
+    # line. Only the VIC-IIe's TEST bit moves the raster counter on between
+    # the two, so the lines it skips shift the picture up until the next
+    # sync.
+    def step_output_line
+      @output_line = if @rasterline.between?(@vsync_line, @vsync_line + VSYNC_LINES - 1)
+                       @rasterline + 1
+                     else
+                       @output_line == @last_line ? 0 : @output_line + 1
+                     end
     end
 
     def video_matrix(index)

data/lib/badline.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "badline/core"
+require "badline/c128"
 require "badline/options"
 require "badline/data_path"
 require "badline/snapshot"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.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/fittings.rb
 - lib/badline/address_bus/pla.rb
 - lib/badline/address_bus/roms.rb
 - lib/badline/address_bus/saved_state.rb
@@ -70,6 +71,23 @@ files:
 - lib/badline/audio/stereo.rb
 - lib/badline/audio/terminal.rb
 - lib/badline/audio/wav.rb
+- lib/badline/c128.rb
+- lib/badline/c128/banks.rb
+- lib/badline/c128/bus.rb
+- lib/badline/c128/bus_state.rb
+- lib/badline/c128/color_lines.rb
+- lib/badline/c128/cpu.rb
+- lib/badline/c128/keys.rb
+- lib/badline/c128/mmu.rb
+- lib/badline/c128/mmu_pages.rb
+- lib/badline/c128/model.rb
+- lib/badline/c128/modes.rb
+- lib/badline/c128/saved_state.rb
+- lib/badline/c128/vdc.rb
+- lib/badline/c128/vdc/memory.rb
+- lib/badline/c128/vdc/painter.rb
+- lib/badline/c128/vdc/raster.rb
+- lib/badline/c128/vdc/window.rb
 - lib/badline/cartridge.rb
 - lib/badline/cartridge/action_replay.rb
 - lib/badline/cartridge/atomic_power.rb
@@ -108,6 +126,7 @@ files:
 - lib/badline/color_memory.rb
 - lib/badline/computer.rb
 - lib/badline/computer/attachments.rb
+- lib/badline/computer/kernal_traps.rb
 - lib/badline/computer/saved_state.rb
 - lib/badline/control_ports.rb
 - lib/badline/core.rb
@@ -173,6 +192,7 @@ files:
 - lib/badline/frontend/player_window.rb
 - lib/badline/frontend/scope.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
@@ -228,6 +248,7 @@ files:
 - lib/badline/model.rb
 - lib/badline/options.rb
 - lib/badline/options/event.rb
+- lib/badline/options/family.rb
 - lib/badline/options/help.rb
 - lib/badline/options/option.rb
 - lib/badline/options/table.rb
@@ -247,11 +268,16 @@ files:
 - lib/badline/rom.rb
 - lib/badline/roms/README
 - lib/badline/roms/basic.rom
+- lib/badline/roms/c128/basic.rom
+- lib/badline/roms/c128/character.rom
+- lib/badline/roms/c128/kernal.rom
+- lib/badline/roms/c64gs.rom
 - lib/badline/roms/character.rom
 - lib/badline/roms/dos1541.rom
 - lib/badline/roms/eapi/LICENSE.md
 - lib/badline/roms/eapi/README
 - lib/badline/roms/eapi/eapi-am29f040-14
+- lib/badline/roms/kernal-pet64.rom
 - lib/badline/roms/kernal-sx64.rom
 - lib/badline/roms/kernal.rom
 - lib/badline/roms/vic20/basic.rom