From 22d513d895bf99767a62215ff585bdd9754b31c0 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Sun, 8 Mar 2020 12:14:53 +0200
Subject: [PATCH] fix div4 and tests

also bug in reduce_int, compiler not carried through
---
 lib/risc/register_value.rb           |  2 +-
 lib/slot_machine/macro/div4.rb       |  7 ++++---
 test/risc/test_register_value1.rb    |  1 +
 test/slot_machine/macro/test_div4.rb | 20 ++++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/risc/register_value.rb b/lib/risc/register_value.rb
index 2adf64e3..e16465f2 100644
--- a/lib/risc/register_value.rb
+++ b/lib/risc/register_value.rb
@@ -71,7 +71,7 @@ module Risc
     def reduce_int(check = true)
       raise "type not int #{type.name}" if check && type.name != "Integer_Type"
       new_name = "#{@symbol}.data_1"
-      new_reg = RegisterValue.new( new_name.to_sym , :Integer , extra)
+      new_reg = RegisterValue.new( new_name.to_sym , :Integer , extra).set_compiler(compiler)
       reduce = Risc::SlotToReg.new( "int -> fix" , self , Parfait::Integer.integer_index , new_reg)
       compiler.add_code(reduce) if compiler
       reduce.register
diff --git a/lib/slot_machine/macro/div4.rb b/lib/slot_machine/macro/div4.rb
index 52302f06..94c65f4d 100644
--- a/lib/slot_machine/macro/div4.rb
+++ b/lib/slot_machine/macro/div4.rb
@@ -3,10 +3,11 @@ module SlotMachine
     def to_risc(compiler)
       builder = compiler.builder(compiler.source)
       integer_tmp = builder.allocate_int
+      integer_1 = builder.register( :integer_1 )
+      integer_self = builder.register( :integer_self )
       builder.build do
-        integer_self! << message[:receiver]
-        integer_self.reduce_int
-        integer_1! << 2
+        integer_self = message[:receiver].to_reg.reduce_int(false)
+        load_object( 2 , integer_1)
         integer_self.op :>> , integer_1
         integer_tmp[Parfait::Integer.integer_index] << integer_self
         message[:return_value] << integer_tmp
diff --git a/test/risc/test_register_value1.rb b/test/risc/test_register_value1.rb
index f73057a2..5a5e20d7 100644
--- a/test/risc/test_register_value1.rb
+++ b/test/risc/test_register_value1.rb
@@ -20,6 +20,7 @@ module Risc
     def test_reduce_int
       ins = @int.reduce_int
       assert_equal RegisterValue , ins.class
+      assert ins.compiler
       assert_equal SlotToReg , @compiler.current.class
       assert_equal Parfait::Integer.integer_index , @compiler.current.index
       assert_equal :"id_456.data_1" , ins.symbol
diff --git a/test/slot_machine/macro/test_div4.rb b/test/slot_machine/macro/test_div4.rb
index 13cf9281..914ca7ea 100644
--- a/test/slot_machine/macro/test_div4.rb
+++ b/test/slot_machine/macro/test_div4.rb
@@ -15,7 +15,7 @@ module SlotMachine
         assert_equal :div4 , @method.callable.name
       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
@@ -24,15 +24,15 @@ module SlotMachine
         assert_return(32)
       end
       def test_all
-        assert_slot_to_reg risc(23) , :r0 , 2 , :r2
-        assert_slot_to_reg risc(24) , :r2 , 2 , :r2
-        assert_data risc(25) , 2
-        assert_operator risc(26) , :>> , :r2 , :r3
-        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_branch risc(31) , "return_label"
+        assert_slot_to_reg 23 , :message , 2 , "message.receiver"
+        assert_slot_to_reg 24 , "message.receiver" , 2 , "message.receiver.data_1"
+        assert_data 25 , 2
+        assert_operator 26 , :>> , "message.receiver.data_1" , :integer_1
+        assert_reg_to_slot 27 ,"message.receiver.data_1" , "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 31 , "return_label"
       end
     end
   end