N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #772 from lioncash/warn

Browse source 
core/video_core: Fix a few warnings when compiling on MSVC.
This commit is contained in:
bunnei 2015-05-18 08:08:49 -04:00
parent 1b47da4115 497f4bee0c
commit f0365f28c2
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/arm/skyeye_common/vfp/vfpdouble.cpp
View file

@ -531,7 +531,7 @@ static u32 vfp_double_fsito(ARMul_State* state, int dd, int unused, int dm, u32
LOG_TRACE(Core_ARM11, "In %s\n", __FUNCTION__); LOG_TRACE(Core_ARM11, "In %s\n", __FUNCTION__);
vdm.sign = (m & 0x80000000) >> 16; vdm.sign = (m & 0x80000000) >> 16;
vdm.exponent = 1023 + 63 - 1; vdm.exponent = 1023 + 63 - 1;
vdm.significand = vdm.sign ? -m : m; vdm.significand = vdm.sign ? (~m + 1) : m;
return vfp_double_normaliseround(state, dd, &vdm, fpscr, 0, "fsito"); return vfp_double_normaliseround(state, dd, &vdm, fpscr, 0, "fsito");
} }
@ -669,7 +669,7 @@ static u32 vfp_double_ftosi(ARMul_State* state, int sd, int unused, int dm, u32
exceptions |= FPSCR_IXC; exceptions |= FPSCR_IXC;
if (vdm.sign) if (vdm.sign)
d = -d; d = (~d + 1);
} else { } else {
d = 0; d = 0;
if (vdm.exponent | vdm.significand) { if (vdm.exponent | vdm.significand) {
@ -817,7 +817,7 @@ u32 vfp_double_add(struct vfp_double *vdd, struct vfp_double *vdn,struct vfp_dou
m_sig = vdn->significand - m_sig; m_sig = vdn->significand - m_sig;
if ((s64)m_sig < 0) { if ((s64)m_sig < 0) {
vdd->sign = vfp_sign_negate(vdd->sign); vdd->sign = vfp_sign_negate(vdd->sign);
m_sig = -m_sig; m_sig = (~m_sig + 1);
} else if (m_sig == 0) { } else if (m_sig == 0) {
vdd->sign = (fpscr & FPSCR_RMODE_MASK) == vdd->sign = (fpscr & FPSCR_RMODE_MASK) ==
FPSCR_ROUND_MINUSINF ? 0x8000 : 0; FPSCR_ROUND_MINUSINF ? 0x8000 : 0;

6
src/core/arm/skyeye_common/vfp/vfpsingle.cpp
View file

@ -388,7 +388,7 @@ sqrt_invalid:
} else { } else {
u64 term; u64 term;
s64 rem; s64 rem;
vsm.significand <<= !(vsm.exponent & 1); vsm.significand <<= static_cast<u32>((vsm.exponent & 1) == 0);
term = (u64)vsd.significand * vsd.significand; term = (u64)vsd.significand * vsd.significand;
rem = ((u64)vsm.significand << 32) - term; rem = ((u64)vsm.significand << 32) - term;
@ -691,7 +691,7 @@ static u32 vfp_single_ftosi(ARMul_State* state, int sd, int unused, s32 m, u32 f
exceptions |= FPSCR_IXC; exceptions |= FPSCR_IXC;
if (vsm.sign) if (vsm.sign)
d = 0-d; d = (~d + 1);
} else { } else {
d = 0; d = 0;
if (vsm.exponent | vsm.significand) { if (vsm.exponent | vsm.significand) {
@ -843,7 +843,7 @@ vfp_single_add(struct vfp_single *vsd, struct vfp_single *vsn,
m_sig = vsn->significand - m_sig; m_sig = vsn->significand - m_sig;
if ((s32)m_sig < 0) { if ((s32)m_sig < 0) {
vsd->sign = vfp_sign_negate(vsd->sign); vsd->sign = vfp_sign_negate(vsd->sign);
m_sig = 0-m_sig; m_sig = (~m_sig + 1);
} else if (m_sig == 0) { } else if (m_sig == 0) {
vsd->sign = (fpscr & FPSCR_RMODE_MASK) == vsd->sign = (fpscr & FPSCR_RMODE_MASK) ==
FPSCR_ROUND_MINUSINF ? 0x8000 : 0; FPSCR_ROUND_MINUSINF ? 0x8000 : 0;

6
src/core/hle/kernel/process.cpp
View file

@ -28,7 +28,7 @@ SharedPtr<Process> Process::Create(std::string name, u64 program_id) {
} }
void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) { void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
for (int i = 0; i < len; ++i) { for (size_t i = 0; i < len; ++i) {
u32 descriptor = kernel_caps[i]; u32 descriptor = kernel_caps[i];
u32 type = descriptor >> 20; u32 type = descriptor >> 20;
@ -65,8 +65,8 @@ void Process::ParseKernelCaps(const u32* kernel_caps, size_t len) {
AddressMapping mapping; AddressMapping mapping;
mapping.address = descriptor << 12; mapping.address = descriptor << 12;
mapping.size = (end_desc << 12) - mapping.address; mapping.size = (end_desc << 12) - mapping.address;
mapping.writable = descriptor & (1 << 20); mapping.writable = (descriptor & (1 << 20)) != 0;
mapping.unk_flag = end_desc & (1 << 20); mapping.unk_flag = (end_desc & (1 << 20)) != 0;
address_mappings.push_back(mapping); address_mappings.push_back(mapping);
} else if ((type & 0xFFF) == 0xFFE) { // 0x000F } else if ((type & 0xFFF) == 0xFFE) { // 0x000F

2
src/video_core/pica.h
View file

@ -614,7 +614,7 @@ struct Regs {
} }
inline bool IsDefaultAttribute(int id) const { inline bool IsDefaultAttribute(int id) const {
return (id >= 12) || (attribute_mask & (1 << id)) != 0; return (id >= 12) || (attribute_mask & (1ULL << id)) != 0;
} }
inline int GetNumTotalAttributes() const { inline int GetNumTotalAttributes() const {