diff mbox

PATCH: Call gen_tls_global_dynamic_64_<mode> and en_tls_local_dynamic_base_64_<mode>

Message ID 20120311232613.GA28504@intel.com
State New
Headers show

Commit Message

H.J. Lu March 11, 2012, 11:26 p.m. UTC 
Hi,

Pmode may be DImode for x32.  This patch calls
gen_tls_global_dynamic_64_<mode> and gen_tls_local_dynamic_base_64_<mode>,
depending on Pmode.  Tested on Linux/x86-64.  OK for trunk?

Thanks.


H.J.
---
2012-03-11  H.J. Lu  <hongjiu.lu@intel.com>

	* config/i386/i386.c (legitimize_tls_address): Call
	gen_tls_global_dynamic_64_<mode> and
	gen_tls_local_dynamic_base_64_<mode>, depending on Pmode.

	* config/i386/i386.md (*tls_global_dynamic_64): Renamed to ...
	(*tls_global_dynamic_64_<mode>): This.
	(tls_global_dynamic_64): Renamed to ...
	(tls_global_dynamic_64_<mode>): This.
	(*tls_local_dynamic_base_64): Renamed to ...
	(*tls_local_dynamic_base_64<mode>): This.
	(tls_local_dynamic_base_64): Renamed to ...
	(tls_local_dynamic_base_64<mode>): This.

Comments

Uros Bizjak March 12, 2012, 7:46 a.m. UTC | #1 
On Mon, Mar 12, 2012 at 12:26 AM, H.J. Lu <hongjiu.lu@intel.com> wrote:

> Pmode may be DImode for x32.  This patch calls
> gen_tls_global_dynamic_64_<mode> and gen_tls_local_dynamic_base_64_<mode>,
> depending on Pmode.  Tested on Linux/x86-64.  OK for trunk?
>
> 2012-03-11  H.J. Lu  <hongjiu.lu@intel.com>
>
>        * config/i386/i386.c (legitimize_tls_address): Call
>        gen_tls_global_dynamic_64_<mode> and
>        gen_tls_local_dynamic_base_64_<mode>, depending on Pmode.
>
>        * config/i386/i386.md (*tls_global_dynamic_64): Renamed to ...
>        (*tls_global_dynamic_64_<mode>): This.
>        (tls_global_dynamic_64): Renamed to ...
>        (tls_global_dynamic_64_<mode>): This.
>        (*tls_local_dynamic_base_64): Renamed to ...
>        (*tls_local_dynamic_base_64<mode>): This.
>        (tls_local_dynamic_base_64): Renamed to ...
>        (tls_local_dynamic_base_64<mode>): This.
>
> diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
> index d673101..fc8fa12 100644
> --- a/gcc/config/i386/i386.c
> +++ b/gcc/config/i386/i386.c
> @@ -12533,7 +12543,12 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov)
>              rtx rax = gen_rtx_REG (Pmode, AX_REG), insns;
>
>              start_sequence ();
> -             emit_call_insn (gen_tls_global_dynamic_64 (rax, x, caddr));
> +             if (Pmode == DImode)
> +               emit_call_insn (gen_tls_global_dynamic_64_di (rax, x,
> +                                                             caddr));
> +             else
> +               emit_call_insn (gen_tls_global_dynamic_64_si (rax, x,
> +                                                             caddr));
>              insns = get_insns ();
>              end_sequence ();
>
> @@ -12581,7 +12596,12 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov)
>              rtx rax = gen_rtx_REG (Pmode, AX_REG), insns, eqv;
>
>              start_sequence ();
> -             emit_call_insn (gen_tls_local_dynamic_base_64 (rax, caddr));
> +             if (Pmode == DImode)
> +               emit_call_insn (gen_tls_local_dynamic_base_64_di (rax,
> +                                                                 caddr));
> +             else
> +               emit_call_insn (gen_tls_local_dynamic_base_64_si (rax,
> +                                                                 caddr));
>              insns = get_insns ();
>              end_sequence ();

Please use indirect functions here, see many examples in the code.

OK with this change.

Thanks,
Uros.
diff mbox

Patch

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index d673101..fc8fa12 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -12533,7 +12543,12 @@  legitimize_tls_address (rtx x, enum tls_model model, bool for_mov)
 	      rtx rax = gen_rtx_REG (Pmode, AX_REG), insns;
 
 	      start_sequence ();
-	      emit_call_insn (gen_tls_global_dynamic_64 (rax, x, caddr));
+	      if (Pmode == DImode)
+		emit_call_insn (gen_tls_global_dynamic_64_di (rax, x,
+							      caddr));
+	      else
+		emit_call_insn (gen_tls_global_dynamic_64_si (rax, x,
+							      caddr));
 	      insns = get_insns ();
 	      end_sequence ();
 
@@ -12581,7 +12596,12 @@  legitimize_tls_address (rtx x, enum tls_model model, bool for_mov)
 	      rtx rax = gen_rtx_REG (Pmode, AX_REG), insns, eqv;
 
 	      start_sequence ();
-	      emit_call_insn (gen_tls_local_dynamic_base_64 (rax, caddr));
+	      if (Pmode == DImode)
+		emit_call_insn (gen_tls_local_dynamic_base_64_di (rax,
+								  caddr));
+	      else
+		emit_call_insn (gen_tls_local_dynamic_base_64_si (rax,
+								  caddr));
 	      insns = get_insns ();
 	      end_sequence ();
 
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 986ddad..4b64aae 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -12573,13 +12573,13 @@ 
      (clobber (match_scratch:SI 5 ""))
      (clobber (reg:CC FLAGS_REG))])])
 
-(define_insn "*tls_global_dynamic_64"
-  [(set (match_operand:DI 0 "register_operand" "=a")
-	(call:DI
-	 (mem:QI (match_operand:DI 2 "constant_call_address_operand" "z"))
-	 (match_operand:DI 3 "" "")))
-   (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
-	      UNSPEC_TLS_GD)]
+(define_insn "*tls_global_dynamic_64_<mode>"
+  [(set (match_operand:P 0 "register_operand" "=a")
+	(call:P
+	 (mem:QI (match_operand:P 2 "constant_call_address_operand" "z"))
+	 (match_operand:P 3 "" "")))
+   (unspec:P [(match_operand:P 1 "tls_symbolic_operand" "")]
+	     UNSPEC_TLS_GD)]
   "TARGET_64BIT"
 {
   if (!TARGET_X32)
@@ -12596,14 +12596,15 @@ 
    (set (attr "length")
 	(symbol_ref "TARGET_X32 ? 15 : 16"))])
 
-(define_expand "tls_global_dynamic_64"
+(define_expand "tls_global_dynamic_64_<mode>"
   [(parallel
-    [(set (match_operand:DI 0 "register_operand" "")
-	  (call:DI
-	   (mem:QI (match_operand:DI 2 "constant_call_address_operand" ""))
+    [(set (match_operand:P 0 "register_operand" "")
+	  (call:P
+	   (mem:QI (match_operand:P 2 "constant_call_address_operand" ""))
 	   (const_int 0)))
-     (unspec:DI [(match_operand 1 "tls_symbolic_operand" "")]
-		UNSPEC_TLS_GD)])])
+     (unspec:P [(match_operand:P 1 "tls_symbolic_operand" "")]
+	       UNSPEC_TLS_GD)])]
+  "TARGET_64BIT")
 
 (define_insn "*tls_local_dynamic_base_32_gnu"
   [(set (match_operand:SI 0 "register_operand" "=a")
@@ -12640,12 +12641,12 @@ 
       (clobber (match_scratch:SI 4 ""))
       (clobber (reg:CC FLAGS_REG))])])
 
-(define_insn "*tls_local_dynamic_base_64"
-  [(set (match_operand:DI 0 "register_operand" "=a")
-	(call:DI
-	 (mem:QI (match_operand:DI 1 "constant_call_address_operand" "z"))
-	 (match_operand:DI 2 "" "")))
-   (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)]
+(define_insn "*tls_local_dynamic_base_64_<mode>"
+  [(set (match_operand:P 0 "register_operand" "=a")
+	(call:P
+	 (mem:QI (match_operand:P 1 "constant_call_address_operand" "z"))
+	 (match_operand:P 2 "" "")))
+   (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)]
   "TARGET_64BIT"
 {
   output_asm_insn
@@ -12657,13 +12658,14 @@ 
   [(set_attr "type" "multi")
    (set_attr "length" "12")])
 
-(define_expand "tls_local_dynamic_base_64"
+(define_expand "tls_local_dynamic_base_64_<mode>"
   [(parallel
-     [(set (match_operand:DI 0 "register_operand" "")
-	   (call:DI
-	    (mem:QI (match_operand:DI 1 "constant_call_address_operand" ""))
+     [(set (match_operand:P 0 "register_operand" "")
+	   (call:P
+	    (mem:QI (match_operand:P 1 "constant_call_address_operand" ""))
 	    (const_int 0)))
-      (unspec:DI [(const_int 0)] UNSPEC_TLS_LD_BASE)])])
+      (unspec:P [(const_int 0)] UNSPEC_TLS_LD_BASE)])]
+  "TARGET_64BIT")
 
 ;; Local dynamic of a single variable is a lose.  Show combine how
 ;; to convert that back to global dynamic.