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

plus function, indentation

Browse Source
This commit is contained in:
Torsten Ruger 2015-08-05 18:49:37 +03:00
parent 21b0702154
commit 8560f15c87
3 changed files with 92 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,99 +8,98 @@ module Register
plus_function.source.return_type = Virtual::Integer plus_function.source.return_type = Virtual::Integer
plus_function.source.receiver = Virtual::Integer plus_function.source.receiver = Virtual::Integer
plus_function.source.add_code Register::OperatorInstruction.new( plus_function, :add , 0 , 0 ) plus_function.source.add_code Register::OperatorInstruction.new( plus_function, :add , 0 , 0 )
return plus_function return plus_function
end end
# The conversion to base10 is quite a bit more complicated than i thought. # The conversion to base10 is quite a bit more complicated than i thought.
# The bulk of it is in div10 # The bulk of it is in div10
# We set up variables, do the devision and write the result to the string # We set up variables, do the devision and write the result to the string
# then check if were done and recurse if neccessary # then check if were done and recurse if neccessary
# As we write before we recurse (save a push) we write the number backwards # As we write before we recurse (save a push) we write the number backwards
# arguments: string address , integer # arguments: string address , integer
# def utoa context # def utoa context
# utoa_function = Virtual::MethodSource.create_method(:Integer ,:utoa , [ Virtual::Integer ] ) # utoa_function = Virtual::MethodSource.create_method(:Integer ,:utoa , [ Virtual::Integer ] )
# function.source.return_type = Virtual::Integer # function.source.return_type = Virtual::Integer
# function.source.receiver = Virtual::Integer # function.source.receiver = Virtual::Integer
# return utoa_function # return utoa_function
# # str_addr = utoa_function.receiver # # str_addr = utoa_function.receiver
# # number = utoa_function.args.first # # number = utoa_function.args.first
# # remainder = utoa_function.new_local # # remainder = utoa_function.new_local
# # Virtual::RegisterMachine.instance.div10( utoa_function , number , remainder ) # # Virtual::RegisterMachine.instance.div10( utoa_function , number , remainder )
# # # make char out of digit (by using ascii encoding) 48 == "0" # # # make char out of digit (by using ascii encoding) 48 == "0"
# # utoa_function.instance_eval do # # utoa_function.instance_eval do
# # add( remainder , remainder , 48) # # add( remainder , remainder , 48)
# # strb( remainder, str_addr ) # # strb( remainder, str_addr )
# # sub( str_addr, str_addr , 1 ) # # sub( str_addr, str_addr , 1 )
# # cmp( number , 0 ) # # cmp( number , 0 )
# # callne( utoa_function ) # # callne( utoa_function )
# # end # # end
# # return utoa_function # # return utoa_function
# end # end
def putint context def putint context
putint_function = Virtual::MethodSource.create_method(:Integer,:putint , [] ) putint_function = Virtual::MethodSource.create_method(:Integer,:putint , [] )
putint_function.source.return_type = Virtual::Integer putint_function.source.return_type = Virtual::Integer
putint_function.source.receiver = Virtual::Integer putint_function.source.receiver = Virtual::Integer
return putint_function return putint_function
# buffer = Parfait::Word.new(" ") # create a buffer # buffer = Parfait::Word.new(" ") # create a buffer
# context.object_space.add_object buffer # and save it (function local variable: a no no) # context.object_space.add_object buffer # and save it (function local variable: a no no)
# int = putint_function.receiver # int = putint_function.receiver
# moved_int = putint_function.new_local # moved_int = putint_function.new_local
# utoa = context.object_space.get_class_by_name(:Object).resolve_method(:utoa) # utoa = context.object_space.get_class_by_name(:Object).resolve_method(:utoa)
# putint_function.instance_eval do # putint_function.instance_eval do
# mov( moved_int , int ) # move arg up # mov( moved_int , int ) # move arg up
# add( int , buffer ,nil ) # string to write to (add string address to pc) # add( int , buffer ,nil ) # string to write to (add string address to pc)
# add( int , int , buffer.length - 3) # 3 for good measure , ahem. # add( int , int , buffer.length - 3) # 3 for good measure , ahem.
# call( utoa ) # call( utoa )
# after = new_block("after_call") # after = new_block("after_call")
# insert_at after # insert_at after
# # And now we "just" have to print it, using the write_stdout # # And now we "just" have to print it, using the write_stdout
# add( int , buffer , nil ) # string to write to # add( int , buffer , nil ) # string to write to
# mov( moved_int , buffer.length ) # mov( moved_int , buffer.length )
# end # end
# Virtual::RegisterMachine.instance.write_stdout(putint_function) # Virtual::RegisterMachine.instance.write_stdout(putint_function)
# putint_function # putint_function
end end
# testing method, hand coded fibo, expects arg in receiver_register # testing method, hand coded fibo, expects arg in receiver_register
# result comes in return_register # result comes in return_register
# a hand coded version of the fibonachi numbers # a hand coded version of the fibonachi numbers
# not my hand off course, found in the net http://www.peter-cockerell.net/aalp/html/ch-5.html # not my hand off course, found in the net http://www.peter-cockerell.net/aalp/html/ch-5.html
def fibo context def fibo context
fibo_function = Virtual::MethodSource.create_method(:Integer,:fibo , [] ) fibo_function = Virtual::MethodSource.create_method(:Integer,:fibo , [] )
fibo_function.source.return_type = Virtual::Integer fibo_function.source.return_type = Virtual::Integer
fibo_function.source.receiver = Virtual::Integer fibo_function.source.receiver = Virtual::Integer
return fibo_function return fibo_function
# result = fibo_function.return_type # result = fibo_function.return_type
# int = fibo_function.receiver # int = fibo_function.receiver
# #
# last = fibo_function.new_block("return") # last = fibo_function.new_block("return")
# #
# f1 = fibo_function.new_local # f1 = fibo_function.new_local
# f2 = fibo_function.new_local # f2 = fibo_function.new_local
# #
# fibo_function.instance_eval do # fibo_function.instance_eval do
# cmp int , 1 # cmp int , 1
# mov( result, int , condition_code: :le) # mov( result, int , condition_code: :le)
# ble( last ) #branch to return, rather than return (as the original) # ble( last ) #branch to return, rather than return (as the original)
# mov f1 , 1 #set up initial values # mov f1 , 1 #set up initial values
# mov f2 , 0 # mov f2 , 0
# end # end
# #
# loop = fibo_function.new_block("loop") # loop = fibo_function.new_block("loop")
# fibo_function.insert_at loop # fibo_function.insert_at loop
# #
# fibo_function.instance_eval do #loop through # fibo_function.instance_eval do #loop through
# add f1 , f1 , f2 # f1 = f1 + f2 # add f1 , f1 , f2 # f1 = f1 + f2
# sub f2 , f1 , f2 # f2 = f1 -f2 # sub f2 , f1 , f2 # f2 = f1 -f2
# sub int , int , 1 # todo: set.. should do below cmp, but doesn't , set_update_status: 1 # sub int , int , 1 # todo: set.. should do below cmp, but doesn't , set_update_status: 1
# cmp int , 1 # cmp int , 1
# bne( loop ) # bne( loop )
# mov( result , f1 ) # mov( result , f1 )
# end # end
# #
# fibo_function # fibo_function
end end
end end
extend ClassMethods extend ClassMethods
end end

2
lib/virtual/boot.rb
View File

@ -160,8 +160,6 @@ module Virtual
[:putint,:fibo , :plus].each do |f| [:putint,:fibo , :plus].each do |f|
obj.add_instance_method Register::Builtin::Integer.send(f , nil) obj.add_instance_method Register::Builtin::Integer.send(f , nil)
end end
# obj.alias :plus , :+
end end
end end
end end

7
lib/virtual/passes/send_implementation.rb
View File

@ -32,9 +32,10 @@ module Virtual
raise "Method not implemented #{me.class}.#{code.name}" unless method raise "Method not implemented #{me.class}.#{code.name}" unless method
new_codes << MethodCall.new( method ) new_codes << MethodCall.new( method )
elsif( me.is_a? Fixnum ) elsif( me.is_a? Fixnum )
# get the function from my class. easy peasy name = code.name
method = Virtual.machine.space.get_class_by_name(:Integer).get_instance_method(code.name) name = :plus if name == :+
raise "Method not implemented #{me.class}.#{code.name}" unless method method = Virtual.machine.space.get_class_by_name(:Integer).get_instance_method(name)
raise "Method not implemented Integer.#{name}" unless method
new_codes << MethodCall.new( method ) new_codes << MethodCall.new( method )
else else
# note: this is the current view: call internal send, even the method name says else # note: this is the current view: call internal send, even the method name says else