GBRb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3fcd2009ea0e3f6548923ab1562f454aa3751bb
-  data.tar.gz: 8c24ac86db2039d3c0523685a759303d40f99180
+  metadata.gz: 53ae49f1e3bd7aa96606a792468a02387302ee0a
+  data.tar.gz: ac9ef838d2b6768abf31269ff20c1f76606e2e5e
 SHA512:
-  metadata.gz: a39fdbc706d100e663b9ee04d1cf4341b1675114d5d772230029ea41bdd525ac7cea164d559c1b24ab208b4bd3403fb64a1f3d4e46cc5ce1fe18dd1e4a944bc8
-  data.tar.gz: 8cd264c566d7c386b25939a0d5ed8cce0923e2a0688b67c133715b9765c67137662efdf7845cd04dac5bf559e8917ca48cf158b0608cd43393ebed4f7e29950f
+  metadata.gz: 9ab562b51196b84d6ab2401f39ef11130deeb5d070d389dc3388b6a01a92826cb72dbe5ca7e37b512cdff657f01e6ede9f08f1cf99b974bd5a79145f3b5475ab
+  data.tar.gz: ee7b759ed9298ff9fcd552fa5826ad2247876027b51b082a6f9d524258175a4b25faa5b61b7110259e2ee10f975fcc28239c0ba7c4fc5bea432b397ea5a1e898

data/.gitignore

@@ -7,7 +7,6 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
-doc/
 lib/bundler/man
 pkg
 rdoc

data/README.md

@@ -27,10 +27,18 @@ Nintendo's Game Boy is well documented across the internet and a quick search wi
 Or you can save some time and visit the [wiki](https://github.com/rampantmonkey/GBRb/wiki) which has links to my research.
 
 ## Code Status
-[![Build Status](https://travis-ci.org/rampantmonkey/GBRb.png?branch=master)](https://travis-ci.org/rampantmonkey/GBRb)[![Code Climate](https://codeclimate.com/github/rampantmonkey/GBRb.png)](https://codeclimate.com/github/rampantmonkey/GBRb)[![Coverage Status](https://coveralls.io/repos/rampantmonkey/GBRb/badge.png)](https://coveralls.io/r/rampantmonkey/GBRb)
+[![Build Status](https://travis-ci.org/rampantmonkey/GBRb.png?branch=master)](https://travis-ci.org/rampantmonkey/GBRb) 
+[![Code Climate](https://codeclimate.com/github/rampantmonkey/GBRb.png)](https://codeclimate.com/github/rampantmonkey/GBRb) 
+[![Coverage Status](https://coveralls.io/repos/rampantmonkey/GBRb/badge.png)](https://coveralls.io/r/rampantmonkey/GBRb) 
 
 ## Progress
 ![Boot Sequence which displays the Nintendo Logo](https://github.com/rampantmonkey/GBRb/raw/master/doc/images/nintendo_logo.png) 
+![Background tiles drawn for Tic-Tac-Toe](https://github.com/rampantmonkey/GBRb/raw/master/doc/images/ttt.png) 
+![Background for OPUS-5 test game discussed in jsGB](https://github.com/rampantmonkey/GBRb/raw/master/doc/images/opus5.png) 
+### Testing
+![Basic Character and Graphics Test (TEST.GB)](https://github.com/rampantmonkey/GBRb/raw/master/doc/images/test.gb.png) 
+![Blargg CPU Tests](https://github.com/rampantmonkey/GBRb/raw/master/doc/images/blargg_cpu.png) 
+
 
 ## Roadmap
 - Improve Performance

data/bin/gbrb

@@ -2,11 +2,11 @@
 
 $:.unshift File.expand_path('../../lib', __FILE__)
 
+require 'gbrb/options'
 require 'gbrb/gb'
 
-cartridge = ARGV.length == 0 ? '' : ARGV.first
-debug = ARGV.length > 1 and ARGV[1] == '-D'
+options = GBRb::Options.new ARGV
 
-gameboy = GBRb::GB.new cartridge, debug
+gameboy = GBRb::GB.new options
 gameboy.power_on
 

data/lib/gbrb.rb

@@ -1,9 +1,16 @@
 require "gbrb/version"
 require "gbrb/cpu"
 require "gbrb/mmu"
+require "gbrb/cartridge"
 
 module GBRb
   MEMORY_BANK_SIZE = 0x4000
 
+  INTERRUPT_ENABLED_FLAG_ADDR = 0xffff
+  INTERRUPT_FLAG_ADDR         = 0xff0f
+  TIMER_OVERFLOW_IRQ          = 0x04
+  TIMER_OVERFLOW_IR_ADDR      = 0x50
+
+
   class InvalidCartridge < StandardError; end
 end

data/lib/gbrb/cartridge.rb

@@ -1,15 +1,28 @@
-require_relative '../gbrb'
-
-require 'pathname'
+require_relative 'cartridge/cartridge'
 
 module GBRb
-  class Cartridge
-    def initialize raw_data
-      @banks = raw_data.read.each_byte.each_slice(MEMORY_BANK_SIZE).to_a
+  module Cartridge
+    def self.load_cartridge path
+      f = File.open(path, 'r')
+      c = build_cartridge f
+      f.close
+      puts "Cartridge Info"
+      puts c.info
+      puts "File Path:    #{File.absolute_path(path)}"
+      puts '*'*80
+      c
+    rescue Errno::ENOENT
+      raise InvalidCartridge, path
     end
 
-    def bank number=0
-      @banks.fetch(number) { Array.new MEMORY_BANK_SIZE, 0 }
+    private
+    def self.build_cartridge file
+      c = BaseCartridge.new file
+      file.rewind
+      if c.type.include? 'MBC1'
+        c = MBC1.new file
+      end
+      c
     end
   end
 end

data/lib/gbrb/cartridge/cartridge.rb

@@ -0,0 +1,187 @@
+require_relative '../../gbrb'
+
+require 'pathname'
+
+module GBRb
+  class BaseCartridge
+    HEADER_START = 0x0100
+    HEADER_END   = 0x014f
+    TITLE_OFFSET = 0x34
+    TITLE_LENGTH = 0xf
+    TYPE_OFFSET  = 0x47
+    DESTINATION_OFFSET = 0x4a
+    RAM_BANK_SIZE = 0x2000
+    def initialize raw_data
+      @rom_banks = raw_data.read.each_byte.each_slice(MEMORY_BANK_SIZE).to_a
+      @header = rom_bank(0)[HEADER_START..HEADER_END]
+      @current_rom_bank = rom_bank 1
+      @rom_bank_number = 1
+      post_initialize
+    end
+
+    def post_initialize; end
+
+    def rom_bank number=0
+      @rom_banks.fetch(number) { Array.new MEMORY_BANK_SIZE, 0 }
+    end
+
+    def ram_bank number=0
+      @ram_banks.fetch(number) { Array.new 0x1fff, 0 }
+    end
+
+    def read_byte addr
+      case addr
+      when 0x0000..0x3fff
+        @rom_banks[0][addr & (MEMORY_BANK_SIZE - 1)]
+      when 0x4000..0x7fff
+        rom_bank(@rom_bank_number)[addr & (MEMORY_BANK_SIZE - 1)]
+      when 0xa000..0xbfff
+        if @current_ram_bank
+          @current_ram_bank[addr & (RAM_BANK_SIZE - 1)]
+        else
+          0
+        end
+      end
+    end
+
+    def write_byte addr, value
+      @current_ram_bank[addr & (ram_bank_size - 1)] = value if (0xa000..0xbfff).cover? addr
+    end
+
+    def info
+      "Title:        #{title}\n"        <<
+      "Type:         #{type}\n"         <<
+      "Destination:  #{destination}\n"  <<
+      ""
+    end
+
+    def title
+      header_field(TITLE_OFFSET, TITLE_LENGTH).select{|el| (0x20..0x7e).cover? el}
+                                              .map(&:chr)
+                                              .join
+    end
+
+    def type
+      case header_field TYPE_OFFSET
+      when 0x00
+        "ROM ONLY"
+      when 0x01
+        "MBC1"
+      when 0x02
+        "MBC1+RAM"
+      when 0x03
+        "MBC1+RAM+BATTERY"
+      when 0x05
+        "MBC2"
+      when 0x06
+        "MBC2+BATTERY"
+      when 0x08
+        "ROM+RAM"
+      when 0x09
+        "ROM+RAM+BATTERY"
+      when 0x0b
+        "MMM01"
+      when 0x0c
+        "MMM01+RAM"
+      when 0x0d
+        "MMM01+RAM+BATTERY"
+      when 0x0f
+        "MBC3+TIMER+BATTERY"
+      when 0x10
+        "MBC3+TIMER+RAM+BATTERY"
+      when 0x11
+        "MBC3"
+      when 0x12
+        "MBC3+RAM"
+      when 0x13
+        "MBC3+RAM+BATTERY"
+      when 0x15
+        "MBC4"
+      when 0x16
+        "MBC4+RAM"
+      when 0x17
+        "MBC4+RAM+BATTERY"
+      when 0x19
+        "MBC5"
+      when 0x1a
+        "MBC5+RAM"
+      when 0x1b
+        "MBC5+RAM+BATTERY"
+      when 0x1c
+        "MBC5+RUMBLE"
+      when 0x1d
+        "MBC5+RUMBLE+RAM"
+      when 0x1e
+        "MBC5+RUMBLE+RAM+BATTERY"
+      when 0xfc
+        "POCKET CAMERA"
+      when 0xfd
+        "BANDAI TAMA5"
+      when 0xfe
+        "HuC3"
+      when 0xff
+        "HuC1+RAM+BATTERY"
+      else
+        "INVALID"
+      end
+    end
+
+    def destination
+      case header_field DESTINATION_OFFSET
+      when 0x00
+        "Japanese"
+      when 0x01
+        "Non-Japanese"
+      else
+        "Unknown"
+      end
+    end
+
+    def header_field offset, length=1
+      if length == 1
+        @header[offset]
+      else
+        @header.slice offset, length
+      end
+    end
+  end
+
+  class MBC1 < BaseCartridge
+    def post_initialize
+      @mode = :rom
+      @rom_bank_number = 1
+      @ram_bank_number = 0
+      @ram_status = :disabled
+      @ram_banks = Array.new 3, Array.new(0x1fff, 0)
+      @current_rom_bank = rom_bank @rom_bank_number
+    end
+
+    def write_byte addr, value
+      STDERR.puts "Cartridge Write #{value.to_s 16} @ #{addr.to_s 16}"
+      case addr
+      when 0x0000..0x1fff
+        @ram_status = value & 0xf == 0xa ? :enabled : :disabled
+      when 0x2000..0x3fff
+        value += 1 if value % 0x20 == 0
+        @rom_bank_number = (@rom_bank_number & 0b11100000) | (value & 0b00011111)
+        @current_rom_bank = rom_bank @rom_bank_number
+      when 0x4000..0x5fff
+        if @mode == :rom
+          @rom_bank_number |= (value & 0b11) << 5
+          @current_rom_bank = rom_bank @rom_bank_number
+        elsif @mode == :ram
+          @ram_bank_number = value & 0b11
+          @current_ram_bank = ram_bank @ram_bank_number
+        end
+      when 0x6000..0x7fff
+        if value == 0x00
+          @mode = :rom
+        elsif value == 0x01
+          @mode = :ram
+        end
+      when 0xa000..0xbfff
+        @current_ram_bank[addr & 0x1fff] = value
+      end
+    end
+  end
+end

data/lib/gbrb/cpu/concatenated_register.rb

@@ -31,7 +31,7 @@ module GBRb::CPU
     end
 
     def half_mask
-      @half_mask ||= 0x10 ** (@bits/8)
+      @half_mask ||= 0x10 ** (1+@bits/8)
     end
 
     def clear

data/lib/gbrb/cpu/z80.rb

@@ -1,7 +1,7 @@
 require_relative '../cpu'
 require_relative '../mmu'
+require_relative '../instruction_set'
 require_relative 'register_ensemble'
-require_relative 'instruction'
 
 module GBRb
   module CPU
@@ -11,6 +11,8 @@ module GBRb
 
       attr_reader :mmu
 
+      attr_writer :halted, :interrupts, :interrupt_before_halt
+
       def initialize mmu=MMU.new
         @mmu = mmu
         reset
@@ -24,257 +26,275 @@ module GBRb
         @registers.pc.store 0x0000
         @last_m = 0
         @last_t = 0
+        @interrupts = :enabled
+        @halted = false
       end
 
       def instructions
         return @instructions if @instructions
 
         i = Array.new 256, :not_implemented
-        i[0x00] = Instruction.new
-        i[0x01] = Ld.new(:bc, nil, 3, 12, false, false, 2)
-        i[0x02] = Ld.new(:bc, :a, 1, 8, true, false)
-        i[0x03] = Inc.new(:bc, 1, 8, false)
-        i[0x04] = Inc.new(:b)
-        i[0x05] = Dec.new(:b)
-        i[0x06] = Ld.new(:b, nil, 2, 8, false, false, 1)
-        i[0x07] = Rl.new :a, true, false, 1, 4
-        i[0x08] = Ld.new(nil, :sp, 3, 20, :immediate, false, 2)
-        i[0x09] = AddHl.new(:bc)
-        i[0x0a] = Ld.new(:a, :bc, 1, 8, false, true)
-        i[0x0b] = Dec.new(:bc, 1, 8, false)
-        i[0x0c] = Inc.new(:c)
-        i[0x0d] = Dec.new(:c)
-        i[0x0e] = Ld.new(:c, nil, 2, 8, false, false, 1)
-        i[0x0f] = Rr.new :a, true, false, 1, 4
-
-        i[0x10] = Stop.new
-        i[0x11] = Ld.new(:de, nil, 3, 12, false, false, 2)
-        i[0x12] = Ld.new(:de, :a, 1, 8, true, false)
-        i[0x13] = Inc.new(:de, 1, 8, false)
-        i[0x14] = Inc.new(:d)
-        i[0x15] = Dec.new(:d)
-        i[0x16] = Ld.new(:d, nil, 2, 8, false, false, 1)
-        i[0x17] = Rl.new :a, false, false, 1, 4
-        i[0x18] = Jump.new :none
-        i[0x19] = AddHl.new(:de)
-        i[0x1a] = Ld.new(:a, :de, 1, 8, false, true)
-        i[0x1b] = Dec.new(:de, 1, 8, false)
-        i[0x1c] = Inc.new(:e)
-        i[0x1d] = Dec.new(:e)
-        i[0x1e] = Ld.new(:e, nil, 2, 8, false, false, 1)
-        i[0x1f] = Rr.new :a, true, false, 1, 4
-
-        i[0x20] = Jump.new(:nz)
-        i[0x21] = Ld.new(:hl, nil, 3, 12, false, false, 2)
-        i[0x22] = Ld.new(:hl, :a, 1, 8, :increment, false)
-        i[0x23] = Inc.new(:hl, 1, 8, false)
-        i[0x24] = Inc.new(:h)
-        i[0x25] = Dec.new(:h)
-        i[0x26] = Ld.new(:h, nil, 2, 8, false, false, 1)
-        i[0x28] = Jump.new :z
-        i[0x29] = AddHl.new(:hl)
-        i[0x2a] = Ld.new(:a, :hl, 1, 8, false, :increment)
-        i[0x2b] = Dec.new(:hl, 1, 8, false)
-        i[0x2c] = Inc.new(:l)
-        i[0x2d] = Dec.new(:l)
-        i[0x2e] = Ld.new(:l, nil, 2, 8, false, false, 1)
-        i[0x2f] = Cpl.new(1, 4)
-
-        i[0x30] = Jump.new :nc
-        i[0x31] = Ld.new(:sp, nil, 3, 12, false, false, 2)
-        i[0x32] = Ld.new(:hl, :a, 1, 8, :decrement, false)
-        i[0x33] = Inc.new(:sp, 1, 8, false)
-        i[0x34] = Inc.new(:hl, 1, 12, true, true)
-        i[0x35] = Dec.new(:hl, 1, 12, true, true)
-        i[0x36] = Ld.new(:hl, nil, 2, 12, true, false, 1)
-        i[0x37] = Scf.new
-        i[0x38] = Jump.new :c
-        i[0x39] = AddHl.new(:sp)
-        i[0x3a] = Ld.new(:a, :hl, 1, 8, false, :decrement)
-        i[0x3b] = Dec.new(:sp, 1, 8, false)
-        i[0x3c] = Inc.new(:a)
-        i[0x3d] = Dec.new(:a)
-        i[0x3e] = Ld.new(:a, nil, 2, 8, false, false, 1)
-        i[0x3f] = Ccf.new
-
-        i[0x40] = Ld.new(:b, :b)
-        i[0x41] = Ld.new(:b, :c)
-        i[0x42] = Ld.new(:b, :d)
-        i[0x43] = Ld.new(:b, :e)
-        i[0x44] = Ld.new(:b, :h)
-        i[0x45] = Ld.new(:b, :l)
-        i[0x46] = Ld.new(:b, :hl, 1, 8, false, true)
-        i[0x47] = Ld.new(:b, :a)
-        i[0x48] = Ld.new(:c, :b)
-        i[0x49] = Ld.new(:c, :c)
-        i[0x4a] = Ld.new(:c, :d)
-        i[0x4b] = Ld.new(:c, :e)
-        i[0x4c] = Ld.new(:c, :h)
-        i[0x4d] = Ld.new(:c, :l)
-        i[0x4e] = Ld.new(:c, :hl, 1, 8, false, true)
-        i[0x4f] = Ld.new(:c, :a)
-
-        i[0x50] = Ld.new(:d, :b)
-        i[0x51] = Ld.new(:d, :c)
-        i[0x52] = Ld.new(:d, :d)
-        i[0x53] = Ld.new(:d, :e)
-        i[0x54] = Ld.new(:d, :h)
-        i[0x55] = Ld.new(:d, :l)
-        i[0x56] = Ld.new(:d, :hl, 1, 8, false, true)
-        i[0x57] = Ld.new(:d, :a)
-        i[0x58] = Ld.new(:e, :b)
-        i[0x59] = Ld.new(:e, :c)
-        i[0x5a] = Ld.new(:e, :d)
-        i[0x5b] = Ld.new(:e, :e)
-        i[0x5c] = Ld.new(:e, :h)
-        i[0x5d] = Ld.new(:e, :l)
-        i[0x5e] = Ld.new(:e, :hl, 1, 8, false, true)
-        i[0x5f] = Ld.new(:e, :a)
-
-        i[0x60] = Ld.new(:h, :b)
-        i[0x61] = Ld.new(:h, :c)
-        i[0x62] = Ld.new(:h, :d)
-        i[0x63] = Ld.new(:h, :e)
-        i[0x64] = Ld.new(:h, :h)
-        i[0x65] = Ld.new(:h, :l)
-        i[0x66] = Ld.new(:h, :hl, 1, 8, false, true)
-        i[0x67] = Ld.new(:h, :a)
-        i[0x68] = Ld.new(:l, :b)
-        i[0x69] = Ld.new(:l, :c)
-        i[0x6a] = Ld.new(:l, :d)
-        i[0x6b] = Ld.new(:l, :e)
-        i[0x6c] = Ld.new(:l, :h)
-        i[0x6d] = Ld.new(:l, :l)
-        i[0x6e] = Ld.new(:l, :hl, 1, 8, false, true)
-        i[0x6f] = Ld.new(:l, :a)
-
-        i[0x70] = Ld.new(:hl, :b, 1, 8, true)
-        i[0x71] = Ld.new(:hl, :c, 1, 8, true)
-        i[0x72] = Ld.new(:hl, :d, 1, 8, true)
-        i[0x73] = Ld.new(:hl, :e, 1, 8, true)
-        i[0x74] = Ld.new(:hl, :h, 1, 8, true)
-        i[0x75] = Ld.new(:hl, :l, 1, 8, true)
-        i[0x77] = Ld.new(:hl, :a, 1, 8, true)
-        i[0x78] = Ld.new(:a, :b)
-        i[0x79] = Ld.new(:a, :c)
-        i[0x7a] = Ld.new(:a, :d)
-        i[0x7b] = Ld.new(:a, :e)
-        i[0x7c] = Ld.new(:a, :h)
-        i[0x7d] = Ld.new(:a, :l)
-        i[0x7e] = Ld.new(:a, :hl, 1, 8, false, true)
-        i[0x7f] = Ld.new(:a, :a)
-
-        i[0x80] = Add.new(:b)
-        i[0x81] = Add.new(:c)
-        i[0x82] = Add.new(:d)
-        i[0x83] = Add.new(:e)
-        i[0x84] = Add.new(:h)
-        i[0x85] = Add.new(:l)
-        i[0x86] = Add.new(:hl, 1, 8, true)
-        i[0x87] = Add.new(:a)
-        i[0x88] = Adc.new(:b)
-        i[0x89] = Adc.new(:c)
-        i[0x8a] = Adc.new(:d)
-        i[0x8b] = Adc.new(:e)
-        i[0x8c] = Adc.new(:h)
-        i[0x8d] = Adc.new(:l)
-        i[0x8e] = Adc.new(:hl, 1, 8, true)
-        i[0x8f] = Adc.new(:a)
-
-        i[0x90] = Sub.new(:b)
-        i[0x91] = Sub.new(:c)
-        i[0x92] = Sub.new(:d)
-        i[0x93] = Sub.new(:e)
-        i[0x94] = Sub.new(:h)
-        i[0x95] = Sub.new(:l)
-        i[0x96] = Sub.new(:hl, 1, 8, true)
-        i[0x97] = Sub.new(:a)
-        i[0x98] = Sbc.new(:b)
-        i[0x99] = Sbc.new(:c)
-        i[0x9a] = Sbc.new(:d)
-        i[0x9b] = Sbc.new(:e)
-        i[0x9c] = Sbc.new(:h)
-        i[0x9d] = Sbc.new(:l)
-        i[0x9e] = Sbc.new(:hl, 1, 8, true)
-        i[0x9f] = Sbc.new(:a)
-
-        i[0xa0] = And.new(:b)
-        i[0xa1] = And.new(:c)
-        i[0xa2] = And.new(:d)
-        i[0xa3] = And.new(:e)
-        i[0xa4] = And.new(:h)
-        i[0xa5] = And.new(:l)
-        i[0xa6] = And.new(:hl, 1, 8, true)
-        i[0xa7] = And.new(:a)
-        i[0xa8] = Xor.new(:b)
-        i[0xa9] = Xor.new(:c)
-        i[0xaa] = Xor.new(:d)
-        i[0xab] = Xor.new(:e)
-        i[0xac] = Xor.new(:h)
-        i[0xad] = Xor.new(:l)
-        i[0xae] = Xor.new(:hl, 1, 8, true)
-        i[0xaf] = Xor.new(:a)
-
-        i[0xb0] = Or.new(:b)
-        i[0xb1] = Or.new(:c)
-        i[0xb2] = Or.new(:d)
-        i[0xb3] = Or.new(:e)
-        i[0xb4] = Or.new(:h)
-        i[0xb5] = Or.new(:l)
-        i[0xb6] = Or.new(:hl, 1, 8, true)
-        i[0xb7] = Or.new(:a)
-        i[0xb8] = Cp.new(:b)
-        i[0xb9] = Cp.new(:c)
-        i[0xba] = Cp.new(:d)
-        i[0xbb] = Cp.new(:e)
-        i[0xbc] = Cp.new(:h)
-        i[0xbd] = Cp.new(:l)
-        i[0xbe] = Cp.new(:hl, 1, 8, true)
-        i[0xbf] = Cp.new(:a)
-
-        i[0xc0] = Ret.new(1, 8, 20, :NZ)
-        i[0xc1] = Pop.new(:bc)
-        i[0xc2] = Jump.new(:nz, 3, 16, 12, 2)
-        i[0xc5] = Push.new(:bc)
-        i[0xc6] = Add.new :a, 2, 8, false, 1
-        i[0xc7] = Rst.new(0x00)
-        i[0xc9] = Ret.new
-        i[0xcb] = Instruction.new
-        i[0xcc] = Call.new(3, 24, 2, :Z)
-        i[0xcd] = Call.new
-        i[0xce] = Adc.new(:a, 2, 8, false, 1)
-        i[0xcf] = Rst.new(0x08)
-
-        i[0xd1] = Pop.new(:de)
-        i[0xd5] = Push.new(:de)
-        i[0xd7] = Rst.new(0x10)
-        i[0xd9] = Ret.new
-        i[0xdd] = Instruction.new 0, 0
-        i[0xde] = Sbc.new(:a, 2, 8, false, 1)
-        i[0xdf] = Rst.new(0x18)
-
-        i[0xe0] = Ldh.new(nil, :a, 2, 12, true, false, 1, 0xff00)
-        i[0xe1] = Pop.new(:hl)
-        i[0xe2] = Ld.new(:c, :a, 2, 8, true, false, 0, 0xff00)
-        i[0xe5] = Push.new(:hl)
-        i[0xe6] = And.new(nil, 2, 8, false, 1)
-        i[0xe7] = Rst.new(0x20)
-        i[0xea] = Ld.new(nil, :a, 3, 16, :immediate, false, 2)
-        i[0xee] = Xor.new(:a, 2, 8, false, 1)
-        i[0xef] = Rst.new(0x28)
-
-        i[0xf0] = Ldh.new(:a, nil, 2, 12, false, true, 1, 0xff00)
-        i[0xf1] = Pop.new(:af)
-        i[0xf2] = Ld.new(:a, :c, 2, 8, false, true, 0, 0xff00)
-        i[0xf3] = DisableInterrupts.new
-        i[0xf5] = Push.new(:af)
-        i[0xf7] = Rst.new(0x30)
-        i[0xf8] = Ldhlsp.new
-        i[0xf9] = Ld.new(:sp, :hl, 1, 8)
-        i[0xfa] = Ld.new(:a, nil, 3, 16, false, true, 2)
-        i[0xfb] = EnableInterrupts.new
-        i[0xfe] = Cp.new nil, 2, 8, false, 1
-        i[0xff] = Rst.new(0x38)
+        i[0x00] = InstructionSet::Instruction.new
+        i[0x01] = InstructionSet::LdD16.new :bc
+        i[0x02] = InstructionSet::Ldnna.new :bc
+        i[0x03] = InstructionSet::Inc.new(:bc, 2, 8, false)
+        i[0x04] = InstructionSet::Inc.new(:b)
+        i[0x05] = InstructionSet::Dec.new(:b)
+        i[0x06] = InstructionSet::LdD8.new :b
+        i[0x07] = InstructionSet::Rl.new :a, true, false, 1, 4, false
+        i[0x08] = InstructionSet::Lda16sp.new
+        i[0x09] = InstructionSet::AddHl.new(:bc)
+        i[0x0a] = InstructionSet::Ldann.new :bc
+        i[0x0b] = InstructionSet::Dec.new(:bc, 2, 8, false)
+        i[0x0c] = InstructionSet::Inc.new(:c)
+        i[0x0d] = InstructionSet::Dec.new(:c)
+        i[0x0e] = InstructionSet::LdD8.new :c
+        i[0x0f] = InstructionSet::Rr.new :a, true, false, 1, 4, false
+
+        i[0x10] = InstructionSet::Stop.new
+        i[0x11] = InstructionSet::LdD16.new :de
+        i[0x12] = InstructionSet::Ldnna.new :de
+        i[0x13] = InstructionSet::Inc.new(:de, 2, 8, false)
+        i[0x14] = InstructionSet::Inc.new(:d)
+        i[0x15] = InstructionSet::Dec.new(:d)
+        i[0x16] = InstructionSet::LdD8.new :d
+        i[0x17] = InstructionSet::Rl.new :a, false, false, 1, 4, false
+        i[0x18] = InstructionSet::Jump.new :none
+        i[0x19] = InstructionSet::AddHl.new(:de)
+        i[0x1a] = InstructionSet::Ldann.new :de
+        i[0x1b] = InstructionSet::Dec.new(:de, 2, 8, false)
+        i[0x1c] = InstructionSet::Inc.new(:e)
+        i[0x1d] = InstructionSet::Dec.new(:e)
+        i[0x1e] = InstructionSet::LdD8.new :e
+        i[0x1f] = InstructionSet::Rr.new :a, false, false, 1, 4, false
+
+        i[0x20] = InstructionSet::Jump.new(:nz)
+        i[0x21] = InstructionSet::LdD16.new :hl
+        i[0x22] = InstructionSet::Ldhlia.new
+        i[0x23] = InstructionSet::Inc.new(:hl, 2, 8, false)
+        i[0x24] = InstructionSet::Inc.new(:h)
+        i[0x25] = InstructionSet::Dec.new(:h)
+        i[0x26] = InstructionSet::LdD8.new :h
+        i[0x27] = InstructionSet::Daa.new
+        i[0x28] = InstructionSet::Jump.new :z
+        i[0x29] = InstructionSet::AddHl.new(:hl)
+        i[0x2a] = InstructionSet::Ldahli.new
+        i[0x2b] = InstructionSet::Dec.new(:hl, 2, 8, false)
+        i[0x2c] = InstructionSet::Inc.new(:l)
+        i[0x2d] = InstructionSet::Dec.new(:l)
+        i[0x2e] = InstructionSet::LdD8.new :l
+        i[0x2f] = InstructionSet::Cpl.new(1, 4)
+
+        i[0x30] = InstructionSet::Jump.new :nc
+        i[0x31] = InstructionSet::LdD16.new :sp
+        i[0x32] = InstructionSet::Ldhlda.new
+        i[0x33] = InstructionSet::Inc.new(:sp, 2, 8, false)
+        i[0x34] = InstructionSet::Inc.new(:hl, 3, 12, true, true)
+        i[0x35] = InstructionSet::Dec.new(:hl, 3, 12, true, true)
+        i[0x36] = InstructionSet::LdhlD8.new
+        i[0x37] = InstructionSet::Scf.new
+        i[0x38] = InstructionSet::Jump.new :c
+        i[0x39] = InstructionSet::AddHl.new(:sp)
+        i[0x3a] = InstructionSet::Ldahld.new
+        i[0x3b] = InstructionSet::Dec.new(:sp, 2, 8, false)
+        i[0x3c] = InstructionSet::Inc.new(:a)
+        i[0x3d] = InstructionSet::Dec.new(:a)
+        i[0x3e] = InstructionSet::LdD8.new :a
+        i[0x3f] = InstructionSet::Ccf.new
+
+        i[0x40] = InstructionSet::Ld.new(:b, :b)
+        i[0x41] = InstructionSet::Ld.new(:b, :c)
+        i[0x42] = InstructionSet::Ld.new(:b, :d)
+        i[0x43] = InstructionSet::Ld.new(:b, :e)
+        i[0x44] = InstructionSet::Ld.new(:b, :h)
+        i[0x45] = InstructionSet::Ld.new(:b, :l)
+        i[0x46] = InstructionSet::Ldnhl.new(:b)
+        i[0x47] = InstructionSet::Ld.new(:b, :a)
+        i[0x48] = InstructionSet::Ld.new(:c, :b)
+        i[0x49] = InstructionSet::Ld.new(:c, :c)
+        i[0x4a] = InstructionSet::Ld.new(:c, :d)
+        i[0x4b] = InstructionSet::Ld.new(:c, :e)
+        i[0x4c] = InstructionSet::Ld.new(:c, :h)
+        i[0x4d] = InstructionSet::Ld.new(:c, :l)
+        i[0x4e] = InstructionSet::Ldnhl.new(:c)
+        i[0x4f] = InstructionSet::Ld.new(:c, :a)
+
+        i[0x50] = InstructionSet::Ld.new(:d, :b)
+        i[0x51] = InstructionSet::Ld.new(:d, :c)
+        i[0x52] = InstructionSet::Ld.new(:d, :d)
+        i[0x53] = InstructionSet::Ld.new(:d, :e)
+        i[0x54] = InstructionSet::Ld.new(:d, :h)
+        i[0x55] = InstructionSet::Ld.new(:d, :l)
+        i[0x56] = InstructionSet::Ldnhl.new(:d)
+        i[0x57] = InstructionSet::Ld.new(:d, :a)
+        i[0x58] = InstructionSet::Ld.new(:e, :b)
+        i[0x59] = InstructionSet::Ld.new(:e, :c)
+        i[0x5a] = InstructionSet::Ld.new(:e, :d)
+        i[0x5b] = InstructionSet::Ld.new(:e, :e)
+        i[0x5c] = InstructionSet::Ld.new(:e, :h)
+        i[0x5d] = InstructionSet::Ld.new(:e, :l)
+        i[0x5e] = InstructionSet::Ldnhl.new(:e)
+        i[0x5f] = InstructionSet::Ld.new(:e, :a)
+
+        i[0x60] = InstructionSet::Ld.new(:h, :b)
+        i[0x61] = InstructionSet::Ld.new(:h, :c)
+        i[0x62] = InstructionSet::Ld.new(:h, :d)
+        i[0x63] = InstructionSet::Ld.new(:h, :e)
+        i[0x64] = InstructionSet::Ld.new(:h, :h)
+        i[0x65] = InstructionSet::Ld.new(:h, :l)
+        i[0x66] = InstructionSet::Ldnhl.new(:h)
+        i[0x67] = InstructionSet::Ld.new(:h, :a)
+        i[0x68] = InstructionSet::Ld.new(:l, :b)
+        i[0x69] = InstructionSet::Ld.new(:l, :c)
+        i[0x6a] = InstructionSet::Ld.new(:l, :d)
+        i[0x6b] = InstructionSet::Ld.new(:l, :e)
+        i[0x6c] = InstructionSet::Ld.new(:l, :h)
+        i[0x6d] = InstructionSet::Ld.new(:l, :l)
+        i[0x6e] = InstructionSet::Ldnhl.new(:l)
+        i[0x6f] = InstructionSet::Ld.new(:l, :a)
+
+        i[0x70] = InstructionSet::Ldhln.new :b
+        i[0x71] = InstructionSet::Ldhln.new :c
+        i[0x72] = InstructionSet::Ldhln.new :d
+        i[0x73] = InstructionSet::Ldhln.new :e
+        i[0x74] = InstructionSet::Ldhln.new :h
+        i[0x75] = InstructionSet::Ldhln.new :l
+        i[0x76] = InstructionSet::Halt.new
+        i[0x77] = InstructionSet::Ldhln.new :a
+        i[0x78] = InstructionSet::Ld.new(:a, :b)
+        i[0x79] = InstructionSet::Ld.new(:a, :c)
+        i[0x7a] = InstructionSet::Ld.new(:a, :d)
+        i[0x7b] = InstructionSet::Ld.new(:a, :e)
+        i[0x7c] = InstructionSet::Ld.new(:a, :h)
+        i[0x7d] = InstructionSet::Ld.new(:a, :l)
+        i[0x7e] = InstructionSet::Ldnhl.new(:a)
+        i[0x7f] = InstructionSet::Ld.new(:a, :a)
+
+        i[0x80] = InstructionSet::Add.new(:b)
+        i[0x81] = InstructionSet::Add.new(:c)
+        i[0x82] = InstructionSet::Add.new(:d)
+        i[0x83] = InstructionSet::Add.new(:e)
+        i[0x84] = InstructionSet::Add.new(:h)
+        i[0x85] = InstructionSet::Add.new(:l)
+        i[0x86] = InstructionSet::Add.new(:hl, 2, 8, true)
+        i[0x87] = InstructionSet::Add.new(:a)
+        i[0x88] = InstructionSet::Adc.new(:b)
+        i[0x89] = InstructionSet::Adc.new(:c)
+        i[0x8a] = InstructionSet::Adc.new(:d)
+        i[0x8b] = InstructionSet::Adc.new(:e)
+        i[0x8c] = InstructionSet::Adc.new(:h)
+        i[0x8d] = InstructionSet::Adc.new(:l)
+        i[0x8e] = InstructionSet::Adc.new(:hl, 2, 8, true)
+        i[0x8f] = InstructionSet::Adc.new(:a)
+
+        i[0x90] = InstructionSet::Sub.new(:b)
+        i[0x91] = InstructionSet::Sub.new(:c)
+        i[0x92] = InstructionSet::Sub.new(:d)
+        i[0x93] = InstructionSet::Sub.new(:e)
+        i[0x94] = InstructionSet::Sub.new(:h)
+        i[0x95] = InstructionSet::Sub.new(:l)
+        i[0x96] = InstructionSet::Sub.new(:hl, 2, 8, true)
+        i[0x97] = InstructionSet::Sub.new(:a)
+        i[0x98] = InstructionSet::Sbc.new(:b)
+        i[0x99] = InstructionSet::Sbc.new(:c)
+        i[0x9a] = InstructionSet::Sbc.new(:d)
+        i[0x9b] = InstructionSet::Sbc.new(:e)
+        i[0x9c] = InstructionSet::Sbc.new(:h)
+        i[0x9d] = InstructionSet::Sbc.new(:l)
+        i[0x9e] = InstructionSet::Sbc.new(:hl, 2, 8, true)
+        i[0x9f] = InstructionSet::Sbc.new(:a)
+
+        i[0xa0] = InstructionSet::And.new(:b)
+        i[0xa1] = InstructionSet::And.new(:c)
+        i[0xa2] = InstructionSet::And.new(:d)
+        i[0xa3] = InstructionSet::And.new(:e)
+        i[0xa4] = InstructionSet::And.new(:h)
+        i[0xa5] = InstructionSet::And.new(:l)
+        i[0xa6] = InstructionSet::And.new(:hl, 2, 8, true)
+        i[0xa7] = InstructionSet::And.new(:a)
+        i[0xa8] = InstructionSet::Xor.new(:b)
+        i[0xa9] = InstructionSet::Xor.new(:c)
+        i[0xaa] = InstructionSet::Xor.new(:d)
+        i[0xab] = InstructionSet::Xor.new(:e)
+        i[0xac] = InstructionSet::Xor.new(:h)
+        i[0xad] = InstructionSet::Xor.new(:l)
+        i[0xae] = InstructionSet::Xor.new(:hl, 2, 8, true)
+        i[0xaf] = InstructionSet::Xor.new(:a)
+
+        i[0xb0] = InstructionSet::Or.new(:b)
+        i[0xb1] = InstructionSet::Or.new(:c)
+        i[0xb2] = InstructionSet::Or.new(:d)
+        i[0xb3] = InstructionSet::Or.new(:e)
+        i[0xb4] = InstructionSet::Or.new(:h)
+        i[0xb5] = InstructionSet::Or.new(:l)
+        i[0xb6] = InstructionSet::Or.new(:hl, 2, 8, true)
+        i[0xb7] = InstructionSet::Or.new(:a)
+        i[0xb8] = InstructionSet::Cp.new(:b)
+        i[0xb9] = InstructionSet::Cp.new(:c)
+        i[0xba] = InstructionSet::Cp.new(:d)
+        i[0xbb] = InstructionSet::Cp.new(:e)
+        i[0xbc] = InstructionSet::Cp.new(:h)
+        i[0xbd] = InstructionSet::Cp.new(:l)
+        i[0xbe] = InstructionSet::Cp.new(:hl, 2, 8, true)
+        i[0xbf] = InstructionSet::Cp.new(:a)
+
+        i[0xc0] = InstructionSet::Ret.new :nz
+        i[0xc1] = InstructionSet::Pop.new(:bc)
+        i[0xc2] = InstructionSet::Jump.new(:nz, 3, 16, 12, 2)
+        i[0xc3] = InstructionSet::Jump.new :none, 4, 16, 16, 2
+        i[0xc4] = InstructionSet::Call.new :nz
+        i[0xc5] = InstructionSet::Push.new(:bc)
+        i[0xc6] = InstructionSet::Add.new :a, 2, 8, false, 1
+        i[0xc7] = InstructionSet::Rst.new(0x00)
+        i[0xc8] = InstructionSet::Ret.new :z
+        i[0xc9] = InstructionSet::Ret.new :none, 4, 16, 16
+        i[0xca] = InstructionSet::Jump.new :z, 3, 16, 12, 2
+        i[0xcb] = InstructionSet::Instruction.new
+        i[0xcc] = InstructionSet::Call.new :z
+        i[0xcd] = InstructionSet::Call.new :none
+        i[0xce] = InstructionSet::Adc.new(:a, 2, 8, false, 1)
+        i[0xcf] = InstructionSet::Rst.new(0x08)
+
+        i[0xd0] = InstructionSet::Ret.new :nc
+        i[0xd1] = InstructionSet::Pop.new(:de)
+        i[0xd2] = InstructionSet::Jump.new :nc, 3, 16, 12, 2
+        i[0xd4] = InstructionSet::Call.new :nc
+        i[0xd5] = InstructionSet::Push.new(:de)
+        i[0xd6] = InstructionSet::Sub.new :a, 2, 8, false, 1
+        i[0xd7] = InstructionSet::Rst.new(0x10)
+        i[0xd8] = InstructionSet::Ret.new :c
+        i[0xd9] = InstructionSet::Ret.new :none
+        i[0xda] = InstructionSet::Jump.new :c, 3, 16, 12, 2
+        i[0xdc] = InstructionSet::Call.new :c
+        i[0xdd] = InstructionSet::Instruction.new 0, 0
+        i[0xde] = InstructionSet::Sbc.new(:a, 2, 8, false, 1)
+        i[0xdf] = InstructionSet::Rst.new(0x18)
+
+        i[0xe0] = InstructionSet::Ldh.new nil, :a, true, false
+        i[0xe1] = InstructionSet::Pop.new(:hl)
+        i[0xe2] = InstructionSet::Ldca.new
+        i[0xe5] = InstructionSet::Push.new(:hl)
+        i[0xe6] = InstructionSet::And.new(nil, 2, 8, false, 1)
+        i[0xe7] = InstructionSet::Rst.new(0x20)
+        i[0xe8] = InstructionSet::AddSpR8.new
+        i[0xe9] = InstructionSet::Jump.new :none, 1, 4, 4, 0
+        i[0xea] = InstructionSet::Lda16a.new
+        i[0xee] = InstructionSet::Xor.new(:a, 2, 8, false, 1)
+        i[0xef] = InstructionSet::Rst.new(0x28)
+
+        i[0xf0] = InstructionSet::Ldh.new :a, nil, false, true
+        i[0xf1] = InstructionSet::Pop.new(:af)
+        i[0xf2] = InstructionSet::Ldac.new
+        i[0xf3] = InstructionSet::DisableInterrupts.new
+        i[0xf5] = InstructionSet::Push.new(:af)
+        i[0xf6] = InstructionSet::Or.new :a, 2, 8, false, 1
+        i[0xf7] = InstructionSet::Rst.new(0x30)
+        i[0xf8] = InstructionSet::Ldhlsp.new
+        i[0xf9] = InstructionSet::Ldsphl.new
+        i[0xfa] = InstructionSet::Ldaa16.new
+        i[0xfb] = InstructionSet::EnableInterrupts.new
+        i[0xfe] = InstructionSet::Cp.new nil, 2, 8, false, 1
+        i[0xff] = InstructionSet::Rst.new(0x38)
 
         @instructions = i
       end
@@ -284,252 +304,277 @@ module GBRb
 
         i = Array.new 256, :not_implemented
 
-        i[0x00] = Rl.new :b, true
-        i[0x01] = Rl.new :c, true
-        i[0x02] = Rl.new :d, true
-        i[0x03] = Rl.new :e, true
-        i[0x04] = Rl.new :h, true
-        i[0x05] = Rl.new :l, true
-        i[0x06] = Rl.new :hl, true, true
-        i[0x07] = Rl.new :a, true
-        i[0x08] = Rr.new :b, true
-        i[0x09] = Rr.new :c, true
-        i[0x0a] = Rr.new :d, true
-        i[0x0b] = Rr.new :e, true
-        i[0x0c] = Rr.new :h, true
-        i[0x0d] = Rr.new :l, true
-        i[0x0e] = Rr.new :hl, true, true
-        i[0x0f] = Rr.new :a, true
-
-        i[0x10] = Rl.new :b
-        i[0x11] = Rl.new :c
-        i[0x12] = Rl.new :d
-        i[0x13] = Rl.new :e
-        i[0x14] = Rl.new :h
-        i[0x15] = Rl.new :l
-        i[0x16] = Rl.new :hl, false, true
-        i[0x17] = Rl.new :a
-        i[0x18] = Rr.new :b
-        i[0x19] = Rr.new :c
-        i[0x1a] = Rr.new :d
-        i[0x1b] = Rr.new :e
-        i[0x1c] = Rr.new :h
-        i[0x1d] = Rr.new :l
-        i[0x1e] = Rr.new :hl, false, true
-        i[0x1f] = Rr.new :a
-
-        i[0x30] = Swap.new :b
-        i[0x31] = Swap.new :c
-        i[0x32] = Swap.new :d
-        i[0x33] = Swap.new :e
-        i[0x34] = Swap.new :h
-        i[0x35] = Swap.new :l
-        i[0x36] = Swap.new :hl, 2, 16, true
-        i[0x37] = Swap.new :a
-
-        i[0x40] = Bit.new 0, :b
-        i[0x41] = Bit.new 0, :c
-        i[0x42] = Bit.new 0, :d
-        i[0x43] = Bit.new 0, :e
-        i[0x44] = Bit.new 0, :h
-        i[0x45] = Bit.new 0, :l
-        i[0x46] = Bit.new 0, :hl, true
-        i[0x47] = Bit.new 0, :a
-        i[0x48] = Bit.new 1, :b
-        i[0x49] = Bit.new 1, :c
-        i[0x4a] = Bit.new 1, :d
-        i[0x4b] = Bit.new 1, :e
-        i[0x4c] = Bit.new 1, :h
-        i[0x4d] = Bit.new 1, :l
-        i[0x4e] = Bit.new 1, :hl, true
-        i[0x4f] = Bit.new 1, :a
-
-        i[0x50] = Bit.new 2, :b
-        i[0x51] = Bit.new 2, :c
-        i[0x52] = Bit.new 2, :d
-        i[0x53] = Bit.new 2, :e
-        i[0x54] = Bit.new 2, :h
-        i[0x55] = Bit.new 2, :l
-        i[0x56] = Bit.new 2, :hl, true
-        i[0x57] = Bit.new 2, :a
-        i[0x58] = Bit.new 3, :b
-        i[0x59] = Bit.new 3, :c
-        i[0x5a] = Bit.new 3, :d
-        i[0x5b] = Bit.new 3, :e
-        i[0x5c] = Bit.new 3, :h
-        i[0x5d] = Bit.new 3, :l
-        i[0x5e] = Bit.new 3, :hl, true
-        i[0x5f] = Bit.new 3, :a
-
-        i[0x60] = Bit.new 4, :b
-        i[0x61] = Bit.new 4, :c
-        i[0x62] = Bit.new 4, :d
-        i[0x63] = Bit.new 4, :e
-        i[0x64] = Bit.new 4, :h
-        i[0x65] = Bit.new 4, :l
-        i[0x66] = Bit.new 4, :hl, true
-        i[0x67] = Bit.new 4, :a
-        i[0x68] = Bit.new 5, :b
-        i[0x69] = Bit.new 5, :c
-        i[0x6a] = Bit.new 5, :d
-        i[0x6b] = Bit.new 5, :e
-        i[0x6c] = Bit.new 5, :h
-        i[0x6d] = Bit.new 5, :l
-        i[0x6e] = Bit.new 5, :hl, true
-        i[0x6f] = Bit.new 5, :a
-
-        i[0x70] = Bit.new 6, :b
-        i[0x71] = Bit.new 6, :c
-        i[0x72] = Bit.new 6, :d
-        i[0x73] = Bit.new 6, :e
-        i[0x74] = Bit.new 6, :h
-        i[0x75] = Bit.new 6, :l
-        i[0x76] = Bit.new 6, :hl, true
-        i[0x77] = Bit.new 6, :a
-        i[0x78] = Bit.new 7, :b
-        i[0x79] = Bit.new 7, :c
-        i[0x7a] = Bit.new 7, :d
-        i[0x7b] = Bit.new 7, :e
-        i[0x7c] = Bit.new 7, :h
-        i[0x7d] = Bit.new 7, :l
-        i[0x7e] = Bit.new 7, :hl, true
-        i[0x7f] = Bit.new 7, :a
-
-        i[0x80] = Res.new 0, :b
-        i[0x81] = Res.new 0, :c
-        i[0x82] = Res.new 0, :d
-        i[0x83] = Res.new 0, :e
-        i[0x84] = Res.new 0, :h
-        i[0x85] = Res.new 0, :l
-        i[0x86] = Res.new 0, :hl, true
-        i[0x87] = Res.new 0, :a
-        i[0x88] = Res.new 1, :b
-        i[0x89] = Res.new 1, :c
-        i[0x8a] = Res.new 1, :d
-        i[0x8b] = Res.new 1, :e
-        i[0x8c] = Res.new 1, :h
-        i[0x8d] = Res.new 1, :l
-        i[0x8e] = Res.new 1, :hl, true
-        i[0x8f] = Res.new 1, :a
-
-        i[0x90] = Res.new 2, :b
-        i[0x91] = Res.new 2, :c
-        i[0x92] = Res.new 2, :d
-        i[0x93] = Res.new 2, :e
-        i[0x94] = Res.new 2, :h
-        i[0x95] = Res.new 2, :l
-        i[0x96] = Res.new 2, :hl, true
-        i[0x97] = Res.new 2, :a
-        i[0x98] = Res.new 3, :b
-        i[0x99] = Res.new 3, :c
-        i[0x9a] = Res.new 3, :d
-        i[0x9b] = Res.new 3, :e
-        i[0x9c] = Res.new 3, :h
-        i[0x9d] = Res.new 3, :l
-        i[0x9e] = Res.new 3, :hl, true
-        i[0x9f] = Res.new 3, :a
-
-        i[0xa0] = Res.new 4, :b
-        i[0xa1] = Res.new 4, :c
-        i[0xa2] = Res.new 4, :d
-        i[0xa3] = Res.new 4, :e
-        i[0xa4] = Res.new 4, :h
-        i[0xa5] = Res.new 4, :l
-        i[0xa6] = Res.new 4, :hl, true
-        i[0xa7] = Res.new 4, :a
-        i[0xa8] = Res.new 5, :b
-        i[0xa9] = Res.new 5, :c
-        i[0xaa] = Res.new 5, :d
-        i[0xab] = Res.new 5, :e
-        i[0xac] = Res.new 5, :h
-        i[0xad] = Res.new 5, :l
-        i[0xae] = Res.new 5, :hl, true
-        i[0xaf] = Res.new 5, :a
-
-        i[0xb0] = Res.new 6, :b
-        i[0xb1] = Res.new 6, :c
-        i[0xb2] = Res.new 6, :d
-        i[0xb3] = Res.new 6, :e
-        i[0xb4] = Res.new 6, :h
-        i[0xb5] = Res.new 6, :l
-        i[0xb6] = Res.new 6, :hl, true
-        i[0xb7] = Res.new 6, :a
-        i[0xb8] = Res.new 7, :b
-        i[0xb9] = Res.new 7, :c
-        i[0xba] = Res.new 7, :d
-        i[0xbb] = Res.new 7, :e
-        i[0xbc] = Res.new 7, :h
-        i[0xbd] = Res.new 7, :l
-        i[0xbe] = Res.new 7, :hl, true
-        i[0xbf] = Res.new 7, :a
-
-        i[0xc0] = Set.new 0, :b
-        i[0xc1] = Set.new 0, :c
-        i[0xc2] = Set.new 0, :d
-        i[0xc3] = Set.new 0, :e
-        i[0xc4] = Set.new 0, :h
-        i[0xc5] = Set.new 0, :l
-        i[0xc6] = Set.new 0, :hl, true
-        i[0xc7] = Set.new 0, :a
-        i[0xc8] = Set.new 1, :b
-        i[0xc9] = Set.new 1, :c
-        i[0xca] = Set.new 1, :d
-        i[0xcb] = Set.new 1, :e
-        i[0xcc] = Set.new 1, :h
-        i[0xcd] = Set.new 1, :l
-        i[0xce] = Set.new 1, :hl, true
-        i[0xcf] = Set.new 1, :a
-
-        i[0xd0] = Set.new 2, :b
-        i[0xd1] = Set.new 2, :c
-        i[0xd2] = Set.new 2, :d
-        i[0xd3] = Set.new 2, :e
-        i[0xd4] = Set.new 2, :h
-        i[0xd5] = Set.new 2, :l
-        i[0xd6] = Set.new 2, :hl, true
-        i[0xd7] = Set.new 2, :a
-        i[0xd8] = Set.new 3, :b
-        i[0xd9] = Set.new 3, :c
-        i[0xda] = Set.new 3, :d
-        i[0xdb] = Set.new 3, :e
-        i[0xdc] = Set.new 3, :h
-        i[0xdd] = Set.new 3, :l
-        i[0xde] = Set.new 3, :hl, true
-        i[0xdf] = Set.new 3, :a
-
-        i[0xe0] = Set.new 4, :b
-        i[0xe1] = Set.new 4, :c
-        i[0xe2] = Set.new 4, :d
-        i[0xe3] = Set.new 4, :e
-        i[0xe4] = Set.new 4, :h
-        i[0xe5] = Set.new 4, :l
-        i[0xe6] = Set.new 4, :hl, true
-        i[0xe7] = Set.new 4, :a
-        i[0xe8] = Set.new 5, :b
-        i[0xe9] = Set.new 5, :c
-        i[0xea] = Set.new 5, :d
-        i[0xeb] = Set.new 5, :e
-        i[0xec] = Set.new 5, :h
-        i[0xed] = Set.new 5, :l
-        i[0xee] = Set.new 5, :hl, true
-        i[0xef] = Set.new 5, :a
-
-        i[0xf0] = Set.new 6, :b
-        i[0xf1] = Set.new 6, :c
-        i[0xf2] = Set.new 6, :d
-        i[0xf3] = Set.new 6, :e
-        i[0xf4] = Set.new 6, :h
-        i[0xf5] = Set.new 6, :l
-        i[0xf6] = Set.new 6, :hl, true
-        i[0xf7] = Set.new 6, :a
-        i[0xf8] = Set.new 7, :b
-        i[0xf9] = Set.new 7, :c
-        i[0xfa] = Set.new 7, :d
-        i[0xfb] = Set.new 7, :e
-        i[0xfc] = Set.new 7, :h
-        i[0xfd] = Set.new 7, :l
-        i[0xfe] = Set.new 7, :hl, true
-        i[0xff] = Set.new 7, :a
+        i[0x00] = InstructionSet::Rl.new :b, true
+        i[0x01] = InstructionSet::Rl.new :c, true
+        i[0x02] = InstructionSet::Rl.new :d, true
+        i[0x03] = InstructionSet::Rl.new :e, true
+        i[0x04] = InstructionSet::Rl.new :h, true
+        i[0x05] = InstructionSet::Rl.new :l, true
+        i[0x06] = InstructionSet::Rl.new :hl, true, true
+        i[0x07] = InstructionSet::Rl.new :a, true
+        i[0x08] = InstructionSet::Rr.new :b, true
+        i[0x09] = InstructionSet::Rr.new :c, true
+        i[0x0a] = InstructionSet::Rr.new :d, true
+        i[0x0b] = InstructionSet::Rr.new :e, true
+        i[0x0c] = InstructionSet::Rr.new :h, true
+        i[0x0d] = InstructionSet::Rr.new :l, true
+        i[0x0e] = InstructionSet::Rr.new :hl, true, true
+        i[0x0f] = InstructionSet::Rr.new :a, true
+
+        i[0x10] = InstructionSet::Rl.new :b
+        i[0x11] = InstructionSet::Rl.new :c
+        i[0x12] = InstructionSet::Rl.new :d
+        i[0x13] = InstructionSet::Rl.new :e
+        i[0x14] = InstructionSet::Rl.new :h
+        i[0x15] = InstructionSet::Rl.new :l
+        i[0x16] = InstructionSet::Rl.new :hl, false, true
+        i[0x17] = InstructionSet::Rl.new :a
+        i[0x18] = InstructionSet::Rr.new :b
+        i[0x19] = InstructionSet::Rr.new :c
+        i[0x1a] = InstructionSet::Rr.new :d
+        i[0x1b] = InstructionSet::Rr.new :e
+        i[0x1c] = InstructionSet::Rr.new :h
+        i[0x1d] = InstructionSet::Rr.new :l
+        i[0x1e] = InstructionSet::Rr.new :hl, false, true
+        i[0x1f] = InstructionSet::Rr.new :a
+
+        i[0x20] = InstructionSet::Sla.new :b
+        i[0x21] = InstructionSet::Sla.new :c
+        i[0x22] = InstructionSet::Sla.new :d
+        i[0x23] = InstructionSet::Sla.new :e
+        i[0x24] = InstructionSet::Sla.new :h
+        i[0x25] = InstructionSet::Sla.new :l
+        i[0x26] = InstructionSet::Sla.new :hl, true, 3, 12
+        i[0x27] = InstructionSet::Sla.new :a
+        i[0x28] = InstructionSet::Sra.new :b
+        i[0x29] = InstructionSet::Sra.new :c
+        i[0x2a] = InstructionSet::Sra.new :d
+        i[0x2b] = InstructionSet::Sra.new :e
+        i[0x2c] = InstructionSet::Sra.new :h
+        i[0x2d] = InstructionSet::Sra.new :l
+        i[0x2e] = InstructionSet::Sra.new :hl, true, 3, 12
+        i[0x2f] = InstructionSet::Sra.new :a
+
+        i[0x30] = InstructionSet::Swap.new :b
+        i[0x31] = InstructionSet::Swap.new :c
+        i[0x32] = InstructionSet::Swap.new :d
+        i[0x33] = InstructionSet::Swap.new :e
+        i[0x34] = InstructionSet::Swap.new :h
+        i[0x35] = InstructionSet::Swap.new :l
+        i[0x36] = InstructionSet::Swap.new :hl, 2, 16, true
+        i[0x37] = InstructionSet::Swap.new :a
+        i[0x38] = InstructionSet::Srl.new :b
+        i[0x39] = InstructionSet::Srl.new :c
+        i[0x3a] = InstructionSet::Srl.new :d
+        i[0x3b] = InstructionSet::Srl.new :e
+        i[0x3c] = InstructionSet::Srl.new :h
+        i[0x3d] = InstructionSet::Srl.new :l
+        i[0x3e] = InstructionSet::Srl.new :hl, true, 2, 16
+        i[0x3f] = InstructionSet::Srl.new :a
+
+        i[0x40] = InstructionSet::Bit.new 0, :b
+        i[0x41] = InstructionSet::Bit.new 0, :c
+        i[0x42] = InstructionSet::Bit.new 0, :d
+        i[0x43] = InstructionSet::Bit.new 0, :e
+        i[0x44] = InstructionSet::Bit.new 0, :h
+        i[0x45] = InstructionSet::Bit.new 0, :l
+        i[0x46] = InstructionSet::Bit.new 0, :hl, true
+        i[0x47] = InstructionSet::Bit.new 0, :a
+        i[0x48] = InstructionSet::Bit.new 1, :b
+        i[0x49] = InstructionSet::Bit.new 1, :c
+        i[0x4a] = InstructionSet::Bit.new 1, :d
+        i[0x4b] = InstructionSet::Bit.new 1, :e
+        i[0x4c] = InstructionSet::Bit.new 1, :h
+        i[0x4d] = InstructionSet::Bit.new 1, :l
+        i[0x4e] = InstructionSet::Bit.new 1, :hl, true
+        i[0x4f] = InstructionSet::Bit.new 1, :a
+
+        i[0x50] = InstructionSet::Bit.new 2, :b
+        i[0x51] = InstructionSet::Bit.new 2, :c
+        i[0x52] = InstructionSet::Bit.new 2, :d
+        i[0x53] = InstructionSet::Bit.new 2, :e
+        i[0x54] = InstructionSet::Bit.new 2, :h
+        i[0x55] = InstructionSet::Bit.new 2, :l
+        i[0x56] = InstructionSet::Bit.new 2, :hl, true
+        i[0x57] = InstructionSet::Bit.new 2, :a
+        i[0x58] = InstructionSet::Bit.new 3, :b
+        i[0x59] = InstructionSet::Bit.new 3, :c
+        i[0x5a] = InstructionSet::Bit.new 3, :d
+        i[0x5b] = InstructionSet::Bit.new 3, :e
+        i[0x5c] = InstructionSet::Bit.new 3, :h
+        i[0x5d] = InstructionSet::Bit.new 3, :l
+        i[0x5e] = InstructionSet::Bit.new 3, :hl, true
+        i[0x5f] = InstructionSet::Bit.new 3, :a
+
+        i[0x60] = InstructionSet::Bit.new 4, :b
+        i[0x61] = InstructionSet::Bit.new 4, :c
+        i[0x62] = InstructionSet::Bit.new 4, :d
+        i[0x63] = InstructionSet::Bit.new 4, :e
+        i[0x64] = InstructionSet::Bit.new 4, :h
+        i[0x65] = InstructionSet::Bit.new 4, :l
+        i[0x66] = InstructionSet::Bit.new 4, :hl, true
+        i[0x67] = InstructionSet::Bit.new 4, :a
+        i[0x68] = InstructionSet::Bit.new 5, :b
+        i[0x69] = InstructionSet::Bit.new 5, :c
+        i[0x6a] = InstructionSet::Bit.new 5, :d
+        i[0x6b] = InstructionSet::Bit.new 5, :e
+        i[0x6c] = InstructionSet::Bit.new 5, :h
+        i[0x6d] = InstructionSet::Bit.new 5, :l
+        i[0x6e] = InstructionSet::Bit.new 5, :hl, true
+        i[0x6f] = InstructionSet::Bit.new 5, :a
+
+        i[0x70] = InstructionSet::Bit.new 6, :b
+        i[0x71] = InstructionSet::Bit.new 6, :c
+        i[0x72] = InstructionSet::Bit.new 6, :d
+        i[0x73] = InstructionSet::Bit.new 6, :e
+        i[0x74] = InstructionSet::Bit.new 6, :h
+        i[0x75] = InstructionSet::Bit.new 6, :l
+        i[0x76] = InstructionSet::Bit.new 6, :hl, true
+        i[0x77] = InstructionSet::Bit.new 6, :a
+        i[0x78] = InstructionSet::Bit.new 7, :b
+        i[0x79] = InstructionSet::Bit.new 7, :c
+        i[0x7a] = InstructionSet::Bit.new 7, :d
+        i[0x7b] = InstructionSet::Bit.new 7, :e
+        i[0x7c] = InstructionSet::Bit.new 7, :h
+        i[0x7d] = InstructionSet::Bit.new 7, :l
+        i[0x7e] = InstructionSet::Bit.new 7, :hl, true
+        i[0x7f] = InstructionSet::Bit.new 7, :a
+
+        i[0x80] = InstructionSet::Res.new 0, :b
+        i[0x81] = InstructionSet::Res.new 0, :c
+        i[0x82] = InstructionSet::Res.new 0, :d
+        i[0x83] = InstructionSet::Res.new 0, :e
+        i[0x84] = InstructionSet::Res.new 0, :h
+        i[0x85] = InstructionSet::Res.new 0, :l
+        i[0x86] = InstructionSet::Res.new 0, :hl, true
+        i[0x87] = InstructionSet::Res.new 0, :a
+        i[0x88] = InstructionSet::Res.new 1, :b
+        i[0x89] = InstructionSet::Res.new 1, :c
+        i[0x8a] = InstructionSet::Res.new 1, :d
+        i[0x8b] = InstructionSet::Res.new 1, :e
+        i[0x8c] = InstructionSet::Res.new 1, :h
+        i[0x8d] = InstructionSet::Res.new 1, :l
+        i[0x8e] = InstructionSet::Res.new 1, :hl, true
+        i[0x8f] = InstructionSet::Res.new 1, :a
+
+        i[0x90] = InstructionSet::Res.new 2, :b
+        i[0x91] = InstructionSet::Res.new 2, :c
+        i[0x92] = InstructionSet::Res.new 2, :d
+        i[0x93] = InstructionSet::Res.new 2, :e
+        i[0x94] = InstructionSet::Res.new 2, :h
+        i[0x95] = InstructionSet::Res.new 2, :l
+        i[0x96] = InstructionSet::Res.new 2, :hl, true
+        i[0x97] = InstructionSet::Res.new 2, :a
+        i[0x98] = InstructionSet::Res.new 3, :b
+        i[0x99] = InstructionSet::Res.new 3, :c
+        i[0x9a] = InstructionSet::Res.new 3, :d
+        i[0x9b] = InstructionSet::Res.new 3, :e
+        i[0x9c] = InstructionSet::Res.new 3, :h
+        i[0x9d] = InstructionSet::Res.new 3, :l
+        i[0x9e] = InstructionSet::Res.new 3, :hl, true
+        i[0x9f] = InstructionSet::Res.new 3, :a
+
+        i[0xa0] = InstructionSet::Res.new 4, :b
+        i[0xa1] = InstructionSet::Res.new 4, :c
+        i[0xa2] = InstructionSet::Res.new 4, :d
+        i[0xa3] = InstructionSet::Res.new 4, :e
+        i[0xa4] = InstructionSet::Res.new 4, :h
+        i[0xa5] = InstructionSet::Res.new 4, :l
+        i[0xa6] = InstructionSet::Res.new 4, :hl, true
+        i[0xa7] = InstructionSet::Res.new 4, :a
+        i[0xa8] = InstructionSet::Res.new 5, :b
+        i[0xa9] = InstructionSet::Res.new 5, :c
+        i[0xaa] = InstructionSet::Res.new 5, :d
+        i[0xab] = InstructionSet::Res.new 5, :e
+        i[0xac] = InstructionSet::Res.new 5, :h
+        i[0xad] = InstructionSet::Res.new 5, :l
+        i[0xae] = InstructionSet::Res.new 5, :hl, true
+        i[0xaf] = InstructionSet::Res.new 5, :a
+
+        i[0xb0] = InstructionSet::Res.new 6, :b
+        i[0xb1] = InstructionSet::Res.new 6, :c
+        i[0xb2] = InstructionSet::Res.new 6, :d
+        i[0xb3] = InstructionSet::Res.new 6, :e
+        i[0xb4] = InstructionSet::Res.new 6, :h
+        i[0xb5] = InstructionSet::Res.new 6, :l
+        i[0xb6] = InstructionSet::Res.new 6, :hl, true
+        i[0xb7] = InstructionSet::Res.new 6, :a
+        i[0xb8] = InstructionSet::Res.new 7, :b
+        i[0xb9] = InstructionSet::Res.new 7, :c
+        i[0xba] = InstructionSet::Res.new 7, :d
+        i[0xbb] = InstructionSet::Res.new 7, :e
+        i[0xbc] = InstructionSet::Res.new 7, :h
+        i[0xbd] = InstructionSet::Res.new 7, :l
+        i[0xbe] = InstructionSet::Res.new 7, :hl, true
+        i[0xbf] = InstructionSet::Res.new 7, :a
+
+        i[0xc0] = InstructionSet::Set.new 0, :b
+        i[0xc1] = InstructionSet::Set.new 0, :c
+        i[0xc2] = InstructionSet::Set.new 0, :d
+        i[0xc3] = InstructionSet::Set.new 0, :e
+        i[0xc4] = InstructionSet::Set.new 0, :h
+        i[0xc5] = InstructionSet::Set.new 0, :l
+        i[0xc6] = InstructionSet::Set.new 0, :hl, true
+        i[0xc7] = InstructionSet::Set.new 0, :a
+        i[0xc8] = InstructionSet::Set.new 1, :b
+        i[0xc9] = InstructionSet::Set.new 1, :c
+        i[0xca] = InstructionSet::Set.new 1, :d
+        i[0xcb] = InstructionSet::Set.new 1, :e
+        i[0xcc] = InstructionSet::Set.new 1, :h
+        i[0xcd] = InstructionSet::Set.new 1, :l
+        i[0xce] = InstructionSet::Set.new 1, :hl, true
+        i[0xcf] = InstructionSet::Set.new 1, :a
+
+        i[0xd0] = InstructionSet::Set.new 2, :b
+        i[0xd1] = InstructionSet::Set.new 2, :c
+        i[0xd2] = InstructionSet::Set.new 2, :d
+        i[0xd3] = InstructionSet::Set.new 2, :e
+        i[0xd4] = InstructionSet::Set.new 2, :h
+        i[0xd5] = InstructionSet::Set.new 2, :l
+        i[0xd6] = InstructionSet::Set.new 2, :hl, true
+        i[0xd7] = InstructionSet::Set.new 2, :a
+        i[0xd8] = InstructionSet::Set.new 3, :b
+        i[0xd9] = InstructionSet::Set.new 3, :c
+        i[0xda] = InstructionSet::Set.new 3, :d
+        i[0xdb] = InstructionSet::Set.new 3, :e
+        i[0xdc] = InstructionSet::Set.new 3, :h
+        i[0xdd] = InstructionSet::Set.new 3, :l
+        i[0xde] = InstructionSet::Set.new 3, :hl, true
+        i[0xdf] = InstructionSet::Set.new 3, :a
+
+        i[0xe0] = InstructionSet::Set.new 4, :b
+        i[0xe1] = InstructionSet::Set.new 4, :c
+        i[0xe2] = InstructionSet::Set.new 4, :d
+        i[0xe3] = InstructionSet::Set.new 4, :e
+        i[0xe4] = InstructionSet::Set.new 4, :h
+        i[0xe5] = InstructionSet::Set.new 4, :l
+        i[0xe6] = InstructionSet::Set.new 4, :hl, true
+        i[0xe7] = InstructionSet::Set.new 4, :a
+        i[0xe8] = InstructionSet::Set.new 5, :b
+        i[0xe9] = InstructionSet::Set.new 5, :c
+        i[0xea] = InstructionSet::Set.new 5, :d
+        i[0xeb] = InstructionSet::Set.new 5, :e
+        i[0xec] = InstructionSet::Set.new 5, :h
+        i[0xed] = InstructionSet::Set.new 5, :l
+        i[0xee] = InstructionSet::Set.new 5, :hl, true
+        i[0xef] = InstructionSet::Set.new 5, :a
+
+        i[0xf0] = InstructionSet::Set.new 6, :b
+        i[0xf1] = InstructionSet::Set.new 6, :c
+        i[0xf2] = InstructionSet::Set.new 6, :d
+        i[0xf3] = InstructionSet::Set.new 6, :e
+        i[0xf4] = InstructionSet::Set.new 6, :h
+        i[0xf5] = InstructionSet::Set.new 6, :l
+        i[0xf6] = InstructionSet::Set.new 6, :hl, true
+        i[0xf7] = InstructionSet::Set.new 6, :a
+        i[0xf8] = InstructionSet::Set.new 7, :b
+        i[0xf9] = InstructionSet::Set.new 7, :c
+        i[0xfa] = InstructionSet::Set.new 7, :d
+        i[0xfb] = InstructionSet::Set.new 7, :e
+        i[0xfc] = InstructionSet::Set.new 7, :h
+        i[0xfd] = InstructionSet::Set.new 7, :l
+        i[0xfe] = InstructionSet::Set.new 7, :hl, true
+        i[0xff] = InstructionSet::Set.new 7, :a
 
         @cb_instructions = i
       end
@@ -538,8 +583,33 @@ module GBRb
         @clock ||= { m: 0, t: 0 }
       end
 
+      def check_for_interrupts
+        if @interrupts == :enabled
+          ie        = @mmu.read_byte INTERRUPT_ENABLED_FLAG_ADDR
+          iflag     = @mmu.read_byte INTERRUPT_FLAG_ADDR
+          interrupt = ie & iflag
+
+          if interrupt != 0x00
+            if interrupt & TIMER_OVERFLOW_IRQ == TIMER_OVERFLOW_IRQ
+              @mmu.write_byte INTERRUPT_FLAG_ADDR, iflag & 0xfb
+              r.sp.store r.sp.read - 2
+              @mmu.write_word r.sp.read, r.pc.read
+              r.pc.store TIMER_OVERFLOW_IR_ADDR
+              @interrupts = :disabled
+            end
+          end
+        end
+      end
+
       def step
-        dispatch decode fetch
+
+        if @halted
+          @halted = false if @interrupt_before_halt != @mmu.read_byte(INTERRUPT_FLAG_ADDR)
+          @last_m
+        else
+          check_for_interrupts
+          dispatch decode fetch
+        end
       end
 
       def fetch
@@ -549,11 +619,11 @@ module GBRb
       end
 
       def decode opcode
-        if @cb_prefix
-          @cb_prefix = false
-          cb_instructions[opcode.to_i]
+        if opcode == 0xcb
+          @cb_prefix = true
+          cb_instructions[fetch].dup
         else
-          @cb_prefix = true if opcode == 0xcb
+          @cb_prefix = false
           instructions[opcode.to_i]
         end
       end
@@ -570,14 +640,21 @@ module GBRb
             immediates = (immediates.last << 8) + immediates.first
           end
           instruction.call @registers, @mmu, immediates
+        elsif instruction.immediate_count < 0
+          instruction.call self
         else
           instruction.call @registers, @mmu
         end
 
+        if @cb_prefix
+          instruction.m += 1
+          instruction.t += 4
+        end
+
         @clock[:m] += instruction.m
         @clock[:t] += instruction.t
-        @last_m = instruction.m
         @last_t = instruction.t
+        @last_m = instruction.m
       end
     end
   end