diff options
| author | Andreas Gampe <agampe@google.com> | 2014-06-05 14:18:08 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-06-09 09:22:29 -0700 |
| commit | d58342caa97108ba413bad467c285c0377f138f5 (patch) | |
| tree | 957cac4b4c1f4c8a42eb2fb8e32af9249fa3d7a2 /runtime/instrumentation.h | |
| parent | cef85adb4933bbd00ca122aa7357e02c716df326 (diff) | |
| download | art-d58342caa97108ba413bad467c285c0377f138f5.zip art-d58342caa97108ba413bad467c285c0377f138f5.tar.gz art-d58342caa97108ba413bad467c285c0377f138f5.tar.bz2 | |
ART: Add instrumentation stubs for ARM64 and X86-64
Adds instrumentation stubs necessary for debugger support.
Refactors MethodAndCode to a top-level TwoWordReturn. A function
having a return type of TwoWordReturn will return its two-word
content, either 2x32b or 2x64b, in two registers according to
the architecture's ABI.
Bug: 15443938
Change-Id: Id7e1fbd4ad8eb6f29e23d48903c76f77b28d981a
Diffstat (limited to 'runtime/instrumentation.h')
| -rw-r--r-- | runtime/instrumentation.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/instrumentation.h b/runtime/instrumentation.h index 2dd2cd7..6625801 100644 --- a/runtime/instrumentation.h +++ b/runtime/instrumentation.h @@ -22,6 +22,7 @@ #include <list> #include "atomic.h" +#include "instruction_set.h" #include "base/macros.h" #include "base/mutex.h" #include "object_callbacks.h" @@ -311,8 +312,8 @@ class Instrumentation { // Called when an instrumented method is exited. Removes the pushed instrumentation frame // returning the intended link register. Generates method exit events. - uint64_t PopInstrumentationStackFrame(Thread* self, uintptr_t* return_pc, uint64_t gpr_result, - uint64_t fpr_result) + TwoWordReturn PopInstrumentationStackFrame(Thread* self, uintptr_t* return_pc, + uint64_t gpr_result, uint64_t fpr_result) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); // Pops an instrumentation frame from the current thread and generate an unwind event. |