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

fix builtin methods according to last commit

Browse Source
This commit is contained in:
Torsten Ruger
2018-04-08 18:52:17 +03:00
parent 9867234c38
commit 8c322329fb
6 changed files with 107 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
lib/risc/builtin/object.rb
View File

@ -9,12 +9,13 @@ module Risc
# (this method returns a new method off course, like all builtin)
def get_internal_word( context )
compiler = compiler_for(:Object , :get_internal_word ,{at: :Integer})
builder = compiler.builder(true)
source = "get_internal_word"
me , index = compiler.self_and_int_arg(source)
me , index = builder.self_and_int_arg(source)
# reduce me to me[index]
compiler.add_slot_to_reg( source , me , index , me)
builder.add_slot_to_reg( source , me , index , me)
# and put it back into the return value
compiler.add_reg_to_slot( source , me , :message , :return_value)
builder.add_reg_to_slot( source , me , :message , :return_value)
compiler.add_mom( Mom::ReturnSequence.new)
return compiler.method
end
@ -24,11 +25,12 @@ module Risc
def set_internal_word( context )
compiler = compiler_for(:Object , :set_internal_word , {at: :Integer, :value => :Object} )
source = "set_internal_word"
me , index = compiler.self_and_int_arg(source)
value = compiler.load_int_arg_at(source , 2)
builder = compiler.builder(true)
me , index = builder.self_and_int_arg(source)
value = builder.load_int_arg_at(source , 2)
# do the set
compiler.add_reg_to_slot( source , value , me , index)
builder.add_reg_to_slot( source , value , me , index)
compiler.add_mom( Mom::ReturnSequence.new)
return compiler.method
end
@ -37,7 +39,7 @@ module Risc
# Even if it's just this one, sys_exit (later raise)
def _method_missing( context )
compiler = compiler_for(:Object,:method_missing ,{})
emit_syscall( compiler , :exit )
emit_syscall( compiler.builder(true) , :exit )
return compiler.method
end
# this is the really really first place the machine starts (apart from the jump here)
@ -46,7 +48,7 @@ module Risc
def __init__ context
compiler = Risc::MethodCompiler.create_method(:Object,:__init__ ,
Parfait::NamedList.type_for({}) , Parfait::NamedList.type_for({}))
builder = Risc::Builder.new(compiler)
builder = compiler.builder(true)
builder.build do
space << Parfait.object_space
message << space[:first_message]
@ -54,8 +56,7 @@ module Risc
space[:first_message] << next_message
end
risc = Mom::MessageSetup.new(Parfait.object_space.get_main).build_with( builder )
compiler.add_code(risc)
Mom::MessageSetup.new(Parfait.object_space.get_main).build_with( builder )
builder.build do
message << message[:next_message]
@ -64,49 +65,51 @@ module Risc
exit_label = Risc.label("_exit_label for __init__" , "#{compiler.type.object_class.name}.#{compiler.method.name}" )
ret_tmp = compiler.use_reg(:Label)
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_function_call( "__init__ issue call" , Parfait.object_space.get_main , ret_tmp)
compiler.add_code exit_label
emit_syscall( compiler , :exit )
builder.build do
add_load_constant("__init__ load return", exit_label , ret_tmp)
add_reg_to_slot("__init__ store return", ret_tmp , :message , :return_address)
add_function_call( "__init__ issue call" , Parfait.object_space.get_main , ret_tmp)
add_code exit_label
end
emit_syscall( builder , :exit )
return compiler.method
end
def exit( context )
compiler = compiler_for(:Object,:exit ,{})
emit_syscall( compiler , :exit )
emit_syscall( compiler.builder(true) , :exit )
return compiler.method
end
def emit_syscall( compiler , name )
save_message( compiler )
compiler.add_code Syscall.new("emit_syscall(#{name})", name )
restore_message(compiler)
def emit_syscall( builder , name )
save_message( builder )
builder.add_code Syscall.new("emit_syscall(#{name})", name )
restore_message(builder)
return unless (@clazz and @method)
compiler.add_label( "#{@clazz.name}.#{@message.name}" , "return_syscall" )
builder.add_code Risc.label( "#{@clazz.name}.#{@message.name}" , "return_syscall" )
end
# save the current message, as the syscall destroys all context
#
# This relies on linux to save and restore all registers
#
def save_message(compiler)
def save_message(builder)
r8 = RiscValue.new( :r8 , :Message)
compiler.add_transfer("save_message", Risc.message_reg , r8 )
builder.add_code Risc.transfer("save_message", Risc.message_reg , r8 )
end
def restore_message(compiler)
def restore_message(builder)
r8 = RiscValue.new( :r8 , :Message)
return_tmp = compiler.use_reg :fixnum
return_tmp = builder.compiler.use_reg :fixnum
source = "_restore_message"
# get the sys return out of the way
compiler.add_transfer(source, Risc.message_reg , return_tmp )
builder.add_code Risc.transfer(source, Risc.message_reg , return_tmp )
# load the stored message into the base register
compiler.add_transfer(source, r8 , Risc.message_reg )
int = compiler.use_reg(:Integer)
compiler.add_new_int(source , return_tmp , int )
builder.add_code Risc.transfer(source, r8 , Risc.message_reg )
int = builder.compiler.use_reg(:Integer)
builder.add_new_int(source , return_tmp , int )
# save the return value into the message
compiler.add_reg_to_slot( source , int , :message , :return_value )
builder.add_code Risc.reg_to_slot( source , int , :message , :return_value )
end
end