moved registers to machine, changed return to 0 (from 7) and erased all integer references to registers
This commit is contained in:
@@ -9,7 +9,7 @@ module Ast
|
||||
|
||||
if receiver.is_a?(NameExpression) and (receiver.name == :self)
|
||||
function = context.current_class.get_or_create_function(name)
|
||||
value_receiver = Vm::Integer.new(Vm::Function::RECEIVER_REG)
|
||||
value_receiver = Vm::Integer.new(Vm::RegisterMachine.instance.receiver_register)
|
||||
else
|
||||
value_receiver = receiver.compile(context , into)
|
||||
function = context.current_class.get_or_create_function(name)
|
||||
|
@@ -7,12 +7,13 @@ module Ast
|
||||
locals = {}
|
||||
params.each_with_index do |param , index|
|
||||
arg = param.name
|
||||
arg_value = Vm::Integer.new(index+2)
|
||||
register = Vm::RegisterUse.new(Vm::RegisterMachine.instance.receiver_register).next_reg_use(index + 1)
|
||||
arg_value = Vm::Integer.new(register)
|
||||
locals[arg] = arg_value
|
||||
args << arg_value
|
||||
end
|
||||
# class depends on receiver
|
||||
me = Vm::Integer.new( Vm::Function::RECEIVER_REG )
|
||||
me = Vm::Integer.new( Vm::RegisterMachine.instance.receiver_register )
|
||||
if receiver.nil?
|
||||
clazz = context.current_class
|
||||
else
|
||||
@@ -36,7 +37,7 @@ module Ast
|
||||
raise "alarm #{last_compiled} \n #{b}" unless last_compiled.is_a? Vm::Word
|
||||
end
|
||||
|
||||
return_reg = Vm::Integer.new(7)
|
||||
return_reg = Vm::Integer.new(Vm::RegisterMachine.instance.return_register)
|
||||
if last_compiled.is_a?(Vm::IntegerConstant) or last_compiled.is_a?(Vm::ObjectConstant)
|
||||
return_reg.load into , last_compiled if last_compiled.register_symbol != return_reg.register_symbol
|
||||
else
|
||||
|
@@ -2,11 +2,11 @@ module Ast
|
||||
class ReturnExpression < Expression
|
||||
# attr_reader :expression
|
||||
def compile context , into
|
||||
puts "compiling return expression #{expression}, now return in 7"
|
||||
puts "compiling return expression #{expression}, now return in return_regsiter"
|
||||
expression_value = expression.compile(context , into)
|
||||
# copied from function expression: TODO make function
|
||||
|
||||
return_reg = Vm::Integer.new(7)
|
||||
return_reg = Vm::Integer.new(Vm::RegisterMachine.instance.return_register)
|
||||
if expression_value.is_a?(Vm::IntegerConstant) or expression_value.is_a?(Vm::ObjectConstant)
|
||||
return_reg.load into , expression_value
|
||||
else
|
||||
|
Reference in New Issue
Block a user