diff options
| author |  Lioncash | 2015-03-02 02:26:49 -0500 |
|---|---|---|
| committer | Lioncash | 2015-03-03 19:13:01 -0500 |
| commit | 4b89cf9e435f0a86f4b6656636b9bc0be092c111 (patch) | |
| tree | c81ed569efea1ff7a6401ef8e2d8ad2d6c3b86d2 /src | |
| parent | Merge pull request #621 from Subv/power (diff) | |
| download | yuzu-4b89cf9e435f0a86f4b6656636b9bc0be092c111.tar.gz yuzu-4b89cf9e435f0a86f4b6656636b9bc0be092c111.tar.xz yuzu-4b89cf9e435f0a86f4b6656636b9bc0be092c111.zip | |
vfp: Get rid of warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp_helper.h | 4 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpdouble.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfp_helper.h b/src/core/arm/skyeye_common/vfp/vfp_helper.h index 75d860e95..5d1b4e53f 100644 --- a/src/core/arm/skyeye_common/vfp/vfp_helper.h +++ b/src/core/arm/skyeye_common/vfp/vfp_helper.h | |||
| @@ -144,8 +144,8 @@ static inline void mul64to128(u64* resh, u64* resl, u64 n, u64 m) | |||
| 144 | u32 nh, nl, mh, ml; | 144 | u32 nh, nl, mh, ml; |
| 145 | u64 rh, rma, rmb, rl; | 145 | u64 rh, rma, rmb, rl; |
| 146 | 146 | ||
| 147 | nl = n; | 147 | nl = static_cast<u32>(n); |
| 148 | ml = m; | 148 | ml = static_cast<u32>(m); |
| 149 | rl = (u64)nl * ml; | 149 | rl = (u64)nl * ml; |
| 150 | 150 | ||
| 151 | nh = n >> 32; | 151 | nh = n >> 32; |
diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp index 1a05ef8c1..d76d37fd4 100644 --- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp | |||
| @@ -661,8 +661,8 @@ static u32 vfp_double_ftosi(ARMul_State* state, int sd, int unused, int dm, u32 | |||
| 661 | 661 | ||
| 662 | if ((rem + incr) < rem && d < 0xffffffff) | 662 | if ((rem + incr) < rem && d < 0xffffffff) |
| 663 | d += 1; | 663 | d += 1; |
| 664 | if (d > (0x7fffffff + (vdm.sign != 0))) { | 664 | if (d > (0x7fffffffU + (vdm.sign != 0))) { |
| 665 | d = (0x7fffffff + (vdm.sign != 0)); | 665 | d = (0x7fffffffU + (vdm.sign != 0)); |
| 666 | exceptions |= FPSCR_IOC; | 666 | exceptions |= FPSCR_IOC; |
| 667 | } else if (rem) | 667 | } else if (rem) |
| 668 | exceptions |= FPSCR_IXC; | 668 | exceptions |= FPSCR_IXC; |