summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-02-09 21:00:12 +0000
committerChris Lattner <sabre@nondot.org>2010-02-09 21:00:12 +0000
commite464a4d815a2e01061afa970b028c6aecf151dad (patch)
tree2f405cb94bf7158c83c53813a6be025d83b392ec /llvm/lib
parent8d3aa40bae2ff92899c350461e2bc34997181cec (diff)
downloadbcm5719-llvm-e464a4d815a2e01061afa970b028c6aecf151dad.tar.gz
bcm5719-llvm-e464a4d815a2e01061afa970b028c6aecf151dad.zip
simplify.
llvm-svn: 95689
Diffstat (limited to 'llvm/lib')
-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 859eb909d94..3f7c42559b2 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 && MCE.earlyResolveAddresses()) || BaseReg == X86::RIP ||
- (BaseReg != 0 && getX86RegNum(BaseReg) != N86::ESP))) {
+ ((BaseReg == 0 && IsPCRel) || BaseReg == X86::RIP ||
+ (BaseReg != 0 && BaseReg != X86::ESP))) {
if (BaseReg == 0 || BaseReg == X86::RIP) { // Just a displacement?
// Emit special case [disp32] encoding
MCE.emitByte(ModRMByte(0, RegOpcodeField, 5));
OpenPOWER on IntegriCloud