From 2fdc59c13c53579a7dbbd0221db045853af4a05f Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Tue, 22 Apr 2014 23:13:16 +0300 Subject: [PATCH] some renaming --- test/test_crystal.rb | 65 +++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 37 deletions(-) diff --git a/test/test_crystal.rb b/test/test_crystal.rb index 345eac31..80093169 100644 --- a/test/test_crystal.rb +++ b/test/test_crystal.rb @@ -9,7 +9,7 @@ require "asm/arm/arm_assembler" class TestArmAsm < MiniTest::Test # need a code generator, for arm def setup - @generator = Asm::Arm::ArmAssembler.new + @assembler = Asm::Arm::ArmAssembler.new end # code is what the generator spits out, at least one instruction worth (.first) @@ -17,7 +17,7 @@ class TestArmAsm < MiniTest::Test # 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 - binary = @generator.assemble_to_string + binary = @assembler.assemble_to_string assert_equal 4 , binary.length index = 0 binary.each_byte do |byte | @@ -26,120 +26,111 @@ class TestArmAsm < MiniTest::Test end end def test_adc - code = @generator.instance_eval { adc r1, r3, r5}.first + code = @assembler.instance_eval { adc r1, r3, r5}.first assert_code code , :adc , [0x05,0x10,0xa3,0xe0] #e0 a3 10 05 end def test_add - code = @generator.instance_eval { add r1 , r1, r3}.first + code = @assembler.instance_eval { add r1 , r1, r3}.first 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 = @generator.and( @generator.r1 , @generator.r2 , @generator.r3).first + code = @assembler.and( @assembler.r1 , @assembler.r2 , @assembler.r3).first assert_code code , :and , [0x03,0x10,0x02,0xe0] #e0 01 10 03 end 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 = @generator.instance_eval { b -1 }.first #this jumps to the next instruction + code = @assembler.instance_eval { b -1 }.first #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 = @generator.instance_eval { bl -1 }.first #this jumps to the next instruction + code = @assembler.instance_eval { bl -1 }.first #this jumps to the next instruction assert_code code , :bl , [0xff,0xff,0xff,0xeb] #ea ff ff fe end def test_bic - code = @generator.instance_eval { bic r2 , r2 , r3 }.first + code = @assembler.instance_eval { bic r2 , r2 , r3 }.first assert_code code , :bic , [0x03,0x20,0xc2,0xe1] #e3 c2 20 44 end def test_cmn - code = @generator.instance_eval { cmn r1 , r2 }.first + code = @assembler.instance_eval { cmn r1 , r2 }.first assert_code code , :cmn , [0x02,0x00,0x71,0xe1] #e1 71 00 02 end def test_cmp - code = @generator.instance_eval { cmp r1 , r2 }.first + code = @assembler.instance_eval { cmp r1 , r2 }.first assert_code code , :cmp , [0x02,0x00,0x51,0xe1] #e1 51 00 02 end def test_eor - code = @generator.instance_eval { eor r2 , r2 , r3 }.first + code = @assembler.instance_eval { eor r2 , r2 , r3 }.first assert_code code , :eor , [0x03,0x20,0x22,0xe0] #e0 22 20 03 end def test_ldr - code = @generator.instance_eval { ldr r0, r0 }.first + code = @assembler.instance_eval { ldr r0, r0 }.first assert_code code, :ldr , [0x00,0x00,0x90,0xe5] #e5 90 00 00 end def test_ldr2 - code = @generator.instance_eval { ldr r0, r0 + 4 }.first + code = @assembler.instance_eval { ldr r0, r0 + 4 }.first assert_code code, :ldr , [0x04,0x00,0x90,0xe5] #e5 90 00 04 end def test_ldrb - code = @generator.instance_eval { ldrb r0, r0 }.first + code = @assembler.instance_eval { ldrb r0, r0 }.first assert_code code, :ldrb , [0x00,0x00,0xd0,0xe5] #e5 d0 00 00 end def test_orr - code = @generator.instance_eval { orr r2 , r2 , r3 }.first + code = @assembler.instance_eval { orr r2 , r2 , r3 }.first assert_code code , :orr , [0x03,0x20,0x82,0xe1] #e1 82 20 03 end def test_push - code = @generator.instance_eval { push lr }.first + code = @assembler.instance_eval { push lr }.first assert_code code , :push , [0x00,0x40,0x2d,0xe9] #e9 2d 40 00 end def test_pop - code = @generator.instance_eval { pop pc }.first + code = @assembler.instance_eval { pop pc }.first assert_code code , :pop , [0x00,0x80,0xbd,0xe8] #e8 bd 80 00 end def test_rsb - code = @generator.instance_eval { rsb r1 , r2 , r3 }.first + code = @assembler.instance_eval { rsb r1 , r2 , r3 }.first assert_code code , :rsb , [0x03,0x10,0x62,0xe0]#e0 62 10 03 end def test_rsc - code = @generator.instance_eval { rsc r2 , r3 , r4 }.first + code = @assembler.instance_eval { rsc r2 , r3 , r4 }.first assert_code code , :rsc , [0x04,0x20,0xe3,0xe0]#e0 e3 20 04 end def test_sbc - code = @generator.instance_eval { sbc r3, r4 , r5 }.first + code = @assembler.instance_eval { sbc r3, r4 , r5 }.first assert_code code , :sbc , [0x05,0x30,0xc4,0xe0]#e0 c4 30 05 end def test_str - code = @generator.instance_eval { str r0, r0 }.first + code = @assembler.instance_eval { str r0, r0 }.first assert_code code, :str , [0x00,0x00,0x80,0xe5] #e5 81 00 00 end def test_strb - code = @generator.instance_eval { strb r0, r0 }.first + code = @assembler.instance_eval { strb r0, r0 }.first assert_code code, :strb , [0x00,0x00,0xc0,0xe5] #e5 c0 00 00 end def test_sub - code = @generator.instance_eval { sub r2, r0, 1 }.first + code = @assembler.instance_eval { sub r2, r0, 1 }.first assert_code code, :sub , [0x01,0x20,0x40,0xe2] #e2 40 20 01 end def test_swi - code = @generator.instance_eval { swi 0x05 }.first + code = @assembler.instance_eval { swi 0x05 }.first assert_code code , :swi , [0x05,0x00,0x00,0xef]#ef 00 00 05 end def test_teq - code = @generator.instance_eval{ teq r1 , r2}.first + code = @assembler.instance_eval{ teq r1 , r2}.first assert_code code , :teq , [0x02,0x00,0x31,0xe1] #e1 31 00 02 end def test_tst - code = @generator.instance_eval{ tst r1 , r2}.first + code = @assembler.instance_eval{ tst r1 , r2}.first assert_code code , :tst , [0x02,0x00,0x11,0xe1] #e1 11 00 02 end def test_mov - code = @generator.instance_eval { mov r0, 5 }.first + code = @assembler.instance_eval { mov r0, 5 }.first assert_code code , :mov , [0x05,0x00,0xa0,0xe3] #e3 a0 10 05 end def test_mvn - code = @generator.instance_eval { mvn r1, 5 }.first + code = @assembler.instance_eval { mvn r1, 5 }.first assert_code code , :mvn , [0x05,0x10,0xe0,0xe3] #e3 e0 10 05 end - def saved_other - @generator.instance_eval do - mov r0, 5 - loop_start = label! - subs r0, r0, 1 - bne loop_start - bx lr - end - end end