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 | a35aed567a09d310c9c9026470212a9919db8011 (patch) | |
| tree | 2d8fb480d36fec0cd5ce9fe6802acff484a17816 /llvm/lib/Target/X86/X86CodeEmitter.cpp | |
| parent | eaefb3a8ca0d0da36961e7a3ea5ace204cadce73 (diff) | |
| download | bcm5719-llvm-a35aed567a09d310c9c9026470212a9919db8011.tar.gz bcm5719-llvm-a35aed567a09d310c9c9026470212a9919db8011.zip | |
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.
llvm-svn: 70986
Diffstat (limited to 'llvm/lib/Target/X86/X86CodeEmitter.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86CodeEmitter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp index e0396cfc2fd..c54a996cb23 100644 --- a/llvm/lib/Target/X86/X86CodeEmitter.cpp +++ b/llvm/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)); |
