stop pinning self and frame

before: r0-message , r1-self , r2-frame , r3-new_message , r4 + tmps
now: r0-message , r1-new_message , r2 + tmps
programs got smaller, less fuss
also fix in return implementation that got the address from the wrong
message
This commit is contained in:
Torsten Ruger
2015-10-18 17:20:19 +03:00
parent da5502e301
commit 6c7e4c0fe2
19 changed files with 98 additions and 94 deletions

View File

@ -16,7 +16,9 @@ module Phisol
index = @method.has_local( name )
if(index)
# TODO, check type @method.locals[index].type
code = Register.set_slot(statement , v , :frame , index )
frame = use_reg(:Frame)
@method.source.add_code Register.get_slot(statement , :message , :frame , frame )
code = Register.set_slot(statement , v , frame , index )
end
end
if( code )

View File

@ -7,14 +7,15 @@ module Phisol
name = name.to_a.first
raise "not inside method " unless @method
reset_regs
if receiver
me = process( receiver.to_a.first )
else
me = Register.self_reg @method.for_class.name
end
#move the new message (that we need to populate to make a call) to std register
new_message = Register.resolve_to_register(:new_message)
@method.source.add_code Register.get_slot(@method, :message , :next_message , new_message )
if receiver
me = process( receiver.to_a.first )
else
me = use_reg @method.for_class.name
@method.source.add_code Register.get_slot(@method, :message , :receiver , me )
end
# move our receiver there
@method.source.add_code Register.set_slot( statement , me , :new_message , :receiver)
# load method name and set to new message (for exceptions/debug)

View File

@ -11,8 +11,10 @@ module Phisol
when :self
index = @clazz.object_layout.variable_index(field_name)
raise "field access, but no such field:#{field_name} for class #{@clazz.name}" unless index
value = use_reg(:Integer) #TODO, need types in layout
move = Register.get_slot(statement, :self , index , value )
value = use_reg(@clazz.name) #TODO incorrect, this is the self, but should be the type of variable at index
@method.source.add_code Register.get_slot(statement , :message , :receiver , value )
# reuse the register for next move
move = Register.get_slot(statement, value , index , value )
@method.source.add_code move
return value
when :message

View File

@ -7,7 +7,11 @@ module Phisol
# whichever way this goes the result is stored in the return slot (as all compiles)
def on_name statement
name = statement.to_a.first
return Register.self_reg(@clazz.name ) if(name == :self)
if( name == :self)
ret = use_reg @clazz.name
@method.source.add_code Register.get_slot(statement , :message , :receiver , ret )
return ret
end
# either an argument, so it's stored in message
if( index = @method.has_arg(name))
ret = use_reg @method.arguments[index].type
@ -16,8 +20,10 @@ module Phisol
else # or a local so it is in the frame
index = @method.has_local( name )
if(index)
frame = use_reg :Frame
@method.source.add_code Register.get_slot(statement , :message , :frame , frame )
ret = use_reg @method.locals[index].type
@method.source.add_code Register.get_slot(statement , :frame , index , ret )
@method.source.add_code Register.get_slot(statement , frame , index , ret )
return ret
end
end