diff options
| author | 2012-03-13 18:45:39 -0700 | |
|---|---|---|
| committer | 2012-03-14 23:25:39 -0700 | |
| commit | f7d9ad39541dd09030e26d54d3b73a076f90cc74 (patch) | |
| tree | aa0a9bc7b422ecc31432471fedd1b5fb496866b1 /src/compiler/codegen/mips | |
| parent | f320b639eee1ec0e9d99e8d6c2a805892d016807 (diff) | |
Enable all JNI internal compiler tests on the host.
(cherry picked from commit abda43c90f70963909128c1cc495190d60fd8372)
Change-Id: I0a7fc96e84dacf34108551271760aae13d5ee010
Diffstat (limited to 'src/compiler/codegen/mips')
| -rw-r--r-- | src/compiler/codegen/mips/FP/MipsFP.cc | 2 | ||||
| -rw-r--r-- | src/compiler/codegen/mips/MipsLIR.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/codegen/mips/FP/MipsFP.cc b/src/compiler/codegen/mips/FP/MipsFP.cc index 3bbb3d7982..d8ca0a1b59 100644 --- a/src/compiler/codegen/mips/FP/MipsFP.cc +++ b/src/compiler/codegen/mips/FP/MipsFP.cc @@ -218,7 +218,7 @@ static bool genCmpFP(CompilationUnit *cUnit, MIR *mir, RegLocation rlDest, } int rTgt = loadHelper(cUnit, offset); opReg(cUnit, kOpBlx, rTgt); - RegLocation rlResult = oatGetReturn(cUnit); + RegLocation rlResult = oatGetReturn(cUnit, false); storeValue(cUnit, rlDest, rlResult); return false; } diff --git a/src/compiler/codegen/mips/MipsLIR.h b/src/compiler/codegen/mips/MipsLIR.h index 8fdfe59580..5c8fc345e7 100644 --- a/src/compiler/codegen/mips/MipsLIR.h +++ b/src/compiler/codegen/mips/MipsLIR.h @@ -147,10 +147,12 @@ namespace art { /* RegisterLocation templates return values (r_V0, or r_V0/r_V1) */ #define LOC_C_RETURN {kLocPhysReg, 0, 0, 0, 0, 0, 1, r_V0, INVALID_REG, \ INVALID_SREG} +#define LOC_C_RETURN_FLOAT LOC_C_RETURN #define LOC_C_RETURN_ALT {kLocPhysReg, 0, 0, 0, 0, 0, 1, r_F0, INVALID_REG, \ - INVALID_SREG} + INVALID_SREG} #define LOC_C_RETURN_WIDE {kLocPhysReg, 1, 0, 0, 0, 0, 1, r_RESULT0, r_RESULT1,\ INVALID_SREG} +#define LOC_C_RETURN_WIDE_DOUBLE LOC_C_RETURN_WIDE #define LOC_C_RETURN_WIDE_ALT {kLocPhysReg, 1, 0, 0, 0, 0, 1, r_FRESULT0,\ r_FRESULT1, INVALID_SREG} |