diff options
Diffstat (limited to 'tools/cpp-define-generator')
| -rw-r--r-- | tools/cpp-define-generator/offset_dexcache.def | 5 | ||||
| -rw-r--r-- | tools/cpp-define-generator/offset_thread.def | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/cpp-define-generator/offset_dexcache.def b/tools/cpp-define-generator/offset_dexcache.def index ec4b248e5d..3b26518788 100644 --- a/tools/cpp-define-generator/offset_dexcache.def +++ b/tools/cpp-define-generator/offset_dexcache.def @@ -18,11 +18,12 @@ #if defined(DEFINE_INCLUDE_DEPENDENCIES) #include "art_method.h" // art::ArtMethod +#include "base/enums.h" // PointerSize #endif #define DEFINE_ART_METHOD_OFFSET(field_name, method_name) \ - DEFINE_EXPR(ART_METHOD_ ## field_name ## _OFFSET_32, int32_t, art::ArtMethod::method_name##Offset(4).Int32Value()) \ - DEFINE_EXPR(ART_METHOD_ ## field_name ## _OFFSET_64, int32_t, art::ArtMethod::method_name##Offset(8).Int32Value()) + DEFINE_EXPR(ART_METHOD_ ## field_name ## _OFFSET_32, int32_t, art::ArtMethod::method_name##Offset(art::PointerSize::k32).Int32Value()) \ + DEFINE_EXPR(ART_METHOD_ ## field_name ## _OFFSET_64, int32_t, art::ArtMethod::method_name##Offset(art::PointerSize::k64).Int32Value()) // New macro suffix Method Name (of the Offset method) DEFINE_ART_METHOD_OFFSET(DEX_CACHE_METHODS, DexCacheResolvedMethods) diff --git a/tools/cpp-define-generator/offset_thread.def b/tools/cpp-define-generator/offset_thread.def index 71648e6cdb..6f94d38870 100644 --- a/tools/cpp-define-generator/offset_thread.def +++ b/tools/cpp-define-generator/offset_thread.def @@ -17,13 +17,14 @@ // Offsets within ShadowFrame. #if defined(DEFINE_INCLUDE_DEPENDENCIES) +#include "base/enums.h" // PointerSize #include "stack.h" // art::ShadowFrame #endif #include "common.def" // DEFINE_OFFSET_EXPR #define DEFINE_THREAD_OFFSET(field_name, method_name) \ - DEFINE_OFFSET_EXPR(Thread, field_name, int32_t, art::Thread::method_name##Offset<sizeof(void*)>().Int32Value()) + DEFINE_OFFSET_EXPR(Thread, field_name, int32_t, art::Thread::method_name##Offset<art::kRuntimePointerSize>().Int32Value()) // New macro suffix Method Name (of the Offset method) DEFINE_THREAD_OFFSET(FLAGS, ThreadFlags) |