ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up intruction instantiation and fix tests

Browse Source
This commit is contained in:
Torsten Ruger
2014-05-14 10:47:30 +03:00
parent 46ea1df51e
commit 2230a4f25e
16 changed files with 86 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/test_arm.rb
View File

@ -3,7 +3,7 @@ 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 bl bx swi strb
# adc add and bic eor orr rsb rsc sbc sub mov mvn cmn cmp teq tst b call bx swi strb
class TestArmAsm < MiniTest::Test
# need Assembler and a block (see those classes)
@ -19,7 +19,7 @@ class TestArmAsm < MiniTest::Test
io = StringIO.new
code.assemble(io)
binary = io.string
assert_equal 4 , binary.length
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)}"
@ -45,9 +45,9 @@ class TestArmAsm < MiniTest::Test
code = @machine.b :left => -4 #this jumps to the next instruction
assert_code code , :b , [0xff,0xff,0xff,0xea] #ea ff ff fe
end
def test_bl #see comment above. bx not implemented (as it means into thumb, and no thumb here)
code = @machine.bl :left => -4 #this jumps to the next instruction
assert_code code , :bl , [0xff,0xff,0xff,0xeb] #ea ff ff fe
def test_call #see comment above. bx not implemented (as it means into thumb, and no thumb here)
code = @machine.call :left => -4 #this jumps to the next instruction
assert_code code , :call, [0xff,0xff,0xff,0xeb] #ea ff ff fe
end
def test_bic
code = @machine.bic :left => :r2 , :right => :r2 , :extra => :r3

10
test/test_small_program.rb
View File

@ -18,10 +18,8 @@ class TestSmallProg < MiniTest::Test
start = Vm::Block.new("start")
add_code start
start.instance_eval do
#subs :left => :r0, :right => :r0, :offset => 1 #2
#bne :left => :start #3
mov :left => :r7, :right => 1 #4
swi :left => 0 #5 5 instructions
sub :left => :r0, :right => :r0, :extra => 1 , :update_status_flag => 1 #2
bne :left => start #3
end
end
write( 6 , "loop" )
@ -36,10 +34,8 @@ class TestSmallProg < MiniTest::Test
add :left =>:r1 , :extra => hello # address of "hello Raisa"
mov :left =>:r2 , :right => hello.length
swi :left => 0 #software interupt, ie kernel syscall
mov :left => :r7, :right => 1 # 1 == exit
swi :left => 0
end
write(9 + hello.length/4 + 1 , 'hello')
write(7 + hello.length/4 + 1 , 'hello')
end
#helper to write the file