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

Change various logs to sound "nicer". 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5160 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2012-04-17 17:55:51 +00:00
parent 5936caa2fe
commit 26392e7f3e
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/CDVD.cpp
View File

@ -765,7 +765,7 @@ __fi void cdvdActionInterrupt()
case cdvdAction_Break: case cdvdAction_Break:
// Make sure the cdvd action state is pretty well cleared: // Make sure the cdvd action state is pretty well cleared:
DevCon.Warning("CDVD Break Call"); DevCon.WriteLn("CDVD Break Call");
cdvd.Reading = 0; cdvd.Reading = 0;
cdvd.Readed = 0; cdvd.Readed = 0;
cdvd.Ready = CDVD_READY2; // should be CDVD_READY1 or something else? cdvd.Ready = CDVD_READY2; // should be CDVD_READY1 or something else?

2
pcsx2/Gif_Unit.h
View File

@ -429,7 +429,7 @@ struct Gif_Unit {
Gif_Tag gifTag(&pMem[offset & memMask]); Gif_Tag gifTag(&pMem[offset & memMask]);
incTag(offset, curSize, 16 + gifTag.len); // Tag + Data length incTag(offset, curSize, 16 + gifTag.len); // Tag + Data length
if (pathIdx == GIF_PATH_1 && curSize >= 0x4000) { 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) return 0; // Bios does this... (Fixed if you delay vu1's xgkick by 103 vu cycles)
} }
if (curSize >= size) return size; if (curSize >= size) return size;

2
pcsx2/PluginManager.cpp
View File

@ -967,7 +967,7 @@ void SysCorePlugins::Load( PluginsEnum_t pid, const wxString& srcfile )
{ {
ScopedLock lock( m_mtx_PluginStatus ); ScopedLock lock( m_mtx_PluginStatus );
pxAssert( (uint)pid < PluginId_Count ); 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 ); m_info[pid] = new PluginStatus_t( pid, srcfile );
} }

8
pcsx2/gui/Panels/MemoryCardListPanel.cpp
View File

@ -53,7 +53,7 @@ bool EnumerateMemoryCard( McdSlotItem& dest, const wxFileName& filename, const w
const wxString fullpath( filename.GetFullPath() ); const wxString fullpath( filename.GetFullPath() );
if( !filename.FileExists() ) return false; if( !filename.FileExists() ) return false;
DevCon.WriteLn( fullpath ); //DevCon.WriteLn( fullpath );
wxFFile mcdFile( fullpath ); wxFFile mcdFile( fullpath );
if( !mcdFile.IsOpened() ) return false; // wx should log the error for us. if( !mcdFile.IsOpened() ) return false; // wx should log the error for us.
if( mcdFile.Length() < (1024*528) ) if( mcdFile.Length() < (1024*528) )
@ -1095,10 +1095,10 @@ void Panels::MemoryCardListPanel_Simple::ReadFilesAtMcdFolder(){
currentCardFile.Slot = -1; currentCardFile.Slot = -1;
currentCardFile.IsEnabled = false; currentCardFile.IsEnabled = false;
m_allFilesystemCards.push_back(currentCardFile); 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 /*else
DevCon.WriteLn(L"MCD folder card file skipped: '%s'", memcardList[i].c_str() ); DevCon.WriteLn(L"MCD folder card file skipped: '%s'", memcardList[i].c_str() );*/
} }
} }

6
pcsx2/gui/SysState.cpp
View File

@ -280,14 +280,14 @@ static void CheckVersion( pxInputStream& thr )
if( savever > g_SaveVersion ) if( savever > g_SaveVersion )
throw Exception::SaveStateLoadError( thr.GetStreamName() ) 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 )) .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 // 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. // than the emulator recognizes. 99% chance that trying to load it will just corrupt emulation or crash.
if( (savever >> 16) != (g_SaveVersion >> 16) ) if( (savever >> 16) != (g_SaveVersion >> 16) )
throw Exception::SaveStateLoadError( thr.GetStreamName() ) 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 )) .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, likely created by a newer edition of PCSX2.")); .SetUserMsg(_("Cannot load this savestate. The state is an unsupported version."));
}; };
// -------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------

12
pcsx2/x86/microVU_Analyze.inl
View File

@ -364,7 +364,7 @@ __fi void mVUanalyzeXGkick(mV, int Fs, int xCycles) {
static void analyzeBranchVI(mV, int xReg, bool& infoVar) { static void analyzeBranchVI(mV, int xReg, bool& infoVar) {
if (!xReg) return; if (!xReg) return;
if (mVUstall) { // I assume a stall on branch means the vi reg is not modified directly b4 the branch... 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; return;
} }
int i, j = 0; int i, j = 0;
@ -374,7 +374,7 @@ static void analyzeBranchVI(mV, int xReg, bool& infoVar) {
incPC2(-2); incPC2(-2);
for (i = 0; i < iEnd && cyc < iEnd; i++) { for (i = 0; i < iEnd && cyc < iEnd; i++) {
if (i && mVUstall) { 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) { if (i == mVUcount) {
bool warn = 0; bool warn = 0;
@ -385,12 +385,12 @@ static void analyzeBranchVI(mV, int xReg, bool& infoVar) {
infoVar = 1; infoVar = 1;
j = i; i++; 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. 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.VI_write.reg == xReg) && mVUlow.VI_write.used) {
if (mVUlow.readFlags) { 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" break; // Not sure if on the above "if (i)" case, if we need to "continue" or if we should "break"
} }
j = i; j = i;
@ -465,14 +465,14 @@ __ri int mVUbranchCheck(mV) {
mVUregs.flagInfo = 0; mVUregs.flagInfo = 0;
mVUregs.fullFlags0 = 0; mVUregs.fullFlags0 = 0;
mVUregs.fullFlags1 = 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); branchSTR[mVUlow.branch&0xf], branchSTR[branchType&0xf], xPC);
return 1; return 1;
} }
else { else {
incPC(2); incPC(2);
mVUlow.isNOP = 1; 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); branchSTR[mVUlow.branch&0xf], branchSTR[branchType&0xf], xPC);
return 0; return 0;
} }

1
plugins/GSdx/GSCrc.cpp
View File

@ -389,6 +389,7 @@ CRC::Game CRC::Lookup(uint32 crc)
if(m_map.empty()) if(m_map.empty())
{ {
string exclusions = theApp.GetConfig( "CrcHacksExclusions", "" ); string exclusions = theApp.GetConfig( "CrcHacksExclusions", "" );
if (exclusions.length() != 0)
printf( "GSdx: CrcHacksExclusions: %s\n", exclusions.c_str() ); printf( "GSdx: CrcHacksExclusions: %s\n", exclusions.c_str() );
for(int i = 0; i < countof(m_games); i++) for(int i = 0; i < countof(m_games); i++)

2
plugins/GSdx/GSState.cpp
View File

@ -183,7 +183,7 @@ void GSState::SetFrameSkip(int skip)
void GSState::Reset() 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 // 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)); memset(&m_path[0], 0, sizeof(m_path[0]) * countof(m_path));