citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #625 from lioncash/warn 

vfp: Get rid of warnings
This commit is contained in:
bunnei 2015-03-03 19:15:32 -05:00
parent 510246ddce 4b89cf9e43
commit 8fc8c51118
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/arm/skyeye_common/vfp/vfp_helper.h
View File

@ -144,8 +144,8 @@ static inline void mul64to128(u64* resh, u64* resl, u64 n, u64 m)
u32 nh, nl, mh, ml; u32 nh, nl, mh, ml;
u64 rh, rma, rmb, rl; u64 rh, rma, rmb, rl;
nl = n; nl = static_cast<u32>(n);
ml = m; ml = static_cast<u32>(m);
rl = (u64)nl * ml; rl = (u64)nl * ml;
nh = n >> 32; nh = n >> 32;

4
src/core/arm/skyeye_common/vfp/vfpdouble.cpp
View File

@ -661,8 +661,8 @@ static u32 vfp_double_ftosi(ARMul_State* state, int sd, int unused, int dm, u32
if ((rem + incr) < rem && d < 0xffffffff) if ((rem + incr) < rem && d < 0xffffffff)
d += 1; d += 1;
if (d > (0x7fffffff + (vdm.sign != 0))) { if (d > (0x7fffffffU + (vdm.sign != 0))) {
d = (0x7fffffff + (vdm.sign != 0)); d = (0x7fffffffU + (vdm.sign != 0));
exceptions |= FPSCR_IOC; exceptions |= FPSCR_IOC;
} else if (rem) } else if (rem)
exceptions |= FPSCR_IXC; exceptions |= FPSCR_IXC;