diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-14 17:43:00 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-04-01 08:24:16 -0700 |
| commit | dd7624d2b9e599d57762d12031b10b89defc9807 (patch) | |
| tree | c972296737f992a84b1552561f823991d28403f0 /runtime/entrypoints/jni | |
| parent | 8464a64a50190c06e95015a932eda9511fa6473d (diff) | |
| download | art-dd7624d2b9e599d57762d12031b10b89defc9807.zip art-dd7624d2b9e599d57762d12031b10b89defc9807.tar.gz art-dd7624d2b9e599d57762d12031b10b89defc9807.tar.bz2 | |
Allow mixing of thread offsets between 32 and 64bit architectures.
Begin a more full implementation x86-64 REX prefixes.
Doesn't implement 64bit thread offset support for the JNI compiler.
Change-Id: If9af2f08a1833c21ddb4b4077f9b03add1a05147
Diffstat (limited to 'runtime/entrypoints/jni')
| -rw-r--r-- | runtime/entrypoints/jni/jni_entrypoints.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/entrypoints/jni/jni_entrypoints.h b/runtime/entrypoints/jni/jni_entrypoints.h index 0a53447..6fb0560 100644 --- a/runtime/entrypoints/jni/jni_entrypoints.h +++ b/runtime/entrypoints/jni/jni_entrypoints.h @@ -20,9 +20,8 @@ #include "base/macros.h" #include "offsets.h" -#define JNI_ENTRYPOINT_OFFSET(x) \ - ThreadOffset(static_cast<uintptr_t>(OFFSETOF_MEMBER(Thread, jni_entrypoints_)) + \ - static_cast<uintptr_t>(OFFSETOF_MEMBER(JniEntryPoints, x))) +#define JNI_ENTRYPOINT_OFFSET(ptr_size, x) \ + Thread::JniEntryPointOffset<ptr_size>(OFFSETOF_MEMBER(JniEntryPoints, x)) namespace art { |