summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Target/X86/X86CodeEmitter.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-02-09 21:21:26 +0000
committerChris Lattner <sabre@nondot.org>2010-02-09 21:21:26 +0000
commit45d89644ae2f3296e4a07657c1aa81c365a1dcd0 (patch)
treeffbe1a9f5125edd063007503b29e834318a061a1 /llvm/lib/Target/X86/X86CodeEmitter.cpp
parente464a4d815a2e01061afa970b028c6aecf151dad (diff)
downloadbcm5719-llvm-45d89644ae2f3296e4a07657c1aa81c365a1dcd0.tar.gz
bcm5719-llvm-45d89644ae2f3296e4a07657c1aa81c365a1dcd0.zip
revert r95689: getX86RegNum(BaseReg) != N86::ESP is
a confusing idiom to check for ESP or RSP. llvm-svn: 95690
Diffstat (limited to 'llvm/lib/Target/X86/X86CodeEmitter.cpp')
-rw-r--r--llvm/lib/Target/X86/X86CodeEmitter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp
index 3f7c42559b2..859eb909d94 100644
--- a/llvm/lib/Target/X86/X86CodeEmitter.cpp
+++ b/llvm/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));
OpenPOWER on IntegriCloud