diff options
| author | Narayan Kamath <narayan@google.com> | 2015-11-12 11:49:06 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-11-12 11:52:42 +0000 |
| commit | d1ef4362bf799f9f5d50e5edef8433664b503051 (patch) | |
| tree | 59aaa140925efa790f787d5e1caf6d0cafd6ae15 /runtime/asm_support.h | |
| parent | e4cf5892c2a244034900d49499c071b255571bba (diff) | |
| parent | f32e8327da5dd33abe18662fbca5e584cd047816 (diff) | |
| download | art-d1ef4362bf799f9f5d50e5edef8433664b503051.tar.gz art-d1ef4362bf799f9f5d50e5edef8433664b503051.tar.bz2 art-d1ef4362bf799f9f5d50e5edef8433664b503051.zip | |
Merge lmp changes into mnc.
Most merge conflicts are due to changes in the string representation.
They have been resolved in favour of "mnc-dev" since we've changed
the string representation there. Other changes relate to the
fact that there are now two jars in libcore (core-oj and core-libart).
Change-Id: I1fcc6e5f8dab8d1954dcddca0493563e7677d433
Diffstat (limited to 'runtime/asm_support.h')
| -rw-r--r-- | runtime/asm_support.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 10ed0f4dfa..685e771e97 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -132,16 +132,16 @@ ADD_TEST_EQ(MIRROR_OBJECT_LOCK_WORD_OFFSET, art::mirror::Object::MonitorOffset() ADD_TEST_EQ(size_t(MIRROR_OBJECT_HEADER_SIZE), sizeof(art::mirror::Object)) // Offsets within java.lang.Class. -#define MIRROR_CLASS_COMPONENT_TYPE_OFFSET (4 + MIRROR_OBJECT_HEADER_SIZE) +#define MIRROR_CLASS_COMPONENT_TYPE_OFFSET (8 + MIRROR_OBJECT_HEADER_SIZE) ADD_TEST_EQ(MIRROR_CLASS_COMPONENT_TYPE_OFFSET, art::mirror::Class::ComponentTypeOffset().Int32Value()) -#define MIRROR_CLASS_ACCESS_FLAGS_OFFSET (36 + MIRROR_OBJECT_HEADER_SIZE) +#define MIRROR_CLASS_ACCESS_FLAGS_OFFSET (72 + MIRROR_OBJECT_HEADER_SIZE) ADD_TEST_EQ(MIRROR_CLASS_ACCESS_FLAGS_OFFSET, art::mirror::Class::AccessFlagsOffset().Int32Value()) -#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (112 + MIRROR_OBJECT_HEADER_SIZE) +#define MIRROR_CLASS_OBJECT_SIZE_OFFSET (116 + MIRROR_OBJECT_HEADER_SIZE) ADD_TEST_EQ(MIRROR_CLASS_OBJECT_SIZE_OFFSET, art::mirror::Class::ObjectSizeOffset().Int32Value()) -#define MIRROR_CLASS_STATUS_OFFSET (124 + MIRROR_OBJECT_HEADER_SIZE) +#define MIRROR_CLASS_STATUS_OFFSET (128 + MIRROR_OBJECT_HEADER_SIZE) ADD_TEST_EQ(MIRROR_CLASS_STATUS_OFFSET, art::mirror::Class::StatusOffset().Int32Value()) |