[llvm] r290609 - [AArch64][AsmParser] Add support for parsing shift/extend operands with symbols.

Chad Rosier via llvm-commits llvm-commits at lists.llvm.org
Tue Dec 27 08:58:09 PST 2016


Author: mcrosier
Date: Tue Dec 27 10:58:09 2016
New Revision: 290609

URL: http://llvm.org/viewvc/llvm-project?rev=290609&view=rev
Log:
[AArch64][AsmParser] Add support for parsing shift/extend operands with symbols.

Differential Revision: https://reviews.llvm.org/D27953

Added:
    llvm/trunk/test/MC/AArch64/shift_extend_op_w_symbol.s
Modified:
    llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp

Modified: llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp?rev=290609&r1=290608&r2=290609&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp (original)
+++ llvm/trunk/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp Tue Dec 27 10:58:09 2016
@@ -2406,17 +2406,19 @@ AArch64AsmParser::tryParseOptionalShiftE
       return MatchOperand_ParseFail;
     }
 
-    // "extend" type operatoins don't need an immediate, #0 is implicit.
+    // "extend" type operations don't need an immediate, #0 is implicit.
     SMLoc E = SMLoc::getFromPointer(getLoc().getPointer() - 1);
     Operands.push_back(
         AArch64Operand::CreateShiftExtend(ShOp, 0, false, S, E, getContext()));
     return MatchOperand_Success;
   }
 
-  // Make sure we do actually have a number or a parenthesized expression.
+  // Make sure we do actually have a number, identifier or a parenthesized
+  // expression.
   SMLoc E = Parser.getTok().getLoc();
   if (!Parser.getTok().is(AsmToken::Integer) &&
-      !Parser.getTok().is(AsmToken::LParen)) {
+      !Parser.getTok().is(AsmToken::LParen) &&
+      !Parser.getTok().is(AsmToken::Identifier)) {
     Error(E, "expected integer shift amount");
     return MatchOperand_ParseFail;
   }

Added: llvm/trunk/test/MC/AArch64/shift_extend_op_w_symbol.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/AArch64/shift_extend_op_w_symbol.s?rev=290609&view=auto
==============================================================================
--- llvm/trunk/test/MC/AArch64/shift_extend_op_w_symbol.s (added)
+++ llvm/trunk/test/MC/AArch64/shift_extend_op_w_symbol.s Tue Dec 27 10:58:09 2016
@@ -0,0 +1,42 @@
+// RUN: not llvm-mc -triple aarch64-none-linux-gnu < %s 1> %t1 2> %t2
+// RUN: FileCheck < %t1 %s
+// RUN: FileCheck --check-prefix=CHECK-ERROR < %t2 %s
+
+        .globl _func
+_func:
+// CHECK-LABEL: _func
+
+        .set IMM2, 2
+        .equ IMM4, 4
+
+// Make sure we can use a symbol with the optionally shift left operand.
+
+        add w1, w2, w3, uxtb #IMM2
+        add w4, w5, w6, uxth #IMM4
+        add x7, x8, x9, lsl #IMM2
+        add w7, w8, w9, uxtw #IMM4
+        add x1, x2, x3, uxtx #IMM4
+
+// CHECK: add w1, w2, w3, uxtb #2
+// CHECK: add w4, w5, w6, uxth #4
+// CHECK: add x7, x8, x9, lsl #2
+// CHECK: add w7, w8, w9, uxtw #4
+// CHECK: add x1, x2, x3, uxtx #4
+
+        add w1, w2, w3, sxtb #IMM2
+        add w4, w5, w6, sxth #IMM4
+        add x7, x8, x9, lsl #IMM2
+        add w7, w8, w9, sxtw #IMM2
+        add x1, x2, x3, sxtx #IMM4
+
+// CHECK: add w1, w2, w3, sxtb #2
+// CHECK: add w4, w5, w6, sxth #4
+// CHECK: add x7, x8, x9, lsl #2
+// CHECK: add w7, w8, w9, sxtw #2
+// CHECK: add x1, x2, x3, sxtx #4
+
+        add w1, w2, w3, lsl #IMM3
+
+// CHECK-ERROR: error: expected constant '#imm' after shift specifier
+// CHECK-ERROR:        add w1, w2, w3, lsl #IMM3
+// CHECK-ERROR:                             ^




More information about the llvm-commits mailing list