diff options
author | Chris Lattner <sabre@nondot.org> | 2010-09-29 03:33:25 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-09-29 03:33:25 +0000 |
commit | 8a5072903e2037da1cfdaffa5a26be00f3d76a22 (patch) | |
tree | 29113b31bd0e320b5c5ac0e3f618c7fbfd243750 /lib | |
parent | 81100d0608efb1f4a4c87b9659b944ec0dfd86c8 (diff) | |
download | llvm-8a5072903e2037da1cfdaffa5a26be00f3d76a22.tar.gz llvm-8a5072903e2037da1cfdaffa5a26be00f3d76a22.tar.bz2 llvm-8a5072903e2037da1cfdaffa5a26be00f3d76a22.tar.xz |
implement support for 32-bit address operands in 64-bit mode, which
are defined to emit the 0x67 prefix byte. rdar://8482675
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115021 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Target/X86/X86MCCodeEmitter.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/lib/Target/X86/X86MCCodeEmitter.cpp b/lib/Target/X86/X86MCCodeEmitter.cpp index ed39abd119..c015451471 100644 --- a/lib/Target/X86/X86MCCodeEmitter.cpp +++ b/lib/Target/X86/X86MCCodeEmitter.cpp @@ -179,6 +179,18 @@ static MCFixupKind getImmFixupKind(uint64_t TSFlags) { } } +/// Is32BitMemOperand - Return true if the specified instruction with a memory +/// operand should emit the 0x67 prefix byte in 64-bit mode due to a 32-bit +/// memory operand. Op specifies the operand # of the memoperand. +static bool Is32BitMemOperand(const MCInst &MI, unsigned Op) { + const MCOperand &BaseReg = MI.getOperand(Op+X86::AddrBaseReg); + const MCOperand &IndexReg = MI.getOperand(Op+X86::AddrIndexReg); + + if (BaseReg.getReg() != 0 && X86::GR32RegClass.contains(BaseReg.getReg()) || + IndexReg.getReg() != 0 && X86::GR32RegClass.contains(IndexReg.getReg())) + return true; + return false; +} void X86MCCodeEmitter:: EmitImmediate(const MCOperand &DispOp, unsigned Size, MCFixupKind FixupKind, @@ -221,10 +233,10 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op, uint64_t TSFlags, unsigned &CurByte, raw_ostream &OS, SmallVectorImpl<MCFixup> &Fixups) const{ - const MCOperand &Disp = MI.getOperand(Op+3); - const MCOperand &Base = MI.getOperand(Op); - const MCOperand &Scale = MI.getOperand(Op+1); - const MCOperand &IndexReg = MI.getOperand(Op+2); + const MCOperand &Disp = MI.getOperand(Op+X86::AddrDisp); + const MCOperand &Base = MI.getOperand(Op+X86::AddrBaseReg); + const MCOperand &Scale = MI.getOperand(Op+X86::AddrScaleAmt); + const MCOperand &IndexReg = MI.getOperand(Op+X86::AddrIndexReg); unsigned BaseReg = Base.getReg(); // Handle %rip relative addressing. @@ -713,7 +725,8 @@ void X86MCCodeEmitter::EmitOpcodePrefix(uint64_t TSFlags, unsigned &CurByte, EmitByte(0x66, CurByte, OS); // Emit the address size opcode prefix as needed. - if (TSFlags & X86II::AdSize) + if ((TSFlags & X86II::AdSize) || + (MemOperand != -1 && Is64BitMode && Is32BitMemOperand(MI, MemOperand))) EmitByte(0x67, CurByte, OS); bool Need0FPrefix = false; |