diff options
| author | 2022-08-07 14:48:09 +0100 | |
|---|---|---|
| committer | 2022-08-08 10:17:34 +0000 | |
| commit | 88d81e035cc385f082452a5b7029a48e9c038cf4 (patch) | |
| tree | dccf3072387126fdeff4f94bcd0235d58f6f56e3 /tools/cpp-define-generator | |
| parent | 9bda94d5909a3be51e956cf3f22d65378885334a (diff) | |
Add isInitializing check in nterp header.
This simplifies Instrumentation::GetCodeForInvoke and will be consistent
with the code we generate for AOT in:
https://android-review.googlesource.com/c/platform/art/+/2163021
Bug: 162110941
Test: test.py
Change-Id: Ic4d7747c7729df1281a2ab309589005c41542a31
Diffstat (limited to 'tools/cpp-define-generator')
| -rw-r--r-- | tools/cpp-define-generator/mirror_class.def | 5 | ||||
| -rw-r--r-- | tools/cpp-define-generator/thread.def | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/cpp-define-generator/mirror_class.def b/tools/cpp-define-generator/mirror_class.def index c01aab387a..af396bfe10 100644 --- a/tools/cpp-define-generator/mirror_class.def +++ b/tools/cpp-define-generator/mirror_class.def @@ -56,3 +56,8 @@ ASM_DEFINE(MIRROR_CLASS_IS_VISIBLY_INITIALIZED_OFFSET, 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_CLINIT_THREAD_ID_OFFSET, + art::mirror::Class::ClinitThreadIdOffset().Int32Value()) diff --git a/tools/cpp-define-generator/thread.def b/tools/cpp-define-generator/thread.def index d796542a32..97033fcaf2 100644 --- a/tools/cpp-define-generator/thread.def +++ b/tools/cpp-define-generator/thread.def @@ -71,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()) |