[llvm-commits] [llvm] r148569 - in /llvm/trunk: lib/Target/X86/X86InstrControl.td test/MC/X86/intel-syntax-encoding.s

[Devang Patel]

Author: dpatel
Date: Fri Jan 20 15:14:06 2012
New Revision: 148569

URL: http://llvm.org/viewvc/llvm-project?rev=148569&view=rev
Log:
Intel syntax: For now, disable ambiguous JMP64pcrel32 for intel syntax.

Modified:
    llvm/trunk/lib/Target/X86/X86InstrControl.td
    llvm/trunk/test/MC/X86/intel-syntax-encoding.s

Modified: llvm/trunk/lib/Target/X86/X86InstrControl.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrControl.td?rev=148569&r1=148568&r2=148569&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrControl.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrControl.td Fri Jan 20 15:14:06 2012
@@ -43,8 +43,10 @@
                         "jmp\t$dst", [(br bb:$dst)]>;
   def JMP_1 : Ii8PCRel<0xEB, RawFrm, (outs), (ins brtarget8:$dst),
                        "jmp\t$dst", []>;
+  // FIXME : Intel syntax for JMP64pcrel32 such that it is not ambiguious
+  // with JMP_1.
   def JMP64pcrel32 : I<0xE9, RawFrm, (outs), (ins brtarget:$dst),
-                       "jmp{q}\t$dst", []>;
+                       "jmpq\t$dst", []>;
 }
 
 // Conditional Branches.

Modified: llvm/trunk/test/MC/X86/intel-syntax-encoding.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/X86/intel-syntax-encoding.s?rev=148569&r1=148568&r2=148569&view=diff
==============================================================================
--- llvm/trunk/test/MC/X86/intel-syntax-encoding.s (original)
+++ llvm/trunk/test/MC/X86/intel-syntax-encoding.s Fri Jan 20 15:14:06 2012
@@ -31,4 +31,7 @@
 // CHECK: encoding: [0x48,0x83,0xc0,0xf4]
 	add	rax, -12
 
-
+LBB0_3:
+// CHECK: encoding: [0xeb,A]
+	jmp	LBB0_3
+