trying to get function calls to work (but will have to rework regeister handling)

This commit is contained in:
Torsten Ruger
2014-05-10 15:24:56 +03:00
parent 7d69132d90
commit 79a28ac5fa
9 changed files with 25 additions and 7 deletions

View File

@ -56,6 +56,7 @@ module Vm
def assemble io
@entry.assemble(io)
raise @body.inspect
@body.assemble(io)
@exit.assemble(io)
end

View File

@ -14,14 +14,14 @@ module Vm
def assign_function context
@function = context.program.get_function @name
if @function
raise "error #{self}" unless @function.arity != args.length
raise "error #{self} , #{@function.args.length} != #{args.length}" if @function.arity != args.length
else
@function = context.program.get_or_create_function @name
end
end
def load_args
args.each_with_index do |arg , index|
add_code arg.load(index)
add_code arg.load("r#{index}".to_sym)
end
end

View File

@ -43,14 +43,21 @@ module Vm
@objects << o # TODO check type , no basic values allowed (must be wrapped)
end
def add_function function
raise "not a function #{function}" unless function.is_a? Function
@functions << function
end
def get_function name
@functions.detect{ |f| (f.name == name) && (f.class == Function) }
name = name.to_sym
@functions.detect{ |f| (f.name == name) }
end
# preferred way of creating new functions (also forward declarations, will flag unresolved later)
def get_or_create_function name
fun = get_function name
unless fun
puts @functions.inspect
fun = Function.new(name)
block = Core::Kernel.send(name)
fun.set_body block

View File

@ -24,6 +24,8 @@ module Vm
def initialize value
@value = value
end
attr_reader :value
#naming convention to infer types in kernel functions. Kernel types are basic types, ie see below
#
def self.type name
@ -41,6 +43,9 @@ module Vm
def load reg
Machine.instance.word_load self , reg
end
def length
4
end
end
class Unsigned < Word