diff options
| author | buzbee <buzbee@google.com> | 2010-08-04 14:11:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 14:11:11 -0700 |
| commit | 19ddba58d8bd7bc39622f5014840d6702520337a (patch) | |
| tree | 1670e39857d2a983cdad201ab50f6b627cdae5f5 /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | f13e71fd254774440b6c6895f024934587e5f05d (diff) | |
| parent | baf196a7b259704137cccf4058b78da15d4c3998 (diff) | |
am baf196a7: Fix for 2892472 jit spew: No free temp registers
Merge commit 'baf196a7b259704137cccf4058b78da15d4c3998' into dalvik-dev
* commit 'baf196a7b259704137cccf4058b78da15d4c3998':
Fix for 2892472 jit spew: No free temp registers
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 37425ada1..a1e54496e 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -41,6 +41,8 @@ static void markCard(CompilationUnit *cUnit, int valReg, int tgtAddrReg) ArmLIR *target = newLIR0(cUnit, kArmPseudoTargetLabel); target->defMask = ENCODE_ALL; branchOver->generic.target = (LIR *)target; + dvmCompilerFreeTemp(cUnit, regCardBase); + dvmCompilerFreeTemp(cUnit, regCardNo); } static bool genConversionCall(CompilationUnit *cUnit, MIR *mir, void *funct, @@ -574,6 +576,9 @@ static void genArrayObjectPut(CompilationUnit *cUnit, MIR *mir, scale, kWord); HEAP_ACCESS_SHADOW(false); + dvmCompilerFreeTemp(cUnit, regPtr); + dvmCompilerFreeTemp(cUnit, regIndex); + /* NOTE: marking card here based on object head */ markCard(cUnit, r0, r1); } @@ -1549,6 +1554,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir) /* NOTE: marking card based on field address */ markCard(cUnit, rlSrc.lowReg, tReg); } + dvmCompilerFreeTemp(cUnit, tReg); break; } |