*** empty log message ***

From-SVN: r748

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 5d8ce773978ee6520e0916e8a786ad7ba33f00ec..25cc56c8017b37811c6345878a53aa8976c86624 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -1952,7 +1952,9 @@ output_block_move (insn, operands, num_regs)
   int num              = 0;
   int offset           = 0;
   int use_lwl_lwr      = FALSE;
+  int last_operand     = num_regs+4;
   int i;
+  int j;
   rtx xoperands[10];
 
   struct {
@@ -1963,6 +1965,25 @@ output_block_move (insn, operands, num_regs)
     enum machine_mode mode;    /* mode to use on (MEM) */
   } load_store[4];
 
+  /* Work around a bug in GCC, where it can give us a register
+     the same as one of the addressing registers.  */
+  for (i = 4; i < last_operand; i++)
+    {
+      if (reg_mentioned_p (operands[i], operands[0])
+         || reg_mentioned_p (operands[i], operands[1]))
+       {
+         warning ("register $%d passed as address and temp register to block move",
+                  REGNO (operands[i]));
+
+         for (j = i+1; j < last_operand; j++)
+           operands[j-1] = operands[j];
+
+         operands[--last_operand] = (rtx)0;
+         if (--num_regs == 0)
+           abort ();
+       }
+    }
+
   /* If we are given global or static addresses, and we would be
      emitting a few instructions, try to save time by using a
      temporary register for the pointer.  */