diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-14 17:41:57 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-16 19:27:28 -0700 |
| commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
| tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /runtime/interpreter/interpreter.h | |
| parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) | |
| download | android_art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.gz android_art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.bz2 android_art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.zip | |
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug: 17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'runtime/interpreter/interpreter.h')
| -rw-r--r-- | runtime/interpreter/interpreter.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/runtime/interpreter/interpreter.h b/runtime/interpreter/interpreter.h index 0750eb5c49..d327a71a4f 100644 --- a/runtime/interpreter/interpreter.h +++ b/runtime/interpreter/interpreter.h @@ -42,19 +42,20 @@ extern void EnterInterpreterFromDeoptimize(Thread* self, ShadowFrame* shadow_fra JValue* ret_val) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -extern JValue EnterInterpreterFromStub(Thread* self, MethodHelper& mh, - const DexFile::CodeItem* code_item, - ShadowFrame& shadow_frame) +extern JValue EnterInterpreterFromEntryPoint(Thread* self, MethodHelper* mh, + const DexFile::CodeItem* code_item, + ShadowFrame* shadow_frame) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -extern "C" void artInterpreterToInterpreterBridge(Thread* self, MethodHelper& mh, + +} // namespace interpreter + +extern "C" void artInterpreterToInterpreterBridge(Thread* self, MethodHelper* mh, const DexFile::CodeItem* code_item, ShadowFrame* shadow_frame, JValue* result) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); -} // namespace interpreter - -extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper& mh, +extern "C" void artInterpreterToCompiledCodeBridge(Thread* self, MethodHelper* mh, const DexFile::CodeItem* code_item, ShadowFrame* shadow_frame, JValue* result) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |