diff options
| author | Ian Rogers <irogers@google.com> | 2013-07-29 11:07:13 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-07-30 16:00:24 -0700 |
| commit | 7655f29fabc0a12765de828914a18314382e5a35 (patch) | |
| tree | 219f2df20cf7f053a73a345ae20e131a73759c79 /runtime/entrypoints/quick/quick_entrypoints.h | |
| parent | 1a8080d4c2e1772cfcc5e9d6587bc63bba3945d9 (diff) | |
| download | art-7655f29fabc0a12765de828914a18314382e5a35.zip art-7655f29fabc0a12765de828914a18314382e5a35.tar.gz art-7655f29fabc0a12765de828914a18314382e5a35.tar.bz2 | |
Portable refactorings.
Separate quick from portable entrypoints.
Move architectural dependencies into arch.
Change-Id: I9adbc0a9782e2959fdc3308215f01e3107632b7c
Diffstat (limited to 'runtime/entrypoints/quick/quick_entrypoints.h')
| -rw-r--r-- | runtime/entrypoints/quick/quick_entrypoints.h | 15 |
1 files changed, 5 insertions, 10 deletions
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<uintptr_t>(OFFSETOF_MEMBER(Thread, entrypoints_)) + \ +#define QUICK_ENTRYPOINT_OFFSET(x) \ + (static_cast<uintptr_t>(OFFSETOF_MEMBER(Thread, quick_entrypoints_)) + \ static_cast<uintptr_t>(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_ |