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

move to relative (to self) addressing

Browse Source
This commit is contained in:
Torsten Ruger 2014-09-06 23:03:33 +03:00
parent c6072c683b
commit f00b06bb44
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/register/assembler.rb
View File

@ -86,9 +86,9 @@ module Register
raise "Object(#{object.object_id}) not linked #{object.inspect}" unless slot raise "Object(#{object.object_id}) not linked #{object.inspect}" unless slot
layout = slot.layout layout = slot.layout
@stream.write_uint32( 0 ) #TODO types @stream.write_uint32( 0 ) #TODO types
write_ref(layout[:names]) write_ref_for(layout[:names] , slot )
variables.each do |var| variables.each do |var|
write_ref var write_ref_for(var , slot)
end end
pad_to( variables.length ) pad_to( variables.length )
slot.position slot.position
@ -106,9 +106,9 @@ module Register
array = slot.objekt array = slot.objekt
layout = slot.layout layout = slot.layout
@stream.write_uint32( 0 ) #TODO types @stream.write_uint32( 0 ) #TODO types
write_ref layout[:names] #ref write_ref_for(layout[:names],slot) #ref
array.each do |var| array.each do |var|
write_ref(var) write_ref_for(var,slot)
end end
pad_to( array.length ) pad_to( array.length )
slot.position slot.position
@ -160,7 +160,7 @@ module Register
def assemble_CompiledMethod(slot) def assemble_CompiledMethod(slot)
method = slot.objekt method = slot.objekt
@stream.write_uint32( 0 ) #TODO types @stream.write_uint32( 0 ) #TODO types
write_ref(slot.layout[:names]) #ref of layout write_ref_for(slot.layout[:names] , slot) #ref of layout
# TODO the assembly may have to move to the object to be more extensible # TODO the assembly may have to move to the object to be more extensible
count = 0 count = 0
method.blocks.each do |block| method.blocks.each do |block|
@ -190,7 +190,7 @@ module Register
str = str.to_s if str.is_a? Symbol str = str.to_s if str.is_a? Symbol
layout = slot.layout layout = slot.layout
@stream.write_uint32( 0 ) #TODO types @stream.write_uint32( 0 ) #TODO types
write_ref( slot.layout[:names] ) #ref write_ref_for( slot.layout[:names] , slot) #ref
@stream.write str @stream.write str
pad = (slot.length*4) - 8 - str.length pad = (slot.length*4) - 8 - str.length
pad.times do pad.times do
@ -227,10 +227,16 @@ module Register
nil nil
end end
def write_ref object # write means we write the resulting address straight into the assembler stream (ie don't return it)
# ref means the object of which we write the address
# and we write the address into the self, given as second parameter
# because of position independence, references/addresses are relative to self
def write_ref_for object , self_slot
slot = get_slot(object) slot = get_slot(object)
raise "Object (#{object.object_id}) not linked #{object.inspect}" unless slot raise "Object (#{object.object_id}) not linked #{object.inspect}" unless slot
@stream.write_uint32 slot.position pos = slot.position - self_slot.position
puts "Writin address #{(4*pos).to_s(16)} = #{slot.position.to_s(16)} - #{self_slot.position.to_s(16)}"
@stream.write_sint32 pos * 4
end end
# objects only come in lengths of multiple of 8 # objects only come in lengths of multiple of 8