another million index fixes

This commit is contained in:
Torsten Ruger
2018-05-14 15:17:04 +03:00
parent 4a88f342d3
commit 3c00239f36
21 changed files with 72 additions and 65 deletions

View File

@ -24,8 +24,8 @@ module Risc
end
def test_load_args_from_message
produced = produce_body
assert_equal :r0 , produced.next.array.symbol , produced.next.to_rxf
assert_equal 8 , produced.next.index , produced.next.to_rxf
assert_equal :r0 , produced.next.array.symbol , produced.next.to_rxf[0..200]
assert_equal 8 , produced.next.index , produced.next.to_rxf[0..200]
end
end

View File

@ -25,8 +25,8 @@ module Risc
def test_load_self_from_message
produced = produce_body
assert_equal :r0 , produced.next.array.symbol , produced.next.to_rxf
assert_equal 3 , produced.next.index , produced.next.to_rxf
assert_equal :r0 , produced.next.array.symbol , produced.next.to_rxf[0..200]
assert_equal 2 , produced.next.index , produced.next.to_rxf[0..200]
end
end

View File

@ -19,13 +19,13 @@ module Risc
end
def test_load_args_from_message
produced = produce_body
assert_equal :r0 , produced.array.symbol , produced.next.to_rxf
assert_equal 9 , produced.index , produced.next.to_rxf
assert_equal :r0 , produced.array.symbol , produced.next.to_rxf[0..200]
assert_equal 8 , produced.index , produced.next.to_rxf[0..200]
end
def test_load_frame_from_message
produced = produce_body
assert_equal :r0 , produced.next(2).array.symbol , produced.next.to_rxf
assert_equal 2 , produced.next.index , produced.next.to_rxf
assert_equal :r0 , produced.next(2).array.symbol , produced.next.to_rxf[0..200]
assert_equal 1 , produced.next.index , produced.next.to_rxf[0..200]
end
end
end

View File

@ -36,14 +36,14 @@ module Risc
assert_equal SlotToReg , produced.next(base+1).class
assert_equal :r2 , produced.next(base+1).register.symbol
assert_equal :r0 , produced.next(base+1).array.symbol
assert_equal 2 , produced.next(base+1).index
assert_equal 1 , produced.next(base+1).index
end
def test_load_args
produced = produce_body
assert_equal SlotToReg , produced.next(base+2).class
assert_equal :r3 , produced.next(base+2).register.symbol
assert_equal :r2 , produced.next(base+2).array.symbol
assert_equal 9 , produced.next(base+2).index
assert_equal 8 , produced.next(base+2).index
end
def test_store_arg_at
produced = produce_body
@ -62,14 +62,14 @@ module Risc
assert_equal SlotToReg , produced.next(base+5).class
assert_equal :r0 , produced.next(base+5).array.symbol
assert_equal :r3 , produced.next(base+5).register.symbol
assert_equal 2 , produced.next(base+5).index
assert_equal 1 , produced.next(base+5).index
end
def test_store_
produced = produce_body
assert_equal RegToSlot , produced.next(base+6).class
assert_equal :r3 , produced.next(base+6).array.symbol
assert_equal :r2 , produced.next(base+6).register.symbol
assert_equal 5 , produced.next(base+6).index
assert_equal 4 , produced.next(base+6).index
end
def test_swap_messages
@ -77,7 +77,7 @@ module Risc
assert_equal SlotToReg , produced.next(base+7).class
assert_equal :r0 , produced.next(base+7).array.symbol
assert_equal :r0 , produced.next(base+7).register.symbol
assert_equal 2 , produced.next(base+7).index
assert_equal 1 , produced.next(base+7).index
end
def test_function_call

View File

@ -30,59 +30,59 @@ module Risc
end
def test_load_first_message #from space (ie r2)
sl = @produced.next( 2 )
assert_slot_to_reg( sl , :r2 , 4 , :r3 )
assert_slot_to_reg( sl , :r2 , 3 , :r3 )
end
def test_store_message_in_current
sl = @produced.next( 3 )
assert_reg_to_slot( sl , :r3 , :r0 , 2 )
assert_reg_to_slot( sl , :r3 , :r0 , 1 )
end
def test_store_caller_in_message
sl = @produced.next( 4 )
assert_reg_to_slot( sl , :r0 , :r3 , 7 )
assert_reg_to_slot( sl , :r0 , :r3 , 6 )
end
def test_get_args_type #from method in r1
sl = @produced.next( 5 )
assert_slot_to_reg( sl , :r1 , 7 , :r4 )
assert_slot_to_reg( sl , :r1 , 6 , :r4 )
end
def test_get_args #from message
sl = @produced.next( 6 )
assert_slot_to_reg( sl , :r3 , 9 , :r5 )
assert_slot_to_reg( sl , :r3 , 8 , :r5 )
end
def test_store_type_in_args
sl = @produced.next( 7 )
assert_reg_to_slot( sl , :r4 , :r5 , 1 )
assert_reg_to_slot( sl , :r4 , :r5 , 0 )
end
def test_get_frame_type #from method in r1
sl = @produced.next( 8 )
assert_slot_to_reg( sl , :r1 , 9 , :r4 )
assert_slot_to_reg( sl , :r1 , 8 , :r4 )
end
def test_get_frame #from message
sl = @produced.next( 9 )
assert_slot_to_reg( sl , :r3 , 4 , :r5 )
assert_slot_to_reg( sl , :r3 , 3 , :r5 )
end
def test_store_type_in_frame
sl = @produced.next( 10 )
assert_reg_to_slot( sl , :r4 , :r5 , 1 )
assert_reg_to_slot( sl , :r4 , :r5 , 0 )
end
def test_get_name
sl = @produced.next( 11 )
assert_slot_to_reg( sl , :r1 , 2 , :r6 )
assert_slot_to_reg( sl , :r1 , 1 , :r6 )
end
def test_store_name_in_message
sl = @produced.next( 12 )
assert_reg_to_slot( sl , :r6 , :r3 , 8 )
assert_reg_to_slot( sl , :r6 , :r3 , 7 )
end
def test_get_next_next #reduce onto itself
sl = @produced.next( 13 )
assert_slot_to_reg( sl , :r3 , 2 , :r3 )
assert_slot_to_reg( sl , :r3 , 1 , :r3 )
end
def test_store_next_next_in_space
sl = @produced.next( 14 )
assert_reg_to_slot( sl , :r3 , :r2 , 4 )
assert_reg_to_slot( sl , :r3 , :r2 , 3 )
end
end
end

View File

@ -1,28 +1,28 @@
require_relative "helper"
module Risc
class TestReturnDynamic #< MiniTest::Test
class TestReturnDynamic < MiniTest::Test
include Statements
def setup
super
@input = "return @a.div4"
@expect = [LoadConstant, SlotToReg, SlotToReg, SlotToReg, OperatorInstruction,
IsZero, SlotToReg, SlotToReg, LoadConstant, RegToSlot,
LoadConstant, LoadConstant, SlotToReg, RegToSlot, RegToSlot,
SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
RegToSlot, SlotToReg, RegToSlot, SlotToReg, RegToSlot,
LoadConstant, SlotToReg, RegToSlot, SlotToReg, SlotToReg,
SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
RegToSlot, SlotToReg, LoadConstant, FunctionCall, Label,
SlotToReg, LoadConstant, RegToSlot, Label, LoadConstant,
LoadConstant, SlotToReg, RegToSlot, RegToSlot, SlotToReg,
SlotToReg, RegToSlot, SlotToReg, SlotToReg, RegToSlot,
@expect = [LoadConstant, SlotToReg, SlotToReg, SlotToReg, SlotToReg,
OperatorInstruction, IsZero, SlotToReg, SlotToReg, SlotToReg,
LoadConstant, RegToSlot, LoadConstant, LoadConstant, SlotToReg,
SlotToReg, Label, LoadConstant, SlotToReg, OperatorInstruction,
IsZero, SlotToReg, OperatorInstruction, IsZero, SlotToReg,
Branch, Label, Transfer, Syscall, Transfer,
Transfer, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
RegToSlot, RegToSlot, Label, RegToSlot, Label,
LoadConstant, SlotToReg, LoadConstant, SlotToReg, RegToSlot,
RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg,
SlotToReg, RegToSlot, SlotToReg, RegToSlot, SlotToReg,
SlotToReg, SlotToReg, RegToSlot, LoadConstant, SlotToReg,
DynamicJump, SlotToReg, SlotToReg, RegToSlot, SlotToReg,
SlotToReg, RegToSlot, SlotToReg, SlotToReg, RegToSlot,
SlotToReg, SlotToReg, FunctionReturn]
RegToSlot, SlotToReg, SlotToReg, SlotToReg, RegToSlot,
LoadConstant, SlotToReg, RegToSlot, SlotToReg, LoadConstant,
SlotToReg, DynamicJump, Label, SlotToReg, SlotToReg,
RegToSlot, SlotToReg, SlotToReg, RegToSlot, SlotToReg,
SlotToReg, RegToSlot, SlotToReg, SlotToReg, FunctionReturn]
end
def test_return_instructions
@ -30,11 +30,11 @@ module Risc
end
def test_function_return
produced = produce_body
assert_equal FunctionReturn , produced.next(77).class
assert_equal FunctionReturn , produced.next(79).class
end
def test_cache_check
produced = produce_body
assert_equal IsZero , produced.next(5).class
assert_equal IsZero , produced.next(6).class
end
end
end