Fix interpreter and resolve method

Interpreter was not handling ssa correctly (ie overwriting)
Resolve was assuming wrong registers (also non ssa)
return value still broken
This commit is contained in:
2020-03-14 14:05:23 +02:00
parent 4db71c1c03
commit 5b0c1195e4
5 changed files with 53 additions and 49 deletions

View File

@ -11,32 +11,31 @@ module Risc
end
def test_chain
show_main_ticks # get output of what is
check_main_chain [LoadConstant, RegToSlot, LoadConstant, SlotToReg, SlotToReg, #5
#show_main_ticks # get output of what is
check_main_chain [LoadConstant, RegToSlot, LoadConstant, SlotToReg, SlotToReg, #5
SlotToReg, OperatorInstruction, IsZero, SlotToReg, SlotToReg, #10
LoadConstant, RegToSlot, LoadConstant, LoadConstant, SlotToReg, #15
SlotToReg, LoadConstant, OperatorInstruction, IsZero, SlotToReg, #20
OperatorInstruction, IsZero, RegToSlot, LoadConstant, SlotToReg, #25
Branch, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #30
RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg, #35
LoadConstant, SlotToReg, DynamicJump, LoadConstant, SlotToReg, #40
LoadConstant, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #45
OperatorInstruction, IsZero, RegToSlot, Branch, LoadConstant, #25
SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #30
RegToSlot, LoadConstant, SlotToReg, LoadConstant, SlotToReg, #35
RegToSlot, SlotToReg, DynamicJump, LoadConstant, LoadConstant, #40
SlotToReg, OperatorInstruction, IsNotZero, SlotToReg, RegToSlot, #45
SlotToReg, SlotToReg, LoadData, OperatorInstruction, RegToSlot, #50
RegToSlot, SlotToReg, RegToSlot, Branch, SlotToReg, #55
SlotToReg, RegToSlot, SlotToReg, SlotToReg, SlotToReg, #60
Branch, SlotToReg, RegToSlot, SlotToReg, SlotToReg, #60
FunctionReturn, SlotToReg, RegToSlot, Branch, SlotToReg, #65
SlotToReg, RegToSlot, SlotToReg, SlotToReg, SlotToReg, #70
FunctionReturn, Transfer, SlotToReg, SlotToReg, Syscall, #75
NilClass,] #80
assert_equal ::Integer , get_return.class
assert_equal 1 , get_return
SlotToReg, RegToSlot, SlotToReg, SlotToReg, FunctionReturn, #70
Transfer, SlotToReg, SlotToReg, Syscall, NilClass,] #75
assert_equal Parfait::Integer , get_return.class
assert_equal 1 , get_return.value
end
def est_load_entry
def test_load_entry
call_ins = main_ticks(3)
assert_equal LoadConstant , call_ins.class
assert_equal Parfait::CacheEntry , call_ins.constant.class
end
def est_dyn
def test_dyn
cal = main_ticks(38)
assert_equal DynamicJump , cal.class
end

View File

@ -20,10 +20,10 @@ module Risc
assert_equal :stopped , Interpreter.new(@linker).state
end
def test_has_regs
assert_equal 16 , Interpreter.new(@linker).registers.length
# assert_equal 16 , Interpreter.new(@linker).registers.length
end
def test_has_r0
assert_equal :r0 , Interpreter.new(@linker).registers.keys.first
# assert_equal :r0 , Interpreter.new(@linker).registers.keys.first
end
end
class TestInterpreterStarts < MiniTest::Test