From 7655f29fabc0a12765de828914a18314382e5a35 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Mon, 29 Jul 2013 11:07:13 -0700 Subject: Portable refactorings. Separate quick from portable entrypoints. Move architectural dependencies into arch. Change-Id: I9adbc0a9782e2959fdc3308215f01e3107632b7c --- runtime/entrypoints/quick/quick_entrypoints.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'runtime/entrypoints/quick/quick_entrypoints.h') diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h index 8692e92..74b8cfd 100644 --- a/runtime/entrypoints/quick/quick_entrypoints.h +++ b/runtime/entrypoints/quick/quick_entrypoints.h @@ -20,15 +20,15 @@ #include "dex_file-inl.h" #include "runtime.h" -#define ENTRYPOINT_OFFSET(x) \ - (static_cast(OFFSETOF_MEMBER(Thread, entrypoints_)) + \ +#define QUICK_ENTRYPOINT_OFFSET(x) \ + (static_cast(OFFSETOF_MEMBER(Thread, quick_entrypoints_)) + \ static_cast(OFFSETOF_MEMBER(QuickEntryPoints, x))) namespace art { namespace mirror { -class AbstractMethod; -class Class; -class Object; + class AbstractMethod; + class Class; + class Object; } // namespace mirror class DvmDex; class MethodHelper; @@ -123,8 +123,6 @@ struct PACKED(4) QuickEntryPoints { void* (*pMemcpy)(void*, const void*, size_t); // Invocation - const void* (*pPortableResolutionTrampolineFromCode)(mirror::AbstractMethod*, mirror::Object*, - mirror::AbstractMethod**, Thread*); const void* (*pQuickResolutionTrampolineFromCode)(mirror::AbstractMethod*, mirror::Object*, mirror::AbstractMethod**, Thread*); void (*pInvokeDirectTrampolineWithAccessCheck)(uint32_t, void*); @@ -167,9 +165,6 @@ extern mirror::Object* JniMethodEndWithReferenceSynchronized(jobject result, jobject locked, Thread* self) SHARED_LOCK_FUNCTION(Locks::mutator_lock_) HOT_ATTR; -// Initialize an entry point data structure, architecture specific. -void InitEntryPoints(QuickEntryPoints* points); - } // namespace art #endif // ART_RUNTIME_ENTRYPOINTS_QUICK_QUICK_ENTRYPOINTS_H_ -- cgit v1.1