diff options
| author | Bill Buzbee <buzbee@google.com> | 2010-03-25 13:11:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-25 13:11:50 -0700 |
| commit | 450212fc3bd3678c6592a78b0e36b6733a1ce5e1 (patch) | |
| tree | c1dc7b04a5c8c6f701e493613a45f23ba9ad5f59 /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | 05f5efaf68ecf55b7d06922365a4e55315b5e9d5 (diff) | |
| parent | d630700a9fbc6d317e0b4df73cbbc74a2c8fadaa (diff) | |
am d630700a: Merge "Jit: Fix for 2542488 JIT codegen bug with overlapping wide operands"
Merge commit 'd630700a9fbc6d317e0b4df73cbbc74a2c8fadaa' into dalvik-dev
* commit 'd630700a9fbc6d317e0b4df73cbbc74a2c8fadaa':
Jit: Fix for 2542488 JIT codegen bug with overlapping wide operands
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index e7496ac96..0720478c0 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -688,7 +688,7 @@ static bool genArithOpLong(CompilationUnit *cUnit, MIR *mir, dvmCompilerAbort(cUnit); } if (!callOut) { - genLong3Addr(cUnit, firstOp, secondOp, rlDest, rlSrc1, rlSrc2); + genLong3Addr(cUnit, mir, firstOp, secondOp, rlDest, rlSrc1, rlSrc2); } else { // Adjust return regs in to handle case of rem returning r2/r3 dvmCompilerFlushAllRegs(cUnit); /* Send everything to home location */ |