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

tighter integration with factory methods for adding code

Browse Source 
define methods to collapse the code Register.
in add_code Register.factory_method
most instructions done, except op and branch that are rare
This commit is contained in:
Torsten Ruger
2016-12-28 20:37:54 +02:00
parent 8cfcb84c8d
commit e551732f18
13 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/register/builtin/compile_helper.rb
View File

@ -17,8 +17,8 @@ module Register
# Load the value
def load_int_arg_at(compiler, source , at)
int_arg = compiler.use_reg :Integer
compiler.add_code Register.slot_to_reg(source , :message , :arguments , int_arg )
compiler.add_code Register.slot_to_reg(source , int_arg , at + 1, int_arg ) #1 for type
compiler.add_slot_to_reg(source , :message , :arguments , int_arg )
compiler.add_slot_to_reg(source , int_arg , at + 1, int_arg ) #1 for type
return int_arg
end

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

@ -25,47 +25,47 @@ module Register
# int tmp = self >> 1
compiler.add_code Register.op( s , ">>" , tmp , const)
# int q = self >> 2
compiler.add_code Register.load_constant( s , 2 , const)
compiler.add_load_constant( s , 2 , const)
compiler.add_code Register.op( s , ">>" , q , const)
# q = q + tmp
compiler.add_code Register.op( s , "+" , q , tmp )
# tmp = q >> 4
compiler.add_code Register.load_constant( s , 4 , const)
compiler.add_code Register.transfer( s, q , tmp)
compiler.add_load_constant( s , 4 , const)
compiler.add_transfer( s, q , tmp)
compiler.add_code Register.op( s , ">>" , tmp , const)
# q = q + tmp
compiler.add_code Register.op( s , "+" , q , tmp )
# tmp = q >> 8
compiler.add_code Register.load_constant( s , 8 , const)
compiler.add_code Register.transfer( s, q , tmp)
compiler.add_load_constant( s , 8 , const)
compiler.add_transfer( s, q , tmp)
compiler.add_code Register.op( s , ">>" , tmp , const)
# q = q + tmp
compiler.add_code Register.op( s , "+" , q , tmp )
# tmp = q >> 16
compiler.add_code Register.load_constant( s , 16 , const)
compiler.add_code Register.transfer( s, q , tmp)
compiler.add_load_constant( s , 16 , const)
compiler.add_transfer( s, q , tmp)
compiler.add_code Register.op( s , ">>" , tmp , const)
# q = q + tmp
compiler.add_code Register.op( s , "+" , q , tmp )
# q = q >> 3
compiler.add_code Register.load_constant( s , 3 , const)
compiler.add_load_constant( s , 3 , const)
compiler.add_code Register.op( s , ">>" , q , const)
# tmp = q * 10
compiler.add_code Register.load_constant( s , 10 , const)
compiler.add_code Register.transfer( s, q , tmp)
compiler.add_load_constant( s , 10 , const)
compiler.add_transfer( s, q , tmp)
compiler.add_code Register.op( s , "*" , tmp , const)
# tmp = self - tmp
compiler.add_code Register.op( s , "-" , me , tmp )
compiler.add_code Register.transfer( s , me , tmp)
compiler.add_transfer( s , me , tmp)
# tmp = tmp + 6
compiler.add_code Register.load_constant( s , 6 , const)
compiler.add_load_constant( s , 6 , const)
compiler.add_code Register.op( s , "+" , tmp , const )
# tmp = tmp >> 4
compiler.add_code Register.load_constant( s , 4 , const)
compiler.add_load_constant( s , 4 , const)
compiler.add_code Register.op( s , ">>" , tmp , const )
# return q + tmp
compiler.add_code Register.op( s , "+" , q , tmp )
compiler.add_code Register.reg_to_slot( s , q , :message , :return_value)
compiler.add_reg_to_slot( s , q , :message , :return_value)
return compiler.method
end
end

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

@ -13,14 +13,14 @@ module Register
space = Parfait::Space.object_space
space_reg = compiler.use_reg(:Space) #Set up the Space as self upon init
compiler.add_code Register.load_constant("__init__ load Space", space , space_reg)
compiler.add_load_constant("__init__ load Space", space , space_reg)
message_ind = Register.resolve_to_index( :space , :first_message )
compiler.add_code Register.slot_to_reg( "__init__ load 1st message" , space_reg , message_ind , :message)
compiler.add_code Register.reg_to_slot( "__init__ store Space in message", space_reg , :message , :receiver)
compiler.add_slot_to_reg( "__init__ load 1st message" , space_reg , message_ind , :message)
compiler.add_reg_to_slot( "__init__ store Space in message", space_reg , :message , :receiver)
exit_label = Register.label("_exit_label for __init__" , "#{compiler.type.object_class.name}.#{compiler.method.name}" )
ret_tmp = compiler.use_reg(:Label)
compiler.add_code Register.load_constant("__init__ load return", exit_label , ret_tmp)
compiler.add_code Register.reg_to_slot("__init__ store return", ret_tmp , :message , :return_address)
compiler.add_load_constant("__init__ load return", exit_label , ret_tmp)
compiler.add_reg_to_slot("__init__ store return", ret_tmp , :message , :return_address)
compiler.add_code Register.function_call( "__init__ issue call" , Register.machine.space.get_main )
compiler.add_code exit_label
emit_syscall( compiler , :exit )
@ -38,7 +38,7 @@ module Register
compiler.add_code Syscall.new("emit_syscall(#{name})", name )
restore_message(compiler)
return unless (@clazz and @method)
compiler.add_code Register.label( "#{@clazz.name}.#{@message.name}" , "return_syscall" )
compiler.add_label( "#{@clazz.name}.#{@message.name}" , "return_syscall" )
end
# save the current message, as the syscall destroys all context
@ -47,7 +47,7 @@ module Register
#
def save_message(compiler)
r8 = RegisterValue.new( :r8 , :Message)
compiler.add_code Register.transfer("save_message", Register.message_reg , r8 )
compiler.add_transfer("save_message", Register.message_reg , r8 )
end
def restore_message(compiler)
@ -55,11 +55,11 @@ module Register
return_tmp = Register.tmp_reg :Integer
source = "_restore_message"
# get the sys return out of the way
compiler.add_code Register.transfer(source, Register.message_reg , return_tmp )
compiler.add_transfer(source, Register.message_reg , return_tmp )
# load the stored message into the base RegisterMachine
compiler.add_code Register.transfer(source, r8 , Register.message_reg )
compiler.add_transfer(source, r8 , Register.message_reg )
# save the return value into the message
compiler.add_code Register.reg_to_slot( source , return_tmp , :message , :return_value )
compiler.add_reg_to_slot( source , return_tmp , :message , :return_value )
end
end
extend ClassMethods

6
lib/register/builtin/object.rb
View File

@ -14,9 +14,9 @@ module Register
source = "get_internal_word"
me , index = self_and_int_arg(compiler,source)
# reduce me to me[index]
compiler.add_code Register.slot_to_reg( source , me , index , me)
compiler.add_slot_to_reg( source , me , index , me)
# and put it back into the return value
compiler.add_code Register.reg_to_slot( source , me , :message , :return_value)
compiler.add_reg_to_slot( source , me , :message , :return_value)
return compiler.method
end
@ -29,7 +29,7 @@ module Register
value = load_int_arg_at(compiler,source , 2)
# do the set
compiler.add_code Register.reg_to_slot( source , value , me , index)
compiler.add_reg_to_slot( source , value , me , index)
return compiler.method
end

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

@ -8,10 +8,10 @@ module Register
def putstring context
compiler = Typed::MethodCompiler.new.create_method(:Word , :putstring ).init_method
compiler.add_code Register.slot_to_reg( "putstring" , :message , :receiver , :new_message )
compiler.add_slot_to_reg( "putstring" , :message , :receiver , :new_message )
index = Parfait::Word.get_length_index
reg = RegisterValue.new(:r2 , :Integer)
compiler.add_code Register.slot_to_reg( "putstring" , :new_message , index , reg )
compiler.add_slot_to_reg( "putstring" , :new_message , index , reg )
Kernel.emit_syscall( compiler , :putstring )
compiler.method
end
@ -23,9 +23,9 @@ module Register
source = "get_internal_byte"
me , index = self_and_int_arg(compiler,source)
# reduce me to me[index]
compiler.add_code Register.byte_to_reg( source , me , index , me)
compiler.add_byte_to_reg( source , me , index , me)
# and put it back into the return value
compiler.add_code Register.reg_to_slot( source , me , :message , :return_value)
compiler.add_reg_to_slot( source , me , :message , :return_value)
return compiler.method
end
@ -41,7 +41,7 @@ module Register
me , index = self_and_int_arg(compiler,source)
value = load_int_arg_at(compiler , source , 2 )
# do the set
compiler.add_code Register.reg_to_byte( source , value , me , index)
compiler.add_reg_to_byte( source , value , me , index)
return compiler.method
end

10
lib/register/instructions/function_call.rb
View File

@ -22,12 +22,12 @@ module Register
def self.issue_call( compiler , callee )
return_label = Register.label("_return_label #{callee.name}" , "#{compiler.type.object_class.name}.#{compiler.method.name}" )
ret_tmp = compiler.use_reg(:Label)
compiler.add_code Register.load_constant("#{callee.name} load ret", return_label , ret_tmp)
compiler.add_code Register.reg_to_slot("#{callee.name} store ret", ret_tmp , :new_message , :return_address)
compiler.add_code Register.transfer("#{callee.name} move new message", Register.new_message_reg , Register.message_reg )
compiler.add_load_constant("#{callee.name} load ret", return_label , ret_tmp)
compiler.add_reg_to_slot("#{callee.name} store ret", ret_tmp , :new_message , :return_address)
compiler.add_transfer("#{callee.name} move new message", Register.new_message_reg , Register.message_reg )
compiler.add_code Register.function_call( "#{callee.name} call" , callee )
compiler.add_code return_label
compiler.add_code Register.transfer("#{callee.name} remove new message", Register.message_reg , Register.new_message_reg )
compiler.add_code Register.slot_to_reg("#{callee.name} restore message" , :new_message , :caller , :message )
compiler.add_transfer("#{callee.name} remove new message", Register.message_reg , Register.new_message_reg )
compiler.add_slot_to_reg("#{callee.name} restore message" , :new_message , :caller , :message )
end
end