Ok for morello branch.
Thanks! ________________________________ From: Alex Coplan Alex.Coplan@arm.com Sent: 10 November 2021 10:16 To: gnu-morello@op-lists.linaro.org gnu-morello@op-lists.linaro.org Cc: Matthew Malcomson Matthew.Malcomson@arm.com; Kyrylo Tkachov Kyrylo.Tkachov@arm.com Subject: [PATCH] aarch64: Fix scbnds validation
Hi,
Prior to this patch, we were failing to validate scbnds instructions properly in multiple ways. The code in tc-aarch64.c:parse_operands failed to check if the expression parsing code actually returned a constant (O_constant) immediate. For sufficiently large immediates this would result in O_big instead and this was not handled.
Moreover, the code to coerce the immediate form into the immediate + shift form of the instruction was buggy in multiple ways: using the wrong mask to check if the lower bits were set and checking the wrong variable.
Finally, the code in operand_general_constraint_met_p was only checking if the immediate is in range for the shifted case: it should be checking this in both cases.
As well as fixing these issues, this patch improves the error messages in a couple of cases and adds tests for various valid and invalid cases.
Regression tested on aarch64-linux-gnu, OK for Morello branch?
Thanks, Alex
gas/ChangeLog:
2021-11-10 Alex Coplan alex.coplan@arm.com
* config/tc-aarch64.c (parse_shift): Improve error message for O_big expressions. (parse_operands): In AARCH64_OPND_A64C_IMM6_EXT case, handle parse_shifter_operand_imm returning non-O_constant expressions; fix logic for coercion to the shifted form. * testsuite/gas/aarch64/scbnds-immed.d: New test. * testsuite/gas/aarch64/scbnds-immed.s: Assembly thereof. * testsuite/gas/aarch64/scbnds-invalid.d: New test. * testsuite/gas/aarch64/scbnds-invalid.l: Error output thereof. * testsuite/gas/aarch64/scbnds-invalid.s: Assembly thereof.
opcodes/ChangeLog:
2021-11-10 Alex Coplan alex.coplan@arm.com
* aarch64-opc.c (operand_general_constraint_met_p): Always check if the immediate is in range for AARCH64_OPND_A64C_IMM6_EXT.