fix get_internal_byte

improved operators and tests
some logic errors still
This commit is contained in:
2020-03-09 12:47:12 +02:00
parent a70f63e7bb
commit fb4fa598f2
9 changed files with 46 additions and 45 deletions

View File

@ -33,7 +33,7 @@ module SlotMachine
assert_load 2 , Parfait::NilClass , "id_nilclass_"
assert_slot_to_reg 3 , "id_factory_" , 2 , "id_factory_.next_object"
assert_operator 4 , :- , "id_nilclass_" , "id_factory_.next_object"
assert_zero 5 , "cont_label"
assert_not_zero 5 , "cont_label"
assert_slot_to_reg 6 , "id_factory_" , 2 , "id_factory_.next_object"
assert_reg_to_slot 7 , "id_factory_.next_object" , "id_factory_" , 2
assert_load 8 , Parfait::Factory , "id_factory_"

View File

@ -14,13 +14,13 @@ module SlotMachine
assert_equal Risc::MethodCompiler , @method.to_risc.class
end
def test_risc_length
assert_equal 68 , @method.to_risc.risc_instructions.length
assert_equal 69 , @method.to_risc.risc_instructions.length
end
def test_allocate
assert_allocate
end
def test_return
assert_return(60)
assert_return(61)
end
def test_all
assert_slot_to_reg 23 , "message" , 2 , "message.receiver"
@ -49,19 +49,19 @@ module SlotMachine
assert_data 46 , 10
assert_transfer 47 , :integer_reg , :integer_1
assert_operator 48 , :* , :integer_1 , :integer_const
assert_transfer 49 , "message.receiver.data_1" , :integer_1
# assert_operator 50 , :- , :r2 , :integer_1
assert_data 50 , 6
assert_operator 51 , :+ , :integer_1 , :integer_const
assert_data 52 , 4
assert_operator 53 , :>> , :integer_1 , :integer_const
assert_operator 54 , :+ , :integer_reg , :integer_1
assert_reg_to_slot 55 , :integer_reg , "id_factory_.next_object" , 2
assert_reg_to_slot 56 , "id_factory_.next_object" , :message , 5
assert_slot_to_reg 57 ,:message , 5 , "message.return_value"
assert_reg_to_slot 58 , "message.return_value" , :message , 5
assert_branch 59 , "return_label"
assert_label 60 , "return_label"
assert_operator 49 , :- , "message.receiver.data_1" , :integer_1
assert_transfer 50 , "message.receiver.data_1" , :integer_1
assert_data 51 , 6
assert_operator 52 , :+ , :integer_1 , :integer_const
assert_data 53 , 4
assert_operator 54 , :>> , :integer_1 , :integer_const
assert_operator 55 , :+ , :integer_reg , :integer_1
assert_reg_to_slot 56 , :integer_reg , "id_factory_.next_object" , 2
assert_reg_to_slot 57 , "id_factory_.next_object" , :message , 5
assert_slot_to_reg 58 ,:message , 5 , "message.return_value"
assert_reg_to_slot 59 , "message.return_value" , :message , 5
assert_branch 60 , "return_label"
assert_label 61 , "return_label"
end
end
end

View File

@ -15,29 +15,29 @@ module SlotMachine
assert_equal Risc::MethodCompiler , @method.to_risc.class
end
def test_risc_length
assert_equal 41 , @method.to_risc.risc_instructions.length
assert_equal 40 , @method.to_risc.risc_instructions.length
end
def test_allocate
assert_allocate
end
def test_all
assert_slot_to_reg risc(23),:r0 , 2 , :r2
assert_slot_to_reg risc(24),:r0 , 9 , :r3
assert_slot_to_reg risc(25),:r3 , 2 , :r3
assert_slot_to_reg 23 ,:message , 2 , "message.receiver"
assert_slot_to_reg 24 ,:message , 9 , "message.arg1"
assert_slot_to_reg 25 ,"message.arg1" , 2 , "message.arg1.data_1"
assert_equal Risc::ByteToReg , risc(26).class
assert_equal :r2 , risc(26).array.symbol
assert_equal :r2 , risc(26).register.symbol
assert_equal :r3 , risc(26).index.symbol
assert_equal :"message.receiver" , risc(26).array.symbol
assert_equal :"message.receiver" , risc(26).register.symbol
assert_equal :"message.arg1.data_1" , risc(26).index.symbol
assert_reg_to_slot risc(27) , :r2 , :r1 , 2
assert_reg_to_slot risc(28) , :r1 , :r0 , 5
assert_slot_to_reg risc(29),:r0 , 5 , :r2
assert_reg_to_slot risc(30) , :r2 , :r0 , 5
assert_reg_to_slot 27 , "message.receiver" , "id_factory_.next_object" , 2
assert_reg_to_slot 28 , "id_factory_.next_object" , :message , 5
assert_slot_to_reg 29 ,:message , 5 , "message.return_value"
assert_reg_to_slot 30 , "message.return_value" , :message , 5
assert_branch risc(31) , "return_label"
assert_label risc(32) , "return_label"
assert_branch 31 , "return_label"
assert_label 32 , "return_label"
end
def test_return
assert_return(32)