diff options
| -rw-r--r-- | runtime/arch/arm64/quick_entrypoints_arm64.S | 8 | ||||
| -rwxr-xr-x | tools/setup-buildbot-device.sh | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S index 5b5d2ef0dc..26622f0482 100644 --- a/runtime/arch/arm64/quick_entrypoints_arm64.S +++ b/runtime/arch/arm64/quick_entrypoints_arm64.S @@ -2379,9 +2379,8 @@ ENTRY \name 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 @@ ENTRY \name 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 diff --git a/tools/setup-buildbot-device.sh b/tools/setup-buildbot-device.sh index 7eaaaf9cbd..6c2c07213f 100755 --- a/tools/setup-buildbot-device.sh +++ b/tools/setup-buildbot-device.sh @@ -61,6 +61,9 @@ adb shell uptime echo -e "${green}Battery info${nc}" adb shell dumpsys battery +echo -e "${green}Killing logd, seen leaking on fugu/N${nc}" +adb shell killall -9 /system/bin/logd + echo -e "${green}Setting adb buffer size to 32MB${nc}" adb logcat -G 32M adb logcat -g |