commit 25633b09df6747d19d1cb30ea2f34d443027c006
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 22 06:56:01 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 06:56:01 2016 +0000
tree 195ee147d90d9665b5d10994a28ec45f318d160f
parent 0b38d6ab37bfc9ce42fda4c15d9634463b1d4584
parent 69564bb83c7903c3a5f3a5696d328f318d46bd6b

Merge "Use adds instead of add to set the N flag."

runtime/interpreter/mterp/arm/op_goto.S

diff --git a/runtime/interpreter/mterp/arm/op_goto.S b/runtime/interpreter/mterp/arm/op_goto.S
index eb1d429..6861950 100644
--- a/runtime/interpreter/mterp/arm/op_goto.S
+++ b/runtime/interpreter/mterp/arm/op_goto.S
@@ -17,7 +17,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
@@ -27,7 +27,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

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