diff options
| author | Douglas Leung <douglas.leung@imgtec.com> | 2015-07-13 10:55:45 +0100 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2015-07-13 12:11:45 +0100 |
| commit | b5aeab1b86a27f2c421894daacf7376112b2fe17 (patch) | |
| tree | 5d9f04e4c1061060f1c76abf54e7802396d60916 /runtime | |
| parent | 997673870a487baa136f1b13f81ae26dd3005e14 (diff) | |
| download | art-b5aeab1b86a27f2c421894daacf7376112b2fe17.zip art-b5aeab1b86a27f2c421894daacf7376112b2fe17.tar.gz art-b5aeab1b86a27f2c421894daacf7376112b2fe17.tar.bz2 | |
Initialize pDeoptimize quick entry pointer for Mips.
This fixes art test 449-checker-bce.
(cherry picked from commit 2e8bf554574516e0e6a9b10ccd9f13bf56189795)
Bug: 21555893
Change-Id: I9a87c430168ea35984289b0b4a417aa0c659b6d5
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; |