diff options
Diffstat (limited to 'tools/cpp-define-generator')
| -rw-r--r-- | tools/cpp-define-generator/globals.def | 9 | ||||
| -rw-r--r-- | tools/cpp-define-generator/lockword.def | 4 | ||||
| -rw-r--r-- | tools/cpp-define-generator/mirror_class.def | 15 | ||||
| -rw-r--r-- | tools/cpp-define-generator/runtime.def | 4 | ||||
| -rw-r--r-- | tools/cpp-define-generator/thread.def | 4 |
5 files changed, 33 insertions, 3 deletions
diff --git a/tools/cpp-define-generator/globals.def b/tools/cpp-define-generator/globals.def index 2572ea6f9b..459e5a8164 100644 --- a/tools/cpp-define-generator/globals.def +++ b/tools/cpp-define-generator/globals.def @@ -28,6 +28,7 @@ #include "mirror/object_reference.h" #include "runtime_globals.h" #include "stack.h" +#include "entrypoints/quick/callee_save_frame.h" #endif ASM_DEFINE(ACCESS_FLAGS_METHOD_IS_NATIVE, @@ -82,3 +83,11 @@ ASM_DEFINE(STD_MEMORY_ORDER_RELAXED, std::memory_order_relaxed) ASM_DEFINE(STACK_OVERFLOW_RESERVED_BYTES, GetStackOverflowReservedBytes(art::kRuntimeISA)) +ASM_DEFINE(CALLEE_SAVE_EVERYTHING_NUM_CORE_SPILLS, + art::POPCOUNT(art::RuntimeCalleeSaveFrame::GetCoreSpills( + art::CalleeSaveType::kSaveEverything))) +ASM_DEFINE(TAGGED_JNI_SP_MASK, art::ManagedStack::kTaggedJniSpMask) +ASM_DEFINE(TAGGED_JNI_SP_MASK_TOGGLED32, + ~static_cast<uint32_t>(art::ManagedStack::kTaggedJniSpMask)) +ASM_DEFINE(TAGGED_JNI_SP_MASK_TOGGLED64, + ~static_cast<uint64_t>(art::ManagedStack::kTaggedJniSpMask)) diff --git a/tools/cpp-define-generator/lockword.def b/tools/cpp-define-generator/lockword.def index a170c15f8b..5494d59d1d 100644 --- a/tools/cpp-define-generator/lockword.def +++ b/tools/cpp-define-generator/lockword.def @@ -30,10 +30,8 @@ ASM_DEFINE(LOCK_WORD_MARK_BIT_MASK_SHIFTED, art::LockWord::kMarkBitStateMaskShifted) ASM_DEFINE(LOCK_WORD_MARK_BIT_SHIFT, art::LockWord::kMarkBitStateShift) -ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_MASK, +ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_MASK_SHIFTED, art::LockWord::kReadBarrierStateMaskShifted) -ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_MASK_TOGGLED, - art::LockWord::kReadBarrierStateMaskShiftedToggled) ASM_DEFINE(LOCK_WORD_READ_BARRIER_STATE_SHIFT, art::LockWord::kReadBarrierStateShift) ASM_DEFINE(LOCK_WORD_STATE_FORWARDING_ADDRESS, diff --git a/tools/cpp-define-generator/mirror_class.def b/tools/cpp-define-generator/mirror_class.def index 8cfd54e8d6..062a7aa4b7 100644 --- a/tools/cpp-define-generator/mirror_class.def +++ b/tools/cpp-define-generator/mirror_class.def @@ -16,6 +16,7 @@ #if ASM_DEFINE_INCLUDE_DEPENDENCIES #include "mirror/class.h" +#include "subtype_check.h" #endif ASM_DEFINE(MIRROR_CLASS_ACCESS_FLAGS_OFFSET, @@ -49,3 +50,17 @@ ASM_DEFINE(MIRROR_CLASS_SUPER_CLASS_OFFSET, ASM_DEFINE(MIRROR_CLASS_IS_INTERFACE_FLAG, art::kAccInterface) ASM_DEFINE(MIRROR_CLASS_IS_INTERFACE_FLAG_BIT, art::WhichPowerOf2(art::kAccInterface)) +ASM_DEFINE(MIRROR_CLASS_IS_VISIBLY_INITIALIZED_OFFSET, + art::mirror::Class::StatusOffset().SizeValue() + + (art::SubtypeCheckBits::BitStructSizeOf() / art::kBitsPerByte)) +ASM_DEFINE(MIRROR_CLASS_IS_VISIBLY_INITIALIZED_VALUE, + art::enum_cast<uint32_t>(art::ClassStatus::kVisiblyInitialized) << + (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte)) +ASM_DEFINE(MIRROR_CLASS_IS_INITIALIZING_VALUE, + art::enum_cast<uint32_t>(art::ClassStatus::kInitializing) << + (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte)) +ASM_DEFINE(MIRROR_CLASS_IS_INITIALIZED_VALUE, + art::enum_cast<uint32_t>(art::ClassStatus::kInitialized) << + (art::SubtypeCheckBits::BitStructSizeOf() % art::kBitsPerByte)) +ASM_DEFINE(MIRROR_CLASS_CLINIT_THREAD_ID_OFFSET, + art::mirror::Class::ClinitThreadIdOffset().Int32Value()) diff --git a/tools/cpp-define-generator/runtime.def b/tools/cpp-define-generator/runtime.def index 2a2e303ba2..fd6567d87e 100644 --- a/tools/cpp-define-generator/runtime.def +++ b/tools/cpp-define-generator/runtime.def @@ -30,3 +30,7 @@ ASM_DEFINE(RUNTIME_SAVE_REFS_AND_ARGS_METHOD_OFFSET, art::Runtime::GetCalleeSaveMethodOffset(art::CalleeSaveType::kSaveRefsAndArgs)) ASM_DEFINE(RUNTIME_SAVE_REFS_ONLY_METHOD_OFFSET, art::Runtime::GetCalleeSaveMethodOffset(art::CalleeSaveType::kSaveRefsOnly)) +ASM_DEFINE(RUNTIME_INSTRUMENTATION_OFFSET, art::Runtime::GetInstrumentationOffset().Int32Value()) +ASM_DEFINE(RUN_EXIT_HOOKS_OFFSET_FROM_RUNTIME_INSTANCE, + art::Runtime::GetInstrumentationOffset().Int32Value() + + art::instrumentation::Instrumentation::RunExitHooksOffset().Int32Value()) diff --git a/tools/cpp-define-generator/thread.def b/tools/cpp-define-generator/thread.def index bae92009b2..97033fcaf2 100644 --- a/tools/cpp-define-generator/thread.def +++ b/tools/cpp-define-generator/thread.def @@ -37,6 +37,8 @@ ASM_DEFINE(THREAD_INTERPRETER_CACHE_SIZE_SHIFT, (art::WhichPowerOf2(sizeof(art::InterpreterCache::Entry)) - 2)) ASM_DEFINE(THREAD_IS_GC_MARKING_OFFSET, art::Thread::IsGcMarkingOffset<art::kRuntimePointerSize>().Int32Value()) +ASM_DEFINE(THREAD_DEOPT_CHECK_REQUIRED_OFFSET, + art::Thread::DeoptCheckRequiredOffset<art::kRuntimePointerSize>().Int32Value()) ASM_DEFINE(THREAD_LOCAL_ALLOC_STACK_END_OFFSET, art::Thread::ThreadLocalAllocStackEndOffset<art::kRuntimePointerSize>().Int32Value()) ASM_DEFINE(THREAD_LOCAL_ALLOC_STACK_TOP_OFFSET, @@ -69,3 +71,5 @@ ASM_DEFINE(THREAD_READ_BARRIER_MARK_REG00_OFFSET, art::Thread::ReadBarrierMarkEntryPointsOffset<art::kRuntimePointerSize>(0)) ASM_DEFINE(THREAD_SHARED_METHOD_HOTNESS_OFFSET, art::Thread::SharedMethodHotnessOffset<art::kRuntimePointerSize>().Int32Value()) +ASM_DEFINE(THREAD_TID_OFFSET, + art::Thread::TidOffset<art::kRuntimePointerSize>().Int32Value()) |