diff options
| author | Dan Gohman <gohman@apple.com> | 2009-03-11 23:01:47 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2009-03-11 23:01:47 +0000 |
| commit | 30143763b9a4b670ccb5b064626fbe90ff97830a (patch) | |
| tree | e985a4a517b8190f65e08a547070758f834b7323 | |
| parent | c40d4f85ddd6f822480f91dacd9646eec055c4ca (diff) | |
| download | llvm-30143763b9a4b670ccb5b064626fbe90ff97830a.tar.gz llvm-30143763b9a4b670ccb5b064626fbe90ff97830a.tar.bz2 llvm-30143763b9a4b670ccb5b064626fbe90ff97830a.tar.xz | |
Revert r66024. The JIT encoding for CALLpcrel32 is wrong -- see PR3773, and the
assembly text output uses an indirect call ("call *") instead of a direct call.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66735 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/X86/X86Instr64bit.td | 6 | ||||
| -rw-r--r-- | lib/Target/X86/X86InstrInfo.td | 3 | ||||
| -rw-r--r-- | test/CodeGen/X86/call-imm.ll | 9 |
4 files changed, 4 insertions, 18 deletions
diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp index 2030d81260..8020fb1cf3 100644 --- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp +++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp @@ -308,9 +308,7 @@ void X86ATTAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo, } case MachineOperand::MO_Immediate: - if (Modifier && !strcmp(Modifier, "call")) - O << '*'; - else if (!Modifier || + if (!Modifier || (strcmp(Modifier, "debug") && strcmp(Modifier, "mem"))) O << '$'; O << MO.getImm(); diff --git a/lib/Target/X86/X86Instr64bit.td b/lib/Target/X86/X86Instr64bit.td index a6c0800c80..65070d35f5 100644 --- a/lib/Target/X86/X86Instr64bit.td +++ b/lib/Target/X86/X86Instr64bit.td @@ -109,10 +109,8 @@ 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 i64i32imm:$dst, variable_ops), - "call\t${dst:call}", [(X86call imm:$dst)]>, - Requires<[In64BitMode]>; + def CALL64pcrel32 : I<0xE8, RawFrm, (outs), (ins i64imm:$dst, variable_ops), + "call\t${dst:call}", []>; 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), diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td index 64d002171a..0b13cc04a3 100644 --- a/lib/Target/X86/X86InstrInfo.td +++ b/lib/Target/X86/X86InstrInfo.td @@ -493,8 +493,7 @@ 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}", [(X86call imm:$dst)]>, - Requires<[In32BitMode]>; + "call\t${dst:call}", []>; 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), diff --git a/test/CodeGen/X86/call-imm.ll b/test/CodeGen/X86/call-imm.ll deleted file mode 100644 index 25b911f597..0000000000 --- a/test/CodeGen/X86/call-imm.ll +++ /dev/null @@ -1,9 +0,0 @@ -; RUN: llvm-as < %s | llc -march=x86 | grep call | grep 12345678 -; RUN: llvm-as < %s | llc -march=x86-64 | grep call | grep 12345678 -; PR3666 - -define i32 @main() nounwind { -entry: - %0 = call i32 inttoptr (i32 12345678 to i32 (i32)*)(i32 0) nounwind ; <i32> [#uses=1] - ret i32 %0 -} |