backport: re PR target/34174 (gcc produces erroneous asm for movdi)

	Backport from mainline:
	2007-11-26  Rask Ingemann Lambertsen  <rask@sygehus.dk>

	PR target/34174
	* config/fr30/fr30.c (fr30_move_double): Sanitize mem->reg case. Copy
	the address before it is clobbered.

testsuite/
	* gcc.dg/pr34174-1.c: New.

From-SVN: r130489

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6f8ce0e54a4b459f219f9cb7640d33845afb32bd..6d2fa78ba02cec97bbcb71dfa543e76a65cf40ec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-28  Rask Ingemann Lambertsen  <rask@sygehus.dk>
+
+       Backport from mainline:
+       2007-11-26  Rask Ingemann Lambertsen  <rask@sygehus.dk>
+
+       PR target/34174
+       * config/fr30/fr30.c (fr30_move_double): Sanitize mem->reg case. Copy
+       the address before it is clobbered.
+
 2007-11-26  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/34215

diff --git a/gcc/config/fr30/fr30.c b/gcc/config/fr30/fr30.c
index c910ab83ced9e18fcacef778e283398497a41982..3d01d3e4f66d450283b3e3e6b5beec85b04ce6e7 100644 (file)
--- a/gcc/config/fr30/fr30.c
+++ b/gcc/config/fr30/fr30.c
@@ -827,47 +827,23 @@ fr30_move_double (rtx * operands)
        {
          rtx addr = XEXP (src, 0);
          int dregno = REGNO (dest);
-         rtx dest0;
-         rtx dest1;
+         rtx dest0 = operand_subword (dest, 0, TRUE, mode);;
+         rtx dest1 = operand_subword (dest, 1, TRUE, mode);;
          rtx new_mem;
          
-         /* If the high-address word is used in the address, we
-            must load it last.  Otherwise, load it first.  */
-         int reverse = (refers_to_regno_p (dregno, dregno + 1, addr, 0) != 0);
-
          gcc_assert (GET_CODE (addr) == REG);
          
-         dest0 = operand_subword (dest, reverse, TRUE, mode);
-         dest1 = operand_subword (dest, !reverse, TRUE, mode);
-
-         if (reverse)
-           {
-             emit_insn (gen_rtx_SET (VOIDmode, dest1,
-                                     adjust_address (src, SImode, 0)));
-             emit_insn (gen_rtx_SET (SImode, dest0,
-                                     gen_rtx_REG (SImode, REGNO (addr))));
-             emit_insn (gen_rtx_SET (SImode, dest0,
-                                     plus_constant (dest0, UNITS_PER_WORD)));
-
-             new_mem = gen_rtx_MEM (SImode, dest0);
-             MEM_COPY_ATTRIBUTES (new_mem, src);
-             
-             emit_insn (gen_rtx_SET (VOIDmode, dest0, new_mem));
-           }
-         else
-           {
-             emit_insn (gen_rtx_SET (VOIDmode, dest0,
-                                     adjust_address (src, SImode, 0)));
-             emit_insn (gen_rtx_SET (SImode, dest1,
-                                     gen_rtx_REG (SImode, REGNO (addr))));
-             emit_insn (gen_rtx_SET (SImode, dest1,
-                                     plus_constant (dest1, UNITS_PER_WORD)));
-
-             new_mem = gen_rtx_MEM (SImode, dest1);
-             MEM_COPY_ATTRIBUTES (new_mem, src);
+         /* Copy the address before clobbering it.  See PR 34174.  */
+         emit_insn (gen_rtx_SET (SImode, dest1, addr));
+         emit_insn (gen_rtx_SET (VOIDmode, dest0,
+                                 adjust_address (src, SImode, 0)));
+         emit_insn (gen_rtx_SET (SImode, dest1,
+                                 plus_constant (dest1, UNITS_PER_WORD)));
+
+         new_mem = gen_rtx_MEM (SImode, dest1);
+         MEM_COPY_ATTRIBUTES (new_mem, src);
              
-             emit_insn (gen_rtx_SET (VOIDmode, dest1, new_mem));
-           }
+         emit_insn (gen_rtx_SET (VOIDmode, dest1, new_mem));
        }
       else if (src_code == CONST_INT || src_code == CONST_DOUBLE)
        {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 85789e97743ef8b87c15ec9a59ff515d187fb2f2..1be5494c0247aed4683c4cce34b17e913262c4f2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-28  Rask Ingemann Lambertsen  <rask@sygehus.dk>
+
+       Backport from mainline:
+       2007-11-26  Rask Ingemann Lambertsen  <rask@sygehus.dk>
+
+       PR target/34174
+       * gcc.dg/pr34174-1.c: New.
+
 2007-11-26  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/34215

diff --git a/gcc/testsuite/gcc.dg/pr34174-1.c b/gcc/testsuite/gcc.dg/pr34174-1.c
new file mode 100644 (file)
index 0000000..b5eef14
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr34174-1.c
@@ -0,0 +1,45 @@
+/* { dg-do run } */
+/* { dg-options "-std=gnu89" } */
+/* Based on PR target/27386 testcase by Joerg Wunsch.  */
+
+extern void abort (void);
+extern void exit (int);
+
+#if __INT_MAX__ >= 9223372036854775807LL
+typedef unsigned int uint64_t;
+#elif __LONG_MAX__ >= 9223372036854775807LL
+typedef unsigned long int uint64_t;
+#elif __LONG_LONG_MAX__ >= 9223372036854775807LL
+typedef unsigned long long int uint64_t;
+#else
+int
+main (void)
+{
+  exit (0);
+}
+#endif
+
+uint64_t a, b, c;
+
+int
+foo (uint64_t x, uint64_t y, uint64_t z, int i)
+{
+  a = x;
+  b = y;
+  c = z;
+  return 2 * i;
+}
+
+int
+main (void)
+{
+  if (foo (1234512345123ull, 3456734567345ull, 7897897897897ull, 42) != 84)
+    abort ();
+  if (a != 1234512345123ull)
+    abort ();
+  if (b != 3456734567345ull)
+    abort ();
+  if (c != 7897897897897ull)
+    abort ();
+  exit (0);
+}