rubyboy 0.1.0 → 0.2.0

data/lib/rubyboy/interrupt.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Rubyboy
+  class Interrupt
+    attr_accessor :ie, :if
+
+    def initialize
+      @ie = 0
+      @if = 0
+    end
+
+    def interrupts
+      @if & @ie & 0x1f
+    end
+
+    def request(interrupt)
+      @if |= interrupt
+    end
+  end
+end

data/lib/rubyboy/ppu.rb

@@ -17,15 +17,15 @@ module Rubyboy
 
     def step(cycles)
       @cycles += cycles
-      if @cycles >= 456
-        @cycles -= 456
-        @ly = (@ly + 1) % 154
-      end
+      return if @cycles < 456
+
+      @cycles -= 456
+      @ly = (@ly + 1) % 154
     end
 
     def draw_bg
-      tile_map_addr = @lcdc[3] == 0 ? 0x9800 : 0x9c00
-      tile_data_addr = @lcdc[4] == 0 ? 0x9000 : 0x8000
+      tile_map_addr = @lcdc[3].zero? ? 0x9800 : 0x9c00
+      tile_data_addr = @lcdc[4].zero? ? 0x9000 : 0x8000
 
       bg = Array.new(256) { Array.new(256, 0x00) }
 
@@ -38,12 +38,12 @@ module Rubyboy
           tile = @vram[tile_data_addr - 0x8000 + tile_index * 16, 16]
 
           8.times do |i|
-            pixelsa = tile[i*2]
-            pixelsb = tile[i*2+1]
+            pixelsa = tile[i * 2]
+            pixelsb = tile[i * 2 + 1]
 
             8.times do |j|
-              c = (pixelsb[7-j] << 1) + pixelsa[7-j]
-              bg[y*8+i][x*8+j] = get_color(c)
+              c = (pixelsb[7 - j] << 1) + pixelsa[7 - j]
+              bg[y * 8 + i][x * 8 + j] = get_color(c)
             end
           end
         end
@@ -52,7 +52,7 @@ module Rubyboy
 
       144.times do |y|
         160.times do |x|
-          view_port[y][x] = bg[(y+@scy) % 144][(x+@scx) % 160]
+          view_port[y][x] = bg[(y + @scy) % 144][(x + @scx) % 160]
         end
       end
       view_port
@@ -63,13 +63,13 @@ module Rubyboy
     def get_color(color_num)
       case color_num
       when 0
-        [0xff, 0xff, 0xff]
+        [0xff, 0xff, 0xff, 0xff]
       when 1
-        [0xcc, 0xcc, 0xcc]
+        [0xcc, 0xcc, 0xcc, 0xff]
       when 2
-        [0x77, 0x77, 0x77]
+        [0x77, 0x77, 0x77, 0xff]
       when 3
-        [0x00, 0x00, 0x00]
+        [0x00, 0x00, 0x00, 0xff]
       end
     end
   end

data/lib/rubyboy/ram.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  class Ram
+    attr_accessor :eram, :wram1, :wram2, :hram
+
+    def initialize
+      @eram = Array.new(0x2000, 0)
+      @wram1 = Array.new(0x1000, 0)
+      @wram2 = Array.new(0x1000, 0)
+      @hram = Array.new(0x80, 0)
+    end
+  end
+end

data/lib/rubyboy/register.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Rubyboy
+  class Register
+    attr_reader :value
+
+    def initialize(name:, value:)
+      @name = name
+      @value = value
+    end
+
+    def value=(v)
+      @value = v & 0xff
+    end
+
+    def increment
+      @value = (@value + 1) & 0xff
+    end
+
+    def decrement
+      @value = (@value - 1) & 0xff
+    end
+  end
+end

data/lib/rubyboy/rom.rb

@@ -27,7 +27,7 @@ module Rubyboy
 
       # 0x104 - 0x133: Nintendo Logo
       @logo = @data[0x104..0x133]
-      raise 'logo is not match' unless LOGO_DUMP == @logo
+      raise 'logo is not match' unless @logo == LOGO_DUMP
 
       # 0x134 - 0x143: Title
       @title = @data[0x134..0x143]

data/lib/rubyboy/timer.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Rubyboy
+  class Timer
+    def initialize(interrupt)
+      @div = 0
+      @tima = 0
+      @tma = 0
+      @tac = 0
+      @cycles = 0
+      @interrupt = interrupt
+    end
+
+    def step(cycles)
+      before_cycles = @cycles
+      after_cycles = @cycles + cycles
+      @cycles = after_cycles & 0xffff
+
+      @div += after_cycles / 256 - before_cycles / 256
+      @div &= 0xffff
+
+      return if @tac[2].zero?
+
+      divider = case @tac & 0b11
+                when 0b00 then 1024
+                when 0b01 then 16
+                when 0b10 then 64
+                when 0b11 then 256
+                end
+
+      tima_diff = (after_cycles / divider - before_cycles / divider)
+      @tima += tima_diff
+
+      return if @tima < 256
+
+      @tima &= 0xff
+      @interrupt.request(0b0000_0100)
+    end
+
+    def read_byte(byte)
+      case byte
+      when 0xff04
+        @div >> 8
+      when 0xff05
+        @tima
+      when 0xff06
+        @tma
+      when 0xff07
+        @tac | 0b1111_1000
+      end
+    end
+
+    def write_byte(byte, value)
+      case byte
+      when 0xff04
+        @div = 0
+      when 0xff05
+        @tima = value
+      when 0xff06
+        @tma = value
+      when 0xff07
+        @tac = value & 0b111
+      end
+    end
+  end
+end

data/lib/rubyboy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rubyboy
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/lib/rubyboy.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'gosu'
-require_relative "rubyboy/version"
+require 'benchmark'
+require_relative 'rubyboy/version'
 require_relative 'rubyboy/bus'
 require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/ppu'
 require_relative 'rubyboy/rom'
+require_relative 'rubyboy/timer'
 
 module Rubyboy
   class Console < Gosu::Window
@@ -18,8 +20,10 @@ module Rubyboy
       @total_cycles = 0
 
       rom = Rom.new(rom_data)
+      interrupt = Interrupt.new
       @ppu = Ppu.new
-      @bus = Bus.new(@ppu, rom)
+      @timer = Timer.new(interrupt)
+      @bus = Bus.new(@ppu, rom, @timer, interrupt)
       @cpu = Cpu.new(@bus)
     end
 
@@ -27,21 +31,19 @@ module Rubyboy
       while @total_cycles < 70224
         cycles = @cpu.exec
         @total_cycles += cycles
+        @timer.step(cycles)
         @ppu.step(cycles)
       end
       @total_cycles -= 70224
-
-    rescue => e
-      p e
+    rescue StandardError => e
+      p e.to_s[0, 100]
+      raise e
     end
 
     def draw
-      bg = @ppu.draw_bg
-      bg.each_with_index do |xarray, i|
-        xarray.each_with_index do |c, j|
-          draw_pixel(j, i, c)
-        end
-      end
+      pixel_data = @ppu.draw_bg.flatten.pack('C*')
+      @image = Gosu::Image.from_blob(160, 144, pixel_data)
+      @image.draw(0, 0, 0, SCALE, SCALE)
     end
 
     def draw_pixel(x, y, color)
@@ -53,5 +55,5 @@ module Rubyboy
   end
 end
 
-rom_data = File.open(File.expand_path('roms/hello-world.gb', __dir__), 'r') { _1.read.bytes }
+rom_data = File.open(File.expand_path('roms/cpu_instrs/cpu_instrs.gb', __dir__), 'r') { _1.read.bytes }
 Rubyboy::Console.new(rom_data).show

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubyboy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - sacckey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -37,14 +37,36 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/opcodes.json
+- lib/roms/cpu_instrs/cpu_instrs.gb
+- lib/roms/cpu_instrs/individual/01-special.gb
+- lib/roms/cpu_instrs/individual/02-interrupts.gb
+- lib/roms/cpu_instrs/individual/03-op sp,hl.gb
+- lib/roms/cpu_instrs/individual/04-op r,imm.gb
+- lib/roms/cpu_instrs/individual/05-op rp.gb
+- lib/roms/cpu_instrs/individual/06-ld r,r.gb
+- lib/roms/cpu_instrs/individual/07-jr,jp,call,ret,rst.gb
+- lib/roms/cpu_instrs/individual/08-misc instrs.gb
+- lib/roms/cpu_instrs/individual/09-op r,r.gb
+- lib/roms/cpu_instrs/individual/10-bit ops.gb
+- lib/roms/cpu_instrs/individual/11-op a,(hl).gb
+- lib/roms/cpu_instrs/readme.txt
 - lib/roms/hello-world.gb
-- lib/roms/hello.gb
+- lib/roms/instr_timing/instr_timing.gb
+- lib/roms/instr_timing/readme.txt
 - lib/roms/tobu.gb
 - lib/rubyboy.rb
 - lib/rubyboy/bus.rb
+- lib/rubyboy/cartridge/factory.rb
+- lib/rubyboy/cartridge/mbc1.rb
+- lib/rubyboy/cartridge/nombc.rb
 - lib/rubyboy/cpu.rb
+- lib/rubyboy/interrupt.rb
 - lib/rubyboy/ppu.rb
+- lib/rubyboy/ram.rb
+- lib/rubyboy/register.rb
 - lib/rubyboy/rom.rb
+- lib/rubyboy/timer.rb
 - lib/rubyboy/version.rb
 - sig/rubyboy.rbs
 homepage: https://github.com/sacckey/rubyboy
@@ -55,6 +77,7 @@ metadata:
   homepage_uri: https://github.com/sacckey/rubyboy
   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:
@@ -63,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="