rnes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbefb5781cd92b0dfc9dc54c37bd93927ba138b6
-  data.tar.gz: e7a40524558104975f1fa6c6f4398150e6a6e841
+  metadata.gz: 768392aacc5ad611aa059d5ef7a7c23c78ca1088
+  data.tar.gz: 37881bb61c15ed1f35c5015174bf47d26b8fc50f
 SHA512:
-  metadata.gz: 12966fa652b5fae1f0815ac80f76f1db5610535c3833f9c760a1bcc8d94d5ff8ded03ab2468a7116e701a05f179d93c1e9184f65e249daad61ffd3591790eff1
-  data.tar.gz: 48143512a1c3206de0dfe00feced98e097a95ed6b4675f8f57fef9fdbf0c7be7dc1462d1eac222a1aeb24a316aa0f8020b6d157889e3840a6335494a4a8749c0
+  metadata.gz: 65ec79252019d26f9d6fa5aa471ecb031adcbeb067c7413a54e0c8dd58a7dbb989d9989638861694caab9ea03dce11625743c0bdcfb05919da3f7c5a9d8b11e0
+  data.tar.gz: 5af737101697e45640a8e211423f5dcbd858c0de846fe2b63d52d197bbd3abdf2baf53d089a3fe7c47440d6f3e6b36bd6597332945ab62a180af62ecd96987ec

data/.rubocop.yml

@@ -1,3 +1,6 @@
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
 Lint/EmptyWhen:
   Enabled: false
 
@@ -31,13 +34,10 @@ Metrics/PerceivedComplexity:
 Naming/PredicateName:
   Enabled: false
 
-Style/Documentation:
-  Enabled: false
-
-Layout/EmptyLineAfterGuardClause:
+Naming/UncommunicativeMethodParamName:
   Enabled: false
 
-Naming/UncommunicativeMethodParamName:
+Style/Documentation:
   Enabled: false
 
 Style/EmptyMethod:

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## 0.1.1 - 2018-11-12
+
+### Changed
+
+- Improve logger format for compatibility with nestest.log.
+
+### Added
+
+- Allow break-less input on key input.
+
+### Fixed
+
+- Fix CPU ADC instruction.
+- Fix CPU ASL instruction.
+- Fix CPU JMP instruction (for the NMOS 6502 overlap bug).
+- Fix CPU PHP instruction.
+- Fix CPU PLP instruction
+- Fix CPU RLA instruction.
+- Fix CPU ROL instruction.
+- Fix CPU SBC instruction.
+- Fix CPU SLO instruction.
+- Fix CPU stack pointer behavior on overflow (must be looped, e.g. $100 -> $1FF).
+- Fix CPU indirect addressing overlap & overflow.
+- Fix CPU cycle calculation on branch instruction and page cross.
+- Fix PPU bus mirroring.
+- Fix PPU sprit hit check.
+- Fix PPU behaviors after reading $2002.
+- Fix PPU buffer read on VRAM read from CPU.
+- Fix PPU sprite RAM read on PPU 0x2004 from CPU.
+- Fix PPU palette mirroring on $3F10, $3F14, $3F18, and $3F1C.
+
 ## 0.1.0 - 2018-11-09
 
 ### Added

data/README.md

@@ -11,7 +11,7 @@ A NES emulator written in Ruby.
 
 ## Installation
 
-Install rnes as a gem.
+Install rnes as a gem (or clone this repository and run `exe/rnes` executable).
 
 ```sh
 gem install rnes
@@ -22,7 +22,7 @@ gem install rnes
 Pass ROM file path to `rnes` executable.
 
 ```sh
-rnes <path-to-rom-file>
+rnes <FILE>
 ```
 
 ## Controls

data/lib/rnes/cpu.rb

@@ -16,6 +16,7 @@ module Rnes
     def initialize(bus:, interrupt_line:)
       @branched = false
       @bus = bus
+      @crossed = false
       @interrupt_line = interrupt_line
       @registers = ::Rnes::CpuRegisters.new
     end
@@ -34,7 +35,7 @@ module Rnes
     end
 
     # @return [Integer]
-    def tick
+    def step
       handle_interrupts
       operation = fetch_operation
       operand = fetch_operand_by(operation.addressing_mode)
@@ -43,8 +44,10 @@ module Rnes
         operand: operand,
         operation_name: operation.name,
       )
+      cycles_count = operation.cycle + (@branched ? 1 : 0) + (@crossed ? 1 : 0)
       @branched = false
-      operation.cycle
+      @crossed = false
+      cycles_count
     end
 
     private
@@ -203,7 +206,7 @@ module Rnes
         if addressing_mode == :accumulator
           execute_operation_rol_for_accumulator(operand)
         else
-          execute_operation_rol_for_non_accumulator_(operand)
+          execute_operation_rol_for_non_accumulator(operand)
         end
       when :ROR
         if addressing_mode == :accumulator
@@ -264,7 +267,7 @@ module Rnes
       @registers.carry = result > 0xFF
       @registers.negative = result[7] == 1
       @registers.overflow = (@registers.accumulator ^ operand)[7].zero? && !(@registers.accumulator ^ result)[7].zero?
-      @registers.zero = result.zero?
+      @registers.zero = (result & 0xFF).zero?
       @registers.accumulator = result & 0xFF
     end
 
@@ -291,7 +294,7 @@ module Rnes
     # @param [Integer] operand
     def execute_operation_asl_for_accoumulator(_operand)
       value = @registers.accumulator
-      result = (value << 1) && 0xFF
+      result = (value << 1) & 0xFF
       @registers.carry = value[7] == 1
       @registers.negative = result[7] == 1
       @registers.zero = result.zero?
@@ -301,7 +304,7 @@ module Rnes
     # @param [Integer] operand
     def execute_operation_asl_for_non_accumulator(operand)
       value = read(operand)
-      result = (value << 1) && 0xFF
+      result = (value << 1) & 0xFF
       @registers.carry = value[7] == 1
       @registers.negative = result[7] == 1
       @registers.zero = result.zero?
@@ -339,7 +342,7 @@ module Rnes
 
     # @param [Integer] operand
     def execute_operation_bmi(operand)
-      unless @registers.negative?
+      if @registers.negative?
         branch(operand)
       end
     end
@@ -644,8 +647,7 @@ module Rnes
 
     # @param [Integer] operand
     def execute_operation_php(_operand)
-      @registers.break = true
-      push(@registers.status)
+      push(@registers.status | 0x10)
     end
 
     # @param [Integer] operand
@@ -658,19 +660,19 @@ module Rnes
 
     # @param [Integer] operand
     def execute_operation_plp(_operand)
-      @registers.status = pop
+      @registers.status = pop & 0b11101111
       @registers.reserved = true
     end
 
     # @param [Integer] operand
     def execute_operation_rla(operand)
       value = (read(operand) << 1) + @registers.carry_bit
-      result = (result & @registers.accumulator) & 0xFF
+      result = (value & @registers.accumulator) & 0xFF
       @registers.carry = value[8] == 1
       @registers.negative = result[7] == 1
       @registers.zero = result.zero?
       @registers.accumulator = result
-      write(operand, value)
+      write(operand, value & 0xFF)
     end
 
     # @param [Integer] operand
@@ -722,6 +724,7 @@ module Rnes
       @registers.overflow = (@registers.accumulator ^ value)[7].zero? && !(@registers.accumulator ^ result)[7].zero?
       @registers.negative = result[7] == 1
       @registers.zero = result.zero?
+      @registers.accumulator = result & 0xFF
       write(operand, value)
     end
 
@@ -750,7 +753,7 @@ module Rnes
       @registers.overflow = ((@registers.accumulator ^ result) & 0x80 != 0 && ((@registers.accumulator ^ operand) & 0x80) != 0)
       @registers.carry = result >= 0
       @registers.negative = result[7] == 1
-      @registers.zero = result.zero?
+      @registers.zero = (result & 0xFF).zero?
       @registers.accumulator = result & 0xFF
     end
 
@@ -781,7 +784,7 @@ module Rnes
       value = (read_value << 1) & 0xFF
       result = value | @registers.accumulator
       @registers.carry = read_value[7] == 1
-      @registers.negative = result == 1
+      @registers.negative = result[7] == 1
       @registers.zero = result.zero?
       @registers.accumulator = result
       write(operand, value)
@@ -908,12 +911,16 @@ module Rnes
 
     # @return [Integer]
     def fetch_operand_by_absolute_x_addressing
-      (fetch_word + @registers.index_x) & 0xFFFF
+      base_address = fetch_word
+      @crossed = (base_address & 0xFF00) != ((base_address + @registers.index_x) & 0xFF00)
+      (base_address + @registers.index_x) & 0xFFFF
     end
 
     # @return [Integer]
     def fetch_operand_by_absolute_y_addressing
-      (fetch_word + @registers.index_y) & 0xFFFF
+      base_address = fetch_word
+      @crossed = (base_address & 0xFF00) != ((base_address + @registers.index_y) & 0xFF00)
+      (base_address + @registers.index_y) & 0xFFFF
     end
 
     # @return [nil]
@@ -929,26 +936,38 @@ module Rnes
     def fetch_operand_by_implied_addressing
     end
 
+    # @note The address must not overlap a page boundary as a bug in the original 6502 prevents it from being fetched properly.
     # @return [Integer]
     def fetch_operand_by_indirect_absolute_addressing
-      read_word(fetch_word)
+      address = fetch_word
+      low = read(address)
+      high = read((address & 0xFF00) | ((address + 1) & 0xFF))
+      low + (high << 8)
     end
 
     # @return [Integer]
     def fetch_operand_by_pre_indexed_indirect_addressing
-      read_word((fetch + @registers.index_x) & 0xFF)
+      base_address = (fetch + @registers.index_x) & 0xFF
+      address = read_word_with_wrap_around(base_address)
+      @crossed = (address & 0xFF00) != (base_address & 0xFF00)
+      address
     end
 
     # @return [Integer]
     def fetch_operand_by_post_indexed_indirect_addressing
-      (read_word(fetch) + @registers.index_y) & 0xFF
+      base_address = fetch
+      address = (read_word_with_wrap_around(base_address) + @registers.index_y) & 0xFFFF
+      @crossed = (address & 0xFF00) != (base_address & 0xFF00)
+      address
     end
 
     # @return [Integer]
     def fetch_operand_by_relative_addressing
       int8 = fetch
-      offset = int8[7] == 1 ? int8 - 256 : int8
-      @registers.program_counter + offset
+      offset = int8 >= 0x80 ? int8 - 256 : int8
+      address = @registers.program_counter + offset
+      @crossed = (address & 0xFF00) != (@registers.program_counter & 0xFF00)
+      address
     end
 
     # @return [Integer]
@@ -1009,10 +1028,10 @@ module Rnes
     def pop
       if @registers.stack_pointer < 0x1FF
         @registers.stack_pointer += 1
-        read(@registers.stack_pointer)
       else
-        raise ::Rnes::Errors::StackPointerOverflowError
+        @registers.stack_pointer = 0x100
       end
+      read(@registers.stack_pointer)
     end
 
     # @return [Integer]
@@ -1023,11 +1042,11 @@ module Rnes
     # @param [Integer] value
     # @raise [Rnes::Errors::StackPointerOverflowError]
     def push(value)
+      write(@registers.stack_pointer, value)
       if @registers.stack_pointer > 0x100
-        write(@registers.stack_pointer, value)
         @registers.stack_pointer -= 1
       else
-        raise ::Rnes::Errors::StackPointerOverflowError
+        @registers.stack_pointer = 0x1FF
       end
     end
 
@@ -1049,6 +1068,13 @@ module Rnes
       read(address) | read((address + 1) & 0xFFFF) << 8
     end
 
+    # @param [Integer] byte Unsigned integer from 0x00 to 0xFF.
+    def read_word_with_wrap_around(byte)
+      low = read(byte)
+      high = read((byte + 1) & 0xFF)
+      low + (high << 8)
+    end
+
     # @param [Integer] address
     # @param [Integer] value
     def write(address, value)

data/lib/rnes/cpu_bus.rb

@@ -19,7 +19,6 @@ module Rnes
       @ram = ram
     end
 
-    # @todo
     # @param [Integer]
     # @return [Integer]
     def read(address)
@@ -31,7 +30,7 @@ module Rnes
       when 0x2000..0x2007
         @ppu.read(address - 0x2000)
       when 0x2008..0x3FFF
-        @ppu.read(address - 0x2008)
+        read(address - 0x0008)
       when 0x4016
         @keypad1.read
       when 0x4017
@@ -51,7 +50,6 @@ module Rnes
       end
     end
 
-    # @todo
     # @param [Integer] address
     # @param [Integer] value
     def write(address, value)
@@ -63,7 +61,7 @@ module Rnes
       when 0x2000..0x2007
         @ppu.write(address - 0x2000, value)
       when 0x2008..0x3FFF
-        @ppu.write(address - 0x2008, value)
+        write(address - 0x0008, value)
       when 0x4014
         @dma_controller.request_transfer(address_hint: value)
       when 0x4016
@@ -71,11 +69,12 @@ module Rnes
       when 0x4017
         @keypad2.write(value)
       when 0x4000..0x401F
-        0 # TODO: I/O port for APU, etc
+        # TODO: I/O port for APU, etc
       when 0x4020..0x5FFF
-        0 # TODO: extended RAM on special mappers
+        # TODO: extended RAM on special mappers
       when 0x6000..0x7FFF
-        0 # TODO: battery-backed-up RAM
+        # TODO: battery-backed-up RAM
+      when 0x8000..0xFFFF
       else
         raise ::Rnes::Errors::InvalidCpuBusAddressError, address
       end

data/lib/rnes/emulator.rb

@@ -28,20 +28,23 @@ module Rnes
     end
 
     def run
+      allow_break_less_input
       $stdin.noecho do
         loop do
           if @logger
             @logger.puts
           end
-          tick
+          step
         end
       end
+    ensure
+      disallow_break_less_input
     end
 
-    def tick
+    def step
       @dma_controller.transfer_if_requested
-      (@cpu.tick * 3).times do
-        @ppu.tick
+      (@cpu.step * 3).times do
+        @ppu.step
       end
       @keypad1.check
       @keypad2.check
@@ -49,6 +52,14 @@ module Rnes
 
     private
 
+    def allow_break_less_input
+      `stty -icanon min 1 time 0`
+    end
+
+    def disallow_break_less_input
+      `stty icanon`
+    end
+
     # @param [Rnes::Rom] from
     # @param [Rnes::Ram] to
     def copy(from:, to:)

data/lib/rnes/logger.rb

@@ -29,6 +29,7 @@ module Rnes
         '',
         segment_operation_code,
         segment_operand,
+        '',
         segment_operation_full_name,
         segment_operand_humanized,
         '',
@@ -36,8 +37,6 @@ module Rnes
         segment_cpu_index_x,
         segment_cpu_index_y,
         segment_cpu_status,
-        segment_ppu_control1,
-        segment_ppu_control2,
         segment_cpu_stack_pointer,
         segment_cycle,
         segment_ppu_line,
@@ -71,12 +70,12 @@ module Rnes
 
     # @return [String]
     def segment_cpu_status
-      format('P:%08b', @cpu.registers.status)
+      format('P:%02X', @cpu.registers.status)
     end
 
     # @return [String]
     def segment_cycle
-      format('CYC:%03d', @ppu.cycle)
+      format('CYC:%3d', @ppu.cycle)
     end
 
     # @return [String]
@@ -84,9 +83,9 @@ module Rnes
       program_counter = @cpu.registers.program_counter
       operation = @cpu.read_operation
       case operation.addressing_mode
-      when :absolute, :absolute_x, :absolute_y, :indirect_absolute, :pre_indexed_absolute, :post_indexed_absolute
+      when :absolute, :absolute_x, :absolute_y, :indirect_absolute
         format('%02X %02X', @cpu.bus.read(program_counter + 1), @cpu.bus.read(program_counter + 2))
-      when :immediate, :relative, :zero_page, :zero_page_x, :zero_page_y
+      when :immediate, :relative, :zero_page, :zero_page_x, :zero_page_y, :pre_indexed_indirect, :post_indexed_indirect
         format('%02X   ', @cpu.bus.read(program_counter + 1))
       else
         ' ' * 5
@@ -107,7 +106,7 @@ module Rnes
           ''
         end
       end
-      format('%-5s', string)
+      format('%-19s', string)
     end
 
     # @return [String]
@@ -123,16 +122,6 @@ module Rnes
       format('%-10s', operation.full_name)
     end
 
-    # @return [String]
-    def segment_ppu_control1
-      format('CTRL1:%08b', @ppu.registers.control1)
-    end
-
-    # @return [String]
-    def segment_ppu_control2
-      format('CTRL2:%08b', @ppu.registers.control2)
-    end
-
     # @note SL means "Scan Line".
     # @return [String]
     def segment_ppu_line

data/lib/rnes/ppu.rb

@@ -30,9 +30,15 @@ module Rnes
 
     V_BLANK_HEIGHT = 21
 
-    VISIBLE_WINDOW_HEIGHT = 240
+    WINDOW_HEIGHT = 240
 
-    VISIBLE_WINDOW_WIDTH = 256
+    WINDOW_WIDTH = 256
+
+    TILES_COUNT_IN_HORIZONTAL_LINE = WINDOW_WIDTH / TILE_WIDTH
+
+    TILES_COUNT_IN_VERTICAL_LINE = WINDOW_HEIGHT / TILE_HEIGHT
+
+    TILES_COUNT_IN_WINDOW = TILES_COUNT_IN_HORIZONTAL_LINE * TILES_COUNT_IN_VERTICAL_LINE
 
     # @note For debug use.
     # @param [Integer]
@@ -58,32 +64,35 @@ module Rnes
     def initialize(bus:, interrupt_line:, renderer:)
       @bus = bus
       @cycle = 0
-      @image = ::Rnes::Image.new(height: VISIBLE_WINDOW_HEIGHT, width: VISIBLE_WINDOW_WIDTH)
+      @image = ::Rnes::Image.new(height: WINDOW_HEIGHT, width: WINDOW_WIDTH)
       @interrupt_line = interrupt_line
       @line = 0
       @registers = ::Rnes::PpuRegisters.new
       @renderer = renderer
       @sprite_ram = ::Rnes::Ram.new(bytesize: SPRITE_RAM_BYTESIZE)
-      @sprite_ram_address = 0x00
-      @video_ram_address = 0x0000
-      @writing_to_scroll_registers = false
-      @writing_video_ram_address = false
+      @video_ram_reading_buffer = 0x00
     end
 
     # @param [Integer] address
     # @return [Integer]
     def read(address)
       case address
+      when 0x0000
+        @registers.control
+      when 0x0001
+        @registers.mask
       when 0x0002
-        registers.status
+        @registers.status
+      when 0x0004
+        read_from_sprite_ram(@registers.sprite_ram_address)
       when 0x0007
-        read_from_video_ram
+        read_from_video_ram_for_cpu
       else
         raise ::Rnes::Errors::InvalidPpuAddressError, address
       end
     end
 
-    def tick
+    def step
       if on_visible_cycle? && x_in_tile.zero?
         draw_background_8pixels
       end
@@ -98,6 +107,7 @@ module Rnes
           render_image
         else
           self.line += 1
+          check_sprite_hit
           if on_line_to_start_v_blank?
             set_v_blank
             if v_blank_interrupt_enabled?
@@ -113,7 +123,7 @@ module Rnes
     # @param [Integer] index
     # @param [Integer] value
     def transfer_sprite_data(index:, value:)
-      address = (@sprite_ram_address + index) % SPRITE_RAM_BYTESIZE
+      address = (@registers.sprite_ram_address + index) % SPRITE_RAM_BYTESIZE
       @sprite_ram.write(address, value)
     end
 
@@ -123,19 +133,19 @@ module Rnes
     def write(address, value)
       case address
       when 0x0000
-        registers.control1 = value
+        @registers.control = value
       when 0x0001
-        registers.control2 = value
+        @registers.mask = value
       when 0x0003
-        write_sprite_ram_address(value)
+        @registers.sprite_ram_address = value
       when 0x0004
-        write_to_sprite_ram(value)
+        write_to_sprite_ram_for_cpu(value)
       when 0x0005
-        write_to_scroll_registers(value)
+        @registers.scroll = value
       when 0x0006
-        write_video_ram_address(value)
+        @registers.video_ram_address = value
       when 0x0007
-        write_to_video_ram(value)
+        write_to_video_ram_for_cpu(value)
       else
         raise ::Rnes::Errors::InvalidPpuAddressError, address
       end
@@ -147,12 +157,41 @@ module Rnes
       @interrupt_line.assert_nmi
     end
 
+    # @return [Integer]
+    def base_name_table_address
+      ADDRESS_TO_START_NAME_TABLE + @registers.base_name_table_id * 0x400
+    end
+
+    # @return [Integer]
+    def base_background_pattern_table_address
+      if registers.background_pattern_table_address_banked?
+        0x1000
+      else
+        0x0000
+      end
+    end
+
+    # @return [Integer]
+    def base_sprite_pattern_table_address
+      if registers.sprite_pattern_table_address_banked?
+        0x1000
+      else
+        0x0000
+      end
+    end
+
+    def check_sprite_hit
+      if read_from_sprite_ram(0) == y && @registers.background_enabled? && @registers.sprite_enabled?
+        registers.sprite_hit = true
+      end
+    end
+
     def clear_sprite_hit
-      registers.toggle_sprite_hit_bit(false)
+      registers.sprite_hit = false
     end
 
     def clear_v_blank
-      registers.toggle_in_v_blank_bit(false)
+      registers.in_v_blank = false
     end
 
     def deassert_nmi
@@ -160,22 +199,22 @@ module Rnes
     end
 
     def draw_background_8pixels
-      character_address_offset = registers.has_background_bank_bit? ? 0x1000 : 0
-      character_index = read_from_name_table(tile_index)
-      character_line_low_byte_address = TILE_HEIGHT * 2 * character_index + y_in_tile + character_address_offset
-      character_line_low_byte = read_from_character_rom(character_line_low_byte_address)
-      character_line_high_byte = read_from_character_rom(character_line_low_byte_address + 8)
+      base_pattern_table_address = base_background_pattern_table_address
+      character_index = read_character_index(tile_index)
+      character_line_low_byte_address = TILE_HEIGHT * 2 * character_index + y_in_tile + base_pattern_table_address
+      character_line_low_byte = read_character_data(character_line_low_byte_address)
+      character_line_high_byte = read_character_data(character_line_low_byte_address + TILE_HEIGHT)
 
       block_id = 0
       block_id |= 0b01 if (x % BLOCK_WIDTH).odd?
       block_id |= 0b10 if (y % BLOCK_HEIGHT).odd?
-      mini_palette_ids_byte = read_from_attribute_table(tile_index)
+      mini_palette_ids_byte = read_object_attribute(tile_index)
       mini_palette_id = (mini_palette_ids_byte >> (block_id * 2)) & 0b11
 
       TILE_WIDTH.times do |x_in_character|
         index_in_character_line_byte = TILE_WIDTH - 1 - x_in_character
         background_palette_index = character_line_low_byte[index_in_character_line_byte] | character_line_high_byte[index_in_character_line_byte] << 1 | mini_palette_id << 2
-        color_id = read_from_background_palette_table(background_palette_index)
+        color_id = read_color_id(background_palette_index)
         @image.write(
           value: ::Rnes::Ppu::COLORS[color_id],
           x: x + x_in_character,
@@ -198,7 +237,7 @@ module Rnes
     #      |`------- horizontal flip
     #      `-------- vertical flip
     def draw_sprites
-      character_address_offset = registers.has_sprite_bank_bit? ? 0x1000 : 0
+      base_pattern_table_address = base_sprite_pattern_table_address
       SPRITES_COUNT.times do |i|
         base_sprite_ram_address = i * 4
         y_for_sprite = (read_from_sprite_ram(base_sprite_ram_address) - TILE_HEIGHT)
@@ -207,18 +246,18 @@ module Rnes
         sprite_attribute_byte = read_from_sprite_ram(base_sprite_ram_address + 2)
         x_for_sprite = read_from_sprite_ram(base_sprite_ram_address + 3)
 
-        character_index = read_from_name_table(name_table_index)
+        character_index = read_character_index(name_table_index)
 
         mini_palette_id = sprite_attribute_byte & 0b11
 
         TILE_HEIGHT.times do |y_in_character|
-          character_line_low_byte_address = TILE_HEIGHT * 2 * character_index + y_in_character + character_address_offset
-          character_line_low_byte = read_from_character_rom(character_line_low_byte_address)
-          character_line_high_byte = read_from_character_rom(character_line_low_byte_address + 8)
+          character_line_low_byte_address = TILE_HEIGHT * 2 * character_index + y_in_character + base_pattern_table_address
+          character_line_low_byte = read_character_data(character_line_low_byte_address)
+          character_line_high_byte = read_character_data(character_line_low_byte_address + TILE_HEIGHT)
           TILE_WIDTH.times do |x_in_character|
             index_in_character_line_byte = TILE_WIDTH - 1 - x_in_character
             background_palette_index = character_line_low_byte[index_in_character_line_byte] | character_line_high_byte[index_in_character_line_byte] << 1 | mini_palette_id << 2
-            color_id = read_from_background_palette_table(background_palette_index)
+            color_id = read_color_id(background_palette_index)
             @image.write(
               value: ::Rnes::Ppu::COLORS[color_id],
               x: x_for_sprite + x_in_character,
@@ -231,12 +270,12 @@ module Rnes
 
     # @return [Boolean]
     def on_bottom_end_line?
-      line == VISIBLE_WINDOW_HEIGHT + V_BLANK_HEIGHT
+      line == WINDOW_HEIGHT + V_BLANK_HEIGHT
     end
 
     # @return [Boolean]
     def on_line_to_start_v_blank?
-      line == VISIBLE_WINDOW_HEIGHT
+      line == WINDOW_HEIGHT
     end
 
     # @return [Boolean]
@@ -246,44 +285,50 @@ module Rnes
 
     # @return [Boolean]
     def on_visible_cycle?
-      (0...VISIBLE_WINDOW_WIDTH).cover?(x) && (0...VISIBLE_WINDOW_HEIGHT).cover?(y)
+      (0...WINDOW_WIDTH).cover?(x) && (0...WINDOW_HEIGHT).cover?(y)
     end
 
     # @param [Integer] index
-    # @return [Integer] 4-color-palette IDs of 4 blocks, as 8 bit data.
-    def read_from_attribute_table(index)
-      @bus.read(ADDRESS_TO_START_ATTRIBUTE_TABLE + index)
+    # @return [Integer]
+    def read_character_data(index)
+      @bus.read(index)
     end
 
     # @param [Integer] index
     # @return [Integer]
-    def read_from_name_table(index)
-      @bus.read(ADDRESS_TO_START_NAME_TABLE + index)
+    def read_character_index(index)
+      @bus.read(base_name_table_address + index)
     end
 
     # @param [Integer] index
     # @return [Integer]
-    def read_from_background_palette_table(index)
+    def read_color_id(index)
       @bus.read(ADDRESS_TO_START_BACKGROUND_PALETTE_TABLE + index)
     end
 
-    # @param [Integer] index
+    # @param [Integer] address
     # @return [Integer]
-    def read_from_character_rom(index)
-      @bus.read(index)
+    def read_from_sprite_ram(address)
+      @sprite_ram.read(address)
     end
 
-    # @return [Integer]
-    def read_from_video_ram
-      value = @bus.read(@video_ram_address)
-      @video_ram_address += video_ram_address_offset
-      value
+    # @param [Integer] index
+    # @return [Integer] 4-color-palette IDs of 4 blocks, as 8 bit data.
+    def read_object_attribute(index)
+      @bus.read(ADDRESS_TO_START_ATTRIBUTE_TABLE + index)
     end
 
-    # @param [Integer] address
     # @return [Integer]
-    def read_from_sprite_ram(address)
-      @sprite_ram.read(address)
+    def read_from_video_ram_for_cpu
+      if (0x3F00..0x3F1F).cover?(@registers.video_ram_address % 0x4000)
+        value = @bus.read(@registers.video_ram_address)
+        @video_ram_reading_buffer = @bus.read(@registers.video_ram_address - 0x1000)
+      else
+        value = @video_ram_reading_buffer
+        @video_ram_reading_buffer = @bus.read(@registers.video_ram_address)
+      end
+      @registers.increment_video_ram_address(video_ram_address_offset)
+      value
     end
 
     def render_image
@@ -291,12 +336,32 @@ module Rnes
     end
 
     def set_v_blank
-      registers.set_in_v_blank_bit
+      registers.in_v_blank = true
     end
 
-    # @return [Integer]
+    # +-----------+-----------+
+    # | 0(0x0000) | 1(0x0400) |
+    # +-----------+-----------+
+    # | 2(0x0800) | 3(0x0C00) |
+    # +-----------+-----------+
+    # @return [Integer] Integer from 0x0000 to 0x0FC0.
     def tile_index
-      y_of_tile * (VISIBLE_WINDOW_WIDTH / TILE_WIDTH) + x_of_tile
+      tile_index_in_window + tile_index_paging_offset
+    end
+
+    # @return [Integer] Integer from 0x0000 to 0x03C0.
+    def tile_index_in_window
+      (y_of_tile % TILES_COUNT_IN_VERTICAL_LINE) * TILES_COUNT_IN_HORIZONTAL_LINE + x_of_tile % TILES_COUNT_IN_HORIZONTAL_LINE
+    end
+
+    # @return [Integer] Integer from 0 to 3.
+    def tile_index_page
+      x_of_tile / TILES_COUNT_IN_HORIZONTAL_LINE + y_of_tile / TILES_COUNT_IN_VERTICAL_LINE * 2
+    end
+
+    # @return [Integer] 0x0000, 0x0400, 0x0800, or 0x0C00.
+    def tile_index_paging_offset
+      tile_index_page * 0x0400
     end
 
     # @return [Boolean]
@@ -306,48 +371,23 @@ module Rnes
 
     # @return [Integer]
     def video_ram_address_offset
-      if registers.has_large_video_ram_address_offset_bit?
-        32
+      if registers.horizontal_increment?
+        TILES_COUNT_IN_HORIZONTAL_LINE
       else
         1
       end
     end
 
-    # @param [Integer] address
-    def write_sprite_ram_address(address)
-      @sprite_ram_address = address
-    end
-
     # @param [Integer] value
-    def write_to_scroll_registers(value)
-      if @writing_to_scroll_registers
-        @registers.scroll_vertical = value
-      else
-        @registers.scroll_horizontal = value
-      end
-      @writing_to_scroll_registers = !@writing_to_scroll_registers
-    end
-
-    # @param [Integer] value
-    def write_to_sprite_ram(value)
-      @sprite_ram.write(@sprite_ram_address, value)
-      @sprite_ram_address += 1
-    end
-
-    # @param [Integer] address
-    def write_video_ram_address(address)
-      if @writing_video_ram_address
-        @video_ram_address |= address
-      else
-        @video_ram_address = address << 8
-      end
-      @writing_video_ram_address = !@writing_video_ram_address
+    def write_to_sprite_ram_for_cpu(value)
+      @sprite_ram.write(@registers.sprite_ram_address, value)
+      @registers.sprite_ram_address += 1
     end
 
     # @param [Integer] value
-    def write_to_video_ram(value)
-      @bus.write(@video_ram_address, value)
-      @video_ram_address += video_ram_address_offset
+    def write_to_video_ram_for_cpu(value)
+      @bus.write(@registers.video_ram_address, value)
+      @registers.increment_video_ram_address(video_ram_address_offset)
     end
 
     # @return [Integer]
@@ -362,7 +402,7 @@ module Rnes
 
     # @return [Integer]
     def x_of_tile
-      x / TILE_WIDTH
+      (x + @registers.scroll_x) / TILE_WIDTH
     end
 
     # @return [Integer]
@@ -377,7 +417,7 @@ module Rnes
 
     # @return [Integer]
     def y_of_tile
-      y / TILE_HEIGHT
+      (y + @registers.scroll_y) / TILE_HEIGHT
     end
   end
 end

data/lib/rnes/ppu_bus.rb

@@ -25,12 +25,14 @@ module Rnes
         read(address - 0x0800)
       when 0x3000..0x3EFF
         read(address - 0x1000)
+      when 0x3F10, 0x3F14, 0x3F18, 0x3F1C
+        read(address - 0x0010)
       when 0x3F00..0x3F1F
         @video_ram.read(address - 0x2000)
       when 0x3F20..0x3FFF
-        read(address - 0x20) # mirror to 0x3F00..0x3F1F
+        read(address - 0x0020)
       when 0x4000..0xFFFF
-        read(address - 0x4000) # mirror to 0x0000..0x3FFF
+        read(address - 0x4000)
       else
         raise ::Rnes::Errors::InvalidPpuBusAddressError, address
       end
@@ -45,13 +47,17 @@ module Rnes
       when 0x2000..0x27FF
         @video_ram.write(address - 0x2000, value)
       when 0x2800..0x2FFF
-        @video_ram.write(address - 0x0800, value)
+        write(address - 0x0800, value)
       when 0x3000..0x3EFF
-        @video_ram.write(address - 0x1000, value)
+        write(address - 0x1000, value)
+      when 0x3F10, 0x3F14, 0x3F18, 0x3F1C
+        write(address - 0x0010, value)
       when 0x3F00..0x3F1F
         @video_ram.write(address - 0x2000, value)
-      when 0x3F00..0xFFFF
-        write(address - 0x1000, value)
+      when 0x3F00..0x3FFF
+        write(address - 0x0020, value)
+      when 0x4000..0xFFFF
+        write(address - 0x4000, value)
       else
         raise ::Rnes::Errors::InvalidPpuBusAddressError, address
       end

data/lib/rnes/ppu_registers.rb

@@ -1,101 +1,181 @@
 module Rnes
   class PpuRegisters
     STATUS_IN_V_BLANK_BIT_INDEX = 7
-    STATUS_SPRITE_HIT_BIT_INDEX = 5
+    STATUS_SPRITE_HIT_BIT_INDEX = 6
+    STATUS_OVERFLOW_BIT_INDEX = 5
 
     # @param [Integer]
     # @return [Integer]
-    attr_accessor :control1
+    attr_accessor :control
 
     # @param [Integer]
     # @return [Integer]
-    attr_accessor :control2
+    attr_accessor :mask
 
-    # @param [Integer]
     # @return [Integer]
-    attr_accessor :scroll_horizontal
+    attr_accessor :sprite_ram_address
 
-    # @param [Integer]
     # @return [Integer]
-    attr_accessor :scroll_vertical
+    attr_reader :scroll_x
+
+    # @return [Integer]
+    attr_reader :scroll_y
 
-    # @param [Integer]
     # @return [Integer]
-    attr_accessor :status
+    attr_reader :video_ram_address
+
+    # @param [Integer]
+    attr_writer :status
 
     def initialize
-      @control1 = 0x0
-      @control2 = 0x0
-      @scroll_horizontal = 0x0
-      @scroll_vertical = 0x0
+      @control = 0x0
+      @mask = 0x0
       @status = 0x0
+
+      @scroll_x = 0x0
+      @scroll_y = 0x0
+
+      @sprite_ram_address = 0x00
+      @video_ram_address = 0x0000
+
+      @address_latch = false
+      @scroll_latch = false
     end
 
     # @return [Boolean]
-    def has_background_bank_bit?
-      @control1[4] == 1
+    def background_enabled?
+      @mask[3] == 1
     end
 
     # @return [Boolean]
-    def has_background_enabled_bit?
-      @control2[3] == 1
+    def background_pattern_table_address_banked?
+      @control[4] == 1
     end
 
-    # @return [Boolean]
-    def has_in_v_blank_bit?
-      @status[STATUS_IN_V_BLANK_BIT_INDEX] == 1
+    # +------------+------------|
+    # | 0 (0x2000) | 1 (0x2400) |
+    # +------------+------------|
+    # | 2 (0x2800) | 3 (0x2C00) |
+    # +------------+------------|
+    # @return [Integer] An integer from 0 to 3.
+    def base_name_table_id
+      @control & 0b11
     end
 
     # @return [Boolean]
-    def has_large_video_ram_address_offset_bit?
-      @control1[4] == 1
+    def color_blue_emphasized?
+      @mask[7] == 1
     end
 
     # @return [Boolean]
-    def has_sprite_enabled_bit?
-      @control2[4] == 1
+    def color_green_emphasized?
+      @mask[6] == 1
     end
 
     # @return [Boolean]
-    def has_sprite_hit_bit?
-      @status[STATUS_SPRITE_HIT_BIT_INDEX] == 1
+    def color_red_emphasized?
+      @mask[5] == 1
     end
 
     # @return [Boolean]
-    def has_sprite_bank_bit?
-      @control1[3] == 1
+    def color_greyscaled?
+      @mask[0] == 1
     end
 
     # @return [Boolean]
     def has_v_blank_irq_enabled_bit?
-      @control1[7] == 1
+      @control[7] == 1
     end
 
-    # Name table id (address)
-    # +------------+------------|
-    # | 0 (0x2000) | 1 (0x2400) |
-    # +------------+------------|
-    # | 2 (0x2800) | 3 (0x2C00) |
-    # +------------+------------|
-    # @return [Integer] An integer from 0 to 3.
-    def name_table_id
-      @status & 0b11
+    # @return [Boolean]
+    def horizontal_increment?
+      @control[2] == 1
     end
 
-    def set_in_v_blank_bit
-      @status |= (1 << STATUS_IN_V_BLANK_BIT_INDEX)
+    # @return [Boolean]
+    def in_v_blank?
+      @status[STATUS_IN_V_BLANK_BIT_INDEX] == 1
     end
 
     # @param [Boolean] boolean
-    def toggle_in_v_blank_bit(boolean)
+    def in_v_blank=(boolean)
       toggle_status_bit(STATUS_IN_V_BLANK_BIT_INDEX, boolean)
     end
 
+    # @param [Integer] offset
+    def increment_video_ram_address(offset)
+      @video_ram_address += offset
+    end
+
+    # @return [Boolean]
+    def leftmost_background_shown?
+      @mask[1] == 1
+    end
+
+    # @return [Boolean]
+    def leftmost_sprite_shown?
+      @mask[2] == 1
+    end
+
+    # @param [Boolean] boolean
+    def overflow=(boolean)
+      toggle_status_bit(STATUS_OVERFLOW_BIT_INDEX, boolean)
+    end
+
+    # @param [Integer] value
+    def scroll=(value)
+      if @scroll_latch
+        @scroll_y = value
+      else
+        @scroll_x = value
+      end
+      @scroll_latch = !@scroll_latch
+    end
+
+    # @return [Boolean]
+    def sprite_enabled?
+      @mask[4] == 1
+    end
+
+    # @return [Boolean]
+    def sprite_hit?
+      @status[STATUS_SPRITE_HIT_BIT_INDEX] == STATUS_SPRITE_HIT_BIT_INDEX
+    end
+
     # @param [Boolean] boolean
-    def toggle_sprite_hit_bit(boolean)
+    def sprite_hit=(boolean)
       toggle_status_bit(STATUS_SPRITE_HIT_BIT_INDEX, boolean)
     end
 
+    # @return [Boolean]
+    def sprite_pattern_table_address_banked?
+      @control[3] == 1
+    end
+
+    # @return [Boolean]
+    def sprite_size_doubled?
+      @control[4] == 1
+    end
+
+    # @return [Integer]
+    def status
+      value = @status
+      self.in_v_blank = false
+      @address_latch = false
+      @scroll_latch = false
+      value
+    end
+
+    # @param [Integer] value
+    def video_ram_address=(value)
+      if @address_latch
+        @video_ram_address |= value
+      else
+        @video_ram_address = value << 8
+      end
+      @address_latch = !@address_latch
+    end
+
     private
 
     # @param [Integer] index

data/lib/rnes/version.rb

@@ -1,3 +1,3 @@
 module Rnes
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rnes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler