lcall and ljmp always default to lcalll and ljmpl. This finally

wraps up r8418316

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@113949 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index acee68c54ef18342a5559498cbb6f04e5097b2c6..303a0f282adc0a65b5854c3ebfaa9512694d5bca 100644 (file)
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -979,16 +979,6 @@ ParseInstruction(StringRef Name, SMLoc NameLoc,
                                                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 @@ ParseInstruction(StringRef Name, SMLoc NameLoc,
     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;
 }
 

diff --git a/test/MC/AsmParser/X86/x86_32-new-encoder.s b/test/MC/AsmParser/X86/x86_32-new-encoder.s
index f5a53bf4eac9ed0390b90f995bb939fcf6e29281..e24fce27236e9df8bf91884988573fd0de574b9c 100644 (file)
--- a/test/MC/AsmParser/X86/x86_32-new-encoder.s
+++ b/test/MC/AsmParser/X86/x86_32-new-encoder.s
@@ -551,4 +551,14 @@ lcalll     $0x7ace,$0x7ace
 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
+