diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 9f4b3cdf72..bbd8dba605 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -302,6 +302,7 @@ set(pcsx2GuiSources gui/Dialogs/BaseConfigurationDialog.inl gui/Dialogs/BiosSelectorDialog.cpp gui/Dialogs/ConfirmationDialogs.cpp + gui/Dialogs/CreateMemoryCardDialog.cpp gui/Dialogs/FirstTimeWizard.cpp gui/Dialogs/ImportSettingsDialog.cpp gui/Dialogs/LogOptionsDialog.cpp diff --git a/pcsx2/Config.h b/pcsx2/Config.h index ef167054a4..f1be1c45a7 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -617,3 +617,5 @@ TraceLogFilters& SetTraceConfig(); // Change to 1 to enable SIF wakeup hack: #define IOP_ENABLE_SIF_HACK 0 +// Change to 1 to cause all logs to be written to the console. (Very slow) +#define LOG_TO_CONSOLE 0 diff --git a/pcsx2/IopMem.cpp b/pcsx2/IopMem.cpp index 4d32c87180..4c0a9bba6a 100644 --- a/pcsx2/IopMem.cpp +++ b/pcsx2/IopMem.cpp @@ -200,7 +200,7 @@ u16 __fastcall iopMemRead16(u32 mem) ret = psxHu16(mem); break; } - SIF_LOG("Sif reg read %x value %x", mem, ret); + //SIF_LOG("Sif reg read %x value %x", mem, ret); return ret; } return *(const u16 *)(p + (mem & 0xffff)); @@ -269,7 +269,7 @@ u32 __fastcall iopMemRead32(u32 mem) ret = psxHu32(mem); break; } - SIF_LOG("Sif reg read %x value %x", mem, ret); + //SIF_LOG("Sif reg read %x value %x", mem, ret); return ret; } return *(const u32 *)(p + (mem & 0xffff)); diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index 5b4f680f78..8ddd5a04ec 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -364,6 +364,7 @@ + diff --git a/pcsx2/Sif0.cpp b/pcsx2/Sif0.cpp index d50830d89a..b69ef6ad97 100644 --- a/pcsx2/Sif0.cpp +++ b/pcsx2/Sif0.cpp @@ -30,6 +30,7 @@ static __forceinline void Sif0Init() done = false; cycles = 0; psxCycles = 0; + //if (sif0.end == 1) SIF_LOG("Starting with sif0.end set."); //memzero(sif0); //sif0.end = 0; //sif0.data.data = 0; diff --git a/pcsx2/Sif1.cpp b/pcsx2/Sif1.cpp index 59addd4725..39780d8d61 100644 --- a/pcsx2/Sif1.cpp +++ b/pcsx2/Sif1.cpp @@ -30,6 +30,7 @@ static __forceinline void Sif1Init() done = false; cycles = 0; psxCycles = 0; + //if (sif1.end == 1) SIF_LOG("Starting with sif1.end set."); //memzero(sif1); //sif1.end = 0; //sif1.data.data = 0; @@ -121,33 +122,33 @@ static __forceinline bool ProcessEETag() switch (ptag->ID) { - case TAG_REFE: // refe + case TAG_REFE: SIF_LOG(" REFE %08X", ptag[1]._u32); sif1.end = 1; sif1dma->madr = ptag[1]._u32; sif1dma->tadr += 16; break; - case TAG_CNT: // cnt + case TAG_CNT: SIF_LOG(" CNT"); sif1dma->madr = sif1dma->tadr + 16; sif1dma->tadr = sif1dma->madr + (sif1dma->qwc << 4); break; - case TAG_NEXT: // next + case TAG_NEXT: SIF_LOG(" NEXT %08X", ptag[1]._u32); sif1dma->madr = sif1dma->tadr + 16; sif1dma->tadr = ptag[1]._u32; break; - case TAG_REF: // ref - case TAG_REFS: // refs + case TAG_REF: + case TAG_REFS: SIF_LOG(" REF %08X", ptag[1]._u32); sif1dma->madr = ptag[1]._u32; sif1dma->tadr += 16; break; - case TAG_END: // end + case TAG_END: SIF_LOG(" END"); sif1.end = 1; sif1dma->madr = sif1dma->tadr + 16; diff --git a/pcsx2/SourceLog.cpp b/pcsx2/SourceLog.cpp index 2292b4f22c..95ea19b54b 100644 --- a/pcsx2/SourceLog.cpp +++ b/pcsx2/SourceLog.cpp @@ -61,6 +61,9 @@ void __Log( const char* fmt, ... ) fputs( "\n", emuLog ); fflush( emuLog ); } +#if LOG_TO_CONSOLE + Console.WriteLn(tmp); +#endif #endif } @@ -91,6 +94,9 @@ static __forceinline void _vSourceLog( u16 protocol, u8 source, u32 cpuPc, u32 c fputs( "\n", emuLog ); fflush( emuLog ); } +#if LOG_TO_CONSOLE + Console.WriteLn(tmp); +#endif #endif } diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp index c6b791b24d..4ad6f14a95 100644 --- a/pcsx2/gui/i18n.cpp +++ b/pcsx2/gui/i18n.cpp @@ -76,7 +76,7 @@ static void i18n_DoPackageCheck( wxLanguage wxLangId, LangPackList& langs ) // database. Anything which hasn't been installed will fail to load. // // Because loading and hashing the entire pcsx2 translation for every possible language would -// assinine and slow, I've decided to use a two-file translation system. One file (pcsx2ident.mo) +// asinine and slow, I've decided to use a two-file translation system. One file (pcsx2ident.mo) // is very small and simply contains the name of the language in the language native. The // second file (pcsx2.mo) is loaded only if the user picks the language (or if it's the default // language of the user's OS installation).