Browse Source

* fix r22319: hp1 must have the same condition as p

git-svn-id: trunk@22321 -
florian 13 years ago
parent
commit
8a6c65b008
1 changed files with 1 additions and 1 deletions
  1. 1 1
      compiler/arm/aoptcpu.pas

+ 1 - 1
compiler/arm/aoptcpu.pas

@@ -885,7 +885,7 @@ Implementation
                        GetNextInstruction(p, hp1) and
                        MatchInstruction(hp1, [A_ADD, A_ADC, A_RSB, A_RSC, A_SUB, A_SBC,
                                               A_AND, A_BIC, A_EOR, A_ORR, A_MOV, A_MVN],
-                                        [], []) and
+                                        [taicpu(p).condition], []) and
                        {MOV and MVN might only have 2 ops}
                        (taicpu(hp1).ops = 3) and
                        MatchOperand(taicpu(p).oper[0]^, taicpu(hp1).oper[0]^.reg) and