rubyboy 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f272f80eda6bc8a180619d01183ddeecc4b8f288b1e182983bee8b4ddaec51c
-  data.tar.gz: c05b9f8e41193fb6c21c928e6bd4b2c4dc1de8d2f5264203cbe9d36be1fc9ede
+  metadata.gz: f906ad2a5676ad89d614d3898dee887cf2b1b0a76c2b5ae906a7f234e806e779
+  data.tar.gz: d5c133d3ba340a570febc3bd4e4d67245e14a5fef408af6d0aba711a7738c503
 SHA512:
-  metadata.gz: 5d33f763fc53d97c0cbc572ceb85f8f5eae609f1dde6fdade9da8a736461cb7e43ffa7131506a748cee86b046e6e2adc930a8d3877a1f15693d21c8f4b8b2e58
-  data.tar.gz: 55e3f162ba70d59c89ad1a2399c20011dc51af7fb22afeb121317ef94bee0c745492fa10c073dc545bb85d1b443af2c52295a93711ffc73124890f1b9cf69e3e
+  metadata.gz: 66db379a951b75f717339c4030e201dbfcf79d85fec15deb2a4c0d03e6513262122411eb4149b00533eae5f18c5ed44ab23d57b0ffb2ed2c7b64076c06f1fb77
+  data.tar.gz: 648a015c3aeceab1b53b1ae3d20023c573c24a0fd91f3fde2c9da66ad0dd8caddfa6a2013374f96f7ab8dd7b70d510c32437cdd48cc46327f431f8ed06b00440

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## [Unreleased]
+## [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/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.0'
 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.0
 platform: ruby
 authors:
 - sacckey
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-11 00:00:00.000000000 Z
+date: 2025-02-09 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: []