summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sebastien Hertz <shertz@google.com> 2015-05-05 20:03:50 +0200
committer Sebastien Hertz <shertz@google.com> 2015-05-06 10:05:17 +0200
commit27a4a9d2a488dd57cd00d9108d10defde04141a2 (patch)
tree1749cfc49c8e6e9e65bafb2f74dae17e3782ed3d
parent3acc27f454e33f4650867a3ba0ecb8d3011e1048 (diff)
Fix instrumentation exit stub for arm64
Fixes bad offset to restore register x21. Bug: 20798393 (cherry picked from commit a538effb3f848bfec232c55f167b9f35b416948f) Change-Id: I030d848ab0f46043e86f53abae204463f0aaccbe
-rw-r--r--runtime/arch/arm64/quick_entrypoints_arm64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/arch/arm64/quick_entrypoints_arm64.S b/runtime/arch/arm64/quick_entrypoints_arm64.S
index 1d316fcea5..f8b0734428 100644
--- a/runtime/arch/arm64/quick_entrypoints_arm64.S
+++ b/runtime/arch/arm64/quick_entrypoints_arm64.S
@@ -182,7 +182,7 @@
// Restore xSELF as it might be scratched.
mov xSELF, xETR
// ETR
- ldr xETR, [sp, #16]
+ ldr xETR, [sp, #32]
.cfi_restore x21
add sp, sp, #112