rubyboy 0.4.0 → 1.1.0

data/lib/rubyboy/interrupt.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Rubyboy
   class Interrupt
-    attr_accessor :ie, :if
+    INTERRUPTS = {
+      vblank: 0,
+      lcd: 1,
+      timer: 2,
+      serial: 3,
+      joypad: 4
+    }.freeze
 
     def initialize
       @ie = 0
@@ -34,7 +38,11 @@ module Rubyboy
     end
 
     def request(interrupt)
-      @if |= interrupt
+      @if |= (1 << INTERRUPTS[interrupt])
+    end
+
+    def reset_flag(i)
+      @if &= (~(1 << i)) & 0xff
     end
   end
 end

data/lib/rubyboy/joypad.rb

@@ -13,8 +13,8 @@ module Rubyboy
       raise "not implemented: write_byte #{addr}" unless addr == 0xff00
 
       res = @mode | 0xcf
-      res &= @direction if @mode[4].zero?
-      res &= @action if @mode[5].zero?
+      res &= @direction if @mode[4] == 0
+      res &= @action if @mode[5] == 0
 
       res
     end
@@ -29,13 +29,13 @@ module Rubyboy
     def direction_button(button)
       @direction = button | 0xf0
 
-      @interupt.request(0b0001_0000) if button < 0b1111
+      @interupt.request(:joypad) if button < 0b1111
     end
 
     def action_button(button)
       @action = button | 0xf0
 
-      @interupt.request(0b0001_0000) if button < 0b1111
+      @interupt.request(:joypad) if button < 0b1111
     end
   end
 end

data/lib/rubyboy/operand/direct16.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Direct16
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/direct8.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Direct8
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/hl_dec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class HlDec
+      def initialize(value = 0)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/hl_inc.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class HlInc
+      def initialize(value = 0)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/immediate16.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Immediate16
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/immediate8.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Immediate8
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/indirect.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Indirect
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/register16.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Register16
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand/register8.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  module Operand
+    class Register8
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+    end
+  end
+end

data/lib/rubyboy/operand.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  class Operand
+    attr_reader :type, :value
+
+    def initialize(type:, value: 0)
+      @type = type
+      @value = value
+    end
+  end
+end

data/lib/rubyboy/ppu.rb

@@ -11,6 +11,33 @@ module Rubyboy
       drawing: 3
     }.freeze
 
+    LCDC = {
+      bg_window_enable: 0,
+      sprite_enable: 1,
+      sprite_size: 2,
+      bg_tile_map_area: 3,
+      bg_window_tile_data_area: 4,
+      window_enable: 5,
+      window_tile_map_area: 6,
+      lcd_ppu_enable: 7
+    }.freeze
+
+    STAT = {
+      ly_eq_lyc: 2,
+      hblank: 3,
+      vblank: 4,
+      oam_scan: 5,
+      lyc: 6
+    }.freeze
+
+    SPRITE_FLAGS = {
+      bank: 3,
+      dmg_palette: 4,
+      x_flip: 5,
+      y_flip: 6,
+      priority: 7
+    }.freeze
+
     LCD_WIDTH = 160
     LCD_HEIGHT = 144
 
@@ -90,8 +117,6 @@ module Rubyboy
         # ly is read only
       when 0xff45
         @lyc = value
-      when 0xff46
-        # dma
       when 0xff47
         @bgp = value
       when 0xff48
@@ -106,7 +131,7 @@ module Rubyboy
     end
 
     def step(cycles)
-      return false if @lcdc[7].zero?
+      return false if @lcdc[LCDC[:lcd_ppu_enable]] == 0
 
       res = false
       @cycles += cycles
@@ -124,7 +149,7 @@ module Rubyboy
           render_sprites
           @cycles -= DRAWING_CYCLES
           @mode = MODE[:hblank]
-          @interrupt.request(0b0000_0010) if @stat[3] == 1
+          @interrupt.request(:lcd) if @stat[STAT[:hblank]] == 1
         end
       when MODE[:hblank]
         if @cycles >= HBLANK_CYCLES
@@ -134,11 +159,11 @@ module Rubyboy
 
           if @ly == LCD_HEIGHT
             @mode = MODE[:vblank]
-            @interrupt.request(0b0000_0001)
-            @interrupt.request(0b0000_0010) if @stat[4] == 1
+            @interrupt.request(:vblank)
+            @interrupt.request(:lcd) if @stat[STAT[:vblank]] == 1
           else
             @mode = MODE[:oam_scan]
-            @interrupt.request(0b0000_0010) if @stat[5] == 1
+            @interrupt.request(:lcd) if @stat[STAT[:oam_scan]] == 1
           end
         end
       when MODE[:vblank]
@@ -152,7 +177,7 @@ module Rubyboy
             @wly = 0
             handle_ly_eq_lyc
             @mode = MODE[:oam_scan]
-            @interrupt.request(0b0000_0010) if @stat[5] == 1
+            @interrupt.request(:lcd) if @stat[STAT[:oam_scan]] == 1
             res = true
           end
         end
@@ -162,30 +187,34 @@ module Rubyboy
     end
 
     def render_bg
-      return if @lcdc[0].zero?
+      return if @lcdc[LCDC[:bg_window_enable]] == 0
 
       y = (@ly + @scy) % 256
+      tile_map_addr = @lcdc[LCDC[:bg_tile_map_area]] == 0 ? 0x1800 : 0x1c00
+      tile_map_addr += (y / 8) * 32
       LCD_WIDTH.times do |i|
         x = (i + @scx) % 256
-        tile_index = get_tile_index(@lcdc[3], x, y)
-        pixel = get_pixel(tile_index, x, y)
+        tile_index = get_tile_index(tile_map_addr + (x / 8))
+        pixel = get_pixel(tile_index << 4, 7 - (x % 8), (y % 8) * 2)
         @buffer[@ly * LCD_WIDTH + i] = get_color(@bgp, pixel)
         @bg_pixels[i] = pixel
       end
     end
 
     def render_window
-      return if @lcdc[0].zero? || @lcdc[5].zero? || @ly < @wy
+      return if @lcdc[LCDC[:bg_window_enable]] == 0 || @lcdc[LCDC[:window_enable]] == 0 || @ly < @wy
 
       rendered = false
       y = @wly
+      tile_map_addr = @lcdc[LCDC[:window_tile_map_area]] == 0 ? 0x1800 : 0x1c00
+      tile_map_addr += (y / 8) * 32
       LCD_WIDTH.times do |i|
         next if i < @wx - 7
 
         rendered = true
         x = i - (@wx - 7)
-        tile_index = get_tile_index(@lcdc[6], x, y)
-        pixel = get_pixel(tile_index, x, y)
+        tile_index = get_tile_index(tile_map_addr + (x / 8))
+        pixel = get_pixel(tile_index << 4, 7 - (x % 8), (y % 8) * 2)
         @buffer[@ly * LCD_WIDTH + i] = get_color(@bgp, pixel)
         @bg_pixels[i] = pixel
       end
@@ -193,40 +222,41 @@ module Rubyboy
     end
 
     def render_sprites
-      return if @lcdc[1].zero?
+      return if @lcdc[LCDC[:sprite_enable]] == 0
 
-      sprite_height = @lcdc[2].zero? ? 8 : 16
+      sprite_height = @lcdc[LCDC[:sprite_size]] == 0 ? 8 : 16
+      sprites = []
+      cnt = 0
 
-      sprites = @oam.each_slice(4).filter_map do |sprite_attr|
-        sprite = {
-          y: (sprite_attr[0] - 16) % 256,
-          x: (sprite_attr[1] - 8) % 256,
-          tile_index: sprite_attr[2],
-          flags: sprite_attr[3]
-        }
-        next if sprite[:y] > @ly || sprite[:y] + sprite_height <= @ly
+      @oam.each_slice(4) do |y, x, tile_index, flags|
+        y = (y - 16) % 256
+        x = (x - 8) % 256
+        next if y > @ly || y + sprite_height <= @ly
 
-        sprite
+        sprites << { y:, x:, tile_index:, flags: }
+        cnt += 1
+        break if cnt == 10
       end
-      sprites = sprites.take(10).sort_by.with_index { |sprite, i| [-sprite[:x], -i] }
+      sprites = sprites.sort_by.with_index { |sprite, i| [-sprite[:x], -i] }
 
       sprites.each do |sprite|
-        pallet = sprite[:flags][4].zero? ? @obp0 : @obp1
+        flags = sprite[:flags]
+        pallet = flags[SPRITE_FLAGS[:dmg_palette]] == 0 ? @obp0 : @obp1
         tile_index = sprite[:tile_index]
         tile_index &= 0xfe if sprite_height == 16
         y = (@ly - sprite[:y]) % 256
-        y = sprite_height - y - 1 if sprite[:flags][6] == 1
+        y = sprite_height - y - 1 if flags[SPRITE_FLAGS[:y_flip]] == 1
         tile_index = (tile_index + 1) % 256 if y >= 8
         y %= 8
 
         8.times do |x|
-          x_flipped = sprite[:flags][5] == 1 ? 7 - x : x
+          x_flipped = flags[SPRITE_FLAGS[:x_flip]] == 1 ? 7 - x : x
 
-          pixel = get_pixel(tile_index, x_flipped, y)
+          pixel = get_pixel(tile_index << 4, 7 - x_flipped, (y % 8) * 2)
           i = (sprite[:x] + x) % 256
 
-          next if pixel.zero? || i >= LCD_WIDTH
-          next if sprite[:flags][7] == 1 && @bg_pixels[i] != 0
+          next if pixel == 0 || i >= LCD_WIDTH
+          next if flags[SPRITE_FLAGS[:priority]] == 1 && @bg_pixels[i] != 0
 
           @buffer[@ly * LCD_WIDTH + i] = get_color(pallet, pixel)
         end
@@ -235,15 +265,13 @@ module Rubyboy
 
     private
 
-    def get_tile_index(tile_map_area, x, y)
-      tile_map_addr = tile_map_area.zero? ? 0x1800 : 0x1c00
-      tile_map_index = (y / 8) * 32 + (x / 8)
-      tile_index = @vram[tile_map_addr + tile_map_index]
-      @lcdc[4].zero? ? to_signed_byte(tile_index) + 256 : tile_index
+    def get_tile_index(tile_map_addr)
+      tile_index = @vram[tile_map_addr]
+      @lcdc[LCDC[:bg_window_tile_data_area]] == 0 ? to_signed_byte(tile_index) + 256 : tile_index
     end
 
-    def get_pixel(tile_index, x, y)
-      @vram[tile_index * 16 + (y % 8) * 2][7 - (x % 8)] + (@vram[tile_index * 16 + (y % 8) * 2 + 1][7 - (x % 8)] << 1)
+    def get_pixel(tile_index, c, r)
+      @vram[tile_index + r][c] + (@vram[tile_index + r + 1][c] << 1)
     end
 
     def get_color(pallet, pixel)
@@ -263,7 +291,7 @@ module Rubyboy
     def handle_ly_eq_lyc
       if @ly == @lyc
         @stat |= 0x04
-        @interrupt.request(0b0000_0010) if @stat[6] == 1
+        @interrupt.request(:lcd) if @stat[STAT[:lyc]] == 1
       else
         @stat &= 0xfb
       end

data/lib/rubyboy/register.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Rubyboy
   class Register
     attr_reader :value

data/lib/rubyboy/registers.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Rubyboy
+  class Registers
+    attr_reader :value
+
+    def initialize
+      @a = 0x01
+      @b = 0x00
+      @c = 0x13
+      @d = 0x00
+      @e = 0xd8
+      @h = 0x01
+      @l = 0x4d
+      @f = 0xb0
+    end
+
+    def read8(register)
+      case register
+      when :a then @a
+      when :b then @b
+      when :c then @c
+      when :d then @d
+      when :e then @e
+      when :h then @h
+      when :l then @l
+      when :f then @f
+      end
+    end
+
+    def write8(register, value)
+      value &= 0xff
+      case register
+      when :a then @a = value
+      when :b then @b = value
+      when :c then @c = value
+      when :d then @d = value
+      when :e then @e = value
+      when :h then @h = value
+      when :l then @l = value
+      when :f then @f = value & 0xf0
+      end
+    end
+
+    def read16(register)
+      case register
+      when :af then (@a << 8) | @f
+      when :bc then (@b << 8) | @c
+      when :de then (@d << 8) | @e
+      when :hl then (@h << 8) | @l
+      end
+    end
+
+    def write16(register, value)
+      value &= 0xffff
+      case register
+      when :af
+        @a = (value >> 8) & 0xff
+        @f = value & 0xf0
+      when :bc
+        @b = (value >> 8) & 0xff
+        @c = value & 0xff
+      when :de
+        @d = (value >> 8) & 0xff
+        @e = value & 0xff
+      when :hl
+        @h = (value >> 8) & 0xff
+        @l = value & 0xff
+      end
+    end
+
+    def increment16(register)
+      write16(register, read16(register) + 1)
+    end
+
+    def decrement16(register)
+      write16(register, read16(register) - 1)
+    end
+  end
+end

data/lib/rubyboy/rom.rb

@@ -2,7 +2,7 @@
 
 module Rubyboy
   class Rom
-    attr_accessor :data, :entroy_point, :logo, :title, :new_licensee_code, :sgb_flag, :cartridge_type, :rom_size, :ram_size, :destination_code, :old_licensee_code, :mask_rom_version_number, :header_checksum, :global_checksum
+    attr_reader :data, :entroy_point, :logo, :title, :new_licensee_code, :sgb_flag, :cartridge_type, :rom_size, :ram_size, :destination_code, :old_licensee_code, :mask_rom_version_number, :header_checksum, :global_checksum
 
     LOGO_DUMP = %w[
       CE ED 66 66 CC 0D 00 0B 03 73 00 83 00 0C 00 0D
@@ -18,49 +18,20 @@ module Rubyboy
     private
 
     def load_data
-      # The Cartridge Header
-      # see: https://gbdev.io/pandocs/The_Cartridge_Header.html
-
-      # 0x100 - 0x103: Entry Point
       @entroy_point = @data[0x100..0x103]
-      # p data[0x102..0x103].pack('C*').unpack('v').first
-
-      # 0x104 - 0x133: Nintendo Logo
       @logo = @data[0x104..0x133]
       raise 'logo is not match' unless @logo == LOGO_DUMP
 
-      # 0x134 - 0x143: Title
       @title = @data[0x134..0x143]
-      # p data[0x134..0x143].pack('C*').strip
-
-      # 0x144 - 0x145: New Licensee Code
       @new_licensee_code = @data[0x144..0x145]
-
-      # 0x146: SGB Flag
       @sgb_flag = @data[0x146]
-
-      # 0x147: Cartridge Type
       @cartridge_type = @data[0x147]
-
-      # 0x148: ROM Size
       @rom_size = @data[0x148]
-
-      # 0x149: RAM Size
       @ram_size = @data[0x149]
-
-      # 0x14A: Destination Code
       @destination_code = @data[0x14A]
-
-      # 0x14B: Old Licensee Code
       @old_licensee_code = @data[0x14B]
-
-      # 0x14C: Mask ROM Version number
       @mask_rom_version_number = @data[0x14C]
-
-      # 0x14D: Header Checksum
       @header_checksum = @data[0x14D]
-
-      # 0x14E - 0x14F: Global Checksum
       @global_checksum = @data[0x14E..0x14F]
     end
   end

data/lib/rubyboy/timer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Rubyboy
   class Timer
     def initialize(interrupt)
@@ -21,7 +19,7 @@ module Rubyboy
       @div += after_cycles / 256 - before_cycles / 256
       @div &= 0xffff
 
-      return if @tac[2].zero?
+      return if @tac[2] == 0
 
       divider = case @tac & 0b11
                 when 0b00 then 1024
@@ -35,8 +33,8 @@ module Rubyboy
 
       return if @tima < 256
 
-      @tima &= 0xff
-      @interrupt.request(0b0000_0100)
+      @tima = @tma
+      @interrupt.request(:timer)
     end
 
     def read_byte(byte)
@@ -56,6 +54,7 @@ module Rubyboy
       case byte
       when 0xff04
         @div = 0
+        @cycles = 0
       when 0xff05
         @tima = value
       when 0xff06

data/lib/rubyboy/version.rb

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

data/lib/rubyboy.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'raylib'
-require 'benchmark'
-require_relative 'rubyboy/version'
 require_relative 'rubyboy/bus'
 require_relative 'rubyboy/cpu'
 require_relative 'rubyboy/ppu'
@@ -10,29 +8,33 @@ require_relative 'rubyboy/rom'
 require_relative 'rubyboy/timer'
 require_relative 'rubyboy/lcd'
 require_relative 'rubyboy/joypad'
+require_relative 'rubyboy/interrupt'
 
 module Rubyboy
   class Console
     include Raylib
 
-    def initialize(rom_data)
+    def initialize(rom_path)
       load_raylib
+      rom_data = File.open(rom_path, 'r') { _1.read.bytes }
       rom = Rom.new(rom_data)
       interrupt = Interrupt.new
       @ppu = Ppu.new(interrupt)
       @timer = Timer.new(interrupt)
       @joypad = Joypad.new(interrupt)
       @bus = Bus.new(@ppu, rom, @timer, interrupt, @joypad)
-      @cpu = Cpu.new(@bus)
+      @cpu = Cpu.new(@bus, interrupt)
       @lcd = Lcd.new
     end
 
     def start
       until @lcd.window_should_close?
-        key_input_check
         cycles = @cpu.exec
         @timer.step(cycles)
-        draw if @ppu.step(cycles)
+        if @ppu.step(cycles)
+          draw
+          key_input_check
+        end
       end
       @lcd.close_window
     rescue StandardError => e
@@ -40,6 +42,21 @@ module Rubyboy
       raise e
     end
 
+    def bench
+      cnt = 0
+      start_time = Time.now
+      while cnt < 1500
+        cycles = @cpu.exec
+        @timer.step(cycles)
+        if @ppu.step(cycles)
+          key_input_check
+          cnt += 1
+        end
+      end
+
+      Time.now - start_time
+    end
+
     private
 
     def draw
@@ -78,6 +95,3 @@ module Rubyboy
     end
   end
 end
-
-rom_data = File.open(File.expand_path('roms/bgbtest.gb', __dir__), 'r') { _1.read.bytes }
-Rubyboy::Console.new(rom_data).start