rubyboy 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f641e78dedf235a5ac8bab34c18fbd624150e5e6c9df92a710d2bc458fab3d62
-  data.tar.gz: 7ab941409fcbec7b0eff98241231e002c249f84be16a19c28216e33f91ac14d2
+  metadata.gz: d1065bd051087c47a5b6a73fdde2887b92a4eaceef15b73fb1ed0f0fc5d6ad2f
+  data.tar.gz: 0e3f57c3c7258170c58c7ce855fa51352c989e1b07fbe3755d1c1bdf6134715d
 SHA512:
-  metadata.gz: f220a9aeff3fa642f334c0248c4f155cf648c53a4bb132801e86a8008039f50d3cb9d3519af07b47e44f5aa2032419ba370e8ddcbb41ffebcb7937e8ed397b92
-  data.tar.gz: 63065e706e48de9fc26dcd9f7bb75332876374769db0914c54843c3f60aa1dd53a950fe0f33755539331e8f02b5b71cc0d4cf0bdca31421911d23911454a8108
+  metadata.gz: 64e5b3e5fa9a54dee5f153a264816e9e1d307d7c95b349d9d92e717cb4f6725307e0d992c3294e4c9c06bee9f22c5ca04cc3257e756e453df432e8b02f244655
+  data.tar.gz: 9b1ace44a5900036efabd776686cbf41bb68d8696176922fcbae445a0b2db84469f4383aae9299ddb3df12cbe70f89f703c6828c647a20b52628a0fdfd328a83

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [1.3.1] - 2024-03-17
+
+- Enable YJIT when initialize
+- Down volume
+- Update README.md
+- Clear queued audio if buffer is full
+- Add CPU clock and cycle timing
+
 ## [1.3.0] - 2024-03-09
 
 - Add ffi to dependencies

data/README.md

@@ -6,17 +6,23 @@
 
 A Game Boy emulator written in Ruby
 
+## Requirements
+[SDL2](https://wiki.libsdl.org/SDL2/Installation)
+
 ## Installation
 
 This project requires Ruby 3.2.0 or higher.
 
+> [!TIP]
+> To enhance performance, it is highly recommended to use Ruby 3.3.x with YJIT.
+
 Install the gem and add to the application's Gemfile by executing:
 
     $ bundle add rubyboy
 
 If bundler is not being used to manage dependencies, install the gem by executing:
 
-    $ gem install rubyboy
+    $ gem install ffi rubyboy
 
 ## Usage
 

data/exe/rubyboy

@@ -6,9 +6,6 @@ require 'bench'
 
 arg = ARGV[0]
 
-puts "Ruby: #{RUBY_VERSION}"
-puts "YJIT: #{RubyVM::YJIT.enabled?}"
-
 if arg == 'bench'
   Rubyboy::Bench.new.bench
 elsif arg == 'stackprof'

data/lib/rubyboy/apu.rb

@@ -32,8 +32,8 @@ module Rubyboy
       @channel3.step(cycles)
       @channel4.step(cycles)
 
-      if @cycles >= 0x1fff
-        @cycles -= 0x1fff
+      if @cycles >= 0x2000
+        @cycles -= 0x2000
 
         @channel1.step_fs(@fs)
         @channel2.step_fs(@fs)
@@ -62,8 +62,8 @@ module Rubyboy
 
         raise "#{@nr51} #{@channel4.dac_output}, #{@channel3.dac_output}, #{@channel2.dac_output},#{@channel1.dac_output}" if left_sample.abs > 1.0 || right_sample.abs > 1.0
 
-        @samples[@sample_idx * 2] = (@nr50[4..6] / 7.0) * left_sample
-        @samples[@sample_idx * 2 + 1] = (@nr50[0..2] / 7.0) * right_sample
+        @samples[@sample_idx * 2] = (@nr50[4..6] / 7.0) * left_sample / 8.0
+        @samples[@sample_idx * 2 + 1] = (@nr50[0..2] / 7.0) * right_sample / 8.0
         @sample_idx += 1
       end
 

data/lib/rubyboy/audio.rb

@@ -22,7 +22,9 @@ module Rubyboy
     end
 
     def queue(buffer)
-      sleep(0.001) while SDL.GetQueuedAudioSize(@device) > 8192
+      # sleep(0.001) while SDL.GetQueuedAudioSize(@device) > 8192
+
+      SDL.ClearQueuedAudio(@device) if SDL.GetQueuedAudioSize(@device) > 8192
 
       buf_ptr = FFI::MemoryPointer.new(:float, buffer.size)
       buf_ptr.put_array_of_float(0, buffer)

data/lib/rubyboy/sdl.rb

@@ -53,6 +53,7 @@ module Rubyboy
     attach_function :PauseAudioDevice, 'SDL_PauseAudioDevice', %i[uint32 int], :void
     attach_function :GetQueuedAudioSize, 'SDL_GetQueuedAudioSize', [:uint32], :uint32
     attach_function :QueueAudio, 'SDL_QueueAudio', %i[uint32 pointer uint32], :int
+    attach_function :ClearQueuedAudio, 'SDL_ClearQueuedAudio', [:uint32], :void
 
     class AudioSpec < FFI::Struct
       layout(

data/lib/rubyboy/version.rb

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

data/lib/rubyboy.rb

@@ -15,6 +15,9 @@ require_relative 'rubyboy/cartridge/factory'
 
 module Rubyboy
   class Console
+    CPU_CLOCK_HZ = 4_194_304
+    CYCLE_NANOSEC = 1_000_000_000 / CPU_CLOCK_HZ
+
     def initialize(rom_path)
       rom_data = File.open(rom_path, 'r') { _1.read.bytes }
       rom = Rom.new(rom_data)
@@ -28,23 +31,38 @@ module Rubyboy
       @bus = Bus.new(@ppu, rom, ram, mbc, @timer, interrupt, @joypad, @apu)
       @cpu = Cpu.new(@bus, interrupt)
       @lcd = Lcd.new
+
+      RubyVM::YJIT.enable
+
+      puts "Ruby: #{RUBY_VERSION}"
+      puts "YJIT: #{RubyVM::YJIT.enabled?}"
     end
 
     def start
       SDL.InitSubSystem(SDL::INIT_KEYBOARD)
-      loop do
-        cycles = @cpu.exec
-        @timer.step(cycles)
-        @apu.step(cycles)
-        next unless @ppu.step(cycles)
 
-        @lcd.draw(@ppu.buffer)
-        key_input_check
-        break if @lcd.window_should_close?
+      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
+      elapsed_machine_time = 0
+      catch(:exit_loop) do
+        loop do
+          elapsed_real_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond) - start_time
+          while elapsed_real_time > elapsed_machine_time
+            cycles = @cpu.exec
+            @timer.step(cycles)
+            @apu.step(cycles)
+            if @ppu.step(cycles)
+              @lcd.draw(@ppu.buffer)
+              key_input_check
+              throw :exit_loop if @lcd.window_should_close?
+            end
+
+            elapsed_machine_time += cycles * CYCLE_NANOSEC
+          end
+        end
       end
       @lcd.close_window
     rescue StandardError => e
-      p e.to_s[0, 100]
+      puts e.to_s[0, 100]
       raise e
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-09 00:00:00.000000000 Z
+date: 2024-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi