From 4d78b6be31457934a265b6965009697e52ff967b Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 14 Apr 2014 21:32:55 +0200 Subject: [PATCH] pcsx2/plugin: sign compare mismatch extra --- pcsx2/CDVD/CDVD.cpp | 2 +- pcsx2/Patch.cpp | 2 +- pcsx2/R5900.cpp | 2 +- pcsx2/SPR.cpp | 2 +- pcsx2/Vif1_MFIFO.cpp | 2 +- pcsx2/x86/sVU_zerorec.cpp | 4 ++-- plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp | 4 ++-- plugins/zzogl-pg/opengl/targets.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index f2a68d90b7..e976d7811b 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -44,7 +44,7 @@ static __fi void SetResultSize(u8 size) 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 // Keep long seeks out though, as games may try to push dmas while seeking. (Tales of the Abyss) diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index 5ba0bc904c..c9615fa37f 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -224,7 +224,7 @@ int LoadCheatsFromZip(wxString gameCRC, const wxString& cheatsArchiveFilename) { { wxString name = entry->GetName(); 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'", entry->GetName().c_str(), cheatsArchiveFilename.c_str()); wxTextInputStream pnach(zip); diff --git a/pcsx2/R5900.cpp b/pcsx2/R5900.cpp index e4c712bac1..fe2e71e7f0 100644 --- a/pcsx2/R5900.cpp +++ b/pcsx2/R5900.cpp @@ -558,7 +558,7 @@ void __fastcall eeloadReplaceOSDSYS() cdvdReloadElfInfo(); // didn't recognize an ELF - if (ElfEntry == -1) { + if (ElfEntry == 0xFFFFFFFF) { eeGameStarting(); return; } diff --git a/pcsx2/SPR.cpp b/pcsx2/SPR.cpp index cc59aadb28..9100796ced 100644 --- a/pcsx2/SPR.cpp +++ b/pcsx2/SPR.cpp @@ -78,7 +78,7 @@ int _SPR0chain() pMem = SPRdmaGetAddr(spr0ch.madr, true); 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; diff --git a/pcsx2/Vif1_MFIFO.cpp b/pcsx2/Vif1_MFIFO.cpp index b038e67c58..cec475392e 100644 --- a/pcsx2/Vif1_MFIFO.cpp +++ b/pcsx2/Vif1_MFIFO.cpp @@ -116,7 +116,7 @@ static __fi void mfifo_VIF1chain() } 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"); diff --git a/pcsx2/x86/sVU_zerorec.cpp b/pcsx2/x86/sVU_zerorec.cpp index eeda23fc48..56dbc220be 100644 --- a/pcsx2/x86/sVU_zerorec.cpp +++ b/pcsx2/x86/sVU_zerorec.cpp @@ -764,7 +764,7 @@ list::iterator VuBaseBlock::GetInstIterAtPc(int instpc) { pxAssert(instpc >= 0); - u32 curpc = startpc; + int curpc = startpc; list::iterator it; for (it = insts.begin(); it != insts.end(); ++it) { @@ -785,7 +785,7 @@ void VuBaseBlock::GetInstsAtPc(int instpc, list& listinsts) listinsts.clear(); - u32 curpc = startpc; + int curpc = startpc; list::iterator it; for (it = insts.begin(); it != insts.end(); ++it) { diff --git a/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp b/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp index b1e311a5d7..354318402a 100644 --- a/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp +++ b/plugins/zzogl-pg/opengl/ZZoglFlushHack.cpp @@ -445,11 +445,11 @@ bool GSC_HauntingGround(const GSFrameInfo& fi, int& skip) // Note GSdx seems to use invert somewhere FBMSK. So values were inverted 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; else if(fi.TME && fi.FBP == 0x3000 && fi.TBP0 == 0x3380) 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)) skip = 1; } diff --git a/plugins/zzogl-pg/opengl/targets.cpp b/plugins/zzogl-pg/opengl/targets.cpp index 1d4e78f7f8..8d3dd32f36 100644 --- a/plugins/zzogl-pg/opengl/targets.cpp +++ b/plugins/zzogl-pg/opengl/targets.cpp @@ -254,7 +254,7 @@ void CRangeManager::Insert(int start, int end) 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; break;