replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Evan Cheng 2009-03-12 18:15:39 +00:00
parent 85ba59eade
commit 2a332aa866
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
View File

@ -308,8 +308,9 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
} }
case MachineOperand::MO_Immediate: case MachineOperand::MO_Immediate:
if (!Modifier || if (!Modifier || (strcmp(Modifier, "debug") &&
(strcmp(Modifier, "debug") && strcmp(Modifier, "mem"))) strcmp(Modifier, "mem") &&
strcmp(Modifier, "call")))
O << '$'; O << '$';
O << MO.getImm(); O << MO.getImm();
return; return;

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

@ -589,6 +589,12 @@ void Emitter::emitInstruction(const MachineInstr &MI,
} else if (MO.isSymbol()) { } else if (MO.isSymbol()) {
emitExternalSymbolAddress(MO.getSymbolName(), X86::reloc_pcrel_word); emitExternalSymbolAddress(MO.getSymbolName(), X86::reloc_pcrel_word);
} else if (MO.isImm()) { } else if (MO.isImm()) {
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)); emitConstant(MO.getImm(), X86InstrInfo::sizeOfImm(Desc));
} else { } else {
assert(0 && "Unknown RawFrm operand!"); assert(0 && "Unknown RawFrm operand!");

6
llvm/lib/Target/X86/X86Instr64bit.td
View File

@ -109,8 +109,10 @@ let isCall = 1 in
XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7, XMM0, XMM1, XMM2, XMM3, XMM4, XMM5, XMM6, XMM7,
XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS], XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS],
Uses = [RSP] in { Uses = [RSP] in {
def CALL64pcrel32 : I<0xE8, RawFrm, (outs), (ins i64imm:$dst, variable_ops), def CALL64pcrel32 : I<0xE8, RawFrm,
"call\t${dst:call}", []>; (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), def CALL64r : I<0xFF, MRM2r, (outs), (ins GR64:$dst, variable_ops),
"call\t{*}$dst", [(X86call GR64:$dst)]>; "call\t{*}$dst", [(X86call GR64:$dst)]>;
def CALL64m : I<0xFF, MRM2m, (outs), (ins i64mem:$dst, variable_ops), def CALL64m : I<0xFF, MRM2m, (outs), (ins i64mem:$dst, variable_ops),

3
llvm/lib/Target/X86/X86InstrInfo.td
View File

@ -493,7 +493,8 @@ let isCall = 1 in
XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS], XMM8, XMM9, XMM10, XMM11, XMM12, XMM13, XMM14, XMM15, EFLAGS],
Uses = [ESP] in { Uses = [ESP] in {
def CALLpcrel32 : Ii32<0xE8, RawFrm, (outs), (ins i32imm:$dst,variable_ops), 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), def CALL32r : I<0xFF, MRM2r, (outs), (ins GR32:$dst, variable_ops),
"call\t{*}$dst", [(X86call GR32:$dst)]>; "call\t{*}$dst", [(X86call GR32:$dst)]>;
def CALL32m : I<0xFF, MRM2m, (outs), (ins i32mem:$dst, variable_ops), def CALL32m : I<0xFF, MRM2m, (outs), (ins i32mem:$dst, variable_ops),