diff mbox

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

Message ID CAMe9rOpaz5Yp-KJ__tU2RBaGp_FD=EcjkqC0tzVeM+U-nWfZNw@mail.gmail.com
State New
Headers show

Commit Message

H.J. Lu March 12, 2012, 4:50 p.m. UTC 
On Mon, Mar 12, 2012 at 12:46 AM, Uros Bizjak <ubizjak@gmail.com> wrote:
> 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.

This is the patch I checked in.

Thanks.
diff mbox

Patch

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index d85dc25..dbcf5a9 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -2444,6 +2444,8 @@  static rtx (*ix86_gen_andsp) (rtx, rtx, rtx);
 static rtx (*ix86_gen_allocate_stack_worker) (rtx, rtx);
 static rtx (*ix86_gen_adjust_stack_and_probe) (rtx, rtx, rtx);
 static rtx (*ix86_gen_probe_stack_range) (rtx, rtx, rtx);
+static rtx (*ix86_gen_tls_global_dynamic_64) (rtx, rtx, rtx);
+static rtx (*ix86_gen_tls_local_dynamic_base_64) (rtx, rtx);
 
 /* Preferred alignment for stack boundary in bits.  */
 unsigned int ix86_preferred_stack_boundary;
@@ -3754,9 +3756,19 @@  ix86_option_override_internal (bool main_args_p)
     {
       ix86_gen_leave = gen_leave_rex64;
       if (Pmode == DImode)
-	ix86_gen_monitor = gen_sse3_monitor64_di;
+	{
+	  ix86_gen_monitor = gen_sse3_monitor64_di;
+	  ix86_gen_tls_global_dynamic_64 = gen_tls_global_dynamic_64_di;
+	  ix86_gen_tls_local_dynamic_base_64
+	    = gen_tls_local_dynamic_base_64_di;
+	}
       else
-	ix86_gen_monitor = gen_sse3_monitor64_si;
+	{
+	  ix86_gen_monitor = gen_sse3_monitor64_si;
+	  ix86_gen_tls_global_dynamic_64 = gen_tls_global_dynamic_64_si;
+	  ix86_gen_tls_local_dynamic_base_64
+	    = gen_tls_local_dynamic_base_64_si;
+	}
     }
   else
     {
@@ -12549,7 +12561,8 @@  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));
+	      emit_call_insn (ix86_gen_tls_global_dynamic_64 (rax, x,
+							      caddr));
 	      insns = get_insns ();
 	      end_sequence ();
 
@@ -12597,7 +12610,8 @@  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));
+	      emit_call_insn (ix86_gen_tls_local_dynamic_base_64 (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.