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

pcsx2/plugin: sign compare mismatch extra

This commit is contained in:
Gregory Hainaut 2014-04-14 21:32:55 +02:00
parent 5087d13de8
commit 4d78b6be31
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/CDVD.cpp
View File

@ -44,7 +44,7 @@ static __fi void SetResultSize(u8 size)
cdvd.sDataIn&=~0x40; cdvd.sDataIn&=~0x40;
} }
static void CDVDREAD_INT(int eCycle) static void CDVDREAD_INT(u32 eCycle)
{ {
// Give it an arbitary FAST value. Good for ~5000kb/s in ULE when copying a file from CDVD to HDD // Give it an arbitary FAST value. Good for ~5000kb/s in ULE when copying a file from CDVD to HDD
// Keep long seeks out though, as games may try to push dmas while seeking. (Tales of the Abyss) // Keep long seeks out though, as games may try to push dmas while seeking. (Tales of the Abyss)

2
pcsx2/Patch.cpp
View File

@ -224,7 +224,7 @@ int LoadCheatsFromZip(wxString gameCRC, const wxString& cheatsArchiveFilename) {
{ {
wxString name = entry->GetName(); wxString name = entry->GetName();
name.MakeUpper(); name.MakeUpper();
if (name.Find(gameCRC) == 0 && name.Find(L".PNACH") == name.Length()-6) { if (name.Find(gameCRC) == 0 && name.Find(L".PNACH")+6u == name.Length()) {
Console.WriteLn(Color_Gray, L"Loading patch '%s' from archive '%s'", Console.WriteLn(Color_Gray, L"Loading patch '%s' from archive '%s'",
entry->GetName().c_str(), cheatsArchiveFilename.c_str()); entry->GetName().c_str(), cheatsArchiveFilename.c_str());
wxTextInputStream pnach(zip); wxTextInputStream pnach(zip);

2
pcsx2/R5900.cpp
View File

@ -558,7 +558,7 @@ void __fastcall eeloadReplaceOSDSYS()
cdvdReloadElfInfo(); cdvdReloadElfInfo();
// didn't recognize an ELF // didn't recognize an ELF
if (ElfEntry == -1) { if (ElfEntry == 0xFFFFFFFF) {
eeGameStarting(); eeGameStarting();
return; return;
} }

2
pcsx2/SPR.cpp
View File

@ -78,7 +78,7 @@ int _SPR0chain()
pMem = SPRdmaGetAddr(spr0ch.madr, true); pMem = SPRdmaGetAddr(spr0ch.madr, true);
if (pMem == NULL) return -1; if (pMem == NULL) return -1;
if(spr0ch.madr >= dmacRegs.rbor.ADDR && spr0ch.madr < (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) if(spr0ch.madr >= dmacRegs.rbor.ADDR && spr0ch.madr < (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16u))
{ {
partialqwc = spr0ch.qwc; partialqwc = spr0ch.qwc;

2
pcsx2/Vif1_MFIFO.cpp
View File

@ -116,7 +116,7 @@ static __fi void mfifo_VIF1chain()
} }
if (vif1ch.madr >= dmacRegs.rbor.ADDR && if (vif1ch.madr >= dmacRegs.rbor.ADDR &&
vif1ch.madr < (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) vif1ch.madr < (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16u))
{ {
//if(vif1ch.madr == (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) DevCon.Warning("Edge VIF1"); //if(vif1ch.madr == (dmacRegs.rbor.ADDR + dmacRegs.rbsr.RMSK + 16)) DevCon.Warning("Edge VIF1");

4
pcsx2/x86/sVU_zerorec.cpp
View File

@ -764,7 +764,7 @@ list<VuInstruction>::iterator VuBaseBlock::GetInstIterAtPc(int instpc)
{ {
pxAssert(instpc >= 0); pxAssert(instpc >= 0);
u32 curpc = startpc; int curpc = startpc;
list<VuInstruction>::iterator it; list<VuInstruction>::iterator it;
for (it = insts.begin(); it != insts.end(); ++it) for (it = insts.begin(); it != insts.end(); ++it)
{ {
@ -785,7 +785,7 @@ void VuBaseBlock::GetInstsAtPc(int instpc, list<VuInstruction*>& listinsts)
listinsts.clear(); listinsts.clear();
u32 curpc = startpc; int curpc = startpc;
list<VuInstruction>::iterator it; list<VuInstruction>::iterator it;
for (it = insts.begin(); it != insts.end(); ++it) for (it = insts.begin(); it != insts.end(); ++it)
{ {

4
plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp
View File

@ -445,11 +445,11 @@ bool GSC_HauntingGround(const GSFrameInfo& fi, int& skip)
// Note GSdx seems to use invert somewhere FBMSK. So values were inverted // Note GSdx seems to use invert somewhere FBMSK. So values were inverted
if(skip == 0) if(skip == 0)
{ {
if(fi.TME && fi.FPSM == fi.TPSM && fi.TPSM == PSMCT16S && fi.FBMSK == ~(0x03FFF)) if(fi.TME && fi.FPSM == fi.TPSM && fi.TPSM == PSMCT16S && ~fi.FBMSK == 0x03FFF)
skip = 1; skip = 1;
else if(fi.TME && fi.FBP == 0x3000 && fi.TBP0 == 0x3380) else if(fi.TME && fi.FBP == 0x3000 && fi.TBP0 == 0x3380)
skip = 1; // bloom skip = 1; // bloom
else if(fi.TME && fi.FBP == fi.TBP0 && fi.TBP0 == 0x3000 && fi.FBMSK == ~(0xFFFFFF) && else if(fi.TME && fi.FBP == fi.TBP0 && fi.TBP0 == 0x3000 && ~fi.FBMSK == 0xFFFFFF &&
GABEST_HAS_SHARED_BITS(fi.FBP, fi.FPSM, fi.TBP0, fi.TPSM)) GABEST_HAS_SHARED_BITS(fi.FBP, fi.FPSM, fi.TBP0, fi.TPSM))
skip = 1; skip = 1;
} }

2
plugins/zzogl-pg/opengl/targets.cpp
View File

@ -254,7 +254,7 @@ void CRangeManager::Insert(int start, int end)
assert(imid < (int)ranges.size()); assert(imid < (int)ranges.size());
if ((ranges[imid].end <= end) && ((imid == ranges.size() - 1) || (ranges[imid+1].start > end))) if ((ranges[imid].end <= end) && ((imid == (int)ranges.size() - 1) || (ranges[imid+1].start > end)))
{ {
imin = imid; imin = imid;
break; break;