fixed linux compilation problems

pcsx2/GS.cpp

@@ -92,8 +92,6 @@ HANDLE g_hGsEvent = NULL, // set when path3 is ready to be processed
 HANDLE g_hGSOpen = NULL, g_hGSDone = NULL;
 HANDLE g_hVuGsThread = NULL;
 
-bool gsHasToExit=false;
-
 DWORD WINAPI GSThreadProc(LPVOID lpParam);
 
 #else
@@ -107,6 +105,7 @@ void* GSThreadProc(void* idp);
 
 #endif
 
+bool gsHasToExit=false;
 int g_FFXHack=0;
 
 #ifdef PCSX2_DEVBUILD
@@ -195,6 +194,8 @@ void gsInit()
 		g_fMTGSRead = fopen("mtgsread.txt", "w");
 #endif
 
+        gsHasToExit=false;
+
 #if defined(_WIN32) && !defined(WIN32_PTHREADS)
 		g_hGsEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
 
@@ -202,8 +203,6 @@ void gsInit()
 		g_hGSOpen = CreateEvent(NULL, FALSE, FALSE, NULL);
 		g_hGSDone = CreateEvent(NULL, FALSE, FALSE, NULL);
 
-		gsHasToExit=false;
-
 		SysPrintf("gsInit\n");
 
 		g_hVuGsThread = CreateThread(NULL, 0, GSThreadProc, NULL, 0, NULL);
@@ -243,12 +242,12 @@ void gsShutdown()
 {
 	if( CHECK_MULTIGS ) {
 
+        gsHasToExit=true;
+		
 #if defined(_WIN32) && !defined(WIN32_PTHREADS)
-		gsHasToExit=true;
 		SetEvent(g_hVuGSExit);
 		SysPrintf("Closing gs thread\n");
 		WaitForSingleObject(g_hVuGsThread, INFINITE);
-		gsHasToExit=false;
 		CloseHandle(g_hVuGsThread);
 		CloseHandle(g_hGsEvent);
 		CloseHandle(g_hVuGSExit);
@@ -265,6 +264,7 @@ void gsShutdown()
 
         SysPrintf("thread terminated\n");
 #endif
+        gsHasToExit=false;
 
 #ifdef _WIN32
 		VirtualFree(GS_RINGBUFFERBASE, GS_RINGBUFFERSIZE, MEM_DECOMMIT|MEM_RELEASE);
@@ -423,14 +423,14 @@ void gsReset()
 	//if( GSreset ) GSreset();
 
 	if( CHECK_MULTIGS ) {
+
 #if defined(_WIN32) && !defined(WIN32_PTHREADS)
 		ResetEvent(g_hGsEvent);
 		ResetEvent(g_hVuGSExit);
-
-		gsHasToExit=false;
 #else
         //TODO
 #endif
+        gsHasToExit=false;
 		g_pGSRingPos = g_pGSWritePos;
 	}
 

pcsx2/R5900.c

@@ -396,7 +396,7 @@ void cpuBranchTest()
 {
 #ifndef PCSX2_NORECBUILD
     // dont' remove this check unless doing an official release
-    if( g_globalXMMSaved || g_globalMMXSaved )
+    if( g_globalXMMSaved X86_32CODE(|| g_globalMMXSaved) )
         SysPrintf("frozen regs have not been restored!!!\n");
 	assert( !g_globalXMMSaved X86_32CODE(&& !g_globalMMXSaved) );
 	g_EEFreezeRegs = 0;

pcsx2/x86/iCore.cpp

@@ -984,7 +984,7 @@ void FreezeXMMRegs_(int save)
 
 	if( save ) {
 		if( g_globalXMMSaved ){
-			SysPrintf("XMM Already saved\n");
+			//SysPrintf("XMM Already saved\n");
 			return;
 			}
 		// only necessary for nonsse CPUs (very rare)
@@ -1030,7 +1030,7 @@ void FreezeXMMRegs_(int save)
 	}
 	else {
 		if( !g_globalXMMSaved ){
-			SysPrintf("XMM Regs not saved!\n");
+			//SysPrintf("XMM Regs not saved!\n");
 			return;
 			}
 

pcsx2/x86/ix86-32/iCore-32.cpp

@@ -770,7 +770,7 @@ void FreezeMMXRegs_(int save)
 
 	if( save ) {
 		if( g_globalMMXSaved ){
-			SysPrintf("MMX Already Saved!\n");
+			//SysPrintf("MMX Already Saved!\n");
 			return;
 			}
 		g_globalMMXSaved = 1;
@@ -804,7 +804,7 @@ void FreezeMMXRegs_(int save)
 	}
 	else {
 		if( !g_globalMMXSaved ){
-			SysPrintf("MMX Not Saved!\n");
+			//SysPrintf("MMX Not Saved!\n");
 			return;
 			}
 		g_globalMMXSaved = 0;