diff options
| author | Bill Buzbee <buzbee@google.com> | 2010-03-11 11:30:26 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-11 11:30:26 -0800 |
| commit | 880f81decd456aea36ee39d494eece1130a44103 (patch) | |
| tree | bd499399afcd7672644de3c7b1527fba57ce4b0b /vm/compiler/codegen/arm/CodegenDriver.c | |
| parent | 9785b99ba871ff20ec5db5d09db296bc4992f437 (diff) | |
| parent | 4527387dd3b5c4dce7300c764805ffd0f3d22649 (diff) | |
am 4527387d: Jit: Make debugging mode aware of inlineExecute/moveResult optimization
Merge commit '4527387dd3b5c4dce7300c764805ffd0f3d22649' into dalvik-dev
* commit '4527387dd3b5c4dce7300c764805ffd0f3d22649':
Jit: Make debugging mode aware of inlineExecute/moveResult optimization
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenDriver.c')
| -rw-r--r-- | vm/compiler/codegen/arm/CodegenDriver.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index 434dbbfa4..4e740bef2 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -1226,6 +1226,10 @@ static void genInterpSingleStep(CompilationUnit *cUnit, MIR *mir) int flagsToCheck = kInstrCanBranch | kInstrCanSwitch | kInstrCanReturn | kInstrCanThrow; + //If already optimized out, just ignore + if (mir->dalvikInsn.opCode == OP_NOP) + return; + //Ugly, but necessary. Flush all Dalvik regs so Interp can find them dvmCompilerFlushAllRegs(cUnit); |