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

Silence a mVU bad opcode error log that would spam in Shadow Hearts 1 battles and likely in Dawn of Mana 2nd level, too. 

Also renamed a widescreen string and added a compiler warning fix.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5730 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2.code 2013-09-12 19:34:01 +00:00
parent 49d417b60e
commit a73e1b294a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/Vif_Codes.cpp
View File

@ -289,7 +289,8 @@ static __fi void _vifCode_MPG(int idx, u32 addr, const u32 *data, int size) {
if((addr + size *4) > (idx ? 0x4000 : 0x1000)) // Don't forget the Unsigned designator for these checks
if((addr + size *4) > (idx ? 0x4000U : 0x1000U))
{ {
//DevCon.Warning("Handling split MPG"); //DevCon.Warning("Handling split MPG");
if (!idx) CpuVU0->Clear(addr, (idx ? 0x4000 : 0x1000) - addr); if (!idx) CpuVU0->Clear(addr, (idx ? 0x4000 : 0x1000) - addr);

5
pcsx2/gui/AppCoreThread.cpp
View File

@ -354,16 +354,17 @@ void AppCoreThread::ApplySettings( const Pcsx2Config& src )
} }
ResetCheatsCount(); ResetCheatsCount();
// regular cheat patches
if (EmuConfig.EnableCheats) { if (EmuConfig.EnableCheats) {
if (numberLoadedCheats = LoadCheats(gameCRC, PathDefs::GetCheats(), L"Cheats")) { if (numberLoadedCheats = LoadCheats(gameCRC, PathDefs::GetCheats(), L"Cheats")) {
gameCheats.Printf(L" [%d Cheats]", numberLoadedCheats); gameCheats.Printf(L" [%d Cheats]", numberLoadedCheats);
} }
} }
// FIXME: we should have a widescreen hacks config // wide screen patches
if (EmuConfig.EnableWideScreenPatches) { if (EmuConfig.EnableWideScreenPatches) {
if (numberLoadedWideScreenPatches = LoadCheats(gameCRC, PathDefs::GetCheatsWS(), L"Widescreen hacks")) { if (numberLoadedWideScreenPatches = LoadCheats(gameCRC, PathDefs::GetCheatsWS(), L"Widescreen hacks")) {
gameWsHacks.Printf(L" [%d WS hacks]", numberLoadedWideScreenPatches); gameWsHacks.Printf(L" [%d widescreen hacks]", numberLoadedWideScreenPatches);
} }
} }

5
pcsx2/x86/microVU_Compile.inl
View File

@ -173,7 +173,9 @@ __fi void mVUcheckBadOp(mV) {
} }
// Prints msg when exiting block early if 1st op was a bad opcode (Dawn of Mana Level 2) // Prints msg when exiting block early if 1st op was a bad opcode (Dawn of Mana Level 2)
// #ifdef PCSX2_DEVBUILD because starting with SVN R5586 we get log spam in releases (Shadow Hearts battles)
__fi void handleBadOp(mV, int count) { __fi void handleBadOp(mV, int count) {
#ifdef PCSX2_DEVBUILD
if (mVUinfo.isBadOp) { if (mVUinfo.isBadOp) {
mVUbackupRegs(mVU, true); mVUbackupRegs(mVU, true);
xMOV(gprT2, mVU.prog.cur->idx); xMOV(gprT2, mVU.prog.cur->idx);
@ -182,6 +184,7 @@ __fi void handleBadOp(mV, int count) {
else xCALL(mVUbadOp1); else xCALL(mVUbadOp1);
mVUrestoreRegs(mVU, true); mVUrestoreRegs(mVU, true);
} }
#endif
} }
__ri void branchWarning(mV) { __ri void branchWarning(mV) {
@ -562,7 +565,7 @@ void* mVUcompile(microVU& mVU, u32 startPC, uptr pState) {
mVUbranch = 0; mVUbranch = 0;
u32 x = 0; u32 x = 0;
for( ; x < endCount; x++) { for( ; x < endCount; x++) {
if (mVUinfo.isEOB) { handleBadOp(mVU, x); x = 0xffff; } if (mVUinfo.isEOB) { handleBadOp(mVU, x); x = 0xffff; } // handleBadOp currently just prints a warning
if (mVUup.mBit) { xOR(ptr32[&mVU.regs().flags], VUFLAG_MFLAGSET); } if (mVUup.mBit) { xOR(ptr32[&mVU.regs().flags], VUFLAG_MFLAGSET); }
mVUexecuteInstruction(mVU); mVUexecuteInstruction(mVU);
if(!mVUinfo.isBdelay && !mVUlow.branch) //T/D Bit on branch is handled after the branch, branch delay slots are executed. if(!mVUinfo.isBdelay && !mVUlow.branch) //T/D Bit on branch is handled after the branch, branch delay slots are executed.