From aa4fe661531bf281ad169f81a9447dfd6b609862 Mon Sep 17 00:00:00 2001 From: masta Date: Sun, 15 Jul 2012 01:03:08 +0000 Subject: [PATCH] Fix ARM ASM-reader for MVN/CMP/CMN/TST/TEQ Like MOV these instructions support 2 operands, with the second beeing a shifterop. Without this patch the asm reader would fail on something like cmp r0, r1, lsr 16 with Error: Unknown identifier "LSR" git-svn-id: trunk@21911 - --- compiler/arm/raarmgas.pas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/arm/raarmgas.pas b/compiler/arm/raarmgas.pas index 91b8c816b7..340ef262d4 100644 --- a/compiler/arm/raarmgas.pas +++ b/compiler/arm/raarmgas.pas @@ -978,7 +978,7 @@ Unit raarmgas; case actasmtoken of AS_COMMA: { Operand delimiter } Begin - if ((instr.opcode=A_MOV) and (operandnum=2)) or + if ((instr.opcode in [A_MOV, A_MVN, A_CMP, A_CMN, A_TST, A_TEQ]) and (operandnum=2)) or ((operandnum=3) and not(instr.opcode in [A_UMLAL,A_UMULL,A_SMLAL,A_SMULL,A_MLA])) then begin Consume(AS_COMMA);