--- Merging r21911 into '.':

U    compiler/arm/raarmgas.pas

# revisions: 21911
r21911 | masta | 2012-07-15 03:03:08 +0200 (Sun, 15 Jul 2012) | 12 lines
Changed paths:
   M /trunk/compiler/arm/raarmgas.pas

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: branches/fixes_2_6@22542 -

compiler/arm/raarmgas.pas

@@ -973,7 +973,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);