reinserted arm for now, until dependecy is cleaned up. fixed tests

test/arm/arm-helper.rb

@@ -0,0 +1,29 @@
+require_relative '../helper'
+
+# try  to test that the generation of basic instructions works
+# one instruction at a time, reverse testing from objdump --demangle -Sfghxp
+# tests are named as per assembler code, ie test_mov testing mov instruction
+#  adc add and bic eor orr rsb rsc sbc sub mov mvn cmn cmp teq tst b call bx swi strb
+
+module ArmHelper 
+  # need Assembler and a block (see those classes) 
+  def setup
+    @machine = Arm::ArmMachine.new
+  end
+
+  # code is what the generator spits out, at least one instruction worth (.first)
+  # the op code is wat was witten as assembler in the first place and the binary result
+  # is reversed and in 4 bytes as ruby can only do 31 bits and so we can't test with just one int (?)
+  def assert_code code , op , should
+    assert_equal op ,  code.opcode
+    io = StringIO.new
+    code.assemble(io,nil)
+    binary = io.string
+    assert_equal 4 , binary.length , "code length wrong for #{code.inspect}"
+    index = 0
+    binary.each_byte do |byte |
+      assert_equal should[index] , byte , "byte #{index} 0x#{should[index].to_s(16)} != 0x#{byte.to_s(16)}"
+      index += 1
+    end
+  end
+end

test/arm/test_all.rb

@@ -0,0 +1,6 @@
+require_relative "test_stack"
+require_relative "test_control"
+require_relative "test_logic"
+require_relative "test_move"
+require_relative "test_memory"
+require_relative "test_compare"

test/arm/test_compare.rb

@@ -0,0 +1,22 @@
+require_relative 'arm-helper'
+
+class TestArmAsm < MiniTest::Test
+  include ArmHelper
+
+  def test_cmn
+    code = @machine.cmn	 :r1 , :r2
+    assert_code code , :cmn , [0x02,0x00,0x71,0xe1] #e1 71 00 02
+  end
+  def test_cmp
+    code = @machine.cmp	 :r1 , :r2
+    assert_code code , :cmp , [0x02,0x00,0x51,0xe1] #e1 51 00 02
+  end
+  def test_teq
+    code = @machine.teq  :r1 , :r2
+    assert_code code , :teq , [0x02,0x00,0x31,0xe1] #e1 31 00 02
+  end
+  def test_tst
+    code = @machine.tst  :r1 , :r2 
+    assert_code code , :tst , [0x02,0x00,0x11,0xe1] #e1 11 00 02
+  end
+end

test/arm/test_control.rb

@@ -0,0 +1,21 @@
+require_relative 'arm-helper'
+
+class TestControl < MiniTest::Test
+  include ArmHelper
+
+  def test_b
+    # the address is what an assembler calculates (a signed number for the amount of instructions), 
+    # ie the relative (to pc) address -8 (pipeline) /4 so save space
+    # so the cpu adds the value*4 and starts loading that (load, decode, execute)
+    code = @machine.b	 -4  #this jumps to the next instruction
+    assert_code code , :b , [0xff,0xff,0xff,0xea] #ea ff ff fe
+  end
+  def test_call #see comment above. bx not implemented (as it means into thumb, and no thumb here)
+    code = @machine.call	 -4 ,{} #this jumps to the next instruction
+    assert_code code , :call, [0xff,0xff,0xff,0xeb] #ea ff ff fe
+  end
+  def test_swi
+    code = @machine.swi	 0x05 
+    assert_code code , :swi , [0x05,0x00,0x00,0xef]#ef 00 00 05
+  end
+end

test/arm/test_logic.rb

@@ -0,0 +1,54 @@
+require_relative 'arm-helper'
+
+class TestLogic < MiniTest::Test
+  include ArmHelper
+
+  def test_adc
+    code = @machine.adc	 :r1,  :r3, :r5
+    assert_code code , :adc , [0x05,0x10,0xa3,0xe0] #e0 a3 10 05
+  end
+  def test_add
+    code = @machine.add	 :r1 , :r1, :r3
+    assert_code code , :add , [0x03,0x10,0x81,0xe0] #e0 81 10 03
+  end
+  def test_add_lst
+    code = @machine.add( :r1 , :r2 , :r3 ,  shift_lsr: 8)
+    assert_code code , :add , [0x23,0x14,0x82,0xe0] #e0 82 14 23
+  end
+  def test_and # inst eval doesn't really work with and
+    code = @machine.and(  :r1 , :r2 , :r3)
+    assert_code code , :and , [0x03,0x10,0x02,0xe0] #e0 01 10 03
+  end
+  def test_bic
+    code = @machine.bic	 :r2 , :r2 , :r3
+    assert_code code , :bic , [0x03,0x20,0xc2,0xe1] #e3 c2 20 44
+  end
+  def test_eor
+    code = @machine.eor	 :r2 , :r2 , :r3
+    assert_code code , :eor , [0x03,0x20,0x22,0xe0] #e0 22 20 03
+  end
+  def test_rsb
+    code = @machine.rsb	 :r1 ,  :r2 ,  :r3
+    assert_code code , :rsb , [0x03,0x10,0x62,0xe0]#e0 62 10 03
+  end
+  def test_rsc
+    code = @machine.rsc	 :r2 ,  :r3 ,  :r4
+    assert_code code , :rsc , [0x04,0x20,0xe3,0xe0]#e0 e3 20 04
+  end
+  def test_sbc
+    code = @machine.sbc	 :r3,  :r4 ,  :r5
+    assert_code code , :sbc , [0x05,0x30,0xc4,0xe0]#e0 c4 30 05
+  end
+  def test_sub
+    code = @machine.sub  :r2, :r0, 1
+    assert_code code, :sub ,  [0x01,0x20,0x40,0xe2] #e2 40 20 01 
+  end
+  def test_subs
+    code = @machine.sub  :r2, :r2, 1 , update_status: 1
+    assert_code code, :sub ,  [0x01,0x20,0x52,0xe2] #e2 52 20 01
+  end
+  def test_orr
+    code = @machine.orr	 :r2 , :r2 , :r3
+    assert_code code , :orr , [0x03,0x20,0x82,0xe1] #e1 82 20 03
+  end
+end

test/arm/test_memory.rb

@@ -0,0 +1,37 @@
+require_relative 'arm-helper'
+
+class TestMemory < MiniTest::Test
+  include ArmHelper
+
+  def test_ldr
+    code = @machine.ldr  :r0, :r0
+    assert_code code, :ldr ,  [0x00,0x00,0x90,0xe5] #e5 90 00 00
+  end
+  def test_ldr_const_offset
+    code = @machine.ldr  :r0, :r0 ,  4
+    assert_code code, :ldr ,  [0x04,0x00,0x90,0xe5] #e5 90 00 04
+  end
+  def test_ldr_reg_offset
+    code = @machine.ldr  :r0, :r1 , :r2
+    assert_code code, :ldr ,  [0x02,0x00,0x91,0xe6] #e6 91 00 02
+  end  
+  def test_ldrb
+    code = @machine.ldrb  :r0, :r0
+    assert_code code, :ldrb ,  [0x00,0x00,0xd0,0xe5] #e5 d0 00 00
+  end
+
+  def test_str
+    code = @machine.str  :r0, :r1
+    assert_code code, :str ,  [0x00,0x00,0x81,0xe5] #e5 81 00 00
+  end
+
+  def test_strb_add
+    code = @machine.strb  :r0, :r1 , 1 , flaggie: 1
+    assert_code code, :strb ,  [0x01,0x00,0xc1,0xe4] #e4 c1 00 01
+  end
+
+  def test_strb
+    code = @machine.strb  :r0, :r0
+    assert_code code, :strb ,  [0x00,0x00,0xc0,0xe5] #e5 c0 00 00
+  end
+end

test/arm/test_move.rb

@@ -0,0 +1,14 @@
+require_relative 'arm-helper'
+
+class TestMoves < MiniTest::Test
+  include ArmHelper
+
+  def test_mov
+    code = @machine.mov  :r0,  5
+    assert_code code , :mov , [0x05,0x00,0xa0,0xe3] #e3 a0 10 05
+  end
+  def test_mvn
+    code = @machine.mvn  :r1,  5
+    assert_code code , :mvn , [0x05,0x10,0xe0,0xe3] #e3 e0 10 05
+  end
+end

test/arm/test_stack.rb

@@ -0,0 +1,31 @@
+require_relative 'arm-helper'
+
+class TestStack < MiniTest::Test
+  include ArmHelper
+
+  def test_push
+    code = @machine.push [:lr] 
+    assert_code code , :push ,  [0x00,0x40,0x2d,0xe9] #e9 2d 40 00
+  end
+  def test_push_three
+    code = @machine.push [:r0,:r1,:lr] 
+    assert_code code , :push ,  [0x03,0x40,0x2d,0xe9] #e9 2d 40 03
+  end
+  def test_push_no_link
+    code = @machine.push [:r0,:r1,:r2 ,:r3,:r4,:r5] 
+    assert_code code , :push ,  [0x3f,0x00,0x2d,0xe9] #e9 2d 00 3f
+  end
+  def test_pop
+    code = @machine.pop [:pc] 
+    assert_code code , :pop , [0x00,0x80,0xbd,0xe8] #e8 bd 80 00
+  end
+  def test_pop_three
+    code = @machine.pop [:r0,:r1,:pc] 
+    assert_code code , :pop , [0x03,0x80,0xbd,0xe8] #e8 bd 80 03
+  end
+  def test_pop_no_pc
+    code = @machine.pop [:r0,:r1,:r2 ,:r3,:r4,:r5] 
+    assert_code code , :pop , [0x3f,0x00,0xbd,0xe8] #e8 bd 00 3f
+  end
+  
+end