diff options
| author | Roland Levillain <rpl@google.com> | 2015-07-13 12:32:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-13 12:32:06 +0000 |
| commit | 54167205ec6f2b5dac3eaec6e4d2f5aee2684c6e (patch) | |
| tree | 0c44021775ede0704a62c663ddd6765e30f14075 /runtime | |
| parent | b0139e854337a188408aed77500ffecdaf771b79 (diff) | |
| parent | b5aeab1b86a27f2c421894daacf7376112b2fe17 (diff) | |
| download | art-54167205ec6f2b5dac3eaec6e4d2f5aee2684c6e.zip art-54167205ec6f2b5dac3eaec6e4d2f5aee2684c6e.tar.gz art-54167205ec6f2b5dac3eaec6e4d2f5aee2684c6e.tar.bz2 | |
Merge "Initialize pDeoptimize quick entry pointer for Mips." into mnc-dev
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/mips/entrypoints_init_mips.cc | 4 | ||||
| -rw-r--r-- | runtime/arch/mips64/entrypoints_init_mips64.cc | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index ff04106..09a018e 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -267,6 +267,10 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, qpoints->pThrowStackOverflow = art_quick_throw_stack_overflow; static_assert(!IsDirectEntrypoint(kQuickThrowStackOverflow), "Non-direct C stub marked direct."); + // Deoptimize + qpoints->pDeoptimize = art_quick_deoptimize; + static_assert(!IsDirectEntrypoint(kQuickDeoptimize), "Non-direct C stub marked direct."); + // Atomic 64-bit load/store qpoints->pA64Load = QuasiAtomic::Read64; static_assert(IsDirectEntrypoint(kQuickA64Load), "Non-direct C stub marked direct."); diff --git a/runtime/arch/mips64/entrypoints_init_mips64.cc b/runtime/arch/mips64/entrypoints_init_mips64.cc index 321c27b..4904af9 100644 --- a/runtime/arch/mips64/entrypoints_init_mips64.cc +++ b/runtime/arch/mips64/entrypoints_init_mips64.cc @@ -176,6 +176,9 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, qpoints->pThrowNullPointer = art_quick_throw_null_pointer_exception; qpoints->pThrowStackOverflow = art_quick_throw_stack_overflow; + // Deoptimize + qpoints->pDeoptimize = art_quick_deoptimize; + // TODO - use lld/scd instructions for Mips64 // Atomic 64-bit load/store qpoints->pA64Load = QuasiAtomic::Read64; |