Convert SimpleCall to new regs

Also fix bug in RegsiterValue/Slot with chain, where logic was dodgy and compiler not set
This commit is contained in:
2020-03-01 23:38:23 +02:00
parent 4b303977a7
commit ff49ff50c0
8 changed files with 54 additions and 23 deletions

View File

@ -72,4 +72,27 @@ module Risc
assert_equal :message , inst.array.symbol
end
end
class TestRegisterSlot4 < MiniTest::Test
def setup
Parfait.boot!(Parfait.default_test_options)
@compiler = Risc.test_compiler
@r0 = RegisterValue.new(:message , :Message).set_compiler(@compiler)
@r0[:next_message][:return_address] << @r0
end
def test_instructions
assert_equal SlotToReg , @compiler.risc_instructions.next(1).class
assert_equal RegToSlot , @compiler.risc_instructions.next(2).class
assert_equal NilClass , @compiler.risc_instructions.next(3).class
end
def test_slot_to
slot = @compiler.risc_instructions.next(1)
assert_slot_to_reg slot , :message, 1, :"message.next_message"
assert slot.register.compiler
end
def test_reg_to
reg = @compiler.risc_instructions.next(2)
assert_reg_to_slot reg , :message, :"message.next_message" , 4
assert reg.register.compiler
end
end
end

View File

@ -64,12 +64,12 @@ module Risc
assert_equal @r0 , instr.register
assert_equal 1 , instr.index
end
def est_slot_to_reg
def test_slot_to_reg
instr = @r0 << @r2[:next_object]
assert_equal SlotToReg , instr.class
assert_equal @r0 , instr.register
assert_equal :message , instr.register.symbol
assert_equal 2 , instr.index
assert_equal @r1 , instr.array
assert instr.array.is_object?
end
def test_reg_to_byte
instr = @r1[1] <= @r0

View File

@ -7,27 +7,30 @@ module SlotMachine
def instruction
SimpleCall.new( make_method )
end
def test_len
def est_len
assert_equal 7 , all.length , all_str
end
def test_1_load_return_label
assert_load risc(1) , Risc::Label , :r1
assert_load risc(1) , Risc::Label
assert_label risc(1).constant , "continue_"
end
def test_2_load_next_message
assert_slot_to_reg risc(2) ,:r0 , 1 , :r2
assert_slot_to_reg risc(2) ,:message , 1 , :"message.next_message"
end
def test_3_store_return_address
assert_reg_to_slot risc(3) , :r1 , :r2 , 4
assert risc(3).register.is_object?
assert_equal 4, risc(3).index
assert_equal :"message.next_message", risc(3).array.symbol
end
def test_4_swap_messages
assert_slot_to_reg risc(4) ,:r0 , 1 , :r0
assert_slot_to_reg risc(4) ,:message , 1 , :message
end
def test_5_call
assert_equal Risc::FunctionCall , risc(5).class
assert_equal :meth , risc(5).method.name
end
def test_6_label
assert_equal Risc::Label , risc(6).class
assert_label risc(6) , "continue_"
end
end