diff options
| author | 2011-09-23 16:48:26 -0700 | |
|---|---|---|
| committer | 2011-09-23 16:48:26 -0700 | |
| commit | 31cc62d259b86844b505c3bfe15b44e372f705b8 (patch) | |
| tree | 3b596e14a2e7fc39027a1016e5b7c77887714330 /src/compiler/codegen/arm | |
| parent | 3311f2763c4103f7c378af417a2863f7e2c224f3 (diff) | |
| parent | b886da8e3c26443ab4d2aa63268bd673c354c3d2 (diff) | |
Merge "Support for exceptions from array allocation." into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/arm')
| -rw-r--r-- | src/compiler/codegen/arm/MethodCodegenDriver.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc index 595bc986b5..c5241ca005 100644 --- a/src/compiler/codegen/arm/MethodCodegenDriver.cc +++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc @@ -33,7 +33,7 @@ static void genNewArray(CompilationUnit* cUnit, MIR* mir, RegLocation rlDest, { oatFlushAllRegs(cUnit); /* Everything to home location */ loadWordDisp(cUnit, rSELF, - OFFSETOF_MEMBER(Thread, pAllocFromCode), rLR); + OFFSETOF_MEMBER(Thread, pArrayAllocFromCode), rLR); loadCurrMethodDirect(cUnit, r1); // arg1 <- Method* loadConstant(cUnit, r0, mir->dalvikInsn.vC); // arg0 <- type_id loadValueDirectFixed(cUnit, rlSrc, r2); // arg2 <- count @@ -56,7 +56,7 @@ static void genFilledNewArray(CompilationUnit* cUnit, MIR* mir, bool isRange) int typeId = dInsn->vB; oatFlushAllRegs(cUnit); /* Everything to home location */ loadWordDisp(cUnit, rSELF, - OFFSETOF_MEMBER(Thread, pCheckAndAllocFromCode), rLR); + OFFSETOF_MEMBER(Thread, pCheckAndArrayAllocFromCode), rLR); loadCurrMethodDirect(cUnit, r1); // arg1 <- Method* loadConstant(cUnit, r0, typeId); // arg0 <- type_id loadConstant(cUnit, r2, elems); // arg2 <- count |