diff options
author | Ian Rogers <irogers@google.com> | 2013-08-05 10:56:33 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2013-08-07 22:17:00 -0700 |
commit | 848871b4d8481229c32e0d048a9856e5a9a17ef9 (patch) | |
tree | 4be4602e3becc899f76a29a87618801458fe04b9 /runtime/stack.cc | |
parent | 423fb4d70f2ac36bf9f630146b4150771a8e7e76 (diff) | |
download | art-848871b4d8481229c32e0d048a9856e5a9a17ef9.zip art-848871b4d8481229c32e0d048a9856e5a9a17ef9.tar.gz art-848871b4d8481229c32e0d048a9856e5a9a17ef9.tar.bz2 |
Entry point clean up.
Create set of entry points needed for image methods to avoid fix-up at load time:
- interpreter - bridge to interpreter, bridge to compiled code
- jni - dlsym lookup
- quick - resolution and bridge to interpreter
- portable - resolution and bridge to interpreter
Fix JNI work around to use JNI work around argument rewriting code that'd been
accidentally disabled.
Remove abstact method error stub, use interpreter bridge instead.
Consolidate trampoline (previously stub) generation in generic helper.
Simplify trampolines to jump directly into assembly code, keeps stack crawlable.
Dex: replace use of int with ThreadOffset for values that are thread offsets.
Tidy entry point routines between interpreter, jni, quick and portable.
Change-Id: I52a7c2bbb1b7e0ff8a3c3100b774212309d0828e
Diffstat (limited to 'runtime/stack.cc')
-rw-r--r-- | runtime/stack.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc index a74bcdb..7f3f40c 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -308,7 +308,7 @@ void StackVisitor::WalkStack(bool include_transitions) { if (UNLIKELY(exit_stubs_installed)) { // While profiling, the return pc is restored from the side stack, except when walking // the stack for an exception where the side stack will be unwound in VisitFrame. - if (GetInstrumentationExitPc() == return_pc) { + if (GetQuickInstrumentationExitPc() == return_pc) { instrumentation::InstrumentationStackFrame instrumentation_frame = GetInstrumentationStackFrame(instrumentation_stack_depth); instrumentation_stack_depth++; |