[llvm-commits] [llvm] r113949 - in /llvm/trunk: lib/Target/X86/AsmParser/X86AsmParser.cpp test/MC/AsmParser/X86/x86_32-new-encoder.s

[Chris Lattner]

Author: lattner
Date: Wed Sep 15 00:30:20 2010
New Revision: 113949

URL: http://llvm.org/viewvc/llvm-project?rev=113949&view=rev
Log:
lcall and ljmp always default to lcalll and ljmpl.  This finally
wraps up r8418316

Modified:
    llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
    llvm/trunk/test/MC/AsmParser/X86/x86_32-new-encoder.s

Modified: llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp?rev=113949&r1=113948&r2=113949&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmParser/X86AsmParser.cpp Wed Sep 15 00:30:20 2010
@@ -979,16 +979,6 @@
                                                NameLoc, NameLoc));
   }
   
-  // lcall *x  and ljmp *x  -> lcalll and ljmpl
-  if ((Name == "lcall" || Name == "ljmp") &&
-      Operands.size() == 3 &&
-      static_cast<X86Operand*>(Operands[1])->isToken() &&
-      static_cast<X86Operand*>(Operands[1])->getToken() == "*") {
-    delete Operands[0];
-    Operands[0] = X86Operand::CreateToken(Name == "lcall" ? "lcalll" : "ljmpl",
-                                          NameLoc);
-  }
-  
   // jmp $42,$5 -> ljmp, similarly for call.
   if ((Name.startswith("call") || Name.startswith("jmp")) &&
       Operands.size() == 3 &&
@@ -1007,9 +997,17 @@
     if (NewOpName) {
       delete Operands[0];
       Operands[0] = X86Operand::CreateToken(NewOpName, NameLoc);
+      Name = NewOpName;
     }
   }
   
+  // lcall  and ljmp  -> lcalll and ljmpl
+  if ((Name == "lcall" || Name == "ljmp") && Operands.size() == 3) {
+    delete Operands[0];
+    Operands[0] = X86Operand::CreateToken(Name == "lcall" ? "lcalll" : "ljmpl",
+                                          NameLoc);
+  }
+  
   return false;
 }
 

Modified: llvm/trunk/test/MC/AsmParser/X86/x86_32-new-encoder.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/X86/x86_32-new-encoder.s?rev=113949&r1=113948&r2=113949&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/X86/x86_32-new-encoder.s (original)
+++ llvm/trunk/test/MC/AsmParser/X86/x86_32-new-encoder.s Wed Sep 15 00:30:20 2010
@@ -551,4 +551,14 @@
 jmpl	$0x7ace,$0x7ace
 ljmpl	$0x7ace,$0x7ace
 
+// CHECK: lcalll	$31438, $31438
+// CHECK: lcalll	$31438, $31438
+// CHECK: ljmpl	$31438, $31438
+// CHECK: ljmpl	$31438, $31438
+
+call	$0x7ace,$0x7ace
+lcall	$0x7ace,$0x7ace
+jmp	$0x7ace,$0x7ace
+ljmp	$0x7ace,$0x7ace
+