From e6d6196822952a9ccbb6ac2a97f4e3ae5e59705b Mon Sep 17 00:00:00 2001 From: buzbee Date: Sat, 27 Aug 2011 11:58:19 -0700 Subject: Various bug fixes. The most amusing fix was the wierd NaN test failure. After spending way too much time debugging, it turned out to be a missing comma in the argument list of the test launcher. Change-Id: I76253575d7fbe2c2c260f1839a517c1b93dc9224 --- src/compiler/codegen/arm/MethodCodegenDriver.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/compiler/codegen/arm/MethodCodegenDriver.cc') diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc index f7194f14a6..1cf37664d4 100644 --- a/src/compiler/codegen/arm/MethodCodegenDriver.cc +++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc @@ -1455,15 +1455,12 @@ static bool compileDalvikInstruction(CompilationUnit* cUnit, MIR* mir, genArithOpLong(cUnit, mir, rlDest, rlSrc[0], rlSrc[1]); break; - case OP_SHL_LONG_2ADDR: - case OP_SHR_LONG_2ADDR: - case OP_USHR_LONG_2ADDR: - genShiftOpLong(cUnit,mir, rlDest, rlSrc[0], rlSrc[0]); - break; - case OP_SHL_LONG: case OP_SHR_LONG: case OP_USHR_LONG: + case OP_SHL_LONG_2ADDR: + case OP_SHR_LONG_2ADDR: + case OP_USHR_LONG_2ADDR: genShiftOpLong(cUnit,mir, rlDest, rlSrc[0], rlSrc[1]); break; -- cgit v1.2.3-59-g8ed1b