diff options
| author | 2014-06-27 16:15:37 +0000 | |
|---|---|---|
| committer | 2014-06-26 18:12:01 +0000 | |
| commit | d5a4a2f96e6f082eea299f52d3373d6573ca06ca (patch) | |
| tree | c373f01c8782f05a16b908c6ab35faf4fcbe0fc7 | |
| parent | aec31aaef2750c620528a35491fd4d9a23f5be7c (diff) | |
| parent | c6301bcfbefa1c320f922d2209caee3481dc1aa2 (diff) | |
Merge "ART: ARM64 fp return reg locations are FP"
| -rw-r--r-- | compiler/dex/quick/arm64/arm64_lir.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/quick/arm64/arm64_lir.h b/compiler/dex/quick/arm64/arm64_lir.h index 1f1a252343..ac5f33b721 100644 --- a/compiler/dex/quick/arm64/arm64_lir.h +++ b/compiler/dex/quick/arm64/arm64_lir.h @@ -181,9 +181,9 @@ const RegLocation arm_loc_c_return = const RegLocation arm_loc_c_return_wide = {kLocPhysReg, 1, 0, 0, 0, 0, 0, 0, 1, rs_x0, INVALID_SREG, INVALID_SREG}; const RegLocation arm_loc_c_return_float = - {kLocPhysReg, 0, 0, 0, 0, 0, 0, 0, 1, rs_f0, INVALID_SREG, INVALID_SREG}; + {kLocPhysReg, 0, 0, 0, 1, 0, 0, 0, 1, rs_f0, INVALID_SREG, INVALID_SREG}; const RegLocation arm_loc_c_return_double = - {kLocPhysReg, 1, 0, 0, 0, 0, 0, 0, 1, rs_d0, INVALID_SREG, INVALID_SREG}; + {kLocPhysReg, 1, 0, 0, 1, 0, 0, 0, 1, rs_d0, INVALID_SREG, INVALID_SREG}; /** * @brief Shift-type to be applied to a register via EncodeShift(). |