[llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp X86ISelPattern.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86CodeEmitter.cpp updated: 1.79 -> 1.80
X86ISelPattern.cpp updated: 1.138 -> 1.139
---
Log message:

Tailcalls require stubs to be emitted.  Otherwise, the compilation callback
doesn't know who 'called' it.


---
Diffs of the changes:  (+16 -9)

 X86CodeEmitter.cpp |   23 +++++++++++++++--------
 X86ISelPattern.cpp |    2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)


Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.79 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.80
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.79	Thu Apr 21 18:38:14 2005
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Thu May 19 00:54:33 2005
@@ -53,9 +53,10 @@
 
     void emitPCRelativeBlockAddress(const MachineBasicBlock *BB);
     void emitPCRelativeValue(unsigned Address);
-    void emitGlobalAddressForCall(GlobalValue *GV);
+    void emitGlobalAddressForCall(GlobalValue *GV, bool isTailCall);
     void emitGlobalAddressForPtr(GlobalValue *GV, int Disp = 0);
-    void emitExternalSymbolAddress(const char *ES, bool isPCRelative);
+    void emitExternalSymbolAddress(const char *ES, bool isPCRelative,
+                                   bool isTailCall);
 
     void emitRegModRMByte(unsigned ModRMReg, unsigned RegOpcodeField);
     void emitSIBByte(unsigned SS, unsigned Index, unsigned Base);
@@ -139,9 +140,10 @@
 /// emitGlobalAddressForCall - Emit the specified address to the code stream
 /// assuming this is part of a function call, which is PC relative.
 ///
-void Emitter::emitGlobalAddressForCall(GlobalValue *GV) {
+void Emitter::emitGlobalAddressForCall(GlobalValue *GV, bool isTailCall) {
   MCE.addRelocation(MachineRelocation(MCE.getCurrentPCOffset(),
-                                      X86::reloc_pcrel_word, GV, 0, true));
+                                      X86::reloc_pcrel_word, GV, 0,
+                                      !isTailCall /*Doesn'tNeedStub*/));
   MCE.emitWord(0);
 }
 
@@ -158,7 +160,8 @@
 /// emitExternalSymbolAddress - Arrange for the address of an external symbol to
 /// be emitted to the current location in the function, and allow it to be PC
 /// relative.
-void Emitter::emitExternalSymbolAddress(const char *ES, bool isPCRelative) {
+void Emitter::emitExternalSymbolAddress(const char *ES, bool isPCRelative,
+                                        bool isTailCall) {
   MCE.addRelocation(MachineRelocation(MCE.getCurrentPCOffset(),
           isPCRelative ? X86::reloc_pcrel_word : X86::reloc_absolute_word, ES));
   MCE.emitWord(0);
@@ -394,9 +397,13 @@
         emitPCRelativeBlockAddress(MO.getMachineBasicBlock());
       } else if (MO.isGlobalAddress()) {
         assert(MO.isPCRelative() && "Call target is not PC Relative?");
-        emitGlobalAddressForCall(MO.getGlobal());
+        bool isTailCall = Opcode == X86::TAILJMPd ||
+                          Opcode == X86::TAILJMPr || Opcode == X86::TAILJMPm;
+        emitGlobalAddressForCall(MO.getGlobal(), isTailCall);
       } else if (MO.isExternalSymbol()) {
-        emitExternalSymbolAddress(MO.getSymbolName(), true);
+        bool isTailCall = Opcode == X86::TAILJMPd ||
+                          Opcode == X86::TAILJMPr || Opcode == X86::TAILJMPm;
+        emitExternalSymbolAddress(MO.getSymbolName(), true, isTailCall);
       } else if (MO.isImmediate()) {
         emitConstant(MO.getImmedValue(), sizeOfImm(Desc));
       } else {
@@ -421,7 +428,7 @@
       } else if (MO1.isExternalSymbol()) {
         assert(sizeOfImm(Desc) == 4 &&
                "Don't know how to emit non-pointer values!");
-        emitExternalSymbolAddress(MO1.getSymbolName(), false);
+        emitExternalSymbolAddress(MO1.getSymbolName(), false, false);
       } else {
         emitConstant(MO1.getImmedValue(), sizeOfImm(Desc));
       }


Index: llvm/lib/Target/X86/X86ISelPattern.cpp
diff -u llvm/lib/Target/X86/X86ISelPattern.cpp:1.138 llvm/lib/Target/X86/X86ISelPattern.cpp:1.139
--- llvm/lib/Target/X86/X86ISelPattern.cpp:1.138	Sun May 15 01:07:10 2005
+++ llvm/lib/Target/X86/X86ISelPattern.cpp	Thu May 19 00:54:33 2005
@@ -3918,7 +3918,7 @@
   if (!isDirect) {
     BuildMI(BB, X86::TAILJMPr, 1).addReg(CalleeReg);
   } else if (GlobalAddressSDNode *GASD = dyn_cast<GlobalAddressSDNode>(Callee)){
-    BuildMI(BB, X86::TAILJMPd, 1).addGlobalAddress(GASD->getGlobal(),true);
+    BuildMI(BB, X86::TAILJMPd, 1).addGlobalAddress(GASD->getGlobal(), true);
   } else {
     ExternalSymbolSDNode *ESSDN = cast<ExternalSymbolSDNode>(Callee);
     BuildMI(BB, X86::TAILJMPd, 1).addExternalSymbol(ESSDN->getSymbol(), true);