* arm.c (arm_reload_in_hi): Ensure that the scratch register does

not overlap the final result register.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62981 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a150420..79562ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-16 Richard Earnshaw  <rearnsha@arm.com>
+
+       * arm.c (arm_reload_in_hi): Ensure that the scratch register does
+       not overlap the final result register.
+
 2003-02-16 Arend Bayer <arend.bayer@web.de>
           Richard Henderson  <rth@redhat.com>
 

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 2d4f4d8..0847c97 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -5845,7 +5845,14 @@ arm_reload_in_hi (operands)
        }
     }
 
-  scratch = gen_rtx_REG (SImode, REGNO (operands[2]));
+  /* Operands[2] may overlap operands[0] (though it won't overlap
+     operands[1]), that's why we asked for a DImode reg -- so we can
+     use the bit that does not overlap.  */
+  if (REGNO (operands[2]) == REGNO (operands[0]))
+    scratch = gen_rtx_REG (SImode, REGNO (operands[2]) + 1);
+  else
+    scratch = gen_rtx_REG (SImode, REGNO (operands[2]));
+
   emit_insn (gen_zero_extendqisi2 (scratch,
                                   gen_rtx_MEM (QImode,
                                                plus_constant (base,