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

makeing the method of the compiler more or less private

Browse Source 
in preparation for using the same code for bocks
This commit is contained in:
Torsten Ruger
2018-07-09 19:32:17 +03:00
parent 63b55f2aa4
commit edea9ac080
13 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/risc/builtin/integer.rb
View File

@ -8,7 +8,7 @@ module Risc
def div4(context)
source = "div4"
compiler = compiler_for(:Integer,:div4 ,{})
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
me = builder.add_known( :receiver )
builder.reduce_int( source , me )
two = compiler.use_reg :fixnum , 2
@ -33,10 +33,10 @@ module Risc
end
def comparison( operator )
compiler = compiler_for(:Integer, operator ,{other: :Integer})
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
me , other = builder.self_and_int_arg("#{operator} load receiver and arg")
false_label = Risc.label(compiler.method , "false_label_#{builder.object_id.to_s(16)}")
merge_label = Risc.label(compiler.method , "merge_label_#{builder.object_id.to_s(16)}")
false_label = Risc.label(compiler.source , "false_label_#{builder.object_id.to_s(16)}")
merge_label = Risc.label(compiler.source , "merge_label_#{builder.object_id.to_s(16)}")
builder.reduce_int( "#{operator} fix me", me )
builder.reduce_int( "#{operator} fix arg", other )
if(operator.to_s.start_with?('<') )
@ -63,7 +63,7 @@ module Risc
end
def operator_method( op_sym )
compiler = compiler_for(:Integer, op_sym ,{other: :Integer})
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
me , other = builder.self_and_int_arg(op_sym.to_s + "load receiver and arg")
builder.reduce_int( op_sym.to_s + " fix me", me )
builder.reduce_int( op_sym.to_s + " fix arg", other )
@ -76,7 +76,7 @@ module Risc
def div10( context )
s = "div_10 "
compiler = compiler_for(:Integer,:div10 ,{})
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
#FIX: this could load receiver once, reduce and then transfer twice
me = builder.add_known( :receiver )
tmp = builder.add_known( :receiver )

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

@ -9,7 +9,7 @@ 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.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
source = "get_internal_word"
me , index = builder.self_and_int_arg(source)
# reduce me to me[index]
@ -25,7 +25,7 @@ module Risc
def set_internal_word( context )
compiler = compiler_for(:Object , :set_internal_word , {at: :Integer, :value => :Object} )
source = "set_internal_word"
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
me , index = builder.self_and_int_arg(source)
value = builder.load_int_arg_at(source , 1)
# do the set
@ -38,7 +38,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.compiler_builder(compiler.method) , :exit )
emit_syscall( compiler.compiler_builder(compiler.source) , :exit )
return compiler
end
@ -48,7 +48,7 @@ module Risc
def __init__ context
compiler = MethodCompiler.compiler_for_class(:Object,:__init__ ,
Parfait::NamedList.type_for({}) , Parfait::NamedList.type_for({}))
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
builder.build do
space << Parfait.object_space
message << space[:next_message]
@ -63,7 +63,7 @@ module Risc
message[:receiver] << space
end
exit_label = Risc.label(compiler.method , "#{compiler.method.self_type.object_class.name}.#{compiler.method.name}" )
exit_label = Risc.label(compiler.source , "#{compiler.resolve_type(:receiver).object_class.name}.#{compiler.source.name}" )
ret_tmp = compiler.use_reg(:Label)
builder.build do
add_load_constant("__init__ load return", exit_label , ret_tmp)
@ -87,7 +87,7 @@ module Risc
def exit( context )
compiler = compiler_for(:Object,:exit ,{})
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
exit_sequence(builder)
return compiler
end

6
lib/risc/builtin/word.rb
View File

@ -6,7 +6,7 @@ module Risc
def putstring( context)
compiler = compiler_for(:Word , :putstring ,{})
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
builder.add_slot_to_reg( "putstring" , :message , :receiver , :new_message )
index = Parfait::Word.get_length_index
reg = RegisterValue.new(:r2 , :Integer)
@ -21,7 +21,7 @@ module Risc
def get_internal_byte( context)
compiler = compiler_for(:Word , :get_internal_byte , {at: :Integer})
source = "get_internal_byte"
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
me , index = builder.self_and_int_arg(source)
builder.reduce_int( source + " fix arg", index )
# reduce me to me[index]
@ -39,7 +39,7 @@ module Risc
def set_internal_byte( context )
compiler = compiler_for(:Word, :set_internal_byte , {at: :Integer , :value => :Integer} )
source = "set_internal_byte"
builder = compiler.compiler_builder(compiler.method)
builder = compiler.compiler_builder(compiler.source)
me , index = builder.self_and_int_arg(source)
value = builder.load_int_arg_at(source , 1 )
builder.reduce_int( source + " fix me", value )