GBRb 0.1.0 → 0.2.0

data/lib/gbrb/gb.rb

@@ -2,32 +2,46 @@ require_relative 'mmu'
 require_relative 'cpu/z80'
 require_relative 'graphics/gpu'
 require_relative 'cartridge'
-
-require 'thread'
+require_relative 'version'
+require_relative 'timer'
 
 module GBRb
   class GB
-    def initialize cartridge_path='', debug=false
-      @debug = debug
-
-      @gpu_send = Queue.new
-      @gpu_receive = Queue.new
+    def initialize config
+      @config = config
+      display_about_info
+      display_separator
 
-      @mmu = GBRb::MMU.new read_bios, create_cartridge(cartridge_path), @gpu_send
+      bios = @config.skip_boot ? [] : read_bios
+      @mmu = GBRb::MMU.new bios
       @cpu = GBRb::CPU::Z80.new @mmu
-      @gpu = GBRb::Graphics::GPU.new @mmu, @gpu_send, @gpu_receive
+      @gpu = GBRb::Graphics::GPU.new
+      @cartridge = GBRb::Cartridge.load_cartridge @config.cartridge_path
+      @timer = Timer.new
+
+      @mmu.connect @gpu, 0x8000..0x9fff
+      @mmu.connect @gpu, GBRb::Graphics::GPU::REGISTER_ADDRESSES
+      @mmu.connect @cartridge, 0x0000..0x7fff, 0xa000..0xbfff
+      @mmu.connect @timer, GBRb::Timer::ADDRESSES
+
+      @timer.irq_handler = @mmu
+
+      fake_boot_sequence if @config.skip_boot
     end
 
     def power_on
       @power = :on
       @gpu.power_on
-      @mode = @debug ? :break : :default
+      @mode = @config.debug || :default
       @breakpoint = nil
 
-      puts "   pc   |   sp   |   a    |   b    |   c    |   d    |   e    |   h    |   l    |   f    | CB | OP Code |" unless @mode == :default
+      unless @mode == :default
+        puts debug_help if @mode == :interactive
+        puts "   pc   |   sp   |   a    |   b    |   c    |   d    |   e    |   h    |   l    |   f    | CB | OP Code |"
+      end
 
       loop do
-        if @mode == :break
+        if @mode == :interactive
           new_mode = nil
           until new_mode
             new_mode = debug_input
@@ -37,19 +51,24 @@ module GBRb
 
         pc = @cpu.r.pc.read
         op_code = @mmu.read_byte(pc).to_i
-        prefix = @cpu.instance_eval '@cb_prefix'
 
         begin
-          @gpu_send.push [:cpu, @cpu.step]
+          cycles = @cpu.step
+          @gpu.update! cycles
+          @timer.step cycles
         rescue GBRb::CPU::InstructionNotImplemented => e
-          display_status prefix, op_code
+          display_status @cpu.instance_eval('@cb_prefix'), op_code
           @gpu.power_off
           exit
         end
 
-        @gpu_receive.pop
-        if @debug
-          display_status prefix, op_code
+        prefix = @cpu.instance_eval '@cb_prefix'
+        op_code = @mmu.read_byte(pc + 1) if prefix
+
+        if @config.debug
+          if (@config.debug == :interactive) or (@config.debug == :dump and (op_code != 0xcb or prefix))
+            display_status prefix, op_code
+          end
           if @step
             @step -= 1
             if @step == 0
@@ -59,15 +78,69 @@ module GBRb
           end
           if @cpu.r.pc.read == @breakpoint
             @breakpoint = nil
-            @mode = :break
+            @mode = :interactive
           end
         end
       end
     end
 
     private
+    def display_about_info
+      puts "GBRb. v#{GBRb::VERSION}"
+      puts "http://rampantmonkey.github.io/GBRb/"
+    end
+
+    def display_separator
+      puts '*'*80
+    end
+
+    def fake_boot_sequence
+      @cpu.r.pc.store 0x100
+      @cpu.r.a.store  0x01
+      @cpu.r.f.store  0xb0
+      @cpu.r.b.store  0x00
+      @cpu.r.c.store  0x13
+      @cpu.r.d.store  0x00
+      @cpu.r.e.store  0xd8
+      @cpu.r.h.store  0x01
+      @cpu.r.l.store  0x4d
+      @cpu.r.sp.store 0xfffe
+      @mmu.write_byte 0xff05, 0x00
+      @mmu.write_byte 0xff06, 0x00
+      @mmu.write_byte 0xff07, 0x00
+      @mmu.write_byte 0xff10, 0x80
+      @mmu.write_byte 0xff11, 0xbf
+      @mmu.write_byte 0xff12, 0xf3
+      @mmu.write_byte 0xff14, 0xbf
+      @mmu.write_byte 0xff16, 0x3f
+      @mmu.write_byte 0xff17, 0x00
+      @mmu.write_byte 0xff19, 0xbf
+      @mmu.write_byte 0xff1a, 0x7f
+      @mmu.write_byte 0xff1b, 0xff
+      @mmu.write_byte 0xff1c, 0x9f
+      @mmu.write_byte 0xff1e, 0xbf
+      @mmu.write_byte 0xff20, 0xff
+      @mmu.write_byte 0xff21, 0x00
+      @mmu.write_byte 0xff22, 0x00
+      @mmu.write_byte 0xff23, 0xbf
+      @mmu.write_byte 0xff24, 0x77
+      @mmu.write_byte 0xff25, 0xf3
+      @mmu.write_byte 0xff26, 0xf1
+      @mmu.write_byte 0xff40, 0x91
+      @mmu.write_byte 0xff42, 0x00
+      @mmu.write_byte 0xff43, 0x00
+      @mmu.write_byte 0xff45, 0x00
+      @mmu.write_byte 0xff47, 0xfc
+      @mmu.write_byte 0xff48, 0xff
+      @mmu.write_byte 0xff49, 0xff
+      @mmu.write_byte 0xff4a, 0x00
+      @mmu.write_byte 0xff4b, 0x00
+      @mmu.write_byte 0xff50, 0x00
+      @mmu.write_byte 0xffff, 0x00
+    end
+
     def debug_help
-      "Available modes: (b)reakpoint (h)elp (q)uit (s)tep (t)iles"
+      "Available debugging modes: (b)reakpoint (g)pu (h)elp (m)emory (q)uit (s)tep (t)iles"
     end
 
     def debug_input
@@ -76,6 +149,13 @@ module GBRb
       when 'b'
         @breakpoint = input[1..-1].to_i 16
         :debug
+      when 'g'
+        command = input[1..-1].strip
+        begin
+          STDERR.puts @gpu.instance_eval(command)
+        rescue NameError
+          puts "#{command} is not a valid GPU operation"
+        end
       when 'h'
         STDERR.puts debug_help
       when 'm'
@@ -91,13 +171,13 @@ module GBRb
       when 's'
         @step = input[1..-1].to_i
         @step = 1 if @step == 0
-        :debug
+        :step
       when 't'
         @gpu.dump_tiles
         nil
       else
         @step = 1
-        :debug
+        :interactive
       end
     end
 
@@ -110,16 +190,6 @@ module GBRb
     def read_bios
       File.read(File.expand_path('../bios', __FILE__)).split.map{ |el| el.to_i(16) }
     end
-
-    def create_cartridge path
-      puts path
-      f = File.open(path, 'r')
-      c = Cartridge.new f
-      f.close
-      c
-    rescue Errno::ENOENT
-      raise InvalidCartridge, path
-    end
   end
 end
 

data/lib/gbrb/graphics.rb

@@ -4,7 +4,7 @@ module GBRb
     HEIGHT=144
 
     NUMBER_OF_COLORS = 4
-    MAX_COLOR = NUMBER_OF_COLORS - 1
+    MAX_COLOR = 255
 
     SOCKET_PATH= '/tmp/gbrb.sock'
 

data/lib/gbrb/graphics/gpu.rb

@@ -16,18 +16,21 @@ module GBRb::Graphics
     TILE_MAP_0       = 0x9800
     TILE_MAP_1       = 0x9c00
     TILE_SET_START   = 0x8000
+    MEMORY_SIZE      = 0x2000
 
-    def initialize memory, incoming, outgoing
-      @memory = memory
-      @incoming = incoming
-      @outgoing = outgoing
+    REGISTER_ADDRESSES = [CONTROL_REGISTER, SCROLL_Y_ADDRESS, SCROLL_X_ADDRESS, LINE_ADDRESS, PALETTE_REGISTER]
+
+    def initialize
       reset
     end
 
     def reset
+      @memory = Array.new MEMORY_SIZE, 0
+      @registers = REGISTER_ADDRESSES.inject({}){|acc, add| acc[add] = 0; acc}
       super
       create_frame_buffer
       create_tiles
+      update_palette
     end
 
     def create_tiles
@@ -41,12 +44,30 @@ module GBRb::Graphics
       end
     end
 
+    def read_byte address
+      if REGISTER_ADDRESSES.include? address
+        @registers[address]
+      else
+        @memory[address & (MEMORY_SIZE - 1)]
+      end
+    end
+
+    def write_byte address, value
+      if REGISTER_ADDRESSES.include? address
+        @registers[address] = value & 0xff
+        update_palette if address == PALETTE_REGISTER
+      else
+        @memory[address & (MEMORY_SIZE - 1)] = value & 0xff
+        update_tile address
+      end
+    end
+
     def update_tile address
       tile = ((address & 0x1ffe) >> 4) & 0x1ff
       y    = ((address & 0x1ffe) >> 1) & 0x07
       8.times do |x|
         x_mask = 1 << (7-x)
-        @tiles[tile][y][x] = ((@memory.read_byte(address) & x_mask) == x_mask ? 1 : 0) + ((@memory.read_byte(address+1) & x_mask) == x_mask ? 2 : 0)
+        @tiles[tile][y][x] = ((read_byte(address-1) & x_mask) == x_mask ? 1 : 0) + ((read_byte(address) & x_mask) == x_mask ? 2 : 0)
       end
     end
 
@@ -57,20 +78,7 @@ module GBRb::Graphics
     def power_on
       trap(:CHLD) { exit }
       @screen_pid = fork { start_screen }
-
-      Thread.abort_on_exception = true
-      Thread.new do
-        loop do
-          message = @incoming.pop
-          case message.first
-          when :cpu
-            self.update! message.last.to_i if display_on?
-            @outgoing.push :nothing
-          when :mmu
-            self.update_tile message.last.to_i
-          end
-        end
-      end
+      screen.write @frame_buffer.map{|row| row.map{|pixel| @palette[pixel]}}
     end
 
     def power_off
@@ -93,7 +101,7 @@ module GBRb::Graphics
       row = []
       WIDTH.times do
         palette_index = @tiles[tile_index][tile_y][tile_x]
-        color = palette[palette_index]
+        color = @palette[palette_index]
         row << color
         tile_x += 1
         if tile_x == 0x08
@@ -106,19 +114,19 @@ module GBRb::Graphics
     end
 
     def calculate_tile_number tilemap_offset, line_offset
-      id = @memory.read_byte(tilemap_offset + line_offset)
+      id = read_byte(tilemap_offset + line_offset)
       id += 256 if background_tile_set == 0x10 and id < 128
       id
     end
 
-    def palette
-      value = @memory.read_byte PALETTE_REGISTER
+    def update_palette
+      value = read_byte PALETTE_REGISTER
       colors = []
       4.times do |i|
         mask = 0b11 << 2*i
-        colors << (((value & mask) >> 2*i) ^ 0b11)
+        colors << ((value & mask) >> 2*i)
       end
-      colors
+      @palette = colors
     end
 
     def dump_tiles
@@ -130,23 +138,23 @@ module GBRb::Graphics
     end
 
     def line
-      @memory.read_byte LINE_ADDRESS
+      read_byte LINE_ADDRESS
     end
 
     def line= value
-      @memory.write_byte LINE_ADDRESS, value
+      @registers[LINE_ADDRESS] = value & 0xff
     end
 
     def scroll_y
-      @memory.read_byte SCROLL_Y_ADDRESS
+      read_byte SCROLL_Y_ADDRESS
     end
 
     def scroll_x
-      @memory.read_byte SCROLL_X_ADDRESS
+      read_byte SCROLL_X_ADDRESS
     end
 
     def control_register
-      @memory.read_byte CONTROL_REGISTER
+      read_byte CONTROL_REGISTER
     end
 
     def background_on?

data/lib/gbrb/graphics/mode_clock.rb

@@ -6,44 +6,45 @@ module GBRb::Graphics
 
     def reset
       @clock = 0
-      @mode = 2
+      @mode = 0
       self.line = 0
     end
 
     def update! time_increment
-      @clock += time_increment
-
-      case mode
-      when 2
-        if @clock >= 80
-          @clock = 0
+      unless self.display_on?
+        self.line = 0
+        @clock = 456
+        @mode = 0
+        return
+      else
+        if line >= 144
+          @mode = 1
+        elsif @clock >= 456 - 80
+          @mode = 2
+        elsif @clock >= 456 - 80 - 172
           @mode = 3
-        end
-      when 3
-        if @clock >= 172
-          @clock = 0
+        else
           @mode = 0
-          render_scan_line
         end
-      when 0
-        if @clock >= 204
-          @clock = 0
-          self.line = line.to_i + 1
-          if line == 144
-            @mode = 1
-            draw_frame_buffer
-          else
-            @mode = 2
-          end
+      end
+
+
+      @clock -= time_increment
+
+      if @clock <= 0
+        @clock += 456
+        self.line = line + 1
+
+        if line == 144
+          self.draw_frame_buffer
+        elsif line > 153
+          self.line = 0
         end
-      when 1
-        if @clock >= 456
-          self.line = line +  1
-          @clock = 0
-         if line > 153
-           self.line = 0
-           @mode = 2
-         end
+
+        if line < 144
+          if self.display_on?
+            render_scan_line
+          end
         end
       end
     end

data/lib/gbrb/graphics/screen_client.rb

@@ -3,11 +3,12 @@ require_relative '../graphics'
 require 'socket'
 
 module GBRb::Graphics
+  PPM_PALETTE = [0xeb, 0xc4, 0x60, 0x00]
   class ScreenClient
     def initialize
       trap(:PIPE) { exit }
       @connection = UNIXSocket.new SOCKET_PATH
-    rescue Errno::ECONNREFUSED
+    rescue Errno::ECONNREFUSED, Errno::ENOENT
       sleep 0.1
       retry
     end
@@ -22,7 +23,7 @@ module GBRb::Graphics
       d = "P6 #{WIDTH} #{HEIGHT} #{MAX_COLOR} "
       data.each do |row|
         row.each do |pixel|
-          d << pixel.chr * 3
+          d << PPM_PALETTE[pixel].chr * 3
         end
       end
       d << "\n"