[PATCH] D104195: [ms] [llvm-ml] When parsing MASM, "jmp short" instructions are case insensitive

[Eric Astor via Phabricator via llvm-commits]

epastor created this revision.
epastor added reviewers: thakis, mstorsjo.
Herald added subscribers: pengfei, hiraditya.
epastor requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added subscribers: llvm-commits, sstefan1.
Herald added a project: LLVM.

Handle "short" in a case-insensitive fashion in MASM.

Required to correctly parse z_Windows_NT-586_asm.asm from the OpenMP runtime.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D104195

Files:
  llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
  llvm/test/tools/llvm-ml/jmp_short.asm


Index: llvm/test/tools/llvm-ml/jmp_short.asm
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-ml/jmp_short.asm
@@ -0,0 +1,21 @@
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+
+.code
+
+t1:
+  jmp short t1_label
+  jmp SHORT t1_label
+  JmP Short t1_label
+  JMP SHORT t1_label
+  mov eax, eax
+t1_label:
+  ret
+
+; CHECK-LABEL: t1:
+; CHECK-NEXT: jmp t1_label
+; CHECK-NEXT: jmp t1_label
+; CHECK-NEXT: jmp t1_label
+; CHECK-NEXT: jmp t1_label
+; CHECK-NEXT: mov eax, eax
+
+end
Index: llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
===================================================================
--- llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -3105,7 +3105,8 @@
        (PatchedName.startswith("j") &&
         ParseConditionCode(PatchedName.substr(1)) != X86::COND_INVALID))) {
     StringRef NextTok = Parser.getTok().getString();
-    if (NextTok == "short") {
+    if (Parser.isParsingMasm() ? NextTok.equals_lower("short")
+                               : NextTok == "short") {
       SMLoc NameEndLoc =
           NameLoc.getFromPointer(NameLoc.getPointer() + Name.size());
       // Eat the short keyword.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D104195.351721.patch
Type: text/x-patch
Size: 1243 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210613/a09ad25f/attachment.bin>