From: Chris Lattner <sabre@nondot.org>
Date: Tue, 9 Feb 2010 21:21:26 +0000 (+0000)
Subject: revert r95689: getX86RegNum(BaseReg) != N86::ESP is
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32f9a2c54e6fbb980146c8c92894bed22cd67610;p=oota-llvm.git

revert r95689: getX86RegNum(BaseReg) != N86::ESP is
a confusing idiom to check for ESP or RSP.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@95690 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp
index 3f7c42559b2..859eb909d94 100644
--- a/lib/Target/X86/X86CodeEmitter.cpp
+++ b/lib/Target/X86/X86CodeEmitter.cpp
@@ -389,8 +389,8 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
   // 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));