[llvm-commits] [llvm] r66735 - in /llvm/trunk: lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp lib/Target/X86/X86Instr64bit.td lib/Target/X86/X86InstrInfo.td test/CodeGen/X86/call-imm.ll

[Evan Cheng]

On Mar 11, 2009, at 4:01 PM, Dan Gohman wrote:

> Author: djg
> Date: Wed Mar 11 18:01:47 2009
> New Revision: 66735
>
> URL: http://llvm.org/viewvc/llvm-project?rev=66735&view=rev
> Log:
> Revert r66024. The JIT encoding for CALLpcrel32 is wrong -- see  
> PR3773, and the

Ok.

> assembly text output uses an indirect call ("call *") instead of a  
> direct call.

That should be fine.  "call 0x1234" is not legal assembly, "call  
*0x1234" really would branch to address 0x1234 as far as I can tell.

Evan

>
> Removed:
>    llvm/trunk/test/CodeGen/X86/call-imm.ll
> Modified:
>    llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
>    llvm/trunk/lib/Target/X86/X86Instr64bit.td
>    llvm/trunk/lib/Target/X86/X86InstrInfo.td
>
> Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=66735&r1=66734&r2=66735&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp  
> (original)
> +++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Wed  
> Mar 11 18:01:47 2009
> @@ -308,9 +308,7 @@
>   }
>
>   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();
>
> Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=66735&r1=66734&r2=66735&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original)
> +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Wed Mar 11 18:01:47  
> 2009
> @@ -109,10 +109,8 @@
>               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),
>
> Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=66735&r1=66734&r2=66735&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original)
> +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Wed Mar 11 18:01:47 2009
> @@ -493,8 +493,7 @@
>               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),
>
> Removed: llvm/trunk/test/CodeGen/X86/call-imm.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/call-imm.ll?rev=66734&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/CodeGen/X86/call-imm.ll (original)
> +++ llvm/trunk/test/CodeGen/X86/call-imm.ll (removed)
> @@ -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
> -}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits