m68k: handle TLS access with offset

This reinstates FINAL_PRESCAN_INSN, and the calls in handle_move_double,
so that access to TLS variables with offset are properly handled.

gcc:
	PR target/106282
	* config/m68k/m68k.h (FINAL_PRESCAN_INSN): Define.
	* config/m68k/m68k.cc (m68k_final_prescan_insn): Define.
	(handle_move_double): Call it before handle_movsi.
	* config/m68k/m68k-protos.h: Declare it.

gcc/testsuite:
	PR target/106282
	* gcc.target/m68k/tls-gd-off.c: New.
	* gcc.target/m68k/tls-ie-off.c: New.
	* gcc.target/m68k/tls-ld-off.c: New.
	* gcc.target/m68k/tls-ld-xtls-off.c: New.
	* gcc.target/m68k/tls-le-off.c: New.
	* gcc.target/m68k/tls-le-xtls-off.c: New.
	* gcc.target/m68k/tls-ld.c: Make pattern less strict.
	* gcc.target/m68k/tls-le.c: Likewise.

diff --git a/gcc/config/m68k/m68k-protos.h b/gcc/config/m68k/m68k-protos.h
index 60bff79653493ed663bb993bcfda4e64683b4e0d..724d446af93c75cecc33f2d062ecfa611fd78bf0 100644 (file)
--- a/gcc/config/m68k/m68k-protos.h
+++ b/gcc/config/m68k/m68k-protos.h
@@ -84,6 +84,7 @@ extern int emit_move_sequence (rtx *, machine_mode, rtx);
 extern bool m68k_movem_pattern_p (rtx, rtx, HOST_WIDE_INT, bool);
 extern const char *m68k_output_movem (rtx *, rtx, HOST_WIDE_INT, bool);
 extern bool m68k_epilogue_uses (int);
+extern void m68k_final_prescan_insn (rtx_insn *, rtx *, int);
 
 /* Functions from m68k.cc used in constraints.md.  */
 extern rtx m68k_unwrap_symbol (rtx, bool);

diff --git a/gcc/config/m68k/m68k.cc b/gcc/config/m68k/m68k.cc
index 0bff89bc39db93b35e57912dab3e7daa283117b4..03db2b6a9369f5d8b5038e1ee61421bf7e98551e 100644 (file)
--- a/gcc/config/m68k/m68k.cc
+++ b/gcc/config/m68k/m68k.cc
@@ -2550,6 +2550,18 @@ m68k_adjust_decorated_operand (rtx op)
     }
 }
 
+/* Prescan insn before outputing assembler for it.  */
+
+void
+m68k_final_prescan_insn (rtx_insn *insn ATTRIBUTE_UNUSED,
+                        rtx *operands, int n_operands)
+{
+  int i;
+
+  for (i = 0; i < n_operands; ++i)
+    m68k_adjust_decorated_operand (operands[i]);
+}
+
 /* Move X to a register and add REG_EQUAL note pointing to ORIG.
    If REG is non-null, use it; generate new pseudo otherwise.  */
 
@@ -3658,6 +3670,7 @@ handle_move_double (rtx operands[2],
 
   /* Normal case: do the two words, low-numbered first.  */
 
+  m68k_final_prescan_insn (NULL, operands, 2);
   handle_movsi (operands);
 
   /* Do the middle one of the three words for long double */
@@ -3668,6 +3681,7 @@ handle_move_double (rtx operands[2],
       if (addreg1)
        handle_reg_adjust (addreg1, 4);
 
+      m68k_final_prescan_insn (NULL, middlehalf, 2);
       handle_movsi (middlehalf);
     }
 
@@ -3678,6 +3692,7 @@ handle_move_double (rtx operands[2],
     handle_reg_adjust (addreg1, 4);
 
   /* Do that word.  */
+  m68k_final_prescan_insn (NULL, latehalf, 2);
   handle_movsi (latehalf);
 
   /* Undo the adds we just did.  */

diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 6f0bdd8dffa2071bcb473195fb64e13f2e94961d..450c380359c43ce6dc4db9fb625083bf531bd96c 100644 (file)
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -837,6 +837,9 @@ __transfer_from_trampoline ()                                       \
   assemble_name ((FILE), (NAME)),              \
   fprintf ((FILE), ",%u\n", (int)(ROUNDED)))
 
+#define FINAL_PRESCAN_INSN(INSN, OPVEC, NOPERANDS) \
+  m68k_final_prescan_insn (INSN, OPVEC, NOPERANDS)
+
 /* On the 68000, we use several CODE characters:
    '.' for dot needed in Motorola-style opcode names.
    '-' for an operand pushing on the stack:

diff --git a/gcc/testsuite/gcc.target/m68k/tls-gd-off.c b/gcc/testsuite/gcc.target/m68k/tls-gd-off.c
new file mode 100644 (file)
index 0000000..4af6128
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/tls-gd-off.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { ! *-linux-* } } */
+/* { dg-options "-O2 -fpic" } */
+/* { dg-final { scan-assembler "foo@TLSGD\\(\%a5\\)" } } */
+/* { dg-final { scan-assembler "bsr.l __tls_get_addr@PLTPC" } } */
+
+extern int __thread foo[2];
+
+int *
+bar (void)
+{
+  return foo + 1;
+}

diff --git a/gcc/testsuite/gcc.target/m68k/tls-ie-off.c b/gcc/testsuite/gcc.target/m68k/tls-ie-off.c
new file mode 100644 (file)
index 0000000..024cefe
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/tls-ie-off.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { ! *-linux-* } } */
+/* { dg-options "-O2" } */
+/* { dg-final { scan-assembler "jsr __m68k_read_tp" } } */
+/* { dg-final { scan-assembler "foo@TLSIE\\(\%a5\\)" } } */
+
+extern int __thread foo[2];
+
+int *
+bar (void)
+{
+  return foo + 1;
+}

diff --git a/gcc/testsuite/gcc.target/m68k/tls-ld-off.c b/gcc/testsuite/gcc.target/m68k/tls-ld-off.c
new file mode 100644 (file)
index 0000000..bd0ee8d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/tls-ld-off.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { ! *-linux-* } } */
+/* { dg-options "-O2 -fpic" } */
+/* { dg-final { scan-assembler "foo@TLSLDM\\(%a5\\)" } } */
+/* { dg-final { scan-assembler "bsr.l __tls_get_addr@PLTPC" } } */
+/* { dg-final { scan-assembler "foo\\+4@TLSLDO,%a0" } } */
+
+static int __thread foo[2];
+
+int *
+bar (void)
+{
+  return foo + 1;
+}

diff --git a/gcc/testsuite/gcc.target/m68k/tls-ld-xtls-off.c b/gcc/testsuite/gcc.target/m68k/tls-ld-xtls-off.c
new file mode 100644 (file)
index 0000000..195682b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/tls-ld-xtls-off.c
@@ -0,0 +1,14 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { ! *-linux-* } } */
+/* { dg-options "-O2 -fpic -mxtls" } */
+/* { dg-final { scan-assembler "foo@TLSLDM\\(\%a5\\)" } } */
+/* { dg-final { scan-assembler "bsr.l __tls_get_addr@PLTPC" } } */
+/* { dg-final { scan-assembler "#foo\\+4@TLSLDO,\%\[ad\]\[0-7\]" } } */
+
+static int __thread foo[2];
+
+int *
+bar (void)
+{
+  return foo + 1;
+}

diff --git a/gcc/testsuite/gcc.target/m68k/tls-ld.c b/gcc/testsuite/gcc.target/m68k/tls-ld.c
index af470c9613afa7556d04c8cdfa935b97d243c911..091a72a03b2713a059a09003970d2a9c8ef9f9e1 100644 (file)
--- a/gcc/testsuite/gcc.target/m68k/tls-ld.c
+++ b/gcc/testsuite/gcc.target/m68k/tls-ld.c
@@ -1,9 +1,9 @@
 /* { dg-do compile } */
 /* { dg-skip-if "" { ! *-linux-* } } */
 /* { dg-options "-O2 -fpic" } */
-/* { dg-final { scan-assembler "foo@TLSLDM\\(\%a5\\)" } } */
+/* { dg-final { scan-assembler "foo@TLSLDM\\(%a5\\)" } } */
 /* { dg-final { scan-assembler "bsr.l __tls_get_addr@PLTPC" } } */
-/* { dg-final { scan-assembler "lea \\(foo@TLSLDO,\%a0\\)" } } */
+/* { dg-final { scan-assembler "foo@TLSLDO,%a0" } } */
 
 static int __thread foo;
 

diff --git a/gcc/testsuite/gcc.target/m68k/tls-le-off.c b/gcc/testsuite/gcc.target/m68k/tls-le-off.c
new file mode 100644 (file)
index 0000000..c61ae08
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/tls-le-off.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { ! *-linux-* } } */
+/* { dg-options "-O2" } */
+/* { dg-final { scan-assembler "jsr __m68k_read_tp" } } */
+/* { dg-final { scan-assembler "foo\\+4@TLSLE,%a0" } } */
+
+static int __thread foo[2];
+
+int *
+bar (void)
+{
+  return foo + 1;
+}

diff --git a/gcc/testsuite/gcc.target/m68k/tls-le-xtls-off.c b/gcc/testsuite/gcc.target/m68k/tls-le-xtls-off.c
new file mode 100644 (file)
index 0000000..0a9f47d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/m68k/tls-le-xtls-off.c
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+/* { dg-skip-if "" { ! *-linux-* } } */
+/* { dg-options "-O2 -mxtls" } */
+/* { dg-final { scan-assembler "jsr __m68k_read_tp" } } */
+/* { dg-final { scan-assembler "#foo\\+4@TLSLE,\%\[ad\]\[0-7\]" } } */
+
+static int __thread foo[2];
+
+int *
+bar (void)
+{
+  return foo + 1;
+}

diff --git a/gcc/testsuite/gcc.target/m68k/tls-le.c b/gcc/testsuite/gcc.target/m68k/tls-le.c
index 74234e9e5a40d8eafa35d887da4dc0c4f41ed110..7a9f215f44bdce4887a47a2b5d3179059e4f49e3 100644 (file)
--- a/gcc/testsuite/gcc.target/m68k/tls-le.c
+++ b/gcc/testsuite/gcc.target/m68k/tls-le.c
@@ -2,7 +2,7 @@
 /* { dg-skip-if "" { ! *-linux-* } } */
 /* { dg-options "-O2" } */
 /* { dg-final { scan-assembler "jsr __m68k_read_tp" } } */
-/* { dg-final { scan-assembler "lea \\(foo@TLSLE,\%a0\\)" } } */
+/* { dg-final { scan-assembler "foo@TLSLE,%a0" } } */
 
 static int __thread foo;