commit fcab6513b5e635f3fbf4f875b9530086371f5dac
author Vladimir Marko <vmarko@google.com> Mon Apr 03 12:21:33 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 03 12:21:34 2017 +0000
tree 6afbb1cee7cc6cf0eda471445a5578d3c1cc96b6
parent 589e13337ddb1d52bcab2a791e3df5d421594133
parent b9d0111d5bfc991f545e900099f3a2de732f27de

Merge "ARM64: Faster forwarding address check in mark entrypoints."

runtime/arch/arm64/quick_entrypoints_arm64.S

diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S
index 5b5d2ef..26622f0 100644
--- a/runtime/arch/arm64/quick_entrypoints_arm64.S
+++ b/runtime/arch/arm64/quick_entrypoints_arm64.S
@@ -2379,9 +2379,8 @@
     ret
 .Lnot_marked_rb_\name:
     // Check if the top two bits are one, if this is the case it is a forwarding address.
-    mvn wIP0, wIP0
-    cmp wzr, wIP0, lsr #30
-    beq .Lret_forwarding_address\name
+    tst   wIP0, wIP0, lsl #1
+    bmi   .Lret_forwarding_address\name
 .Lslow_rb_\name:
     /*
      * Allocate 44 stack slots * 8 = 352 bytes:
@@ -2452,10 +2451,9 @@
     DECREASE_FRAME 352
     ret
 .Lret_forwarding_address\name:
-    mvn wIP0, wIP0
     // Shift left by the forwarding address shift. This clears out the state bits since they are
     // in the top 2 bits of the lock word.
-    lsl \wreg, wIP0, #LOCK_WORD_STATE_FORWARDING_ADDRESS_SHIFT
+    lsl   \wreg, wIP0, #LOCK_WORD_STATE_FORWARDING_ADDRESS_SHIFT
     ret
 END \name
 .endm