[llvm-commits] CVS: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp X86ISelLowering.cpp X86InstrInfo.td

[Lauro Ramos Venancio]

Changes in directory llvm/lib/Target/X86:

X86ATTAsmPrinter.cpp updated: 1.101 -> 1.102
X86ISelLowering.cpp updated: 1.395 -> 1.396
X86InstrInfo.td updated: 1.303 -> 1.304
---
Log message:

X86 TLS: fix and optimize the implementation of "initial exec" model.


---
Diffs of the changes:  (+11 -2)

 X86ATTAsmPrinter.cpp |    2 +-
 X86ISelLowering.cpp  |    4 ++++
 X86InstrInfo.td      |    7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.101 llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.102
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.101	Fri Apr 20 16:38:10 2007
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp	Sun Apr 22 17:50:52 2007
@@ -277,7 +277,7 @@
     GlobalVariable *GVar = dyn_cast<GlobalVariable>(GV);
     bool isThreadLocal = GVar && GVar->isThreadLocal();
 
-    if (!isMemOp && !isCallOp && !isThreadLocal) O << '$';
+    if (!isMemOp && !isCallOp) O << '$';
 
     std::string Name = Mang->getValueName(GV);
     X86SharedAsmPrinter::decorateName(Name, GV);


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.395 llvm/lib/Target/X86/X86ISelLowering.cpp:1.396
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.395	Sat Apr 21 15:56:26 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Sun Apr 22 17:50:52 2007
@@ -2996,6 +2996,10 @@
                                              GA->getValueType(0),
                                              GA->getOffset());
   SDOperand Offset = DAG.getNode(X86ISD::Wrapper, PtrVT, TGA);
+
+  if (GA->getGlobal()->isDeclaration()) // initial exec TLS model
+    Offset = DAG.getLoad(PtrVT, DAG.getEntryNode(), Offset, NULL, 0);
+
   // The address of the thread local variable is the add of the thread
   // pointer with the offset of the variable.
   return DAG.getNode(ISD::ADD, PtrVT, ThreadPointer, Offset);


Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.303 llvm/lib/Target/X86/X86InstrInfo.td:1.304
--- llvm/lib/Target/X86/X86InstrInfo.td:1.303	Fri Apr 20 16:38:10 2007
+++ llvm/lib/Target/X86/X86InstrInfo.td	Sun Apr 22 17:50:52 2007
@@ -2462,10 +2462,15 @@
 //
 
 def TLS_addr : I<0, Pseudo, (ops GR32:$dst, i32imm:$sym),
-               "leal $sym(,%ebx,1), $dst",
+               "leal ${sym:mem}(,%ebx,1), $dst",
                [(set GR32:$dst, (X86tlsaddr tglobaltlsaddr:$sym))]>,
                Imp<[EBX],[]>;
 
+let AddedComplexity = 10 in
+def TLS_gs : I<0, Pseudo, (ops GR32:$dst, GR32:$src),
+               "movl %gs:($src), $dst",
+               [(set GR32:$dst, (load (add X86TLStp, GR32:$src)))]>;
+
 def TLS_tp : I<0, Pseudo, (ops GR32:$dst),
                "movl %gs:0, $dst",
                [(set GR32:$dst, X86TLStp)]>;