diff options
| author | buzbee <buzbee@google.com> | 2010-09-30 20:24:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 20:24:45 -0700 |
| commit | 6d55b33267ddad823bc310c77c01c8527d6f87a4 (patch) | |
| tree | 0c19caae1e4580ad9016237839923450b99840c8 /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | 33ff9f32d460a232729a123617ca81b3f67195c6 (diff) | |
| parent | b78c76f88ea42e7a3b295c210ca9ee86e7290043 (diff) | |
am b78c76f8: GC Card marking fix for SPUT_OBJECT - use correct object head
Merge commit 'b78c76f88ea42e7a3b295c210ca9ee86e7290043' into gingerbread-plus-aosp
* commit 'b78c76f88ea42e7a3b295c210ca9ee86e7290043':
GC Card marking fix for SPUT_OBJECT - use correct object head
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 706866252..657533bf0 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -1549,20 +1549,20 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir) rlSrc = dvmCompilerGetSrc(cUnit, mir, 0); rlSrc = loadValue(cUnit, rlSrc, kAnyReg); - loadConstant(cUnit, tReg, (int) fieldPtr + valOffset); + loadConstant(cUnit, tReg, (int) fieldPtr); if (isSputObject) { objHead = dvmCompilerAllocTemp(cUnit); - loadConstant(cUnit, objHead, (intptr_t)method->clazz); + loadWordDisp(cUnit, tReg, offsetof(Field, clazz), objHead); } HEAP_ACCESS_SHADOW(true); - storeWordDisp(cUnit, tReg, 0 ,rlSrc.lowReg); + storeWordDisp(cUnit, tReg, valOffset ,rlSrc.lowReg); dvmCompilerFreeTemp(cUnit, tReg); HEAP_ACCESS_SHADOW(false); if (isVolatile) { dvmCompilerGenMemBarrier(cUnit); } if (isSputObject) { - /* NOTE: marking card based object head */ + /* NOTE: marking card based sfield->clazz */ markCard(cUnit, rlSrc.lowReg, objHead); dvmCompilerFreeTemp(cUnit, objHead); } |