[X86][Asm]Allow far jmp/call to be picked when using explicit FWORD size specifier

[coby]

Summary

Currently, far jmp/call which utilizes a 48bit memory operand would have been invoked via the 'lcall/ljmp' mnemonic (intel style).
This patch align those variants to formal intel spec

[craig.topper]

Is this consistent with GNU assembler behavior? Or does GNU assembler accept both versions?

[coby]

In D35846#827607, @craig.topper wrote:

Is this consistent with GNU assembler behavior? Or does GNU assembler accept both versions?

Both, as do we, via this change

[RKSimon]

In D35846#833693, @coby wrote:

In D35846#827607, @craig.topper wrote:

Is this consistent with GNU assembler behavior? Or does GNU assembler accept both versions?

Both, as do we, via this change

So should we test for it as well as the intel syntax?

[coby]

So should we test for it as well as the intel syntax?

Added some missing tests (intel & gnu)

[craig.topper]

I'm happy with this if @RKSimon is happy.

[RKSimon]

LGTM

llvm/trunk/lib/Target/X86/X86InstrControl.td

let isBranch = 1, isTerminator = 1, isBarrier = 1, isIndirectBranch = 1 in {
   def FARJMP64   : RI<0xFF, MRM5m, (outs), (ins opaque80mem:$dst),
                       "ljmp{q}\t{*}$dst", [], IIC_JMP_FAR_MEM>,
                    Sched<[WriteJump]>;
 
   def FARJMP16m  : I<0xFF, MRM5m, (outs), (ins opaque32mem:$dst),
                      "ljmp{w}\t{*}$dst", [], IIC_JMP_FAR_MEM>, OpSize16,
                    Sched<[WriteJumpLd]>;
   def FARJMP32m  : I<0xFF, MRM5m, (outs), (ins opaque48mem:$dst),
-                     "ljmp{l}\t{*}$dst", [], IIC_JMP_FAR_MEM>, OpSize32,
+                     "{l}jmp{l}\t{*}$dst", [], IIC_JMP_FAR_MEM>, OpSize32,
                    Sched<[WriteJumpLd]>;
 }
 
 
 // Loop instructions
 let SchedRW = [WriteJump] in {
 def LOOP   : Ii8PCRel<0xE2, RawFrm, (outs), (ins brtarget8:$dst), "loop\t$dst", [], IIC_LOOP>;
 def LOOPE  : Ii8PCRel<0xE1, RawFrm, (outs), (ins brtarget8:$dst), "loope\t$dst", [], IIC_LOOPE>;
let Predicates = [Not64BitMode] in {
                                "lcall{l}\t$seg, $off", [],
                                IIC_CALL_FAR_PTR>, OpSize32, Sched<[WriteJump]>;
     }
 
     def FARCALL16m  : I<0xFF, MRM3m, (outs), (ins opaque32mem:$dst),
                         "lcall{w}\t{*}$dst", [], IIC_CALL_FAR_MEM>, OpSize16,
                       Sched<[WriteJumpLd]>;
     def FARCALL32m  : I<0xFF, MRM3m, (outs), (ins opaque48mem:$dst),
-                        "lcall{l}\t{*}$dst", [], IIC_CALL_FAR_MEM>, OpSize32,
+                        "{l}call{l}\t{*}$dst", [], IIC_CALL_FAR_MEM>, OpSize32,
                       Sched<[WriteJumpLd]>;
   }
 
 
 // Tail call stuff.
 let isCall = 1, isTerminator = 1, isReturn = 1, isBarrier = 1,
     isCodeGenOnly = 1, SchedRW = [WriteJumpLd] in
   let Uses = [ESP] in {

llvm/trunk/test/MC/X86/intel-syntax.s

 
 // CHECK: leaq    _foo(%rax), %rdx
   lea RDX, [_foo + RAX]
 // CHECK: leaq    8(%rax), %rdx
   lea RDX, [number + RAX]
 // CHECK: leaq    8(%rax), %rdx
   lea RDX, [8 + RAX]
 
+// CHECK: lcalll *(%rax)
+  call FWORD ptr [rax]
+// CHECK: lcalll *(%rax)
+  lcall [rax]
+// CHECK: ljmpl *(%rax)
+  jmp FWORD ptr [rax]
+// CHECK: ljmpl *(%rax)
+  ljmp [rax]
+
 // CHECK: movl  $257, -4(%rsp)
   mov DWORD PTR [RSP - 4], 257
 // CHECK: movl  $258, 4(%rsp)
   mov DWORD PTR [RSP + 4], 258
 // CHECK: movq  $123, -16(%rsp)
   mov QWORD PTR [RSP - 16], 123
 // CHECK: movb  $97, -17(%rsp)
   mov BYTE PTR [RSP - 17], 97

llvm/trunk/test/MC/X86/x86-64.s

 // CHECK: sldtl %ecx
 // CHECK: encoding: [0x0f,0x00,0xc1]
 // CHECK: sldtw %cx
 // CHECK: encoding: [0x66,0x0f,0x00,0xc1]
 
 sldt  %ecx
 sldt  %cx
 
-// CHECK: lcalll  *3135175374 
-// CHECK: ljmpl *3135175374
-lcall *0xbadeface
-ljmp  *0xbadeface
-
+// CHECK: lcalll *3135175374 
+// CHECK: ljmpl  *3135175374
+// CHECK: lcalll *(%rax)
+// CHECK: ljmpl *(%rax)
+lcall  *0xbadeface
+ljmp *0xbadeface
+lcall *(%rax)
+ljmpl *(%rax)
 
 // rdar://8444631
 // CHECK: enter $31438, $0
 // CHECK: encoding: [0xc8,0xce,0x7a,0x00]
 // CHECK: enter $31438, $1
 // CHECK: encoding: [0xc8,0xce,0x7a,0x01]
 // CHECK: enter $31438, $127
 // CHECK: encoding: [0xc8,0xce,0x7a,0x7f]