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

change right syntax to 1.9 style, looks a little nicer

Browse Source
This commit is contained in:
Torsten Ruger
2014-05-15 21:35:45 +03:00
parent a0f0d08e81
commit 009c0895f4
4 changed files with 66 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/test_arm.rb
View File

@ -27,15 +27,15 @@ class TestArmAsm < MiniTest::Test
end
end
def test_adc
code = @machine.adc :r1, :right => :r3, :extra => :r5
code = @machine.adc :r1, right: :r3, :extra => :r5
assert_code code , :adc , [0x05,0x10,0xa3,0xe0] #e0 a3 10 05
end
def test_add
code = @machine.add :r1 , :right => :r1, :extra => :r3
code = @machine.add :r1 , right: :r1, :extra => :r3
assert_code code , :add , [0x03,0x10,0x81,0xe0] #e0 81 10 03
end
def test_and # inst eval doesn't really work with and
code = @machine.and( :r1 , :right => :r2 , :extra => :r3)
code = @machine.and( :r1 , right: :r2 , :extra => :r3)
assert_code code , :and , [0x03,0x10,0x02,0xe0] #e0 01 10 03
end
def test_b
@ -50,35 +50,35 @@ class TestArmAsm < MiniTest::Test
assert_code code , :call, [0xff,0xff,0xff,0xeb] #ea ff ff fe
end
def test_bic
code = @machine.bic :r2 , :right => :r2 , :extra => :r3
code = @machine.bic :r2 , right: :r2 , :extra => :r3
assert_code code , :bic , [0x03,0x20,0xc2,0xe1] #e3 c2 20 44
end
def test_cmn
code = @machine.cmn :r1 , :right => :r2
code = @machine.cmn :r1 , right: :r2
assert_code code , :cmn , [0x02,0x00,0x71,0xe1] #e1 71 00 02
end
def test_cmp
code = @machine.cmp :r1 , :right => :r2
code = @machine.cmp :r1 , right: :r2
assert_code code , :cmp , [0x02,0x00,0x51,0xe1] #e1 51 00 02
end
def test_eor
code = @machine.eor :r2 , :right => :r2 , :extra => :r3
code = @machine.eor :r2 , right: :r2 , :extra => :r3
assert_code code , :eor , [0x03,0x20,0x22,0xe0] #e0 22 20 03
end
def test_ldr
code = @machine.ldr :r0, :right => :r0
code = @machine.ldr :r0, right: :r0
assert_code code, :ldr , [0x00,0x00,0x90,0xe5] #e5 90 00 00
end
def test_ldr2
code = @machine.ldr :r0, :right => :r0 , :offset => 4
code = @machine.ldr :r0, right: :r0 , :offset => 4
assert_code code, :ldr , [0x04,0x00,0x90,0xe5] #e5 90 00 04
end
def test_ldrb
code = @machine.ldrb :r0, :right => :r0
code = @machine.ldrb :r0, right: :r0
assert_code code, :ldrb , [0x00,0x00,0xd0,0xe5] #e5 d0 00 00
end
def test_orr
code = @machine.orr :r2 , :right => :r2 , :extra => :r3
code = @machine.orr :r2 , right: :r2 , :extra => :r3
assert_code code , :orr , [0x03,0x20,0x82,0xe1] #e1 82 20 03
end
def test_push
@ -90,27 +90,27 @@ class TestArmAsm < MiniTest::Test
assert_code code , :pop , [0x00,0x80,0xbd,0xe8] #e8 bd 80 00
end
def test_rsb
code = @machine.rsb :r1 , :right => :r2 , :extra => :r3
code = @machine.rsb :r1 , right: :r2 , :extra => :r3
assert_code code , :rsb , [0x03,0x10,0x62,0xe0]#e0 62 10 03
end
def test_rsc
code = @machine.rsc :r2 , :right => :r3 , :extra => :r4
code = @machine.rsc :r2 , right: :r3 , :extra => :r4
assert_code code , :rsc , [0x04,0x20,0xe3,0xe0]#e0 e3 20 04
end
def test_sbc
code = @machine.sbc :r3, :right => :r4 , :extra => :r5
code = @machine.sbc :r3, right: :r4 , :extra => :r5
assert_code code , :sbc , [0x05,0x30,0xc4,0xe0]#e0 c4 30 05
end
def test_str
code = @machine.str :r0, :right => :r0
code = @machine.str :r0, right: :r0
assert_code code, :str , [0x00,0x00,0x80,0xe5] #e5 81 00 00
end
def test_strb
code = @machine.strb :r0, :right => :r0
code = @machine.strb :r0, right: :r0
assert_code code, :strb , [0x00,0x00,0xc0,0xe5] #e5 c0 00 00
end
def test_sub
code = @machine.sub :r2, :right => :r0, :extra => 1
code = @machine.sub :r2, right: :r0, :extra => 1
assert_code code, :sub , [0x01,0x20,0x40,0xe2] #e2 40 20 01
end
def test_swi
@ -118,19 +118,19 @@ class TestArmAsm < MiniTest::Test
assert_code code , :swi , [0x05,0x00,0x00,0xef]#ef 00 00 05
end
def test_teq
code = @machine.teq :r1 , :right => :r2
code = @machine.teq :r1 , right: :r2
assert_code code , :teq , [0x02,0x00,0x31,0xe1] #e1 31 00 02
end
def test_tst
code = @machine.tst :r1 , :right => :r2
code = @machine.tst :r1 , right: :r2
assert_code code , :tst , [0x02,0x00,0x11,0xe1] #e1 11 00 02
end
def test_mov
code = @machine.mov :r0, :right => 5
code = @machine.mov :r0, right: 5
assert_code code , :mov , [0x05,0x00,0xa0,0xe3] #e3 a0 10 05
end
def test_mvn
code = @machine.mvn :r1, :right => 5
code = @machine.mvn :r1, right: 5
assert_code code , :mvn , [0x05,0x10,0xe0,0xe3] #e3 e0 10 05
end
end

10
test/test_small_program.rb
View File

@ -14,11 +14,11 @@ class TestSmallProg < MiniTest::Test
def test_loop
@program.main.instance_eval do
mov :r0, :right => 5 #1
mov :r0, right: 5 #1
start = Vm::Block.new("start")
add_code start
start.instance_eval do
sub :r0, :right => :r0, :extra => 1 , :update_status_flag => 1 #2
sub :r0, right: :r0, :extra => 1 , :update_status_flag => 1 #2
bne start ,{} #3
end
end
@ -29,10 +29,10 @@ class TestSmallProg < MiniTest::Test
hello = Vm::StringConstant.new "Hello Raisa\n"
@program.add_object hello
@program.main.instance_eval do
mov :r7, :right => 4 # 4 == write
mov :r0 , :right => 1 # stdout
mov :r7, right: 4 # 4 == write
mov :r0 , right: 1 # stdout
add :r1 , :extra => hello # address of "hello Raisa"
mov :r2 , :right => hello.length
mov :r2 , right: hello.length
swi 0 , {} #software interupt, ie kernel syscall
end
write(7 + hello.length/4 + 1 , 'hello')