From 0e5ff796e3ab641581aeea4ad53f88594fad7797 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Wed, 6 Jul 2016 13:45:52 +0100 Subject: [PATCH] Mark ReadBarrierJni as a direct entry point on MIPS32. The ReadBarrierJni MIPS32 entry point is a direct reference to the native (C++) method art::ReadBarrierJni. Test: Build ART for MIPS32. Bug: 12687968 Change-Id: I6475855f4696690a681f69931618a055be65a00a --- runtime/arch/mips/entrypoints_direct_mips.h | 1 + runtime/arch/mips/entrypoints_init_mips.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/arch/mips/entrypoints_direct_mips.h b/runtime/arch/mips/entrypoints_direct_mips.h index 0d01ad575..5b74d620a 100644 --- a/runtime/arch/mips/entrypoints_direct_mips.h +++ b/runtime/arch/mips/entrypoints_direct_mips.h @@ -45,6 +45,7 @@ static constexpr bool IsDirectEntrypoint(QuickEntrypointEnum entrypoint) { entrypoint == kQuickCmpgFloat || entrypoint == kQuickCmplDouble || entrypoint == kQuickCmplFloat || + entrypoint == kQuickReadBarrierJni || entrypoint == kQuickReadBarrierMark || entrypoint == kQuickReadBarrierSlow || entrypoint == kQuickReadBarrierForRootSlow; diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index 833ba1b61..6697a8d05 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -283,7 +283,7 @@ void InitEntryPoints(JniEntryPoints* jpoints, QuickEntryPoints* qpoints) { // Read barrier. qpoints->pReadBarrierJni = ReadBarrierJni; - static_assert(!IsDirectEntrypoint(kQuickReadBarrierJni), "Non-direct C stub marked direct."); + static_assert(IsDirectEntrypoint(kQuickReadBarrierJni), "Direct C stub not marked direct."); qpoints->pReadBarrierMark = artReadBarrierMark; static_assert(IsDirectEntrypoint(kQuickReadBarrierMark), "Direct C stub not marked direct."); qpoints->pReadBarrierSlow = artReadBarrierSlow; -- 2.11.0