diff options
| author | 2012-06-13 11:12:43 -0700 | |
|---|---|---|
| committer | 2012-06-13 11:12:43 -0700 | |
| commit | 1a5e1e7b3b2340a6ac08c53220900d4044ac3e4c (patch) | |
| tree | 06f0041c4ff4363b1b94d3a4e8133e914fb02fa9 /src/compiler/codegen/MethodBitcode.cc | |
| parent | 27cac650c28bb6887b1be85fff3857c77211b294 (diff) | |
| parent | 15bf9804820b73765899e4b3e0d8a1fa15e0dbd3 (diff) | |
Merge "More Quick compiler restructuring" into ics-mr1-plus-art
Diffstat (limited to 'src/compiler/codegen/MethodBitcode.cc')
| -rw-r--r-- | src/compiler/codegen/MethodBitcode.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc index 4ada78cfb0..3b6b087e8d 100644 --- a/src/compiler/codegen/MethodBitcode.cc +++ b/src/compiler/codegen/MethodBitcode.cc @@ -336,7 +336,7 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, rlSrc[0] = rlSrc[1] = rlSrc[2] = badLoc; if (attrs & DF_UA) { if (attrs & DF_A_WIDE) { - rlSrc[nextLoc++] = oatGetSrcWide(cUnit, mir, nextSreg, nextSreg + 1); + rlSrc[nextLoc++] = oatGetSrcWide(cUnit, mir, nextSreg); nextSreg+= 2; } else { rlSrc[nextLoc++] = oatGetSrc(cUnit, mir, nextSreg); @@ -345,7 +345,7 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, } if (attrs & DF_UB) { if (attrs & DF_B_WIDE) { - rlSrc[nextLoc++] = oatGetSrcWide(cUnit, mir, nextSreg, nextSreg + 1); + rlSrc[nextLoc++] = oatGetSrcWide(cUnit, mir, nextSreg); nextSreg+= 2; } else { rlSrc[nextLoc++] = oatGetSrc(cUnit, mir, nextSreg); @@ -354,16 +354,16 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, } if (attrs & DF_UC) { if (attrs & DF_C_WIDE) { - rlSrc[nextLoc++] = oatGetSrcWide(cUnit, mir, nextSreg, nextSreg + 1); + rlSrc[nextLoc++] = oatGetSrcWide(cUnit, mir, nextSreg); } else { rlSrc[nextLoc++] = oatGetSrc(cUnit, mir, nextSreg); } } if (attrs & DF_DA) { if (attrs & DF_A_WIDE) { - rlDest = oatGetDestWide(cUnit, mir, 0, 1); + rlDest = oatGetDestWide(cUnit, mir); } else { - rlDest = oatGetDest(cUnit, mir, 0); + rlDest = oatGetDest(cUnit, mir); if (rlDest.ref) { objectDefinition = true; } @@ -993,7 +993,7 @@ void convertExtendedMIR(CompilationUnit* cUnit, BasicBlock* bb, MIR* mir, for (int i = 0; i < mir->ssaRep->numUses; i++) { RegLocation loc; if (rlDest.wide) { - loc = oatGetSrcWide(cUnit, mir, i, i+1); + loc = oatGetSrcWide(cUnit, mir, i); i++; } else { loc = oatGetSrc(cUnit, mir, i); |