diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/X86/X86CodeEmitter.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Target/X86/X86CodeEmitter.cpp b/lib/Target/X86/X86CodeEmitter.cpp index e0396cfc2f..c54a996cb2 100644 --- a/lib/Target/X86/X86CodeEmitter.cpp +++ b/lib/Target/X86/X86CodeEmitter.cpp @@ -338,8 +338,8 @@ void Emitter::emitMemModRMByte(const MachineInstr &MI, unsigned BaseReg = Base.getReg(); // Is a SIB byte needed? - if (IndexReg.getReg() == 0 && (!Is64BitMode || BaseReg != 0) && - (BaseReg == 0 || getX86RegNum(BaseReg) != N86::ESP)) { + if ((!Is64BitMode || DispForReloc) && IndexReg.getReg() == 0 && + (BaseReg == 0 || getX86RegNum(BaseReg) != N86::ESP)) { if (BaseReg == 0) { // Just a displacement? // Emit special case [disp32] encoding MCE.emitByte(ModRMByte(0, RegOpcodeField, 5)); diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index 0a3103af09..50115c29ca 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -2811,7 +2811,7 @@ static unsigned getMemModRMByteSize(const MachineInstr &MI, unsigned Op, unsigned BaseReg = Base.getReg(); // Is a SIB byte needed? - if (IndexReg.getReg() == 0 && (!Is64BitMode || BaseReg != 0) && + if ((!Is64BitMode || DispForReloc) && IndexReg.getReg() == 0 && (BaseReg == 0 || X86RegisterInfo::getX86RegNum(BaseReg) != N86::ESP)) { if (BaseReg == 0) { // Just a displacement? // Emit special case [disp32] encoding |