diff options
author | 2014-05-28 22:43:01 -0700 | |
---|---|---|
committer | 2014-05-29 20:50:49 -0700 | |
commit | cf4035a4c41ccfcc3e89a0cee25f5218a11b0705 (patch) | |
tree | 323d9e98e6129c67e464a3e6857ee02593a2f2c2 /runtime/fault_handler.cc | |
parent | 29b53d3d715b1ec19349e8cbf7c5e4ff529bd5fe (diff) |
ART: Use StackReference in Quick Stack Frame
The method reference at the bottom of a quick frame is a stack
reference and not a native pointer. This is important for 64b
architectures, where the notions do not coincide.
Change key methods to have StackReference<mirror::ArtMethod>*
parameter instead of mirror::ArtMethod**. Make changes to
invoke stubs for 64b archs, change the frame setup for JNI code
(both generic JNI and compilers), tie up loose ends.
Tested on x86 and x86-64 with host tests. On x86-64, tests succeed
with jni compiler activated. x86-64 QCG was not tested.
Tested on ARM32 with device tests.
Fix ARM64 not saving x19 (used for wSUSPEND) on upcalls.
Tested on ARM64 in interpreter-only + generic-jni mode.
Fix ARM64 JNI Compiler to work with the CL.
Tested on ARM64 in interpreter-only + jni compiler.
Change-Id: I77931a0cbadd04d163b3eb8d6f6a6f8740578f13
Diffstat (limited to 'runtime/fault_handler.cc')
-rw-r--r-- | runtime/fault_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index 15c38c1f4b..6b216c7e89 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -250,7 +250,8 @@ bool JavaStackTraceHandler::Action(int sig, siginfo_t* siginfo, void* context) { manager_->GetMethodAndReturnPCAndSP(context, &method, &return_pc, &sp); Thread* self = Thread::Current(); // Inside of generated code, sp[0] is the method, so sp is the frame. - mirror::ArtMethod** frame = reinterpret_cast<mirror::ArtMethod**>(sp); + StackReference<mirror::ArtMethod>* frame = + reinterpret_cast<StackReference<mirror::ArtMethod>*>(sp); self->SetTopOfStack(frame, 0); // Since we don't necessarily have a dex pc, pass in 0. self->DumpJavaStack(LOG(ERROR)); } |