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

stop pinning self and frame

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/phisol/compiler/assignment.rb
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 )

11
lib/phisol/compiler/call_site.rb
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)

6
lib/phisol/compiler/field_access.rb
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

10
lib/phisol/compiler/name_expression.rb
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

7
lib/register/builtin/integer.rb
View File

@ -3,6 +3,7 @@ module Register
module Builtin
module Integer
module ClassMethods
include AST::Sexp
def plus c
plus_function = Virtual::MethodSource.create_method(:Integer,:Integer,:plus , [:Integer] )
plus_function.source.set_return_type :Integer
@ -11,8 +12,12 @@ module Register
tmp = Register.tmp_reg :Integer
index = Register.arg_index 1
plus_function.source.add_code Register.get_slot( plus_function , :message , index , tmp )
add = Register::OperatorInstruction.new( plus_function, :add , Register.self_reg(:Integer) , tmp )
me = Register.tmp_reg :Integer
plus_function.source.add_code Register.get_slot(plus_function , :message , :receiver , me )
add = Register::OperatorInstruction.new( plus_function, :add , me , tmp )
plus_function.source.add_code add
plus_function.source.add_code Register.set_slot(plus_function , me , :message , :return_value )
return plus_function
end

11
lib/register/builtin/kernel.rb
View File

@ -13,12 +13,13 @@ module Register
function.source.blocks.last.codes.pop # no Method return
#Set up the Space as self upon init
space = Parfait::Space.object_space
function.source.add_code LoadConstant.new(function, space , Register.self_reg(:Space))
space_reg = Register.tmp_reg(:Space)
function.source.add_code LoadConstant.new(function, space , space_reg)
message_ind = Register.resolve_index( :space , :first_message )
# Load the message to new message register (r3)
function.source.add_code Register.get_slot( function , :self , message_ind , :new_message)
# Load the message to new message register (r1)
function.source.add_code Register.get_slot( function , space_reg , message_ind , :new_message)
# And store the space as the new self (so the call can move it back as self)
function.source.add_code Register.set_slot( function, :self , :new_message , :receiver)
function.source.add_code Register.set_slot( function, space_reg , :new_message , :receiver)
# now we are set up to issue a call to the main
function.source.add_code Virtual::MethodCall.new(Virtual.machine.space.get_main)
emit_syscall( function , :exit )
@ -63,8 +64,6 @@ module Register
# save the return value into the message
function.source.add_code Register.set_slot( function, return_tmp , :message , :return_value )
# and "unroll" self and frame
function.source.add_code Register.get_slot(function, :message , :receiver, :self )
function.source.add_code Register.get_slot(function, :message , :frame , :frame)
end
end
extend ClassMethods

1
lib/register/builtin/word.rb
View File

@ -4,6 +4,7 @@ module Register
module ClassMethods
def putstring context
function = Virtual::MethodSource.create_method(:Word,:Integer , :putstring , [] )
function.source.add_code Register.get_slot( function , :message , :receiver , :new_message )
Kernel.emit_syscall( function , :putstring )
function
end

2
lib/register/passes/call_implementation.rb
View File

@ -14,8 +14,6 @@ module Register
new_codes = []
# move the current new_message to message
new_codes << RegisterTransfer.new(code, Register.new_message_reg , Register.message_reg )
# "roll out" self into its register
new_codes << Register.get_slot( code , :message , :receiver, :self )
# do the register call
new_codes << FunctionCall.new( code , code.method )
block.replace(code , new_codes )

5
lib/register/passes/return_implementation.rb
View File

@ -8,11 +8,8 @@ module Register
new_codes << RegisterTransfer.new(code, Register.message_reg , Register.new_message_reg )
# and restore the message from saved value in new_message
new_codes << Register.get_slot(code,:new_message , :caller , :message )
# "roll out" self and frame into their registers
new_codes << Register.get_slot(code, :message , :receiver , :self )
new_codes << Register.get_slot(code, :message , :frame , :frame )
#load the return address into pc, affecting return. (other cpus have commands for this, but not arm)
new_codes << FunctionReturn.new( code , Register.message_reg , Register.resolve_index(:message , :return_address) )
new_codes << FunctionReturn.new( code , Register.new_message_reg , Register.resolve_index(:message , :return_address) )
block.replace(code , new_codes )
end
end

17
lib/register/register_value.rb
View File

@ -65,27 +65,16 @@ module Register
RegisterValue.new :r0 , :Message
end
# A register to hold the receiver of the current message, in oo terms the self. :r1
def self.self_reg type
RegisterValue.new :r1 , type
end
# The register to hold a possible frame of the currently executing method. :r2
# May be nil if the method has no local variables
def self.frame_reg
RegisterValue.new :r2 , :Frame
end
# The register we use to store the new message object is :r3
# The new message is the one being built, to be sent
def self.new_message_reg
RegisterValue.new :r3 , :Message
RegisterValue.new :r1 , :Message
end
# The first scratch register. There is a next_reg_use to get a next and next.
# Current thinking is that scratch is schatch between instructions
def self.tmp_reg type , value = nil
RegisterValue.new :r4 , type , value
RegisterValue.new :r2 , type , value
end
# The first arg is a class name (possibly lowercase) and the second an instance variable name.
@ -116,8 +105,10 @@ module Register
when :new_message
register = new_message_reg
when :self
raise "self good?"
register = self_reg(:Object) #TODO , probably have to get rid of this resolve method
when :frame
raise "frame good?"
register = frame_reg
else
raise "not recognized register reference #{reference}"

4
lib/virtual/passes/enter_implementation.rb
View File

@ -7,10 +7,6 @@ module Virtual
new_codes = []
# save return register to the message at instance return_address
new_codes << Register.save_return(code, :message , :return_address)
# and create a new frame if needed
unless code.method.locals.empty?
new_codes << Register.get_slot( code, :message , :frame , Register.resolve_to_register(:frame))
end
block.replace(code , new_codes )
end
end

12
test/compiler/statements/test_assign.rb
View File

@ -29,7 +29,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,SetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [Virtual::MethodReturn]]
check
end
@ -42,7 +42,7 @@ end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,LoadConstant,
OperatorInstruction,SetSlot],[Virtual::MethodReturn]]
OperatorInstruction,GetSlot,SetSlot],[Virtual::MethodReturn]]
check
end
@ -55,7 +55,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,SetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot] , [Virtual::MethodReturn]]
check
end
@ -67,7 +67,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant, SetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,LoadConstant, GetSlot,SetSlot] , [Virtual::MethodReturn]]
check
end
@ -79,8 +79,8 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot,SetSlot, LoadConstant,
SetSlot,Virtual::MethodCall,GetSlot,SetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,GetSlot,GetSlot,SetSlot, LoadConstant,SetSlot,
Virtual::MethodCall,GetSlot,GetSlot,SetSlot] , [Virtual::MethodReturn]]
check
end
end

14
test/compiler/statements/test_call.rb
View File

@ -17,7 +17,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,
@expect = [[Virtual::MethodEnter,GetSlot,LoadConstant,
SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,GetSlot] ,
[Virtual::MethodReturn]]
check
@ -37,7 +37,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,
@expect = [[Virtual::MethodEnter,GetSlot,LoadConstant,
SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,GetSlot] ,
[Virtual::MethodReturn]]
check
@ -57,8 +57,8 @@ class Object
end
end
HERE
@expect = [ [Virtual::MethodEnter,LoadConstant,SetSlot,GetSlot,
GetSlot,SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,
@expect = [ [Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot,GetSlot,
GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,Virtual::MethodCall,
GetSlot] ,[Virtual::MethodReturn] ]
check
end
@ -77,13 +77,13 @@ class Object
end
end
HERE
@expect = [ [Virtual::MethodEnter,GetSlot,GetSlot,SetSlot,
@expect = [ [Virtual::MethodEnter,GetSlot,GetSlot,GetSlot,SetSlot,
LoadConstant,SetSlot,Virtual::MethodCall,
GetSlot] ,[Virtual::MethodReturn] ]
check
end
def test_puts_string
def test_call_puts
@string_input = <<HERE
class Object
int puts(Word str)
@ -94,7 +94,7 @@ int main()
end
end
HERE
@expect = [ [Virtual::MethodEnter , GetSlot,SetSlot,LoadConstant,SetSlot,LoadConstant,
@expect = [ [Virtual::MethodEnter , GetSlot,GetSlot,SetSlot,LoadConstant,SetSlot,LoadConstant,
SetSlot,Virtual::MethodCall,GetSlot],
[Virtual::MethodReturn]]
check

8
test/compiler/statements/test_return.rb
View File

@ -26,7 +26,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,GetSlot,GetSlot] , [Virtual::MethodReturn]]
check
end
@ -39,7 +39,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant, SetSlot,GetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot,GetSlot,GetSlot] , [Virtual::MethodReturn]]
check
end
@ -52,7 +52,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot] , [Virtual::MethodReturn]]
@expect = [[Virtual::MethodEnter,GetSlot,GetSlot] , [Virtual::MethodReturn]]
check
end
@ -64,7 +64,7 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,GetSlot,SetSlot, LoadConstant,
@expect = [[Virtual::MethodEnter,GetSlot,GetSlot,SetSlot, LoadConstant,
SetSlot,Virtual::MethodCall,GetSlot] , [Virtual::MethodReturn]]
check
end

10
test/compiler/statements/test_while.rb
View File

@ -31,8 +31,8 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,SetSlot],[GetSlot,LoadConstant,OperatorInstruction,
IsZeroBranch,GetSlot,LoadConstant,OperatorInstruction,SetSlot,AlwaysBranch],
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot],[GetSlot,GetSlot,LoadConstant,OperatorInstruction,
IsZeroBranch,GetSlot,GetSlot,LoadConstant,OperatorInstruction,GetSlot,SetSlot,AlwaysBranch],
[],[Virtual::MethodReturn]]
check
end
@ -50,9 +50,9 @@ class Object
end
end
HERE
@expect = [[Virtual::MethodEnter,LoadConstant,SetSlot],
[GetSlot,LoadConstant,OperatorInstruction,IsZeroBranch,
GetSlot,LoadConstant,OperatorInstruction,SetSlot,
@expect = [[Virtual::MethodEnter,LoadConstant,GetSlot,SetSlot],
[GetSlot,GetSlot,LoadConstant,OperatorInstruction,IsZeroBranch,GetSlot,
GetSlot,LoadConstant,OperatorInstruction,GetSlot,SetSlot,GetSlot,
GetSlot,AlwaysBranch] ,
[],[Virtual::MethodReturn]]
check

1
test/interpreter/helper.rb
View File

@ -27,6 +27,7 @@ module Ticker
puts e
end
classes = classes.collect {|c| '"' + c.name.sub("Register::","") + '",' }
classes << "length = #{classes.length}"
classes.each_slice(5).each do |line|
puts " " + line.join
end

18
test/interpreter/test_add.rb
View File

@ -31,13 +31,13 @@ class AddTest < MiniTest::Test
end
def test_load
assert_equal Register::LoadConstant , ticks(2).class
assert_equal Parfait::Space , Virtual.machine.objects[ @interpreter.get_register(:r1)].class
assert_equal :r1, @interpreter.instruction.array.symbol
assert_equal Parfait::Space , Virtual.machine.objects[ @interpreter.get_register(:r2)].class
assert_equal :r2, @interpreter.instruction.array.symbol
end
def test_get
assert_equal Register::GetSlot , ticks(3).class
assert @interpreter.get_register( :r3 )
assert @interpreter.get_register( :r3 ).is_a? Integer
assert @interpreter.get_register( :r2 )
assert @interpreter.get_register( :r2 ).is_a? Integer
end
def test_transfer
transfer = ticks 5
@ -45,11 +45,11 @@ class AddTest < MiniTest::Test
assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
end
def test_call
assert_equal Register::FunctionCall , ticks(7).class
assert_equal Register::FunctionCall , ticks(6).class
assert @interpreter.link
end
def test_adding
done_op = ticks(11)
done_op = ticks(10)
assert_equal Register::OperatorInstruction , done_op.class
left = @interpreter.get_register(done_op.left)
rr = done_op.right
@ -65,9 +65,11 @@ class AddTest < MiniTest::Test
end
def test_chain
#show_ticks # get output of what is
["Branch","LoadConstant","GetSlot","SetSlot","RegisterTransfer",
"GetSlot","FunctionCall","SaveReturn","LoadConstant","LoadConstant",
"OperatorInstruction","RegisterTransfer","GetSlot"].each_with_index do |name , index|
"FunctionCall","SaveReturn","LoadConstant","LoadConstant","OperatorInstruction",
"RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer","Syscall",
"NilClass"].each_with_index do |name , index|
got = ticks(1)
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
end

20
test/interpreter/test_puti.rb
View File

@ -51,7 +51,7 @@ HERE
Virtual.machine.boot
syntax = Parser::Salama.new.parse_with_debug(@string_input)
parts = Parser::Transform.new.apply(syntax)
puts parts.inspect
#puts parts.inspect
Phisol::Compiler.compile( parts )
# statements = Virtual.machine.boot.parse_and_compile @string_input
@ -59,16 +59,18 @@ HERE
Virtual.machine.run_before "Register::CallImplementation"
@interpreter = Interpreter::Interpreter.new
@interpreter.start Virtual.machine.init
#show_ticks # get output of what is
["Branch","LoadConstant","GetSlot","SetSlot","RegisterTransfer",
"GetSlot","FunctionCall","SaveReturn","LoadConstant","GetSlot",
"SetSlot","LoadConstant","SetSlot","RegisterTransfer","GetSlot",
"FunctionCall","SaveReturn","GetSlot","LoadConstant","SetSlot",
"GetSlot","SetSlot","LoadConstant","SetSlot","GetSlot",
"SetSlot","RegisterTransfer","GetSlot","FunctionCall","SaveReturn",
"GetSlot","LoadConstant","OperatorInstruction","SetSlot","GetSlot",
"OperatorInstruction","SetSlot","GetSlot","LoadConstant","OperatorInstruction",
"IsZeroBranch","GetSlot","SetSlot","LoadConstant","SetSlot",
"GetSlot","SetSlot","RegisterTransfer","GetSlot","FunctionCall",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","SaveReturn",
"LoadConstant","GetSlot","SetSlot","GetSlot","GetSlot",
"SetSlot","LoadConstant","SetSlot","GetSlot","GetSlot",
"SetSlot","RegisterTransfer","FunctionCall","SaveReturn","GetSlot",
"LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
"GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
"GetSlot","GetSlot","LoadConstant","OperatorInstruction","IsZeroBranch",
"GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
"GetSlot","GetSlot","SetSlot","RegisterTransfer","FunctionCall",
"SaveReturn","GetSlot","LoadConstant","OperatorInstruction","IsZeroBranch",
"LoadConstant","GetSlot","LoadConstant","OperatorInstruction","IsZeroBranch",
"LoadConstant","GetSlot","LoadConstant","OperatorInstruction","IsZeroBranch",

31
test/interpreter/test_puts.rb
View File

@ -31,13 +31,13 @@ class TestPuts < MiniTest::Test
end
def test_load
assert_equal Register::LoadConstant , ticks(2).class
assert_equal Parfait::Space , Virtual.machine.objects[ @interpreter.get_register(:r1)].class
assert_equal :r1, @interpreter.instruction.array.symbol
assert_equal Parfait::Space , Virtual.machine.objects[ @interpreter.get_register(:r2)].class
assert_equal :r2, @interpreter.instruction.array.symbol
end
def test_get
assert_equal Register::GetSlot , ticks(3).class
assert @interpreter.get_register( :r3 )
assert @interpreter.get_register( :r3 ).is_a? Integer
assert @interpreter.get_register( :r1 )
assert @interpreter.get_register( :r1 ).is_a? Integer
end
def test_transfer
transfer = ticks 5
@ -45,23 +45,24 @@ class TestPuts < MiniTest::Test
assert_equal @interpreter.get_register(transfer.to) , @interpreter.get_register(transfer.from)
end
def test_call
assert_equal Register::FunctionCall , ticks(7).class
assert_equal Register::FunctionCall , ticks(6).class
assert @interpreter.link
end
def test_save
done = ticks(8)
done = ticks(7)
assert_equal Register::SaveReturn , done.class
assert @interpreter.get_register done.register.symbol
end
def test_chain
#show_ticks # get output of what is
["Branch","LoadConstant","GetSlot","SetSlot","RegisterTransfer",
"GetSlot","FunctionCall","SaveReturn","LoadConstant","GetSlot",
"SetSlot","LoadConstant","SetSlot","RegisterTransfer","GetSlot",
"FunctionCall","SaveReturn","RegisterTransfer","Syscall","RegisterTransfer",
"RegisterTransfer","SetSlot","GetSlot","GetSlot","RegisterTransfer",
"GetSlot","GetSlot","GetSlot","FunctionReturn","RegisterTransfer",
"Syscall","NilClass"].each_with_index do |name , index|
"FunctionCall","SaveReturn","GetSlot","LoadConstant","SetSlot",
"LoadConstant","SetSlot","RegisterTransfer","FunctionCall","SaveReturn",
"GetSlot","RegisterTransfer","Syscall","RegisterTransfer","RegisterTransfer",
"SetSlot","RegisterTransfer","GetSlot","FunctionReturn","GetSlot",
"RegisterTransfer","GetSlot","FunctionReturn","RegisterTransfer","Syscall",
"NilClass"].each_with_index do |name , index|
got = ticks(1)
#puts "TICK #{index}"
assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
@ -69,20 +70,20 @@ class TestPuts < MiniTest::Test
end
def test_putstring
done = ticks(19)
done = ticks(18)
assert_equal Register::Syscall , done.class
assert_equal "Hello again" , @interpreter.stdout
end
def test_return
done = ticks(29)
done = ticks(24)
assert_equal Register::FunctionReturn , done.class
assert @interpreter.block.is_a?(Virtual::Block)
assert @interpreter.instruction.is_a?(Register::Instruction) , "not instruction #{@interpreter.instruction}"
end
def test_exit
done = ticks(32)
done = ticks(31)
assert_equal NilClass , done.class
assert_equal "Hello again" , @interpreter.stdout
end