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

Vif: Fix logically dead code with something slightly quicker. Coverity CID 146827: In _vifCode_MPG(int, unsigned int, unsigned int const*, int): Code can never be reached because of a logical contradiction (CWE-561)

This commit is contained in:
refractionpcsx2 2015-09-26 12:59:48 +01:00
parent 00e37224ed
commit a89307c5ba
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcsx2/Vif_Codes.cpp
View File

@ -278,6 +278,7 @@ vifOp(vifCode_Mark) {
static __fi void _vifCode_MPG(int idx, u32 addr, const u32 *data, int size) { static __fi void _vifCode_MPG(int idx, u32 addr, const u32 *data, int size) {
VURegs& VUx = idx ? VU1 : VU0; VURegs& VUx = idx ? VU1 : VU0;
vifStruct& vifX = GetVifX; vifStruct& vifX = GetVifX;
u16 vuMemSize = idx ? 0x4000 : 0x1000;
pxAssert(VUx.Micro > 0); pxAssert(VUx.Micro > 0);
vifExecQueue(idx); vifExecQueue(idx);
@ -290,14 +291,14 @@ static __fi void _vifCode_MPG(int idx, u32 addr, const u32 *data, int size) {
// Don't forget the Unsigned designator for these checks // Don't forget the Unsigned designator for these checks
if((addr + size *4) > (idx ? 0x4000U : 0x1000U)) if((addr + size *4) > vuMemSize)
{ {
//DevCon.Warning("Handling split MPG"); //DevCon.Warning("Handling split MPG");
if (!idx) CpuVU0->Clear(addr, (idx ? 0x4000 : 0x1000) - addr); if (!idx) CpuVU0->Clear(addr, vuMemSize - addr);
else CpuVU1->Clear(addr, (idx ? 0x4000 : 0x1000) - addr); else CpuVU1->Clear(addr, vuMemSize - addr);
memcpy(VUx.Micro + addr, data, (idx ? 0x4000 : 0x1000) - addr); memcpy(VUx.Micro + addr, data, vuMemSize - addr);
size -= ((idx ? 0x4000 : 0x1000) - addr) / 4; size -= (vuMemSize - addr) / 4;
memcpy(VUx.Micro, data, size); memcpy(VUx.Micro, data, size);
vifX.tag.addr = size * 4; vifX.tag.addr = size * 4;