diff options
Diffstat (limited to 'vm/compiler/codegen')
5 files changed, 13 insertions, 13 deletions
diff --git a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp index 8ab956ec7..5188417c9 100644 --- a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp @@ -62,11 +62,11 @@ bool dvmCompilerArchVariantInit(void) #endif /* Codegen-specific assumptions */ - assert(offsetof(ClassObject, vtable) < 128 && - (offsetof(ClassObject, vtable) & 0x3) == 0); - assert(offsetof(ArrayObject, length) < 128 && - (offsetof(ArrayObject, length) & 0x3) == 0); - assert(offsetof(ArrayObject, contents) < 256); + assert(OFFSETOF_MEMBER(ClassObject, vtable) < 128 && + (OFFSETOF_MEMBER(ClassObject, vtable) & 0x3) == 0); + assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 && + (OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0); + assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256); /* Up to 5 args are pushed on top of FP - sizeofStackSaveArea */ assert(sizeof(StackSaveArea) < 236); diff --git a/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp index 3e13af5bf..f394aa1c8 100644 --- a/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp @@ -62,8 +62,8 @@ bool dvmCompilerArchVariantInit(void) #endif /* Codegen-specific assumptions */ - assert(offsetof(ClassObject, vtable) < 128 && - (offsetof(ClassObject, vtable) & 0x3) == 0); + assert(OFFSETOF_MEMBER(ClassObject, vtable) < 128 && + (OFFSETOF_MEMBER(ClassObject, vtable) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 && (OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256); diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp index d68d150da..c3fe518e0 100644 --- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp @@ -57,8 +57,8 @@ bool dvmCompilerArchVariantInit(void) #endif /* Codegen-specific assumptions */ - assert(offsetof(ClassObject, vtable) < 128 && - (offsetof(ClassObject, vtable) & 0x3) == 0); + assert(OFFSETOF_MEMBER(ClassObject, vtable) < 128 && + (OFFSETOF_MEMBER(ClassObject, vtable) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 && (OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256); diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp index d68d150da..c3fe518e0 100644 --- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp @@ -57,8 +57,8 @@ bool dvmCompilerArchVariantInit(void) #endif /* Codegen-specific assumptions */ - assert(offsetof(ClassObject, vtable) < 128 && - (offsetof(ClassObject, vtable) & 0x3) == 0); + assert(OFFSETOF_MEMBER(ClassObject, vtable) < 128 && + (OFFSETOF_MEMBER(ClassObject, vtable) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 && (OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256); diff --git a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp index 5ccd26d0f..9f17522a5 100644 --- a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp +++ b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp @@ -62,8 +62,8 @@ bool dvmCompilerArchVariantInit(void) #endif /* Codegen-specific assumptions */ - assert(offsetof(ClassObject, vtable) < 128 && - (offsetof(ClassObject, vtable) & 0x3) == 0); + assert(OFFSETOF_MEMBER(ClassObject, vtable) < 128 && + (OFFSETOF_MEMBER(ClassObject, vtable) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, length) < 128 && (OFFSETOF_MEMBER(ArrayObject, length) & 0x3) == 0); assert(OFFSETOF_MEMBER(ArrayObject, contents) < 256); |