From a0929372ae4996cde3aece52f98128a957166ffc Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Thu, 11 Nov 2010 16:49:22 -0800 Subject: Stop reporting negative widths. At one point, returning a negative width for dexopt output was useful. That stopped being the case a long time ago. This also removes a bad assert that went into my previous checkin. Change-Id: I18880c2316f5499a09dc479d271ca70b2a5be259 --- vm/compiler/codegen/arm/CodegenDriver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vm/compiler/codegen/arm/CodegenDriver.c') diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c index de0d6e6f0..17c356b98 100644 --- a/vm/compiler/codegen/arm/CodegenDriver.c +++ b/vm/compiler/codegen/arm/CodegenDriver.c @@ -1283,8 +1283,7 @@ static void genMonitorPortable(CompilationUnit *cUnit, MIR *mir) if (isEnter) { /* Get dPC of next insn */ loadConstant(cUnit, r4PC, (int)(cUnit->method->insns + mir->offset + - dexGetInstrWidthAbs(gDvm.instrInfo.widths, - OP_MONITOR_ENTER))); + dexGetInstrWidth(gDvm.instrInfo.widths, OP_MONITOR_ENTER))); #if defined(WITH_DEADLOCK_PREDICTION) genDispatchToHandler(cUnit, TEMPLATE_MONITOR_ENTER_DEBUG); #else @@ -1298,8 +1297,7 @@ static void genMonitorPortable(CompilationUnit *cUnit, MIR *mir) ArmLIR *branchOver = genCmpImmBranch(cUnit, kArmCondNe, r0, 0); loadConstant(cUnit, r0, (int) (cUnit->method->insns + mir->offset + - dexGetInstrWidthAbs(gDvm.instrInfo.widths, - OP_MONITOR_EXIT))); + dexGetInstrWidth(gDvm.instrInfo.widths, OP_MONITOR_EXIT))); genDispatchToHandler(cUnit, TEMPLATE_THROW_EXCEPTION_COMMON); ArmLIR *target = newLIR0(cUnit, kArmPseudoTargetLabel); target->defMask = ENCODE_ALL; -- cgit v1.2.3