badline 0.3.0 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: badline
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Inge Jørgensen
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: ruby-sdl2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 description: Badline is a Commodore 64 emulator written in Ruby, implementing cycle-accurate
   timing and hardware behavior. Supports PRG/P00 programs, D64/D71/D81 disk images,
   T64 archives, TAP tapes, CRT cartridges, SID tunes and host directories mounted
@@ -44,20 +30,21 @@ description: Badline is a Commodore 64 emulator written in Ruby, implementing cy
 email:
 - inge@elektronaut.no
 executables:
-- badline
-- badline-sid
+- badline-ruby
 extensions: []
 extra_rdoc_files: []
 files:
+- ".claude/hooks/session-start.sh"
+- ".claude/settings.json"
 - CHANGELOG.md
 - CLAUDE.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - MIT-LICENSE
 - README.md
+- SECURITY.md
 - doc/pinned-behaviour.md
-- exe/badline
-- exe/badline-sid
+- exe/badline-ruby
 - lib/badline.rb
 - lib/badline/address_bus.rb
 - lib/badline/addressable.rb
@@ -68,12 +55,12 @@ files:
 - lib/badline/audio/console.rb
 - lib/badline/audio/jukebox.rb
 - lib/badline/audio/machine_player.rb
-- lib/badline/audio/options.rb
 - lib/badline/audio/pcm_writer.rb
 - lib/badline/audio/playback.rb
 - lib/badline/audio/renderer.rb
 - lib/badline/audio/sdl_sink.rb
 - lib/badline/audio/stream.rb
+- lib/badline/audio/terminal.rb
 - lib/badline/audio/wav.rb
 - lib/badline/cartridge.rb
 - lib/badline/cartridge/action_replay.rb
@@ -89,6 +76,7 @@ files:
 - lib/badline/cartridge/fun_play.rb
 - lib/badline/cartridge/g_mod2.rb
 - lib/badline/cartridge/game_system.rb
+- lib/badline/cartridge/geo_ram.rb
 - lib/badline/cartridge/kcs_power.rb
 - lib/badline/cartridge/mach5.rb
 - lib/badline/cartridge/magic_desk.rb
@@ -152,6 +140,8 @@ files:
 - 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/drive/write_file.rb
+- lib/badline/kernal_trap/drive/writes.rb
 - lib/badline/kernal_trap/file.rb
 - lib/badline/kernal_trap/load.rb
 - lib/badline/kernal_trap/routine.rb
@@ -161,6 +151,13 @@ files:
 - lib/badline/keyboard_buffer.rb
 - lib/badline/media.rb
 - lib/badline/memory.rb
+- lib/badline/options.rb
+- lib/badline/ram_expansion.rb
+- lib/badline/ram_expansion/banking.rb
+- lib/badline/ram_expansion/plus256k.rb
+- lib/badline/ram_expansion/plus60k.rb
+- lib/badline/ram_expansion/unexpanded.rb
+- lib/badline/region.rb
 - lib/badline/rom.rb
 - lib/badline/roms/README
 - lib/badline/roms/basic.rom
@@ -169,6 +166,9 @@ files:
 - lib/badline/roms/eapi/README
 - lib/badline/roms/eapi/eapi-am29f040-14
 - lib/badline/roms/kernal.rom
+- lib/badline/sdl.rb
+- lib/badline/sdl/events.rb
+- lib/badline/sdl/functions.rb
 - lib/badline/sid.rb
 - lib/badline/sid/catch_up.rb
 - lib/badline/sid/decimator.rb
@@ -186,6 +186,9 @@ files:
 - lib/badline/storage/d71_image.rb
 - lib/badline/storage/d81_image.rb
 - lib/badline/storage/disk_image.rb
+- lib/badline/storage/disk_image/bam.rb
+- lib/badline/storage/disk_image/directory.rb
+- lib/badline/storage/disk_image/writing.rb
 - lib/badline/storage/host_directory.rb
 - lib/badline/storage/p00.rb
 - lib/badline/storage/sid_file.rb
@@ -195,6 +198,12 @@ files:
 - lib/badline/time_of_day.rb
 - lib/badline/traps.rb
 - lib/badline/version.rb
+- lib/badline/via.rb
+- lib/badline/via/control_lines.rb
+- lib/badline/via/interrupt_register.rb
+- lib/badline/via/shift_register.rb
+- lib/badline/via/timer1.rb
+- lib/badline/via/timer2.rb
 - lib/badline/vic.rb
 - lib/badline/vic/bank.rb
 - lib/badline/vic/border_mask.rb
@@ -211,6 +220,7 @@ files:
 - lib/badline/vic/sprite/internal_bus.rb
 - lib/badline/vic/sprite/shifter.rb
 - lib/badline/vic/sprites.rb
+- packaging/homebrew/badline.rb
 - vendor/.gitkeep
 homepage: https://github.com/elektronaut/badline
 licenses:

data/exe/badline

@@ -1,78 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-lib = File.expand_path("../lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "optparse"
-
-options = { autostart: true, jit: true, sound: false }
-
-parser = OptionParser.new do |opts|
-  opts.banner = <<~BANNER
-    Usage: badline [options] [media]
-
-    Media can be a .prg/.p00 program, a .d64/.d71/.d81 disk image,
-    a .t64 tape archive, a .tap tape, a .crt cartridge, a .sid tune, or
-    a directory to mount as device 8.
-
-    Options:
-  BANNER
-
-  opts.on("--no-autostart", "Boot to READY. instead of running the program") do
-    options[:autostart] = false
-  end
-
-  opts.on("--song N", Integer, "Subtune of a .sid to play (default: the tune's own)") do |n|
-    options[:song] = n
-  end
-
-  opts.on("--sid MODEL", { "6581" => :mos6581, "8580" => :mos8580 },
-          "SID to fit: 6581 or 8580 (default: a .sid tune's own, else 6581)") do |model|
-    options[:sid_model] = model
-  end
-
-  opts.on("--sound", "Play the SID through the host's audio device (F10 mutes)") { options[:sound] = true }
-
-  opts.on("--disable-jit", "Run without enabling YJIT") do
-    options[:jit] = false
-  end
-
-  opts.on("-h", "--help", "Show this help") do
-    puts opts
-    exit
-  end
-end
-
-begin
-  parser.parse!
-rescue OptionParser::ParseError => e
-  warn "badline: #{e.message}"
-  warn "Try 'badline --help' for more information."
-  exit 1
-end
-
-media_path = ARGV[0]
-if media_path && !File.exist?(media_path)
-  warn "badline: no such file or directory: #{media_path}"
-  exit 1
-end
-
-jit_available = defined?(RubyVM::YJIT) && !RubyVM::YJIT.enabled?
-RubyVM::YJIT.enable if options[:jit] && jit_available
-
-require "badline"
-require "badline/gui"
-
-begin
-  application = Badline::GUI::Application.new(media_path:, autostart: options[:autostart],
-                                              song: options[:song], sid_model: options[:sid_model],
-                                              sound: options[:sound])
-rescue Badline::Storage::SIDFile::FormatError, Badline::Storage::T64::FormatError,
-       Badline::Storage::TAP::FormatError, Badline::Storage::CRTFile::FormatError,
-       Badline::Cartridge::UnsupportedTypeError => e
-  warn "badline: #{media_path}: #{e.message}"
-  exit 1
-end
-
-application.run

data/exe/badline-sid

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-lib = File.expand_path("../lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "badline/audio/options"
-
-begin
-  options = Badline::Audio::Options.parse(ARGV)
-rescue Badline::Audio::Options::Error => e
-  warn "badline-sid: #{e.message}"
-  warn "Try 'badline-sid --help' for more information."
-  exit 1
-end
-
-if options.help?
-  puts options.help
-  exit
-end
-
-jit_available = defined?(RubyVM::YJIT) && !RubyVM::YJIT.enabled?
-RubyVM::YJIT.enable if options.jit? && jit_available
-
-require "badline"
-
-begin
-  Badline::Audio::CLI.new(options).run
-rescue Badline::Audio::CLI::Error => e
-  warn "badline-sid: #{e.message}"
-  exit 1
-rescue Interrupt
-  exit 130
-end

data/lib/badline/audio/options.rb

@@ -1,137 +0,0 @@
-# frozen_string_literal: true
-
-require "optparse"
-
-module Badline
-  module Audio
-    # The command line of `badline-sid`. It loads nothing else from badline,
-    # so the executable can parse and reject its arguments before paying for
-    # the emulator.
-    class Options
-      class Error < StandardError; end
-
-      FALLBACK_SECONDS = 60.0
-
-      DEFAULT_RATE = 44_100
-
-      SID_MODELS = { "6581" => :mos6581, "8580" => :mos8580 }.freeze
-
-      BANNER = <<~BANNER.freeze
-        Usage: badline-sid [options] tune.sid [-o output]
-
-        Plays a .sid tune on the host's audio device, or with an output file
-        renders it to 16-bit PCM instead. The container follows the output
-        file's extension, .wav or .aiff.
-
-        A .sid file carries no length of its own. Without --seconds the tune is
-        looked up by MD5 in HVSC's Songlengths.md5, taken from --songlengths, from
-        the DOCUMENTS directory of an HVSC collection above the tune, or from
-        $HVSC_BASE. Failing all of those it runs for #{FALLBACK_SECONDS.to_i} seconds.
-
-        Played on a terminal, n or → skips to the next song, p or ← to the
-        previous one, space pauses and q quits.
-
-        PSID tunes run on a bare CPU and SID, faster than real time. RSID
-        tunes boot the whole machine and run at about half real time, so
-        they stutter when played. --filter-chunk 1 runs the filter cycle by
-        cycle, which is exact but takes about twice as long.
-
-        Options:
-      BANNER
-
-      attr_reader :tune_path, :output, :song, :seconds, :songlengths, :sid_model, :filter_chunk
-
-      def self.parse(argv) = new.parse(argv)
-
-      def initialize
-        @jit = true
-        @quiet = false
-        @tui = true
-        @help = false
-      end
-
-      def parse(argv)
-        arguments = parser.parse(argv)
-        @tune_path, positional_output, *extra = arguments
-        raise Error, "unexpected argument: #{extra.first}" if extra.any?
-
-        @output ||= positional_output
-        validate unless help?
-        self
-      rescue OptionParser::ParseError => e
-        raise Error, e.message
-      end
-
-      def render? = !output.nil?
-
-      def rate = @rate || DEFAULT_RATE
-
-      def rate_given? = !@rate.nil?
-
-      def help = parser.help
-
-      def help? = @help
-
-      def quiet? = @quiet
-
-      def tui? = @tui
-
-      def jit? = @jit
-
-      private
-
-      def validate
-        raise Error, "no tune given" unless tune_path
-
-        validate_numbers
-        validate_paths
-      end
-
-      def validate_numbers
-        raise Error, "invalid argument: --song #{song}" if song&.< 1
-        raise Error, "invalid argument: --seconds #{seconds}" unless seconds.nil? || seconds.positive?
-        raise Error, "invalid argument: --rate #{rate}" unless rate.positive?
-        raise Error, "invalid argument: --filter-chunk #{filter_chunk}" if filter_chunk&.< 1
-      end
-
-      def validate_paths
-        [tune_path, songlengths].compact.each do |path|
-          raise Error, "no such file: #{path}" unless File.exist?(path)
-        end
-      end
-
-      def parser
-        @parser ||= OptionParser.new do |opts|
-          opts.banner = BANNER
-          define_tune_options(opts)
-          define_output_options(opts)
-          define_run_options(opts)
-        end
-      end
-
-      def define_tune_options(opts)
-        opts.on("-s", "--song N", Integer, "Subtune to play, from 1 (default: the tune's own)") { |n| @song = n }
-        opts.on("--seconds N", Float, "Length to play (default: the tune's own)") { |n| @seconds = n }
-        opts.on("--songlengths PATH", "HVSC Songlengths.md5 to take the length from") { |path| @songlengths = path }
-        opts.on("--sid MODEL", SID_MODELS,
-                "SID to play on: 6581 or 8580 (default: the tune's own, else 6581)") { |model| @sid_model = model }
-      end
-
-      def define_output_options(opts)
-        opts.on("-o", "--output PATH", "Render to a .wav or .aiff file instead of playing") { |path| @output = path }
-        opts.on("--rate HZ", Integer,
-                "Sample rate (default: #{DEFAULT_RATE}, or the audio device's own)") { |n| @rate = n }
-        opts.on("--filter-chunk N", Integer, "Filter step in cycles, 1 is exact (default: 4)") do |n|
-          @filter_chunk = n
-        end
-      end
-
-      def define_run_options(opts)
-        opts.on("--quiet", "Don't report progress") { @quiet = true }
-        opts.on("--no-tui", "Play without the interactive display, even on a terminal") { @tui = false }
-        opts.on("--disable-jit", "Run without enabling YJIT") { @jit = false }
-        opts.on("-h", "--help", "Show this help") { @help = true }
-      end
-    end
-  end
-end