ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some minor bugs pointed out by PVS Studio (thanks!)

This commit is contained in:
Henrik Rydgard 2012-03-03 20:07:20 +01:00
parent ee09def802
commit f5d4fe0bfe
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/SysConf.cpp
View File

@ -387,7 +387,7 @@ bool SysConf::SaveToFile(const char *filename)
} }
else if (i->type == Type_SmallArray) else if (i->type == Type_SmallArray)
{ {
const u8 len = i->dataLength; const u8 len = (u8)(i->dataLength);
f.WriteArray(&len, 1); f.WriteArray(&len, 1);
} }

2
Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
View File

@ -109,7 +109,7 @@ CEXIIPL::CEXIIPL() :
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bHLE_BS2)
{ {
// Copy header // Copy header
memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, sizeof(m_bNTSC ? iplverNTSC : iplverPAL)); memcpy(m_pIPL, m_bNTSC ? iplverNTSC : iplverPAL, m_bNTSC ? sizeof(iplverNTSC) : sizeof(iplverPAL));
// Load fonts // Load fonts
LoadFileToIPL((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SJIS), 0x1aff00); LoadFileToIPL((File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + FONT_SJIS), 0x1aff00);

2
Source/Core/Core/Src/PowerPC/Jit64IL/IR.cpp
View File

@ -1212,7 +1212,7 @@ void IRBuilder::simplifyCommutative(unsigned Opcode, InstLoc& Op1, InstLoc& Op2)
} }
bool IRBuilder::maskedValueIsZero(InstLoc Op1, InstLoc Op2) const { bool IRBuilder::maskedValueIsZero(InstLoc Op1, InstLoc Op2) const {
return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op1)) == 0; return (~ComputeKnownZeroBits(Op1) & ~ComputeKnownZeroBits(Op2)) == 0;
} }
// Returns I' if I == (0 - I') // Returns I' if I == (0 - I')

2
Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
View File

@ -299,7 +299,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
merged_addresses[0] = address; merged_addresses[0] = address;
size_of_merged_addresses = 1; size_of_merged_addresses = 1;
memset(st, 0, sizeof(st)); memset(st, 0, sizeof(*st));
// Disabled the following optimization in preference of FAST_ICACHE // Disabled the following optimization in preference of FAST_ICACHE
//UGeckoInstruction previnst = Memory::Read_Opcode_JIT_LC(address - 4); //UGeckoInstruction previnst = Memory::Read_Opcode_JIT_LC(address - 4);

2
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
View File

@ -158,7 +158,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo
} }
u32* ptr = &uid->values[2]; u32* ptr = &uid->values[2];
for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i)
{ {
StageHash(i, ptr); StageHash(i, ptr);
ptr += 4; // max: ptr = &uid->values[66] ptr += 4; // max: ptr = &uid->values[66]

2
Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp
View File

@ -595,7 +595,7 @@ void drawShadedTexSubQuad(ID3D11ShaderResourceView* texture,
// only upload the data to VRAM if it changed // only upload the data to VRAM if it changed
if (stsq_observer || if (stsq_observer ||
memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(rDest)) != 0 || memcmp(rDest, &tex_sub_quad_data.rdest, sizeof(*rDest)) != 0 ||
tex_sub_quad_data.u1 != u1 || tex_sub_quad_data.v1 != v1 || tex_sub_quad_data.u1 != u1 || tex_sub_quad_data.v1 != v1 ||
tex_sub_quad_data.u2 != u2 || tex_sub_quad_data.v2 != v2 || tex_sub_quad_data.G != G) tex_sub_quad_data.u2 != u2 || tex_sub_quad_data.v2 != v2 || tex_sub_quad_data.G != G)
{ {

2
Source/Plugins/Plugin_VideoDX9/Src/D3DUtil.cpp
View File

@ -383,7 +383,7 @@ void drawShadedTexQuad(IDirect3DTexture9 *texture,
float v2=((float)rSource->bottom) * sh; float v2=((float)rSource->bottom) * sh;
float g = 1.0f/Gamma; float g = 1.0f/Gamma;
struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = { const struct Q2DVertex { float x,y,z,rhw,u,v,w,h,G; } coords[4] = {
{-1.0f - dw,-1.0f + dh, 0.0f,1.0f, u1, v2, sw, sh, g}, {-1.0f - dw,-1.0f + dh, 0.0f,1.0f, u1, v2, sw, sh, g},
{-1.0f - dw, 1.0f + dh, 0.0f,1.0f, u1, v1, sw, sh, g}, {-1.0f - dw, 1.0f + dh, 0.0f,1.0f, u1, v1, sw, sh, g},
{ 1.0f - dw,-1.0f + dh, 0.0f,1.0f, u2, v2, sw, sh, g}, { 1.0f - dw,-1.0f + dh, 0.0f,1.0f, u2, v2, sw, sh, g},