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

Comment out broken MTGS logging code. Disable Logging menu in Linux if not a devbuild. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@330 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-11-15 14:08:49 +00:00 committed by Gregory Hainaut
parent 0cb03d20a7
commit 2ecf6d1372
4 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pcsx2/GS.cpp
View File

@ -189,11 +189,11 @@ void gsInit()
if( GSsetBaseMem != NULL )
GSsetBaseMem(g_MTGSMem);
#if defined(_DEBUG) && defined(PCSX2_DEVBUILD)
assert( g_fMTGSWrite == NULL && g_fMTGSRead == NULL );
g_fMTGSWrite = fopen("mtgswrite.txt", "w");
g_fMTGSRead = fopen("mtgsread.txt", "w");
#endif
//#if defined(_DEBUG) && defined(PCSX2_DEVBUILD)
// assert( g_fMTGSWrite == NULL && g_fMTGSRead == NULL );
// g_fMTGSWrite = fopen("mtgswrite.txt", "w");
// g_fMTGSRead = fopen("mtgsread.txt", "w");
//#endif
gsHasToExit=false;
@ -269,16 +269,16 @@ void gsShutdown()
SysMunmap((uptr)GS_RINGBUFFERBASE, GS_RINGBUFFERSIZE);
#endif
#if defined(_DEBUG) && defined(PCSX2_DEVBUILD)
if( g_fMTGSWrite != NULL ) {
fclose(g_fMTGSWrite);
g_fMTGSWrite = NULL;
}
if( g_fMTGSRead != NULL ) {
fclose(g_fMTGSRead);
g_fMTGSRead = NULL;
}
#endif
//#if defined(_DEBUG) && defined(PCSX2_DEVBUILD)
// if( g_fMTGSWrite != NULL ) {
// fclose(g_fMTGSWrite);
// g_fMTGSWrite = NULL;
// }
// if( g_fMTGSRead != NULL ) {
// fclose(g_fMTGSRead);
// g_fMTGSRead = NULL;
// }
//#endif
}
else
GSclose();
@ -1480,19 +1480,19 @@ void* GSThreadProc(void* lpParam)
case GS_RINGTYPE_P1:
{
int qsize = (tag>>16);
MTGS_RECREAD(g_pGSRingPos+16, (qsize<<4));
// MTGS_RECREAD(g_pGSRingPos+16, (qsize<<4));
// make sure that tag>>16 is the MAX size readable
GSgifTransfer1((u32*)(g_pGSRingPos+16) - 0x1000 + 4*qsize, 0x4000-qsize*16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + ((tag>>16)<<4));
break;
}
case GS_RINGTYPE_P2:
MTGS_RECREAD(g_pGSRingPos+16, ((tag>>16)<<4));
// MTGS_RECREAD(g_pGSRingPos+16, ((tag>>16)<<4));
GSgifTransfer2((u32*)(g_pGSRingPos+16), tag>>16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + ((tag>>16)<<4));
break;
case GS_RINGTYPE_P3:
MTGS_RECREAD(g_pGSRingPos+16, ((tag>>16)<<4));
// MTGS_RECREAD(g_pGSRingPos+16, ((tag>>16)<<4));
GSgifTransfer3((u32*)(g_pGSRingPos+16), tag>>16);
InterlockedExchangeAdd((long*)&g_pGSRingPos, 16 + ((tag>>16)<<4));
break;

48
pcsx2/GS.h
View File

@ -67,41 +67,41 @@ u8* GSRingBufCopy(void* mem, u32 size, u32 type);
void GSRingBufSimplePacket(int type, int data0, int data1, int data2);
extern u8* g_pGSWritePos;
#ifdef PCSX2_DEVBUILD
//#ifdef PCSX2_DEVBUILD
// use for debugging MTGS
extern FILE* g_fMTGSWrite, *g_fMTGSRead;
extern u32 g_MTGSDebug, g_MTGSId;
//extern FILE* g_fMTGSWrite, *g_fMTGSRead;
//extern u32 g_MTGSDebug, g_MTGSId;
static __forceinline void MTGS_RECWRITE(const u8 *start, u32 size) {
if( g_MTGSDebug & 1 ) {
const u32* pstart = (u32*)(start);
u32 cursize = (size);
fprintf(g_fMTGSWrite, "*%x-%x (%d)\n", (u32)(uptr)(start), (u32)(size), ++g_MTGSId);
if( g_MTGSDebug & 2 ) fflush(g_fMTGSWrite);
}
}
//static __forceinline void MTGS_RECWRITE(const u8 *start, u32 size) {
// if( g_MTGSDebug & 1 ) {
// const u32* pstart = (u32*)(start);
// u32 cursize = (size);
// fprintf(g_fMTGSWrite, "*%x-%x (%d)\n", (u32)(uptr)(start), (u32)(size), ++g_MTGSId);
// if( g_MTGSDebug & 2 ) fflush(g_fMTGSWrite);
// }
//}
static __forceinline void MTGS_RECREAD( const u8* start, u32 size) {
if( g_MTGSDebug & 1 ) {
const u32* pstart = (u32*)(start);
u32 cursize = (size);
fprintf(g_fMTGSRead, "*%x-%x (%d)\n", (u32)(uptr)(start), (u32)(size), ++g_MTGSId);
if( g_MTGSDebug & 4 ) fflush(g_fMTGSRead);
}
}
#else
//static __forceinline void MTGS_RECREAD( const u8* start, u32 size) {
// if( g_MTGSDebug & 1 ) {
// const u32* pstart = (u32*)(start);
// u32 cursize = (size);
// fprintf(g_fMTGSRead, "*%x-%x (%d)\n", (u32)(uptr)(start), (u32)(size), ++g_MTGSId);
// if( g_MTGSDebug & 4 ) fflush(g_fMTGSRead);
// }
//}
//#else
#define MTGS_RECWRITE 0&&
#define MTGS_RECREAD 0&&
//#define MTGS_RECWRITE 0&&
//#define MTGS_RECREAD 0&&
#endif
//#endif
// mem and size are the ones from GSRingBufCopy
static __forceinline void GSRINGBUF_DONECOPY(const u8 *mem, u32 size) {
u8* temp = (u8*)(mem) + (size);
assert( temp <= GS_RINGBUFFEREND);
MTGS_RECWRITE(mem, size);
// MTGS_RECWRITE(mem, size);
if( temp == GS_RINGBUFFEREND ) temp = GS_RINGBUFFERBASE;
InterlockedExchangePointer((void**)&g_pGSWritePos, temp);
}

5
pcsx2/Linux/GtkGui.cpp
View File

@ -70,6 +70,9 @@ void StartGui() {
// disable anything not implemented or not working properly.
gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(MainWindow, "patch_browser1")), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(MainWindow, "patch_finder2")), FALSE);
#ifndef PCSX2_DEVBUILD
gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(MainWindow, "GtkMenuItem_Logging")), FALSE);
#endif
gtk_widget_show_all(MainWindow);
gtk_window_activate_focus(GTK_WINDOW(MainWindow));
@ -146,7 +149,7 @@ void RunExecute(int run)
// this needs to be called for every new game! (note: sometimes launching games through bios will give a crc of 0)
if( GSsetGameCRC != NULL )
GSsetGameCRC(ElfCRC, g_ZeroGSOptions);
if (run) Cpu->Execute();
}

1
pcsx2/Linux/LnxMain.c
View File

@ -254,7 +254,6 @@ void CloseLanguages() {
void ChangeLanguage(char *lang) {
strcpy(Config.Lang, lang);
SaveConfig();
LoadConfig();
}
/* Quick macros for checking shift, control, alt, and caps lock. */