test and last fixes for previous commits (allocalte ints)

mostly just fixing the additional instructions
close #20

test/risc/interpreter/calling/test_plus.rb

@@ -10,79 +10,77 @@ module Risc
     end
 
     def test_chain
-      #show_main_ticks # get output of what is
+      #show_base_ticks # get output of what is
       check_main_chain [LoadConstant, LoadConstant, SlotToReg, SlotToReg, RegToSlot,
             RegToSlot, RegToSlot, RegToSlot, LoadConstant, SlotToReg, # 10
             RegToSlot, LoadConstant, SlotToReg, Branch, SlotToReg,
             RegToSlot, LoadConstant, SlotToReg, RegToSlot, SlotToReg, # 20
-            FunctionCall, SlotToReg, SlotToReg, SlotToReg, SlotToReg,
-            SlotToReg, OperatorInstruction, LoadConstant, SlotToReg, SlotToReg, # 30
-            RegToSlot, RegToSlot, RegToSlot, SlotToReg, Branch,
-            SlotToReg, RegToSlot, LoadConstant, SlotToReg, RegToSlot, # 40
-            RegToSlot, SlotToReg, SlotToReg, SlotToReg, FunctionReturn,
-            SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg, # 50
-            RegToSlot, Branch, Branch, SlotToReg, SlotToReg,
-            RegToSlot, LoadConstant, SlotToReg, RegToSlot, RegToSlot, # 60
-            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, Transfer,
-            SlotToReg, SlotToReg, Syscall, NilClass, ]
+            FunctionCall, LoadConstant, SlotToReg, LoadConstant, OperatorInstruction,
+            IsNotZero, SlotToReg, RegToSlot, SlotToReg, Branch, # 30
+            SlotToReg, SlotToReg, SlotToReg, SlotToReg, OperatorInstruction,
+            RegToSlot, RegToSlot, SlotToReg, SlotToReg, RegToSlot, # 40
+            LoadConstant, SlotToReg, RegToSlot, Branch, RegToSlot,
+            SlotToReg, SlotToReg, SlotToReg, FunctionReturn, SlotToReg, # 50
+            SlotToReg, RegToSlot, SlotToReg, SlotToReg, RegToSlot,
+            Branch, Branch, SlotToReg, SlotToReg, RegToSlot, # 60
+            LoadConstant, SlotToReg, RegToSlot, RegToSlot, SlotToReg,
+            SlotToReg, SlotToReg, FunctionReturn, Transfer, SlotToReg, # 70
+            SlotToReg, Syscall, NilClass, ]
        assert_equal 10 , get_return
     end
+    def base_ticks(num)
+      main_ticks(22 + num)
+    end
     def test_load_5
       lod = main_ticks( 12 )
       assert_load( lod , Parfait::Integer , :r1)
       assert_equal 5 , lod.constant.value
     end
-    def base
-      22
+    def test_load_receiver
+      sl = base_ticks( 7 )
+      assert_slot_to_reg( sl , :r0 , 2 , :r2)
     end
-    def test_slot_receiver #load receiver from message
-      sl = main_ticks( base )
-      assert_slot_to_reg( sl , :r0 , 2 , :r1)
+    def test_reduce_receiver
+      sl = base_ticks( 9 )
+      assert_slot_to_reg( sl , :r2 , 2 , :r2)
     end
     def test_slot_args #load args from message
-      sl = main_ticks( base + 1 )
-      assert_slot_to_reg( sl , :r0 , 8 , :r2)
+      sl = base_ticks( 10 )
+      assert_slot_to_reg( sl , :r0 , 8 , :r3)
     end
     def test_slot_arg_int #load arg 1, destructively from args
-      sl = main_ticks( base + 2 )
-      assert_slot_to_reg( sl , :r2 , 1 , :r2)
+      sl = base_ticks( 11 )
+      assert_slot_to_reg( sl , :r3 , 1 , :r3)
     end
-    def test_slot_int1 #load int from object
-      sl = main_ticks( base + 3 )
-      assert_slot_to_reg( sl , :r1 , 2 , :r1)
-      assert_equal 5 , @interpreter.get_register(:r1)
-    end
-    def test_slot_int2 #load int from object
-      sl = main_ticks( base + 4 )
-      assert_slot_to_reg( sl , :r2 , 2 , :r2)
-      assert_equal 5 , @interpreter.get_register(:r2)
+    def test_reduce_arg
+      sl = base_ticks( 12 )
+      assert_slot_to_reg( sl , :r3 , 2 , :r3)
+      assert_equal 5 , @interpreter.get_register(:r3)
     end
     def test_op
-      op = main_ticks(base + 5)
+      op = base_ticks(13)
       assert_equal OperatorInstruction , op.class
       assert_equal :+ , op.operator
-      assert_equal :r1 , op.left.symbol
-      assert_equal :r2 , op.right.symbol
-      assert_equal 10 , @interpreter.get_register(:r1)
-      assert_equal 5 , @interpreter.get_register(:r2)
+      assert_equal :r2 , op.left.symbol
+      assert_equal :r3 , op.right.symbol
+      assert_equal 10 , @interpreter.get_register(:r2)
+      assert_equal 5 , @interpreter.get_register(:r3)
     end
-    def test_load_int_space
-      cons = main_ticks(base + 6)
-      assert_load( cons , Parfait::Factory , :r3)
+    def test_move_res_to_int
+      int = base_ticks( 14 )
+      assert_reg_to_slot( int , :r2 , :r1 , 2)
     end
-    def test_load_int_next_space
-      sl = main_ticks(base + 7)
-      assert_slot_to_reg( sl , :r3 , 2 , :r2)
-      assert_equal Parfait::Integer , @interpreter.get_register(:r2).class
+    def test_move_int_to_reg
+      int = base_ticks( 15 )
+      assert_reg_to_slot( int , :r1 , :r0 , 5)
     end
-    def test_load_int_next_int
-      sl = main_ticks(base + 8)
-      assert_slot_to_reg( sl , :r2 , 1 , :r4)
-      assert_equal Parfait::Integer , @interpreter.get_register(:r4).class
+    def test_move_fix_to_result
+      sl = base_ticks( 16 )
+      assert_slot_to_reg( sl , :r0 , 5 , :r1)
     end
-    def test_load_int_next_int2
-      sl = main_ticks(base + 9)
-      assert_reg_to_slot( sl , :r4 , :r3 , 2)
+    def test_start_return_sequence
+      sl = base_ticks( 17 )
+      assert_slot_to_reg( sl , :r0 , 6 , :r2)
     end
   end
 end