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

@ -78,7 +78,7 @@ module Risc
translate_arm unless @translated translate_arm unless @translated
#need the initial jump at 0 and then functions #need the initial jump at 0 and then functions
Position.set(binary_init,0) Position.set(binary_init,0)
Position.set(cpu_init , 3 , binary_init) Position.set(cpu_init , 12 , binary_init)
@code_start = position_objects( binary_init.padded_length ) @code_start = position_objects( binary_init.padded_length )
# and then everything code # and then everything code
position_code position_code

View File

@ -36,7 +36,7 @@ module Risc
"0x#{@at.to_s(16)}" "0x#{@at.to_s(16)}"
end end
# just a callback after creation AND insertion # just a callback after creation AND insertion
def init def init(pos)
end end
def reset_to(pos) def reset_to(pos)
return false if pos == at return false if pos == at
@ -77,7 +77,7 @@ module Risc
end end
position = for_at( object , pos , extra) position = for_at( object , pos , extra)
self.positions[object] = position self.positions[object] = position
position.init position.init(pos)
position position
end end
@ -102,22 +102,16 @@ module Risc
@binary = binary @binary = binary
end end
def set_position( position , binary = nil) def init(at)
raise "invalid position #{position}" if position > 15 return unless instruction.next
binary = Risc::Position.get(self).binary unless binary at += instruction.byte_length
Risc::Position.set(self, position , binary) bin = binary
position += byte_length / 4 #assumes 4 byte instructions, as does the whole setup if( 12 == at % 60)
if self.next at = 12
if( 3 == position % 15) # 12 is the amount of instructions that fit into a BinaryCode bin = binary.next
position = 3
binary = binary.next
end end
self.next.set_position( position , binary) Position.set(instruction.next, at , binary)
else
position
end end
end
def reset_to(pos) def reset_to(pos)
changed = super(pos) changed = super(pos)
@ -135,5 +129,9 @@ module Risc
@code = code @code = code
@method = method @method = method
end end
def init(at)
return unless code.next
Position.set(code.next , at + code.padded_length, method)
end
end end
end end

View File

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

View File

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

View File

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