r6502 0.0.1 → 0.0.2

data/bin/klaus_dormann_test.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../../lib',__FILE__)
+require 'r6502'
+require 'pry'
+
+@mem = R6502::Memory.new
+@asm = R6502::Assembler.new(@mem)
+@cpu = R6502::Cpu.new(@mem)
+@cpu.pc = 0x0400
+
+code = IO.read('6502_functional_test.bin')
+raise 'too much code' if code.bytesize > 2**16
+
+@mem.instance_variable_set( :@mem_array, code.unpack('C*') )
+
+begin
+  last_pc = @cpu.pc
+  @cpu.step
+end while last_pc != @cpu.pc #run it until we hit a `jmp *` loop
+
+puts "loop at pc = 0x#{@cpu.pc.to_s(16)}"
+
+binding.pry

data/lib/r6502/cpu_execution.rb

@@ -30,6 +30,8 @@ module R6502
       case mode
       when :imp
           nil
+      when :acc
+          nil
       when :imm
         sec_word
       when :zp
@@ -58,7 +60,7 @@ module R6502
         lb = @mem.get( 0xff & sec_word )
         hb = @mem.get( 0xff & sec_word + 1)
         addr = (hb<<8) + lb
-        @mem.get( addr + @y )
+        addr + @y
       end
     end
     def inc_pc_by_mode(mode)

data/lib/r6502/cpu_instructions.rb

@@ -330,14 +330,7 @@ module R6502
       inc_pc_by_mode(mode)
     end
     def jmp(arg, mode)
-      case mode
-      when :abs
-        @pc = arg
-      else #indirect
-        lsb = @mem.get( arg )
-        msb = @mem.get( arg + 1)
-        @pc = lsb + msb<<8
-      end
+      @pc = arg
     end
     def lda(arg, mode)
       case mode
@@ -390,8 +383,8 @@ module R6502
       addr = 0x0100 + (0xff & @s)
       val =            @n #bit 7
       val = (val<<1) + @v #bit 6
-      val = (val<<1) +  1 #bit 5
-      val = (val<<1) + @b #bit 4
+      val = (val<<1) +  1 #bit 5, reserved
+      val = (val<<1) +  1 #bit 4, break
       val = (val<<1) + @d #bit 3
       val = (val<<1) + @i #bit 2
       val = (val<<1) + @z #bit 1
@@ -412,6 +405,7 @@ module R6502
       # bit 5
       @v = 0x1 & (val>>6)
       @n = 0x1 & (val>>7)
+      @s += 1
       inc_pc_by_mode(mode)
     end
     def sta(arg, mode)
@@ -500,17 +494,17 @@ module R6502
       @pc = 0xffff&((hi<<8) + lo)
     end
     def jsr( arg, mode )
-      @mem.set(0x0100 + @s, @pc>>8)
+      @mem.set(0x0100 + @s, (@pc+2)>>8)
       @s -= 1
-      @mem.set(0x0100 + @s, (0xff&@pc) + 2)
+      @mem.set(0x0100 + @s, 0xff&(@pc+2))
       @s -= 1
       @pc = arg
     end
     def rts( arg, mode )
-      hi = @mem.get(0x0100 + @s + 1)
-      @s += 1
       lo = @mem.get(0x0100 + @s + 1)
       @s += 1
+      hi = @mem.get(0x0100 + @s + 1)
+      @s += 1
       @pc = 0xffff&((hi<<8) + lo + 1)
     end
   end

data/lib/r6502/instr_table.rb

@@ -123,7 +123,7 @@ module R6502
         0xac => [:ldy, :abs],
         0xbc => [:ldy, :absx],
     #lsr,
-        0x4a => [:lsr, :imp],
+        0x4a => [:lsr, :acc],
         0x46 => [:lsr, :zp],
         0x56 => [:lsr, :zpx],
         0x4e => [:lsr, :abs],
@@ -156,13 +156,13 @@ module R6502
     #iny,
         0xc8 => [:iny, :imp],
     #rol,
-        0x2a => [:rol, :imp],
+        0x2a => [:rol, :acc],
         0x26 => [:rol, :zp],
         0x36 => [:rol, :zpx],
         0x2e => [:rol, :abs],
         0x3e => [:rol, :absx],
     #ror,
-        0x6a => [:ror, :imp],
+        0x6a => [:ror, :acc],
         0x66 => [:ror, :zp],
         0x76 => [:ror, :zpx],
         0x6e => [:ror, :abs],

data/r6502.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'r6502'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.date        = '2014-04-09'
   s.summary     = "6502 simulator and assembler"
   s.description = "6502 simulator and assembler, work-in-progress, not cycle-accurate, etc."

data/spec/r6502/cpu_execution_spec.rb

@@ -69,7 +69,7 @@ module R6502
       @cpu.mem.set( 0x10, 0xa0 )
       @cpu.mem.set( 0x11, 0xb0 )
       @cpu.mem.set( 0xb0a4, 0xcd )
-      @cpu.decode_arg(:indy, 0x10, 0x66).should == 0xcd
+      @cpu.decode_arg(:indy, 0x10, 0x66).should == 0xb0a4
     end
     it "executes a single instr. from PC value and mem" do
       @cpu.pc = 0x2000

data/spec/r6502/cpu_instructions_spec.rb

@@ -983,10 +983,8 @@ module R6502
       @cpu.pc.should == 0x2000
 
       @cpu.pc = 0x1000
-      @mem.set( 0x2000, 0x00 )
-      @mem.set( 0x2001, 0x11 )
       @cpu.jmp(0x2000, :ind)
-      @cpu.pc.should == 0x1100
+      @cpu.pc.should == 0x2000
     end
     it "jsr" do
       @cpu.s = 0xff
@@ -995,11 +993,18 @@ module R6502
       @mem.get(0x01ff).should == 0x06
       @mem.get(0x01fe).should == 0x02
       @cpu.pc.should == 0x1000
+
+      @cpu.s = 0xff
+      @cpu.pc = 0x06ff
+      @cpu.jsr(0x1000, :abs)
+      @mem.get(0x01ff).should == 0x07
+      @mem.get(0x01fe).should == 0x01
+      @cpu.pc.should == 0x1000
     end
     it "rts" do
       @cpu.s = 0xfd
-      @mem.set(0x01ff, 0xcd)
-      @mem.set(0x01fe, 0xab)
+      @mem.set(0x01ff, 0xab)
+      @mem.set(0x01fe, 0xcd)
       @cpu.rts(nil, :imp)
       @cpu.pc.should == 0xabce
     end
@@ -1125,7 +1130,7 @@ module R6502
       @cpu.s = 0xfe
       @cpu.php(nil, :imp)
       @cpu.s.should == 0xfd
-      @mem.get( 0x01fe ).should == 0b01101010
+      @mem.get( 0x01fe ).should == 0b01111010
     end
     it "plp" do
       @cpu.c = 1
@@ -1142,6 +1147,7 @@ module R6502
       @cpu.s = 0xfe
       @cpu.plp(nil, :imp)
       @cpu.pc.should == 0x0101
+      @cpu.s.should == 0xff
 
       @cpu.c.should == 0
       @cpu.z.should == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r6502
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Joe Landers
@@ -18,6 +18,9 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/6502_functional_test.bin
+- bin/6502_functional_test.lst
+- bin/klaus_dormann_test.rb
 - bin/r6502
 - lib/r6502.rb
 - lib/r6502/assembler.rb