rubyboy 1.4.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f272f80eda6bc8a180619d01183ddeecc4b8f288b1e182983bee8b4ddaec51c
-  data.tar.gz: c05b9f8e41193fb6c21c928e6bd4b2c4dc1de8d2f5264203cbe9d36be1fc9ede
+  metadata.gz: 22c8e1f0094ec086f0e7130e6c79623d0e9385c718f0724ca2773c101ff3b976
+  data.tar.gz: 49adde27b593ef7bf8bf3f874160922ed7994388960db71f5757b2cbf033735f
 SHA512:
-  metadata.gz: 5d33f763fc53d97c0cbc572ceb85f8f5eae609f1dde6fdade9da8a736461cb7e43ffa7131506a748cee86b046e6e2adc930a8d3877a1f15693d21c8f4b8b2e58
-  data.tar.gz: 55e3f162ba70d59c89ad1a2399c20011dc51af7fb22afeb121317ef94bee0c745492fa10c073dc545bb85d1b443af2c52295a93711ffc73124890f1b9cf69e3e
+  metadata.gz: 48abbc79e8dde1e691f3f76a2736ad909b29af549c3c3b6a99eedd16a5b832f8b84bfb810ed4115483e116f5acbd50e1b07ec333e61778dc82433293f36a8401
+  data.tar.gz: dcf874037cd1d133687e3a99c5aeb36d97cd8a8f356514bb97b40eec57184b3bed7bd003538925fce18875d13d8bd37e1f50ffdd646568b5fbc351925f710a5a

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## [Unreleased]
+## [1.5.1] - 2025-02-16
+
+- Optimize Cartridge::Mbc1 and Bus
+
+## [1.5.0] - 2025-02-09
+
+- Add EmulatorHeadless and use it for bench
+- Bump ruby.wasm version to 2.7.1
 
 ## [1.4.2] - 2025-01-11
 

data/docs/worker.js

@@ -1,4 +1,4 @@
-import { DefaultRubyVM } from 'https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.0/dist/browser/+esm';
+import { DefaultRubyVM } from 'https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.1/dist/browser/+esm';
 import { File } from 'https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.3.0/+esm';
 
 const DIRECTION_KEY_MASKS = {

data/exe/rubyboy-bench

@@ -40,4 +40,4 @@ else
   puts 'YJIT is not available in this environment.'
 end
 
-Rubyboy::Bench.new.bench(**options)
+Rubyboy::Bench.new.run(**options)

data/exe/rubyboy-wasm

@@ -3,7 +3,7 @@
 
 case ARGV[0]
 when 'build'
-  command = %w[build --ruby-version 3.3 -o ./docs/ruby-js.wasm]
+  command = %w[build --ruby-version 3.4 -o ./docs/ruby-js.wasm]
 when 'pack'
   command = %w[pack ./docs/ruby-js.wasm --dir ./lib::/lib -o ./docs/rubyboy.wasm]
 else

data/lib/bench.rb

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
-require 'stackprof'
-require_relative 'rubyboy'
+require_relative 'rubyboy/emulator_headless'
 
 module Rubyboy
   class Bench
-    def stackprof
-      StackProf.run(mode: :cpu, out: 'stackprof-cpu-myapp.dump', raw: true) do
-        Rubyboy::Emulator.new('lib/roms/tobu.gb').bench
-      end
-    end
-
-    def bench(count: 3, frames: 1500, rom_path: 'lib/roms/tobu.gb')
+    def run(count: 3, frames: 1500, rom_path: 'lib/roms/tobu.gb')
       time_sum = 0
+
       count.times do |i|
-        time = Rubyboy::Emulator.new(rom_path).bench(frames)
-        time_sum += time
+        emulator = Rubyboy::EmulatorHeadless.new(rom_path)
+        frame_count = 0
+        start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+        while frame_count < frames
+          emulator.step
+          frame_count += 1
+        end
+        time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond) - start_time
         puts "#{i + 1}: #{time / 1_000_000_000.0} sec"
+
+        time_sum += time
       end
 
       puts "FPS: #{frames * count * 1_000_000_000.0 / time_sum}"

data/lib/rubyboy/bus.rb

@@ -11,74 +11,93 @@ module Rubyboy
       @apu = apu
       @interrupt = interrupt
       @timer = timer
+    end
+
+    def read_byte(addr)
+      case addr >> 12
+      when 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0xa, 0xb
+        return @mbc.read_byte(addr)
+      when 0x8, 0x9
+        return @ppu.read_byte(addr)
+      when 0xc
+        return @ram.wram1[addr - 0xc000]
+      when 0xd
+        return @ram.wram2[addr - 0xd000]
+      when 0xf
+        case addr >> 8
+        when 0xfe
+          return @ppu.read_byte(addr) if addr <= 0xfe9f
+        when 0xff
+          last_byte = addr & 0xFF
 
-      @read_methods = Array.new(0x10000)
-      @write_methods = Array.new(0x10000)
+          case last_byte
+          when 0x00
+            return @joypad.read_byte(addr)
+          when 0x04, 0x05, 0x06, 0x07
+            return @timer.read_byte(addr)
+          when 0x0f
+            return @interrupt.read_byte(addr)
+          when 0x46
+            return @ppu.read_byte(addr)
+          when 0xff
+            return @interrupt.read_byte(addr)
+          end
 
-      set_methods
-    end
+          return @apu.read_byte(addr) if last_byte <= 0x26 && last_byte >= 0x10
 
-    def set_methods
-      0x10000.times do |addr|
-        case addr
-        when 0x0000..0x7fff
-          @read_methods[addr] = -> { @mbc.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @mbc.write_byte(addr, value) }
-        when 0x8000..0x9fff
-          @read_methods[addr] = -> { @ppu.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @ppu.write_byte(addr, value) }
-        when 0xa000..0xbfff
-          @read_methods[addr] = -> { @mbc.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @mbc.write_byte(addr, value) }
-        when 0xc000..0xcfff
-          @read_methods[addr] = -> { @ram.wram1[addr - 0xc000] }
-          @write_methods[addr] = ->(value) { @ram.wram1[addr - 0xc000] = value }
-        when 0xd000..0xdfff
-          @read_methods[addr] = -> { @ram.wram2[addr - 0xd000] }
-          @write_methods[addr] = ->(value) { @ram.wram2[addr - 0xd000] = value }
-        when 0xfe00..0xfe9f
-          @read_methods[addr] = -> { @ppu.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @ppu.write_byte(addr, value) }
-        when 0xff00
-          @read_methods[addr] = -> { @joypad.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @joypad.write_byte(addr, value) }
-        when 0xff04..0xff07
-          @read_methods[addr] = -> { @timer.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @timer.write_byte(addr, value) }
-        when 0xff0f
-          @read_methods[addr] = -> { @interrupt.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @interrupt.write_byte(addr, value) }
-        when 0xff10..0xff26
-          @read_methods[addr] = -> { @apu.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @apu.write_byte(addr, value) }
-        when 0xff30..0xff3f
-          @read_methods[addr] = -> { @apu.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @apu.write_byte(addr, value) }
-        when 0xff46
-          @read_methods[addr] = -> { @ppu.read_byte(addr) }
-          @write_methods[addr] = ->(value) { 0xa0.times { |i| write_byte(0xfe00 + i, read_byte((value << 8) + i)) } }
-        when 0xff40..0xff4b
-          @read_methods[addr] = -> { @ppu.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @ppu.write_byte(addr, value) }
-        when 0xff80..0xfffe
-          @read_methods[addr] = -> { @ram.hram[addr - 0xff80] }
-          @write_methods[addr] = ->(value) { @ram.hram[addr - 0xff80] = value }
-        when 0xffff
-          @read_methods[addr] = -> { @interrupt.read_byte(addr) }
-          @write_methods[addr] = ->(value) { @interrupt.write_byte(addr, value) }
-        else
-          @read_methods[addr] = -> { 0xff }
-          @write_methods[addr] = ->(_value) {}
+          return @apu.read_byte(addr) if last_byte <= 0x3f && last_byte >= 0x30
+
+          return @ppu.read_byte(addr) if last_byte <= 0x4b && last_byte >= 0x40
+
+          return @ram.hram[addr - 0xff80] if last_byte <= 0xfe && last_byte >= 0x80
         end
       end
-    end
 
-    def read_byte(addr)
-      @read_methods[addr].call
+      0xff
     end
 
     def write_byte(addr, value)
-      @write_methods[addr].call(value)
+      case addr >> 12
+      when 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0xa, 0xb
+        return @mbc.write_byte(addr, value)
+      when 0x8, 0x9
+        return @ppu.write_byte(addr, value)
+      when 0xc
+        return @ram.wram1[addr - 0xc000] = value
+      when 0xd
+        return @ram.wram2[addr - 0xd000] = value
+      when 0xf
+        case addr >> 8
+        when 0xfe
+          return @ppu.write_byte(addr, value) if addr <= 0xfe9f
+        when 0xff
+          last_byte = addr & 0xFF
+
+          case last_byte
+          when 0x00
+            return @joypad.write_byte(addr, value)
+          when 0x04, 0x05, 0x06, 0x07
+            return @timer.write_byte(addr, value)
+          when 0x0f
+            return @interrupt.write_byte(addr, value)
+          when 0x46
+            0xa0.times { |i| write_byte(0xfe00 + i, read_byte((value << 8) + i)) }
+            return
+          when 0xff
+            return @interrupt.write_byte(addr, value)
+          end
+
+          return @apu.write_byte(addr, value) if last_byte <= 0x26 && last_byte >= 0x10
+
+          return @apu.write_byte(addr, value) if last_byte <= 0x3f && last_byte >= 0x30
+
+          return @ppu.write_byte(addr, value) if last_byte <= 0x4b && last_byte >= 0x40
+
+          return @ram.hram[addr - 0xff80] = value if last_byte <= 0xfe && last_byte >= 0x80
+        end
+      end
+
+      nil
     end
 
     def read_word(addr)

data/lib/rubyboy/cartridge/mbc1.rb

@@ -10,65 +10,47 @@ module Rubyboy
         @ram_bank = 0
         @ram_enable = false
         @ram_banking_mode = false
-
-        @read_methods = Array.new(0xc000)
-        @write_methods = Array.new(0xc000)
-
-        set_methods
       end
 
-      def set_methods
-        0xc000.times do |addr|
-          @read_methods[addr] =
-            case addr
-            when 0x0000..0x3fff then -> { @rom.data[addr] }
-            when 0x4000..0x7fff then -> { @rom.data[addr + (@rom_bank - 1) * 0x4000] }
-            when 0xa000..0xbfff
-              lambda do
-                if @ram_enable
-                  if @ram_banking_mode
-                    @ram.eram[addr - 0xa000 + @ram_bank * 0x800]
-                  else
-                    @ram.eram[addr - 0xa000]
-                  end
-                else
-                  0xff
-                end
-              end
-            end
-        end
-
-        0xc000.times do |addr|
-          @write_methods[addr] =
-            case addr
-            when 0x0000..0x1fff then ->(value) { @ram_enable = value & 0x0f == 0x0a }
-            when 0x2000..0x3fff
-              lambda do |value|
-                @rom_bank = value & 0x1f
-                @rom_bank = 1 if @rom_bank == 0
-              end
-            when 0x4000..0x5fff then ->(value) { @ram_bank = value & 0x03 }
-            when 0x6000..0x7fff then ->(value) { @ram_banking_mode = value & 0x01 == 0x01 }
-            when 0xa000..0xbfff
-              lambda do |value|
-                if @ram_enable
-                  if @ram_banking_mode
-                    @ram.eram[addr - 0xa000 + @ram_bank * 0x800] = value
-                  else
-                    @ram.eram[addr - 0xa000] = value
-                  end
-                end
-              end
+      def read_byte(addr)
+        case (addr >> 12)
+        when 0x0, 0x1, 0x2, 0x3
+          @rom.data[addr]
+        when 0x4, 0x5, 0x6, 0x7
+          @rom.data[addr + ((@rom_bank - 1) << 14)]
+        when 0xa, 0xb
+          if @ram_enable
+            if @ram_banking_mode
+              @ram.eram[addr - 0xa000 + (@ram_bank << 11)]
+            else
+              @ram.eram[addr - 0xa000]
             end
+          else
+            0xff
+          end
         end
       end
 
-      def read_byte(addr)
-        @read_methods[addr].call
-      end
-
       def write_byte(addr, value)
-        @write_methods[addr].call(value)
+        case addr >> 12
+        when 0x0, 0x1
+          @ram_enable = value & 0x0f == 0x0a
+        when 0x2, 0x3
+          @rom_bank = value & 0x1f
+          @rom_bank = 1 if @rom_bank == 0
+        when 0x4, 0x5
+          @ram_bank = value & 0x03
+        when 0x6, 0x7
+          @ram_banking_mode = value & 0x01 == 0x01
+        when 0xa, 0xb
+          if @ram_enable
+            if @ram_banking_mode
+              @ram.eram[addr - 0xa000 + (@ram_bank << 11)] = value
+            else
+              @ram.eram[addr - 0xa000] = value
+            end
+          end
+        end
       end
     end
   end

data/lib/rubyboy/emulator_headless.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative 'apu'
+require_relative 'bus'
+require_relative 'cpu'
+require_relative 'ppu'
+require_relative 'rom'
+require_relative 'ram'
+require_relative 'timer'
+require_relative 'joypad'
+require_relative 'interrupt'
+require_relative 'cartridge/factory'
+
+module Rubyboy
+  class EmulatorHeadless
+    def initialize(rom_path)
+      rom_data = File.open(rom_path, 'r') { _1.read.bytes }
+      rom = Rom.new(rom_data)
+      ram = Ram.new
+      mbc = Cartridge::Factory.create(rom, ram)
+      interrupt = Interrupt.new
+      @ppu = Ppu.new(interrupt)
+      @timer = Timer.new(interrupt)
+      joypad = Joypad.new(interrupt)
+      @apu = Apu.new
+      bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, joypad, @apu)
+      @cpu = Cpu.new(bus, interrupt)
+    end
+
+    def step
+      loop do
+        cycles = @cpu.exec
+        @timer.step(cycles)
+        @apu.step(cycles)
+        break if @ppu.step(cycles)
+      end
+    end
+  end
+end

data/lib/rubyboy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubyboy
-  VERSION = '1.4.2'
+  VERSION = '1.5.1'
 end

data/lib/stackprof.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'stackprof'
+require_relative 'rubyboy/emulator'
+
+module Rubyboy
+  class Stackprof
+    def run
+      StackProf.run(mode: :cpu, out: 'stackprof-cpu-myapp.dump', raw: true) do
+        Rubyboy::Emulator.new('lib/roms/tobu.gb').bench
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.1
 platform: ruby
 authors:
 - sacckey
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -30,8 +29,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.3
-description:
-email:
 executables:
 - rubyboy
 - rubyboy-bench
@@ -91,6 +88,7 @@ files:
 - lib/rubyboy/cartridge/nombc.rb
 - lib/rubyboy/cpu.rb
 - lib/rubyboy/emulator.rb
+- lib/rubyboy/emulator_headless.rb
 - lib/rubyboy/emulator_wasm.rb
 - lib/rubyboy/interrupt.rb
 - lib/rubyboy/joypad.rb
@@ -105,6 +103,7 @@ files:
 - lib/rubyboy/sdl.rb
 - lib/rubyboy/timer.rb
 - lib/rubyboy/version.rb
+- lib/stackprof.rb
 - resource/logo/logo.png
 - resource/logo/logo.svg
 - resource/logo/rubyboy.png
@@ -120,7 +119,6 @@ metadata:
   source_code_uri: https://github.com/sacckey/rubyboy
   changelog_uri: https://github.com/sacckey/rubyboy/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Game Boy emulator written in Ruby
 test_files: []