maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Evan Cheng 2009-05-05 18:18:57 +00:00
parent eaefb3a8ca
commit a35aed567a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/X86/X86CodeEmitter.cpp
View File

@ -338,8 +338,8 @@ void Emitter::emitMemModRMByte(const MachineInstr &MI,
unsigned BaseReg = Base.getReg(); unsigned BaseReg = Base.getReg();
// Is a SIB byte needed? // Is a SIB byte needed?
if (IndexReg.getReg() == 0 && (!Is64BitMode || BaseReg != 0) && if ((!Is64BitMode || DispForReloc) && IndexReg.getReg() == 0 &&
(BaseReg == 0 || getX86RegNum(BaseReg) != N86::ESP)) { (BaseReg == 0 || getX86RegNum(BaseReg) != N86::ESP)) {
if (BaseReg == 0) { // Just a displacement? if (BaseReg == 0) { // Just a displacement?
// Emit special case [disp32] encoding // Emit special case [disp32] encoding
MCE.emitByte(ModRMByte(0, RegOpcodeField, 5)); MCE.emitByte(ModRMByte(0, RegOpcodeField, 5));

2
llvm/lib/Target/X86/X86InstrInfo.cpp
View File

@ -2811,7 +2811,7 @@ static unsigned getMemModRMByteSize(const MachineInstr &MI, unsigned Op,
unsigned BaseReg = Base.getReg(); unsigned BaseReg = Base.getReg();
// Is a SIB byte needed? // 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)) { (BaseReg == 0 || X86RegisterInfo::getX86RegNum(BaseReg) != N86::ESP)) {
if (BaseReg == 0) { // Just a displacement? if (BaseReg == 0) { // Just a displacement?
// Emit special case [disp32] encoding // Emit special case [disp32] encoding