Fix the trunk for gcc 4.4 (haven't looked at 4.3 yet), and add a few log changes I hadn't committed yet.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2074 96395faa-99c1-11dd-bbfe-3dabce05a288

common/build/x86emitter/x86emitter.cbp

@@ -81,11 +81,12 @@
 		<Unit filename="../../include/x86emitter/implement/incdec.h" />
 		<Unit filename="../../include/x86emitter/implement/jmpcall.h" />
 		<Unit filename="../../include/x86emitter/implement/movs.h" />
+		<Unit filename="../../include/x86emitter/implement/simd_arithmetic.h" />
+		<Unit filename="../../include/x86emitter/implement/simd_comparisons.h" />
+		<Unit filename="../../include/x86emitter/implement/simd_helpers.h" />
+		<Unit filename="../../include/x86emitter/implement/simd_templated_helpers.h" />
 		<Unit filename="../../include/x86emitter/implement/test.h" />
 		<Unit filename="../../include/x86emitter/implement/xchg.h" />
-		<Unit filename="../../include/x86emitter/implement/xmm/arithmetic.h" />
-		<Unit filename="../../include/x86emitter/implement/xmm/basehelpers.h" />
-		<Unit filename="../../include/x86emitter/implement/xmm/comparisons.h" />
 		<Unit filename="../../include/x86emitter/implement/xmm/moremovs.h" />
 		<Unit filename="../../include/x86emitter/implement/xmm/shufflepack.h" />
 		<Unit filename="../../include/x86emitter/inlines.inl" />

common/include/x86emitter/x86emitter.h

@@ -75,10 +75,10 @@
 #	define CallAddress( ptr ) \
 		( (void (*)()) &(ptr)[0] )()
 
-#	define FastCallAddress( ptr, param )
+#	define FastCallAddress( ptr, param ) \
 		( (void (*)( int )) &(ptr)[0] )( param )
 
-#	define FastCallAddress2( ptr, param1, param2 )
+#	define FastCallAddress2( ptr, param1, param2 ) \
 		( (void (*)( int, int )) &(ptr)[0] )( param1, param2 )
 
 #endif

pcsx2/DebugTools/Debug.h

@@ -83,6 +83,7 @@ struct LogSources
 		VU0:1,
 		COP0:1,		// TLB logs, PERF logs, Debug register logs
 		VIF:1,
+		VIFUnpack:1,
 		SPR:1,		// Scratchpad
 		GIF:1,
 		SIF:1,
@@ -98,8 +99,10 @@ struct LogSources
 		IopCnt:1,
 		Memcards:1,
 		Pad:1,
+		CDR:1,
 		CDVD:1,
 		GPU:1,		// PS1's GPU (currently unimplemented)
+		Cache:1,    // Unimplemented.
 		LogToConsole:1;
 };
 
@@ -119,6 +122,7 @@ extern bool SrcLog_ELF( const char* fmt, ... );
 extern bool SrcLog_VU0( const char* fmt, ... );
 
 extern bool SrcLog_VIF( const char* fmt, ... );
+extern bool SrcLog_VIFUNPACK( const char* fmt, ... );
 extern bool SrcLog_SPR( const char* fmt, ... );
 extern bool SrcLog_GIF( const char* fmt, ... );
 extern bool SrcLog_SIF( const char* fmt, ... );
@@ -126,6 +130,7 @@ extern bool SrcLog_IPU( const char* fmt, ... );
 extern bool SrcLog_VUM( const char* fmt, ... );
 extern bool SrcLog_RPC( const char* fmt, ... );
 extern bool SrcLog_EECNT( const char* fmt, ... );
+extern bool SrcLog_ISOFS( const char* fmt, ... );
 
 extern bool SrcLog_PSXCPU( const char* fmt, ... );
 extern bool SrcLog_PSXMEM( const char* fmt, ... );
@@ -139,6 +144,7 @@ extern bool SrcLog_PAD( const char* fmt, ... );
 extern bool SrcLog_CDR( const char* fmt, ... );
 extern bool SrcLog_CDVD( const char* fmt, ... );
 extern bool SrcLog_GPU( const char* fmt, ... );
+extern bool SrcLog_CACHE( const char* fmt, ... );
 
 #define CPU_LOG  (varLog.R5900) && SrcLog_CPU
 #define MEM_LOG  (varLog.Memory) && SrcLog_MEM
@@ -149,6 +155,7 @@ extern bool SrcLog_GPU( const char* fmt, ... );
 #define VU0_LOG  (varLog.VU0) && SrcLog_VU0
 #define COP0_LOG (varLog.COP0) && SrcLog_COP0
 #define VIF_LOG  (varLog.VIF) && SrcLog_VIF
+#define VIFUNPACK_LOG  (varLog.VIFUnpack) && SrcLog_VIFUNPACK
 #define SPR_LOG  (varLog.SPR) && SrcLog_SPR
 #define GIF_LOG  (varLog.GIF) && SrcLog_GIF
 #define SIF_LOG  (varLog.SIF) && SrcLog_SIF
@@ -156,7 +163,7 @@ extern bool SrcLog_GPU( const char* fmt, ... );
 #define VUM_LOG  (varLog.VUMacro) && SrcLog_VUM
 #define RPC_LOG  (varLog.RPC) && SrcLog_RPC
 #define EECNT_LOG (varLog.Counters) && SrcLog_EECNT
-#define ISOFS_LOG  (varLog.IsoFS) && SrcLog_RPC
+#define ISOFS_LOG  (varLog.IsoFS) && SrcLog_ISOFS
 
 #define PSXCPU_LOG  (varLog.R3000A) && SrcLog_PSXCPU
 #define PSXMEM_LOG  (varLog.IopMemory) && SrcLog_PSXMEM
@@ -165,15 +172,13 @@ extern bool SrcLog_GPU( const char* fmt, ... );
 #define PSXDMA_LOG  (varLog.IopDMA) && SrcLog_PSXDMA
 #define PSXCNT_LOG  (varLog.IopCnt) && SrcLog_PSXCNT
 
-//memcard has the same number as PAD_LOG for now
 #define MEMCARDS_LOG (varLog.Memcards) && SrcLog_MEMCARDS
 #define PAD_LOG  (varLog.Pad) && SrcLog_PAD
-#define CDR_LOG  (varLog.CDVD) && SrcLog_CDR
+#define CDR_LOG  (varLog.CDR) && SrcLog_CDR
 #define GPU_LOG  (varLog.GPU) && SrcLog_GPU
-#define CDVD_LOG  SrcLog_CDVD
+#define CDVD_LOG  (varLog.CDVD) && SrcLog_CDVD
 
-// fixme - currently we don't log cache
-#define CACHE_LOG 0&&
+#define CACHE_LOG  (varLog.Cache) && SrcLog_CACHE
 
 #else // PCSX2_DEVBUILD
 
@@ -214,11 +219,3 @@ extern bool SrcLog_GPU( const char* fmt, ... );
 #define CACHE_LOG 0&&
 #define MEMCARDS_LOG 0&&
 #endif
-
-//#define VIFUNPACKDEBUG //enable unpack debugging output
-
-#ifdef VIFUNPACKDEBUG
-#define VIFUNPACK_LOG VIF_LOG
-#else
-#define VIFUNPACK_LOG 0&&
-#endif

pcsx2/Linux/LnxKeyCodes.cpp

@@ -238,6 +238,10 @@ int TranslateGDKtoWXK( u32 keysym )
 
         case GDK_KP_Separator:
             // FIXME: what is this?
+            // 
+            // Some numeric keyboards have a comma on them. I believe this is the symbol
+            // for the comma, to distinguish it from the period on the numeric keypad.
+            // --arcum42
             key_code = WXK_NUMPAD_SEPARATOR;
             break;
 

pcsx2/SourceLog.cpp

@@ -168,6 +168,8 @@ IMPLEMENT_SOURCE_LOG( SIF, 'E', 9 )
 IMPLEMENT_SOURCE_LOG( IPU, 'E', 8 ) 
 IMPLEMENT_SOURCE_LOG( VUM, 'E', 2 ) 
 IMPLEMENT_SOURCE_LOG( RPC, 'E', 9 ) 
+IMPLEMENT_SOURCE_LOG( ISOFS, 'E', 9 ) 
+IMPLEMENT_SOURCE_LOG( VIFUNPACK, 'E', 7 ) 
 
 IMPLEMENT_SOURCE_LOG( PSXCPU, 'I', 1 ) 
 IMPLEMENT_SOURCE_LOG( PSXMEM, 'I', 6 ) 
@@ -181,6 +183,7 @@ IMPLEMENT_SOURCE_LOG( PAD, 'I', 7 )
 IMPLEMENT_SOURCE_LOG( GTE, 'I', 3 ) 
 IMPLEMENT_SOURCE_LOG( CDR, 'I', 8 ) 
 IMPLEMENT_SOURCE_LOG( CDVD, 'I', 8 ) 
+IMPLEMENT_SOURCE_LOG( CACHE, 'I', 8 )