[llvm] r262313 - AsmParser: Fix nested .irp/.irpc

Nikolay Haustov via llvm-commits llvm-commits at lists.llvm.org
Tue Mar 1 00:18:29 PST 2016


Author: nhaustov
Date: Tue Mar  1 02:18:28 2016
New Revision: 262313

URL: http://llvm.org/viewvc/llvm-project?rev=262313&view=rev
Log:
AsmParser: Fix nested .irp/.irpc

Count .irp/.irpc in parseMacroLikeBody similar to .rept
Update tests.

Review: http://reviews.llvm.org/D17707

Modified:
    llvm/trunk/lib/MC/MCParser/AsmParser.cpp
    llvm/trunk/test/MC/AsmParser/macro-irp.s
    llvm/trunk/test/MC/AsmParser/macro-irpc.s

Modified: llvm/trunk/lib/MC/MCParser/AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCParser/AsmParser.cpp?rev=262313&r1=262312&r2=262313&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCParser/AsmParser.cpp (original)
+++ llvm/trunk/lib/MC/MCParser/AsmParser.cpp Tue Mar  1 02:18:28 2016
@@ -4707,7 +4707,9 @@ MCAsmMacro *AsmParser::parseMacroLikeBod
     }
 
     if (Lexer.is(AsmToken::Identifier) &&
-        (getTok().getIdentifier() == ".rept")) {
+        (getTok().getIdentifier() == ".rept" ||
+         getTok().getIdentifier() == ".irp" ||
+         getTok().getIdentifier() == ".irpc")) {
       ++NestLevel;
     }
 

Modified: llvm/trunk/test/MC/AsmParser/macro-irp.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/macro-irp.s?rev=262313&r1=262312&r2=262313&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/macro-irp.s (original)
+++ llvm/trunk/test/MC/AsmParser/macro-irp.s Tue Mar  1 02:18:28 2016
@@ -6,3 +6,16 @@
 
 // CHECK: pushl %eax
 // CHECK: pushl %ebx
+
+.irp reg,%eax,%ebx
+.irp imm,4,3,5
+        addl \reg, \imm
+.endr
+.endr
+
+// CHECK: addl %eax, 4
+// CHECK: addl %eax, 3
+// CHECK: addl %eax, 5
+// CHECK: addl %ebx, 4
+// CHECK: addl %ebx, 3
+// CHECK: addl %ebx, 5

Modified: llvm/trunk/test/MC/AsmParser/macro-irpc.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AsmParser/macro-irpc.s?rev=262313&r1=262312&r2=262313&view=diff
==============================================================================
--- llvm/trunk/test/MC/AsmParser/macro-irpc.s (original)
+++ llvm/trunk/test/MC/AsmParser/macro-irpc.s Tue Mar  1 02:18:28 2016
@@ -7,3 +7,16 @@
 // CHECK: long 1
 // CHECK: long 2
 // CHECK: long 3
+
+.irpc foo,123
+.irpc bar,45
+        addl %eax, \foo\bar
+.endr
+.endr
+
+// CHECK: addl %eax, 14
+// CHECK: addl %eax, 15
+// CHECK: addl %eax, 24
+// CHECK: addl %eax, 25
+// CHECK: addl %eax, 34
+// CHECK: addl %eax, 35




More information about the llvm-commits mailing list