use jit_reg_other_reg

diff --git a/ChangeLog b/ChangeLog
index 830afec996c82260fb2a4a1b8e2f111d3c1d3739..259ec645d9ebb1e574aff61e780b44688c24aa16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
        * jit/jit-rules.h (jit_reg_other_reg): add macro.
        * jit/jit-reg-alloc.c: replace OTHER_REG with jit_reg_other_reg.
        * jit/jit-rules-x86.c (_jit_gen_load_value): use jit_reg_other_reg.
+       * jit/jit-rules-arm.c (_jit_gen_load_value) 
+       (_jit_gen_load_value_struct): use jit_reg_other_reg.
 
 2009-03-23  Aleksey Demakov  <ademakov@gmail.com>
 

diff --git a/jit/jit-rules-arm.c b/jit/jit-rules-arm.c
index ee8cf89e3c6a28c480b8db44eb1fd6828ac48fed..2461f61aad0efefa8accd9ab7ac5f995833bd3b8 100644 (file)
--- a/jit/jit-rules-arm.c
+++ b/jit/jit-rules-arm.c
@@ -1093,13 +1093,12 @@ void _jit_gen_load_value
                if (!value->in_global_register)
                {       
                        /* Find the other register in a long pair */
-                       int reg=value->reg;
-                       int other_reg;
-                       get_reg_and_other_reg(gen, &reg, &other_reg);
-                       //Spill to the global register
+                       int reg = value->reg;
+                       int other_reg = jit_reg_other_reg(reg);
+                       /* Spill to the global register */
                        _jit_gen_spill_reg(gen, reg, other_reg, value);
                        value->in_global_register=1;
-                       
+
                        /* A new instruction has probably been generated by _jit_gen_spill_reg: reload the inst pointer */
                        jit_gen_load_inst_ptr(gen, inst);
                }
@@ -1117,12 +1116,11 @@ void _jit_gen_load_value
                if(value->in_register)
                {
                        /* Find the other register in a long pair */
-                       int reg=value->reg;
-                       int other_reg;
-                       get_reg_and_other_reg(gen, &reg, &other_reg);
+                       int reg = value->reg;
+                       int other_reg = jit_reg_other_reg(reg);
                        _jit_gen_spill_reg(gen, reg, other_reg, value);
                        value->in_frame=1;
-                       
+
                        /* A new instruction has probably been generated by _jit_gen_spill_reg: reload the inst pointer */
                        jit_gen_load_inst_ptr(gen, inst);
                }
@@ -1245,13 +1243,12 @@ void _jit_gen_load_value_struct (jit_gencode_t gen, int reg, jit_value_t value)
                if (!value->in_global_register)
                {       
                        /* Find the other register in a long pair */
-                       int reg=value->reg;
-                       int other_reg;
-                       get_reg_and_other_reg(gen, &reg, &other_reg);
-                       //Spill to the global register
+                       int reg = value->reg;
+                       int other_reg = jit_reg_other_reg(reg);
+                       /* Spill to the global register */
                        _jit_gen_spill_reg(gen, reg, other_reg, value);
                        value->in_global_register=1;
-                       
+
                        /* A new instruction has probably been generated by _jit_gen_spill_reg: reload the inst pointer */
                        jit_gen_load_inst_ptr(gen, inst);
                }
@@ -1269,12 +1266,11 @@ void _jit_gen_load_value_struct (jit_gencode_t gen, int reg, jit_value_t value)
                if(value->in_register)
                {
                        /* Find the other register in a long pair */
-                       int reg=value->reg;
-                       int other_reg;
-                       get_reg_and_other_reg(gen, &reg, &other_reg);
+                       int reg = value->reg;
+                       int other_reg = jit_reg_other_reg(reg);
                        _jit_gen_spill_reg(gen, reg, other_reg, value);
                        value->in_frame=1;
-                       
+
                        /* A new instruction has probably been generated by _jit_gen_spill_reg: reload the inst pointer */
                        jit_gen_load_inst_ptr(gen, inst);
                }