diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2009-05-05 18:18:57 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2009-05-05 18:18:57 +0000 |
| commit | a0b42d64f3ce57c5705df899626709df400098a5 (patch) | |
| tree | d1f3470ce13ac782f68ded022b2cf4b878d95dc7 /lib/Target/X86 | |
| parent | 93ea95e5736ba37b99b963431d1b826870c2c54e (diff) | |
| download | external_llvm-a0b42d64f3ce57c5705df899626709df400098a5.zip external_llvm-a0b42d64f3ce57c5705df899626709df400098a5.tar.gz external_llvm-a0b42d64f3ce57c5705df899626709df400098a5.tar.bz2 | |
Revert part of 70929 that has to do with determining whether a SIB byte is needed. It causes a lot of x86_64 JIT failures.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@70986 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86')
| -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 e0396cf..c54a996 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 0a3103a..50115c2 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 |