From a62c3a0ab3fcdde37f47d16e9699a935ae7a8e88 Mon Sep 17 00:00:00 2001 From: Carl Shapiro Date: Tue, 3 May 2011 17:59:35 -0700 Subject: Establish a subclass relationship between ArrayObject and Object. Change-Id: I9f9fe52bd4ceebb6dde48251a89190ba6bb00ce4 --- vm/compiler/codegen/arm/CodegenDriver.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'vm/compiler/codegen/arm/CodegenDriver.cpp') diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp index d170c8b4c..1a8ac4203 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.cpp +++ b/vm/compiler/codegen/arm/CodegenDriver.cpp @@ -404,8 +404,8 @@ static void genArrayGet(CompilationUnit *cUnit, MIR *mir, OpSize size, RegLocation rlDest, int scale) { RegisterClass regClass = dvmCompilerRegClassBySize(size); - int lenOffset = offsetof(ArrayObject, length); - int dataOffset = offsetof(ArrayObject, contents); + int lenOffset = OFFSETOF_MEMBER(ArrayObject, length); + int dataOffset = OFFSETOF_MEMBER(ArrayObject, contents); RegLocation rlResult; rlArray = loadValue(cUnit, rlArray, kCoreReg); rlIndex = loadValue(cUnit, rlIndex, kCoreReg); @@ -473,8 +473,8 @@ static void genArrayPut(CompilationUnit *cUnit, MIR *mir, OpSize size, RegLocation rlSrc, int scale) { RegisterClass regClass = dvmCompilerRegClassBySize(size); - int lenOffset = offsetof(ArrayObject, length); - int dataOffset = offsetof(ArrayObject, contents); + int lenOffset = OFFSETOF_MEMBER(ArrayObject, length); + int dataOffset = OFFSETOF_MEMBER(ArrayObject, contents); int regPtr; rlArray = loadValue(cUnit, rlArray, kCoreReg); @@ -547,8 +547,8 @@ static void genArrayObjectPut(CompilationUnit *cUnit, MIR *mir, RegLocation rlArray, RegLocation rlIndex, RegLocation rlSrc, int scale) { - int lenOffset = offsetof(ArrayObject, length); - int dataOffset = offsetof(ArrayObject, contents); + int lenOffset = OFFSETOF_MEMBER(ArrayObject, length); + int dataOffset = OFFSETOF_MEMBER(ArrayObject, contents); dvmCompilerFlushAllRegs(cUnit); @@ -2076,7 +2076,7 @@ static bool handleFmt12x(CompilationUnit *cUnit, MIR *mir) storeValue(cUnit, rlDest, rlResult); break; case OP_ARRAY_LENGTH: { - int lenOffset = offsetof(ArrayObject, length); + int lenOffset = OFFSETOF_MEMBER(ArrayObject, length); rlSrc = loadValue(cUnit, rlSrc, kCoreReg); genNullCheck(cUnit, rlSrc.sRegLow, rlSrc.lowReg, mir->offset, NULL); @@ -3576,7 +3576,7 @@ static bool genInlinedStringIsEmpty(CompilationUnit *cUnit, MIR *mir) static bool genInlinedStringCharAt(CompilationUnit *cUnit, MIR *mir) { - int contents = offsetof(ArrayObject, contents); + int contents = OFFSETOF_MEMBER(ArrayObject, contents); RegLocation rlObj = dvmCompilerGetSrc(cUnit, mir, 0); RegLocation rlIdx = dvmCompilerGetSrc(cUnit, mir, 1); RegLocation rlDest = inlinedTarget(cUnit, mir, false); @@ -3939,7 +3939,7 @@ static void genHoistedChecksForCountUpLoop(CompilationUnit *cUnit, MIR *mir) * ssa name. */ DecodedInstruction *dInsn = &mir->dalvikInsn; - const int lenOffset = offsetof(ArrayObject, length); + const int lenOffset = OFFSETOF_MEMBER(ArrayObject, length); const int maxC = dInsn->arg[0]; int regLength; RegLocation rlArray = cUnit->regLocation[mir->dalvikInsn.vA]; @@ -3986,7 +3986,7 @@ static void genHoistedChecksForCountUpLoop(CompilationUnit *cUnit, MIR *mir) static void genHoistedChecksForCountDownLoop(CompilationUnit *cUnit, MIR *mir) { DecodedInstruction *dInsn = &mir->dalvikInsn; - const int lenOffset = offsetof(ArrayObject, length); + const int lenOffset = OFFSETOF_MEMBER(ArrayObject, length); const int regLength = dvmCompilerAllocTemp(cUnit); const int maxC = dInsn->arg[0]; RegLocation rlArray = cUnit->regLocation[mir->dalvikInsn.vA]; -- cgit v1.2.3