From bd847644b3aa71eb03cb5c71ef96c22ce9183505 Mon Sep 17 00:00:00 2001 From: Jim Grosbach Date: Tue, 23 Sep 2014 22:16:02 +0000 Subject: [PATCH] AArch64: allow constant expressions for shifted reg literals e.g., add w1, w2, w3, lsl #(2 - 1) This sort of thing comes up in pre-processed assembly playing macro games. Still validate that it's an assembly time constant. The early exit error check was just a bit overzealous and disallowed a left paren. rdar://18430542 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218336 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp | 13 +++++++------ test/MC/AArch64/basic-a64-instructions.s | 12 ++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp index c4f5449d869..1c92c8c07b8 100644 --- a/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp +++ b/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp @@ -2299,10 +2299,11 @@ AArch64AsmParser::tryParseOptionalShiftExtend(OperandVector &Operands) { if (Hash) Parser.Lex(); // Eat the '#'. - // Make sure we do actually have a number - if (!Parser.getTok().is(AsmToken::Integer)) { - Error(Parser.getTok().getLoc(), - "expected integer shift amount"); + // Make sure we do actually have a number or a parenthesized expression. + SMLoc E = Parser.getTok().getLoc(); + if (!Parser.getTok().is(AsmToken::Integer) && + !Parser.getTok().is(AsmToken::LParen)) { + Error(E, "expected integer shift amount"); return MatchOperand_ParseFail; } @@ -2312,11 +2313,11 @@ AArch64AsmParser::tryParseOptionalShiftExtend(OperandVector &Operands) { const MCConstantExpr *MCE = dyn_cast(ImmVal); if (!MCE) { - TokError("expected #imm after shift specifier"); + Error(E, "expected constant '#imm' after shift specifier"); return MatchOperand_ParseFail; } - SMLoc E = SMLoc::getFromPointer(getLoc().getPointer() - 1); + E = SMLoc::getFromPointer(getLoc().getPointer() - 1); Operands.push_back(AArch64Operand::CreateShiftExtend( ShOp, MCE->getValue(), true, S, E, getContext())); return MatchOperand_Success; diff --git a/test/MC/AArch64/basic-a64-instructions.s b/test/MC/AArch64/basic-a64-instructions.s index 140ea336984..fd3b67423da 100644 --- a/test/MC/AArch64/basic-a64-instructions.s +++ b/test/MC/AArch64/basic-a64-instructions.s @@ -370,23 +370,29 @@ _func: add w11, w13, w15, lsl #0 add w9, w3, wzr, lsl #10 add w17, w29, w20, lsl #31 + add w17, w29, w20, lsl #(31-2) // CHECK: add w11, w13, w15 // encoding: [0xab,0x01,0x0f,0x0b] // CHECK: add w9, w3, wzr, lsl #10 // encoding: [0x69,0x28,0x1f,0x0b] // CHECK: add w17, w29, w20, lsl #31 // encoding: [0xb1,0x7f,0x14,0x0b] +// CHECK: add w17, w29, w20, lsl #29 // encoding: [0xb1,0x77,0x14,0x0b] add w21, w22, w23, lsr #0 add w24, w25, w26, lsr #18 add w27, w28, w29, lsr #31 + add w27, w28, w29, lsr #(31-2) // CHECK: add w21, w22, w23, lsr #0 // encoding: [0xd5,0x02,0x57,0x0b] // CHECK: add w24, w25, w26, lsr #18 // encoding: [0x38,0x4b,0x5a,0x0b] // CHECK: add w27, w28, w29, lsr #31 // encoding: [0x9b,0x7f,0x5d,0x0b] +// CHECK: add w27, w28, w29, lsr #29 // encoding: [0x9b,0x77,0x5d,0x0b] add w2, w3, w4, asr #0 add w5, w6, w7, asr #21 add w8, w9, w10, asr #31 + add w8, w9, w10, asr #(31-2) // CHECK: add w2, w3, w4, asr #0 // encoding: [0x62,0x00,0x84,0x0b] // CHECK: add w5, w6, w7, asr #21 // encoding: [0xc5,0x54,0x87,0x0b] // CHECK: add w8, w9, w10, asr #31 // encoding: [0x28,0x7d,0x8a,0x0b] +// CHECK: add w8, w9, w10, asr #29 // encoding: [0x28,0x75,0x8a,0x0b] add x3, x5, x7 add xzr, x3, x5 @@ -400,23 +406,29 @@ _func: add x11, x13, x15, lsl #0 add x9, x3, xzr, lsl #10 add x17, x29, x20, lsl #63 + add x17, x29, x20, lsl #(63-5) // CHECK: add x11, x13, x15 // encoding: [0xab,0x01,0x0f,0x8b] // CHECK: add x9, x3, xzr, lsl #10 // encoding: [0x69,0x28,0x1f,0x8b] // CHECK: add x17, x29, x20, lsl #63 // encoding: [0xb1,0xff,0x14,0x8b] +// CHECK: add x17, x29, x20, lsl #58 // encoding: [0xb1,0xeb,0x14,0x8b] add x21, x22, x23, lsr #0 add x24, x25, x26, lsr #18 add x27, x28, x29, lsr #63 + add x17, x29, x20, lsr #(63-5) // CHECK: add x21, x22, x23, lsr #0 // encoding: [0xd5,0x02,0x57,0x8b] // CHECK: add x24, x25, x26, lsr #18 // encoding: [0x38,0x4b,0x5a,0x8b] // CHECK: add x27, x28, x29, lsr #63 // encoding: [0x9b,0xff,0x5d,0x8b] +// CHECK: add x17, x29, x20, lsr #58 // encoding: [0xb1,0xeb,0x54,0x8b] add x2, x3, x4, asr #0 add x5, x6, x7, asr #21 add x8, x9, x10, asr #63 + add x17, x29, x20, asr #(63-5) // CHECK: add x2, x3, x4, asr #0 // encoding: [0x62,0x00,0x84,0x8b] // CHECK: add x5, x6, x7, asr #21 // encoding: [0xc5,0x54,0x87,0x8b] // CHECK: add x8, x9, x10, asr #63 // encoding: [0x28,0xfd,0x8a,0x8b] +// CHECK: add x17, x29, x20, asr #58 // encoding: [0xb1,0xeb,0x94,0x8b] adds w3, w5, w7 adds wzr, w3, w5 -- 2.34.1