commit 69564bb83c7903c3a5f3a5696d328f318d46bd6b
author Nicolas Geoffray <ngeoffray@google.com> Sun Feb 21 17:19:18 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Sun Feb 21 17:19:55 2016 +0000
tree 9af836c1bb66367145b99e4167325bb6998c2512
parent ea6e7556887716b806f377c018fb6514bdae5bca

Use adds instead of add to set the N flag.

That flag will be used by the following bmi instruction.

Fixes 109-suspend-check on arm32.

Change-Id: I07ee069294e7a0d9709718375bce1e21e3db6529

runtime/interpreter/mterp/out/mterp_arm.S

diff --git a/runtime/interpreter/mterp/out/mterp_arm.S b/runtime/interpreter/mterp/out/mterp_arm.S
index 511c35b..519f896 100644
--- a/runtime/interpreter/mterp/out/mterp_arm.S
+++ b/runtime/interpreter/mterp/out/mterp_arm.S
@@ -1117,7 +1117,7 @@
     cmp     r0, #0
     bne     MterpOnStackReplacement     @ Note: offset must be in rINST
     ldr     lr, [rSELF, #THREAD_FLAGS_OFFSET]
-    add     r2, rINST, rINST            @ r2<- byte offset, set flags
+    adds    r2, rINST, rINST            @ r2<- byte offset, set flags
     FETCH_ADVANCE_INST_RB r2            @ update rPC, load rINST
        @ If backwards branch refresh rIBASE
     bmi     MterpCheckSuspendAndContinue
@@ -1127,7 +1127,7 @@
     mov     r0, rINST, lsl #16          @ r0<- AAxx0000
     movs    rINST, r0, asr #24          @ rINST<- ssssssAA (sign-extended)
     ldr     lr, [rSELF, #THREAD_FLAGS_OFFSET]
-    add     r2, rINST, rINST            @ r2<- byte offset, set flags
+    adds    r2, rINST, rINST            @ r2<- byte offset, set flags
     FETCH_ADVANCE_INST_RB r2            @ update rPC, load rINST
        @ If backwards branch refresh rIBASE
     bmi     MterpCheckSuspendAndContinue