start passing positions along inside the position code

This commit is contained in:
Torsten Ruger
2018-05-08 19:59:43 +03:00
parent ce3cc72f9e
commit cf06642768
6 changed files with 48 additions and 27 deletions

View File

@ -20,7 +20,7 @@ module Arm
bin = Parfait::BinaryCode.new(1)
Risc::Position.set(bin , 0x20)
code = @machine.call( bin ,{} )#this jumps to the next instruction
Risc::Position.set(code , 0)
Risc::Position.set(code , 0, 1)
assert_code code , :call, [0x09,0x0,0x0,0xeb]
end
def test_swi

View File

@ -82,7 +82,7 @@ module Arm
end
def test_too_big_add
code = @machine.add :r1 , :r1, 0x222
Risc::Position.set(0,0)
Risc::Position.set(code,0,1)
# add 0x02 (first instruction) and then 0x220 shifted
assert_code code , :add , [0x02,0x1c,0x91,0xe2] #e2 91 1e 02
# added extra instruction to add "extra"

View File

@ -1,12 +1,9 @@
require_relative "../helper"
module Risc
# tests that do no require a boot and only test basic positioning
class TestPositionBasic < MiniTest::Test
def setup
Risc.machine.boot
@binary = Parfait::BinaryCode.new(1)
end
def test_creation_ok
assert Position.new(0)
end
@ -29,10 +26,6 @@ module Risc
pos = Position.set(self , 5)
assert_equal 5 , pos.at
end
def test_set_instr
pos = Position.set( Risc::Label.new("hi","ho") , 0 , @binary)
assert_equal IPosition , pos.class
end
def tet_tos
assert_equal "0x10" , Position.set(self).to_s
end

View File

@ -0,0 +1,30 @@
require_relative "../helper"
module Risc
# tests that require a boot and test propagation
class TestPositionBasic < MiniTest::Test
def setup
Risc.machine.boot
@binary = Parfait::BinaryCode.new(1)
@label = Label.new("hi","ho")
end
def test_set_instr
pos = Position.set( @label , 0 , @binary)
assert_equal IPosition , pos.class
end
def test_set_bin
pos = Position.set( @binary , 0 , Parfait.object_space.get_main)
assert_equal BPosition , pos.class
end
def test_ins_propagates
@label.set_next Arm::ArmMachine.b( @label)
Position.set( @label , 0 , @binary)
assert_equal 0 , Position.get(@label.next).at
end
def test_bin_propagates
@binary.extend_to(16)
Position.set( @binary , 0 , Parfait.object_space.get_main)
assert_equal @binary.padded_length , Position.get(@binary.next).at
end
end
end