[llvm-commits] [llvm] r95690 - /llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp

[Chris Lattner]

Author: lattner
Date: Tue Feb  9 15:21:26 2010
New Revision: 95690

URL: http://llvm.org/viewvc/llvm-project?rev=95690&view=rev
Log:
revert r95689: getX86RegNum(BaseReg) != N86::ESP is
a confusing idiom to check for ESP or RSP.

Modified:
    llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp

Modified: llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp?rev=95690&r1=95689&r2=95690&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86CodeEmitter.cpp Tue Feb  9 15:21:26 2010
@@ -389,8 +389,8 @@
   // 2-7) and absolute references.
   if ((!Is64BitMode || DispForReloc || BaseReg != 0) &&
       IndexReg.getReg() == 0 && 
-      ((BaseReg == 0 && IsPCRel) || BaseReg == X86::RIP || 
-       (BaseReg != 0 && BaseReg != X86::ESP))) {
+      ((BaseReg == 0 && MCE.earlyResolveAddresses()) || BaseReg == X86::RIP || 
+       (BaseReg != 0 && getX86RegNum(BaseReg) != N86::ESP))) {
     if (BaseReg == 0 || BaseReg == X86::RIP) {  // Just a displacement?
       // Emit special case [disp32] encoding
       MCE.emitByte(ModRMByte(0, RegOpcodeField, 5));