forked from OSchip/llvm-project
Re-apply 66024 with fixes: 1. Fixed indirect call to immediate address assembly. 2. Fixed JIT encoding by making the address pc-relative.
llvm-svn: 66803
This commit is contained in:
parent
85ba59eade
commit
2a332aa866
|
@ -308,8 +308,9 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
|
|||
}
|
||||
|
||||
case MachineOperand::MO_Immediate:
|
||||
if (!Modifier ||
|
||||
(strcmp(Modifier, "debug") && strcmp(Modifier, "mem")))
|
||||
if (!Modifier || (strcmp(Modifier, "debug") &&
|
||||
strcmp(Modifier, "mem") &&
|
||||
strcmp(Modifier, "call")))
|
||||
O << '$';
|
||||
O << MO.getImm();
|
||||
return;
|
||||
|
|
|
@ -589,7 +589,13 @@ void Emitter::emitInstruction(const MachineInstr &MI,
|
|||
} else if (MO.isSymbol()) {
|
||||
emitExternalSymbolAddress(MO.getSymbolName(), X86::reloc_pcrel_word);
|
||||
} else if (MO.isImm()) {
|
||||
emitConstant(MO.getImm(), X86InstrInfo::sizeOfImm(Desc));
|
||||
if (Opcode == X86::CALLpcrel32 || Opcode == X86::CALL64pcrel32) {
|
||||
// Fix up immediate operand for pc relative calls.
|
||||
intptr_t Imm = (intptr_t)MO.getImm();
|
||||
Imm = Imm - MCE.getCurrentPCValue() - 4;
|
||||
emitConstant(Imm, X86InstrInfo::sizeOfImm(Desc));
|
||||
} else
|
||||
emitConstant(MO.getImm(), X86InstrInfo::sizeOfImm(Desc));
|
||||
} else {
|
||||
assert(0 && "Unknown RawFrm operand!");
|
||||
}
|
||||
|
|
|
@ -109,8 +109,10 @@ let isCall = 1 in
|
|||
XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7,
|
||||
XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS],
|
||||
Uses = [RSP] in {
|
||||
def CALL64pcrel32 : I<0xE8, RawFrm, (outs), (ins i64imm:$dst, variable_ops),
|
||||
"call\t${dst:call}", []>;
|
||||
def CALL64pcrel32 : I<0xE8, RawFrm,
|
||||
(outs), (ins i64i32imm:$dst, variable_ops),
|
||||
"call\t${dst:call}", [(X86call imm:$dst)]>,
|
||||
Requires<[In64BitMode]>;
|
||||
def CALL64r : I<0xFF, MRM2r, (outs), (ins GR64:$dst, variable_ops),
|
||||
"call\t{*}$dst", [(X86call GR64:$dst)]>;
|
||||
def CALL64m : I<0xFF, MRM2m, (outs), (ins i64mem:$dst, variable_ops),
|
||||
|
|
|
@ -493,7 +493,8 @@ let isCall = 1 in
|
|||
XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS],
|
||||
Uses = [ESP] in {
|
||||
def CALLpcrel32 : Ii32<0xE8, RawFrm, (outs), (ins i32imm:$dst,variable_ops),
|
||||
"call\t${dst:call}", []>;
|
||||
"call\t${dst:call}", [(X86call imm:$dst)]>,
|
||||
Requires<[In32BitMode]>;
|
||||
def CALL32r : I<0xFF, MRM2r, (outs), (ins GR32:$dst, variable_ops),
|
||||
"call\t{*}$dst", [(X86call GR32:$dst)]>;
|
||||
def CALL32m : I<0xFF, MRM2m, (outs), (ins i32mem:$dst, variable_ops),
|
||||
|
|
Loading…
Reference in New Issue