diff options
| author | 2016-07-08 14:21:44 +0100 | |
|---|---|---|
| committer | 2016-07-08 14:59:08 +0100 | |
| commit | e6a2d0ff48201990d16bc02c5e40f07a6413e7f9 (patch) | |
| tree | 9a7668241ff3d3be614fd6b9d324cd1caa645a38 | |
| parent | 2e7acaffda05db1df6e0631468f10726e898a20a (diff) | |
Fix the definition of THREAD_CURRENT_IBASE_OFFSET.
The difference between between
art::Thread::tlsPtr_.mterp_current_ibase and
art::Thread::tlsPtr_.thread_local_objects is sizeof(size_t),
not sizeof(void*) (even if they have the same value on all
supported platforms/compilers in practice).
Test: ART host tests.
Change-Id: I70d196732499bd0cd073983de564547d08ee59ef
| -rw-r--r-- | runtime/asm_support.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 2d702f6af7..da68923cdd 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -140,7 +140,7 @@ ADD_TEST_EQ(THREAD_LOCAL_END_OFFSET, ADD_TEST_EQ(THREAD_LOCAL_OBJECTS_OFFSET, art::Thread::ThreadLocalObjectsOffset<__SIZEOF_POINTER__>().Int32Value()) // Offset of field Thread::tlsPtr_.mterp_current_ibase. -#define THREAD_CURRENT_IBASE_OFFSET (THREAD_LOCAL_OBJECTS_OFFSET + __SIZEOF_POINTER__) +#define THREAD_CURRENT_IBASE_OFFSET (THREAD_LOCAL_OBJECTS_OFFSET + __SIZEOF_SIZE_T__) ADD_TEST_EQ(THREAD_CURRENT_IBASE_OFFSET, art::Thread::MterpCurrentIBaseOffset<__SIZEOF_POINTER__>().Int32Value()) // Offset of field Thread::tlsPtr_.mterp_default_ibase. |