From 26392e7f3e2110294b179137e0c1d83be1de9a09 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Tue, 17 Apr 2012 17:55:51 +0000 Subject: [PATCH] Change various logs to sound "nicer". git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5160 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CDVD/CDVD.cpp | 2 +- pcsx2/Gif_Unit.h | 2 +- pcsx2/PluginManager.cpp | 2 +- pcsx2/gui/Panels/MemoryCardListPanel.cpp | 8 ++++---- pcsx2/gui/SysState.cpp | 6 +++--- pcsx2/x86/microVU_Analyze.inl | 12 ++++++------ plugins/GSdx/GSCrc.cpp | 3 ++- plugins/GSdx/GSState.cpp | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index 3a8ab4892b..be4bf99b94 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -765,7 +765,7 @@ __fi void cdvdActionInterrupt() case cdvdAction_Break: // Make sure the cdvd action state is pretty well cleared: - DevCon.Warning("CDVD Break Call"); + DevCon.WriteLn("CDVD Break Call"); cdvd.Reading = 0; cdvd.Readed = 0; cdvd.Ready = CDVD_READY2; // should be CDVD_READY1 or something else? diff --git a/pcsx2/Gif_Unit.h b/pcsx2/Gif_Unit.h index b867720134..4e4dc10470 100644 --- a/pcsx2/Gif_Unit.h +++ b/pcsx2/Gif_Unit.h @@ -429,7 +429,7 @@ struct Gif_Unit { Gif_Tag gifTag(&pMem[offset & memMask]); incTag(offset, curSize, 16 + gifTag.len); // Tag + Data length if (pathIdx == GIF_PATH_1 && curSize >= 0x4000) { - Console.Warning("Gif Unit - GS packet size exceeded VU memory size!"); + DevCon.Warning("Gif Unit - GS packet size exceeded VU memory size!"); return 0; // Bios does this... (Fixed if you delay vu1's xgkick by 103 vu cycles) } if (curSize >= size) return size; diff --git a/pcsx2/PluginManager.cpp b/pcsx2/PluginManager.cpp index 0fc2cba716..1166fca2cd 100644 --- a/pcsx2/PluginManager.cpp +++ b/pcsx2/PluginManager.cpp @@ -967,7 +967,7 @@ void SysCorePlugins::Load( PluginsEnum_t pid, const wxString& srcfile ) { ScopedLock lock( m_mtx_PluginStatus ); pxAssert( (uint)pid < PluginId_Count ); - Console.Indent().WriteLn( L"Binding %s\t: %s ", tbl_PluginInfo[pid].GetShortname().c_str(), srcfile.c_str() ); + Console.Indent().WriteLn( L"Binding %4s: %s ", tbl_PluginInfo[pid].GetShortname().c_str(), srcfile.c_str() ); m_info[pid] = new PluginStatus_t( pid, srcfile ); } diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 918bedde5e..b365fcd8be 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -53,7 +53,7 @@ bool EnumerateMemoryCard( McdSlotItem& dest, const wxFileName& filename, const w const wxString fullpath( filename.GetFullPath() ); if( !filename.FileExists() ) return false; - DevCon.WriteLn( fullpath ); + //DevCon.WriteLn( fullpath ); wxFFile mcdFile( fullpath ); if( !mcdFile.IsOpened() ) return false; // wx should log the error for us. if( mcdFile.Length() < (1024*528) ) @@ -1095,10 +1095,10 @@ void Panels::MemoryCardListPanel_Simple::ReadFilesAtMcdFolder(){ currentCardFile.Slot = -1; currentCardFile.IsEnabled = false; m_allFilesystemCards.push_back(currentCardFile); - DevCon.WriteLn(L"Enumerated file: '%s'", currentCardFile.Filename.GetFullName().c_str() ); + //DevCon.WriteLn(L"Enumerated file: '%s'", currentCardFile.Filename.GetFullName().c_str() ); } - else - DevCon.WriteLn(L"MCD folder card file skipped: '%s'", memcardList[i].c_str() ); + /*else + DevCon.WriteLn(L"MCD folder card file skipped: '%s'", memcardList[i].c_str() );*/ } } diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index dafa635e73..4e6f137aa8 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -280,14 +280,14 @@ static void CheckVersion( pxInputStream& thr ) if( savever > g_SaveVersion ) throw Exception::SaveStateLoadError( thr.GetStreamName() ) .SetDiagMsg(pxsFmt( L"Savestate uses an unsupported or unknown savestate version.\n(PCSX2 ver=%x, state ver=%x)", g_SaveVersion, savever )) - .SetUserMsg(_("Cannot load this savestate. The state is from an incompatible edition of PCSX2 that is either newer than this version, or is no longer supported.")); + .SetUserMsg(_("Cannot load this savestate. The state is an unsupported version.")); // check for a "minor" version incompatibility; which happens if the savestate being loaded is a newer version // than the emulator recognizes. 99% chance that trying to load it will just corrupt emulation or crash. if( (savever >> 16) != (g_SaveVersion >> 16) ) throw Exception::SaveStateLoadError( thr.GetStreamName() ) - .SetDiagMsg(pxsFmt( L"Savestate uses an unknown (future?!) savestate version.\n(PCSX2 ver=%x, state ver=%x)", g_SaveVersion, savever )) - .SetUserMsg(_("Cannot load this savestate. The state is an unsupported version, likely created by a newer edition of PCSX2.")); + .SetDiagMsg(pxsFmt( L"Savestate uses an unknown savestate version.\n(PCSX2 ver=%x, state ver=%x)", g_SaveVersion, savever )) + .SetUserMsg(_("Cannot load this savestate. The state is an unsupported version.")); }; // -------------------------------------------------------------------------------------- diff --git a/pcsx2/x86/microVU_Analyze.inl b/pcsx2/x86/microVU_Analyze.inl index 51f1e17987..7fd22f544e 100644 --- a/pcsx2/x86/microVU_Analyze.inl +++ b/pcsx2/x86/microVU_Analyze.inl @@ -364,7 +364,7 @@ __fi void mVUanalyzeXGkick(mV, int Fs, int xCycles) { static void analyzeBranchVI(mV, int xReg, bool& infoVar) { if (!xReg) return; if (mVUstall) { // I assume a stall on branch means the vi reg is not modified directly b4 the branch... - DevCon.Warning("microVU%d: Warning %d cycle stall on branch instruction [%04x]", getIndex, mVUstall, xPC); + DevCon.Warning("microVU%d: %d cycle stall on branch instruction [%04x]", getIndex, mVUstall, xPC); return; } int i, j = 0; @@ -374,7 +374,7 @@ static void analyzeBranchVI(mV, int xReg, bool& infoVar) { incPC2(-2); for (i = 0; i < iEnd && cyc < iEnd; i++) { if (i && mVUstall) { - DevCon.Warning("microVU%d: Warning Branch VI-Delay with %d cycle stall (%d) [%04x]", getIndex, mVUstall, i, xPC); + DevCon.Warning("microVU%d: Branch VI-Delay with %d cycle stall (%d) [%04x]", getIndex, mVUstall, i, xPC); } if (i == mVUcount) { bool warn = 0; @@ -385,12 +385,12 @@ static void analyzeBranchVI(mV, int xReg, bool& infoVar) { infoVar = 1; j = i; i++; } - if (warn) DevCon.Warning("microVU%d: Warning Branch VI-Delay with small block (%d) [%04x]", getIndex, i, xPC); + if (warn) DevCon.Warning("microVU%d: Branch VI-Delay with small block (%d) [%04x]", getIndex, i, xPC); break; // if (warn), we don't have enough information to always guarantee the correct result. } if ((mVUlow.VI_write.reg == xReg) && mVUlow.VI_write.used) { if (mVUlow.readFlags) { - if (i) DevCon.Warning("microVU%d: Warning Branch VI-Delay with Read Flags Set (%d) [%04x]", getIndex, i, xPC); + if (i) DevCon.Warning("microVU%d: Branch VI-Delay with Read Flags Set (%d) [%04x]", getIndex, i, xPC); break; // Not sure if on the above "if (i)" case, if we need to "continue" or if we should "break" } j = i; @@ -465,14 +465,14 @@ __ri int mVUbranchCheck(mV) { mVUregs.flagInfo = 0; mVUregs.fullFlags0 = 0; mVUregs.fullFlags1 = 0; - DevCon.Warning("microVU%d Warning: %s in %s delay slot! [%04x]", mVU.index, + DevCon.Warning("microVU%d: %s in %s delay slot! [%04x]", mVU.index, branchSTR[mVUlow.branch&0xf], branchSTR[branchType&0xf], xPC); return 1; } else { incPC(2); mVUlow.isNOP = 1; - DevCon.Warning("microVU%d Warning: %s in %s delay slot! [%04x]", mVU.index, + DevCon.Warning("microVU%d: %s in %s delay slot! [%04x]", mVU.index, branchSTR[mVUlow.branch&0xf], branchSTR[branchType&0xf], xPC); return 0; } diff --git a/plugins/GSdx/GSCrc.cpp b/plugins/GSdx/GSCrc.cpp index 002f8be424..5bffeb484c 100644 --- a/plugins/GSdx/GSCrc.cpp +++ b/plugins/GSdx/GSCrc.cpp @@ -389,7 +389,8 @@ CRC::Game CRC::Lookup(uint32 crc) if(m_map.empty()) { string exclusions = theApp.GetConfig( "CrcHacksExclusions", "" ); - printf( "GSdx: CrcHacksExclusions: %s\n", exclusions.c_str() ); + if (exclusions.length() != 0) + printf( "GSdx: CrcHacksExclusions: %s\n", exclusions.c_str() ); for(int i = 0; i < countof(m_games); i++) { diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp index 9d6490c6b1..77c64f49ab 100644 --- a/plugins/GSdx/GSState.cpp +++ b/plugins/GSdx/GSState.cpp @@ -183,7 +183,7 @@ void GSState::SetFrameSkip(int skip) void GSState::Reset() { - printf("GSdx info: GS reset\n"); + //printf("GSdx info: GS reset\n"); // FIXME: memset(m_mem.m_vm8, 0, m_mem.m_vmsize); // bios logo not shown cut in half after reset, missing graphics in GoW after first FMV memset(&m_path[0], 0, sizeof(m_path[0]) * countof(m_path));