rubyboy 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f029df58812310dc308546c77d25e75496e0e7b0aff605a5d0826deba85d9014
-  data.tar.gz: c2fffa4e8f4535ae4fad4bdf3c5742f569443fffc925ee02fa06f6b268f5e2c4
+  metadata.gz: f906ad2a5676ad89d614d3898dee887cf2b1b0a76c2b5ae906a7f234e806e779
+  data.tar.gz: d5c133d3ba340a570febc3bd4e4d67245e14a5fef408af6d0aba711a7738c503
 SHA512:
-  metadata.gz: c7f5d75b7ae8ec29488242943aca521b013875c896c8b368622f02408f52803b01e94b548b720fb4bad1ffca30d4223cfbf15ab2e8bd04b89799dc2a41bcf164
-  data.tar.gz: b21b63a6c19263c3a72aa9b592505358dc55f450b0fd9fd3c8fb8b907d2057c07b2dae41dc9c0fa1be2fcd4e77010d4dcaf8ca7eafab908f27f7b5d903596a69
+  metadata.gz: 66db379a951b75f717339c4030e201dbfcf79d85fec15deb2a4c0d03e6513262122411eb4149b00533eae5f18c5ed44ab23d57b0ffb2ed2c7b64076c06f1fb77
+  data.tar.gz: 648a015c3aeceab1b53b1ae3d20023c573c24a0fd91f3fde2c9da66ad0dd8caddfa6a2013374f96f7ab8dd7b70d510c32437cdd48cc46327f431f8ed06b00440

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## [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
+
+- Use DefaultRubyVM
+- Bump ruby.wasm version to 2.7.0
 
 ## [1.4.1] - 2024-12-25
 

data/docs/worker.js

@@ -1,5 +1,5 @@
-import { RubyVM } from 'https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.2/+esm';
-import { Directory, File, OpenDirectory, OpenFile, PreopenDirectory, WASI } from 'https://cdn.jsdelivr.net/npm/@bjorn3/browser_wasi_shim@0.3.0/+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 = {
   'KeyD': 0b0001, // Right
@@ -19,20 +19,6 @@ class Rubyboy {
   constructor() {
     this.wasmUrl = 'https://proxy.sacckey.dev/rubyboy.wasm';
 
-    const rootContents = new Map();
-    rootContents.set('RUBYBOY_TMP', new Directory(new Map()));
-    this.rootFs = rootContents;
-
-    const args = ['ruby.wasm', '-e_=0'];
-    this.wasi = new WASI(args, [], [
-      new OpenFile(new File([])), // stdin
-      new OpenFile(new File([])), // stdout
-      new OpenFile(new File([])), // stderr
-      new PreopenDirectory('/', rootContents)
-    ], {
-      debug: false
-    });
-
     this.directionKey = 0b1111;
     this.actionKey = 0b1111;
   }
@@ -43,18 +29,8 @@ class Rubyboy {
       response = await fetch(this.wasmUrl);
     }
 
-    const buffer = await response.arrayBuffer();
-    const imports = {
-      wasi_snapshot_preview1: this.wasi.wasiImport,
-    };
-    const vm = new RubyVM();
-    vm.addToImports(imports);
-
-    const { instance } = await WebAssembly.instantiate(buffer, imports);
-    await vm.setInstance(instance);
-    this.wasi.initialize(instance);
-    vm.initialize();
-
+    const module = await WebAssembly.compileStreaming(response)
+    const { vm, wasi } = await DefaultRubyVM(module);
     vm.eval(`
       require 'js'
       require_relative 'lib/executor'
@@ -63,15 +39,13 @@ class Rubyboy {
     `);
 
     this.vm = vm;
+    this.rootDir = wasi.fds[3].dir
   }
 
   sendPixelData() {
     this.vm.eval(`$executor.exec(${this.directionKey}, ${this.actionKey})`);
 
-    const tmpDir = this.rootFs.get('RUBYBOY_TMP');
-    const op = new OpenDirectory(tmpDir);
-    const result = op.path_lookup('video.data', 0);
-    const file = result.inode_obj;
+    const file = this.rootDir.contents.get('video.data');
     const bytes = file.data;
 
     postMessage({ type: 'pixelData', data: bytes.buffer }, [bytes.buffer]);
@@ -127,8 +101,7 @@ self.addEventListener('message', async (event) => {
 
   if (event.data.type === 'loadROM') {
     const romFile = new File(new Uint8Array(event.data.data));
-    const tmpDir = rubyboy.rootFs.get('RUBYBOY_TMP');
-    tmpDir.contents.set('rom.data', romFile);
+    rubyboy.rootDir.contents.set('rom.data', romFile);
     rubyboy.vm.eval(`
       $executor.read_rom_from_virtual_fs
     `);

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/executor.rb

@@ -15,11 +15,11 @@ class Executor
 
   def exec(direction_key = 0b1111, action_key = 0b1111)
     bin = @emulator.step(direction_key, action_key).pack('V*')
-    File.binwrite(File.join('/RUBYBOY_TMP', 'video.data'), bin)
+    File.binwrite('/video.data', bin)
   end
 
   def read_rom_from_virtual_fs
-    rom_path = '/RUBYBOY_TMP/rom.data'
+    rom_path = '/rom.data'
     raise "ROM file not found in virtual filesystem at #{rom_path}" unless File.exist?(rom_path)
 
     rom_data = File.open(rom_path, 'rb') { |file| file.read.bytes }

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.1'
+  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.1
+  version: 1.5.0
 platform: ruby
 authors:
 - sacckey
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-25 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: []