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

fix indexing when accessing locals or args

Browse Source 
Was missing the offset of object variables
This commit is contained in:
Torsten Ruger
2015-10-22 11:02:46 +03:00
parent a44b88f570
commit ede0fe5f16
6 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/phisol/compiler/assignment.rb
View File

@ -11,14 +11,14 @@ module Phisol
code = nil
if( index = @method.has_arg(name))
# TODO, check type @method.arguments[index].type
code = Register.set_slot(statement , v , :message , index )
code = Register.set_slot(statement , v , :message , index + Parfait::Message.offset )
else # or a local so it is in the frame
index = @method.has_local( name )
if(index)
# TODO, check type @method.locals[index].type
frame = use_reg(:Frame)
@method.source.add_code Register.get_slot(statement , :message , :frame , frame )
code = Register.set_slot(statement , v , frame , index )
code = Register.set_slot(statement , v , frame , index + Parfait::Frame.offset )
end
end
if( code )

4
lib/phisol/compiler/name_expression.rb
View File

@ -15,7 +15,7 @@ module Phisol
# either an argument, so it's stored in message
if( index = @method.has_arg(name))
ret = use_reg @method.arguments[index].type
@method.source.add_code Register.get_slot(statement , :message , index , ret )
@method.source.add_code Register.get_slot(statement , :message , index + Parfait::Message.offset , ret )
return ret
else # or a local so it is in the frame
index = @method.has_local( name )
@ -23,7 +23,7 @@ module Phisol
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 + Parfait::Frame.offset , ret )
return ret
end
end