diff options
| author | 2012-11-14 13:32:55 -0800 | |
|---|---|---|
| committer | 2012-11-14 13:32:55 -0800 | |
| commit | 8bb8e8653b4c3ad5d87863f98ffec5f95a96c1fa (patch) | |
| tree | fa64f9ad72867a7928ade0708533d8fe51f99db4 /src/compiler/codegen/MethodCodegenDriver.cc | |
| parent | 725a957985171d712d5c048cc3d00ff14968784b (diff) | |
| parent | f0504cdc5b6400edd4b39eea64ac280465042d5b (diff) | |
Merge "Quick backend: rename target-specific #defines" into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/MethodCodegenDriver.cc')
| -rw-r--r-- | src/compiler/codegen/MethodCodegenDriver.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc index 8fd6045a8d..3170abc7f0 100644 --- a/src/compiler/codegen/MethodCodegenDriver.cc +++ b/src/compiler/codegen/MethodCodegenDriver.cc @@ -25,8 +25,8 @@ const RegLocation badLoc = {kLocDalvikFrame, 0, 0, 0, 0, 0, 0, 0, 0, /* Mark register usage state and return long retloc */ RegLocation oatGetReturnWide(CompilationUnit* cUnit, bool isDouble) { - RegLocation gpr_res = LOC_C_RETURN_WIDE; - RegLocation fpr_res = LOC_C_RETURN_WIDE_DOUBLE; + RegLocation gpr_res = locCReturnWide(); + RegLocation fpr_res = locCReturnDouble(); RegLocation res = isDouble ? fpr_res : gpr_res; oatClobber(cUnit, res.lowReg); oatClobber(cUnit, res.highReg); @@ -38,8 +38,8 @@ RegLocation oatGetReturnWide(CompilationUnit* cUnit, bool isDouble) RegLocation oatGetReturn(CompilationUnit* cUnit, bool isFloat) { - RegLocation gpr_res = LOC_C_RETURN; - RegLocation fpr_res = LOC_C_RETURN_FLOAT; + RegLocation gpr_res = locCReturn(); + RegLocation fpr_res = locCReturnFloat(); RegLocation res = isFloat ? fpr_res : gpr_res; oatClobber(cUnit, res.lowReg); if (cUnit->instructionSet == kMips) { @@ -126,10 +126,11 @@ void genInvoke(CompilationUnit* cUnit, CallInfo* info) } LIR* callInst; if (cUnit->instructionSet != kX86) { - callInst = opReg(cUnit, kOpBlx, rINVOKE_TGT); + callInst = opReg(cUnit, kOpBlx, targetReg(kInvokeTgt)); } else { if (fastPath && info->type != kInterface) { - callInst = opMem(cUnit, kOpBlx, rARG0, AbstractMethod::GetCodeOffset().Int32Value()); + callInst = opMem(cUnit, kOpBlx, targetReg(kArg0), + AbstractMethod::GetCodeOffset().Int32Value()); } else { int trampoline = 0; switch (info->type) { |