diff options
| author | 2011-09-07 13:33:53 -0700 | |
|---|---|---|
| committer | 2011-09-07 13:33:53 -0700 | |
| commit | c83b29da4c2052e2299bf0480065ea2d4c6cdac1 (patch) | |
| tree | 53810d043b2e55ce024958e61cd1fa3afb163d37 /src/compiler/codegen/arm/MethodCodegenDriver.cc | |
| parent | 98e0e5eb4792dd71ef696b8601c93b527193b0d3 (diff) | |
| parent | 0c7f26d54ddb70dbc60aaaa6a6e9f011e402018f (diff) | |
Merge "Fixes for register promotion; enable fast path" into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/arm/MethodCodegenDriver.cc')
| -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 96f54237c9..9c87659be8 100644 --- a/src/compiler/codegen/arm/MethodCodegenDriver.cc +++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#define FORCE_SLOW 1 +#define FORCE_SLOW 0 static const RegLocation badLoc = {kLocDalvikFrame, 0, 0, INVALID_REG, INVALID_REG, INVALID_SREG, 0, @@ -804,7 +804,7 @@ static int genDalvikArgsRange(CompilationUnit* cUnit, MIR* mir, * frame backing storage. */ // Scan the rest of the args - if in physReg flush to memory - for (int i = 4; i < numArgs; i++) { + for (int i = 3; i < numArgs; i++) { RegLocation loc = oatGetRawSrc(cUnit, mir, i); if (loc.wide) { loc = oatUpdateLocWide(cUnit, loc); |