re PR target/63542 (My build log is full of "non-delegitimized UNSPEC UNSPEC_GOT...

	PR target/63542
	* config/i386/i386.c (ix86_pic_register_p): Also return
	true if x is a hard register with ORIGINAL_REGNO equal to
	pic_offset_table_rtx pseudo REGNO.
	(ix86_delegitimize_address): For ix86_use_pseudo_pic_reg ()
	after reload, subtract GOT_SYMBOL_NAME symbol if possible.

	* gcc.target/i386/pr63542-1.c: New test.
	* gcc.target/i386/pr63542-2.c: New test.

From-SVN: r216540

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc1703b02b38729f378f1b78f36a044139800355..2ef7289879a06bd3e38971b75021f017b792f859 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/63542
+       * config/i386/i386.c (ix86_pic_register_p): Also return
+       true if x is a hard register with ORIGINAL_REGNO equal to
+       pic_offset_table_rtx pseudo REGNO.
+       (ix86_delegitimize_address): For ix86_use_pseudo_pic_reg ()
+       after reload, subtract GOT_SYMBOL_NAME symbol if possible.
+
 2014-10-22  Alan Modra  <amodra@gmail.com>
 
        * gengtype.h (obstack_chunk_alloc, obstack_chunk_free): Remove cast.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 34273ca12de0fd4deb77c1a43791679ed333b5ec..a6ff41de813b90cf257963b4e277f400ae0616db 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -14281,10 +14281,20 @@ ix86_pic_register_p (rtx x)
   if (GET_CODE (x) == VALUE && CSELIB_VAL_PTR (x))
     return (pic_offset_table_rtx
            && rtx_equal_for_cselib_p (x, pic_offset_table_rtx));
+  else if (!REG_P (x))
+    return false;
   else if (pic_offset_table_rtx)
-    return REG_P (x) && REGNO (x) == REGNO (pic_offset_table_rtx);
+    {
+      if (REGNO (x) == REGNO (pic_offset_table_rtx))
+       return true;
+      if (HARD_REGISTER_P (x)
+         && !HARD_REGISTER_P (pic_offset_table_rtx)
+         && ORIGINAL_REGNO (x) == REGNO (pic_offset_table_rtx))
+       return true;
+      return false;
+    }
   else
-    return REG_P (x) && REGNO (x) == PIC_OFFSET_TABLE_REGNUM;
+    return REGNO (x) == PIC_OFFSET_TABLE_REGNUM;
 }
 
 /* Helper function for ix86_delegitimize_address.
@@ -14457,15 +14467,20 @@ ix86_delegitimize_address (rtx x)
         leal (%ebx, %ecx, 4), %ecx
         ...
         movl foo@GOTOFF(%ecx), %edx
-        in which case we return (%ecx - %ebx) + foo.
-
-        Note that when pseudo_pic_reg is used we can generate it only
-        before reload_completed.  */
+        in which case we return (%ecx - %ebx) + foo
+        or (%ecx - _GLOBAL_OFFSET_TABLE_) + foo if pseudo_pic_reg
+        and reload has completed.  */
       if (pic_offset_table_rtx
          && (!reload_completed || !ix86_use_pseudo_pic_reg ()))
         result = gen_rtx_PLUS (Pmode, gen_rtx_MINUS (Pmode, copy_rtx (addend),
                                                     pic_offset_table_rtx),
                               result);
+      else if (pic_offset_table_rtx && !TARGET_MACHO && !TARGET_VXWORKS_RTP)
+       {
+         rtx tmp = gen_rtx_SYMBOL_REF (Pmode, GOT_SYMBOL_NAME);
+         tmp = gen_rtx_MINUS (Pmode, copy_rtx (addend), tmp);
+         result = gen_rtx_PLUS (Pmode, tmp, result);
+       }
       else
        return orig_x;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7db3ce4e5b06fcdddaece0ec91c6bca8eab1a110..b0c392bb089f4836cf862a4476c359c6b51eac90 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/63542
+       * gcc.target/i386/pr63542-1.c: New test.
+       * gcc.target/i386/pr63542-2.c: New test.
+
 2014-10-21  Joern Rennecke  <joern.rennecke@embecosm.com>
 
        * gcc.target/avr/tiny-memx.c: New test.

diff --git a/gcc/testsuite/gcc.target/i386/pr63542-1.c b/gcc/testsuite/gcc.target/i386/pr63542-1.c
new file mode 100644 (file)
index 0000000..98a4007
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr63542-1.c
@@ -0,0 +1,21 @@
+/* PR target/63542 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -g -dA" } */
+/* { dg-additional-options "-fpic" { target fpic } } */
+
+float
+foo (long long u)
+{
+  if (!(-(1LL << 53) < u && u < (1LL << 53)))
+    {
+      if ((unsigned long long) u & ((1ULL << 11) - 1))
+       {
+         u &= ~((1ULL << 11) - 1);
+         u |= (1ULL << 11);
+       }
+    }
+  double f = (int) (u >> (32));
+  f *= 0x1p32f;
+  f += (unsigned int) u;
+  return (float) f;
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr63542-2.c b/gcc/testsuite/gcc.target/i386/pr63542-2.c
new file mode 100644 (file)
index 0000000..e9e9d84
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr63542-2.c
@@ -0,0 +1,37 @@
+/* PR target/63542 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -g -dA" } */
+/* { dg-additional-options "-fpic" { target fpic } } */
+
+struct B { unsigned long c; unsigned char *d; };
+extern struct A { struct B *e[0x400]; } *f[128];
+extern void (*bar) (char *p, char *q);
+
+char *
+foo (char *p, char *q)
+{
+  struct B *g;
+  char *b, *l;
+  unsigned long s;
+
+  g = f[((unsigned long) p) >> 22]->e[(((unsigned long) p) >> 12) & 0x3ff];
+  s = g->c << 2;
+  int r = ((unsigned long) p) & 0xfff;
+  int m = g->d[r];
+  if (m > 0xfd)
+    {
+      m = (r >> 2) % (s >> 2);
+      if ((((unsigned long) p) & ~(unsigned long) 0xfff) != (((unsigned long) q) & ~(unsigned long) 0xfff))
+       goto fail;
+    }
+  b = (char *) ((unsigned long) p & ~(unsigned long) 3);
+  b -= m << 2;
+  l = b + s;
+
+  if ( q >= l || q < b)
+    goto fail;
+  return p;
+fail:
+  (*bar) (p, q);
+  return p;
+}