stdafx_gui.h created, wx removed from stdafx.h

Utilities/GNU.h

@@ -83,3 +83,14 @@ int clock_gettime(int foo, struct timespec *ts);
 
 #define DWORD int32_t
 #endif
+
+#ifndef InterlockedCompareExchange
+static __forceinline uint32_t InterlockedCompareExchange(volatile uint32_t* dest, uint32_t exch, uint32_t comp)
+{
+	return _InterlockedCompareExchange((volatile long*)dest, exch, comp);
+}
+static __forceinline uint64_t InterlockedCompareExchange(volatile uint64_t* dest, uint64_t exch, uint64_t comp)
+{
+	return _InterlockedCompareExchange64((volatile long long*)dest, exch, comp);
+}
+#endif

Utilities/StrFmt.cpp

@@ -14,7 +14,11 @@ std::string fmt::FormatV(const char *fmt, va_list args)
 	for (;;)
 	{
 		std::vector<char> buffptr(length);
+#if !defined(_MSC_VER)
 		size_t printlen = vsnprintf(buffptr.data(), length, fmt, args);
+#else
+		size_t printlen = vsnprintf_s(buffptr.data(), length, length - 1, fmt, args);
+#endif
 		if (printlen < length)
 		{
 			str = std::string(buffptr.data(), printlen);

Utilities/StrFmt.h

@@ -1,4 +1,5 @@
 #pragma once
+#include <wx/string.h>
 
 #if defined(_MSC_VER)
 #define snprintf _snprintf
@@ -111,10 +112,14 @@ namespace fmt{
 		for (;;)
 		{
 			std::vector<char> buffptr(length);
+#if !defined(_MSC_VER)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wformat-security"
 			size_t printlen = snprintf(buffptr.data(), length, fmt.c_str(), std::forward<Args>(parameters)...);
 #pragma clang diagnostic pop
+#else
+			size_t printlen = _snprintf_s(buffptr.data(), length, length - 1, fmt.c_str(), std::forward<Args>(parameters)...);
+#endif
 			if (printlen < length)
 			{
 				str = string(buffptr.data(), printlen);

Utilities/rFile.cpp

@@ -1,9 +1,13 @@
 #include "stdafx.h"
 #include "Log.h"
 #include <wx/dir.h>
+#include <wx/file.h>
+#include <wx/filename.h>
 #include "rFile.h"
 
 #ifdef _WIN32
+#include <Windows.h>
+
 // Maybe in StrFmt?
 std::wstring ConvertUTF8ToWString(const std::string &source) {
 	int len = (int)source.size();

Utilities/rMsgBox.cpp

@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <wx/msgdlg.h>
 #include "rMsgBox.h"
 
 #ifndef QT_UI

Utilities/rPlatform.cpp

@@ -1,4 +1,5 @@
 #include "stdafx.h"
+#include <wx/image.h>
 
 #ifndef _WIN32
 #include <dirent.h>

rpcs3/Emu/Cell/PPUProgramCompiler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "PPUProgramCompiler.h"
 #include "Utilities/rFile.h"
 

rpcs3/Emu/Cell/SPUThread.cpp

@@ -11,7 +11,6 @@
 #include "Emu/SysCalls/lv2/sys_spu.h"
 #include "Emu/SysCalls/lv2/sys_event_flag.h"
 #include "Emu/SysCalls/lv2/sys_time.h"
-#include "Emu/Event.h"
 
 #include "Emu/Cell/SPUDisAsm.h"
 #include "Emu/Cell/SPUThread.h"
@@ -424,7 +423,7 @@ void SPUThread::EnqMfcCmd(MFCReg& MFCArgs)
 				{
 					if (buf[i] != R_DATA[i])
 					{
-						if (InterlockedCompareExchange64((volatile long long*)(Memory + (ea + i * 8)), buf[i], R_DATA[i]) != R_DATA[i])
+						if (InterlockedCompareExchange((volatile u64*)(Memory + (ea + i * 8)), buf[i], R_DATA[i]) != R_DATA[i])
 						{
 							m_events |= SPU_EVENT_LR;
 							MFCArgs.AtomicStat.PushUncond(MFC_PUTLLC_FAILURE);

rpcs3/Emu/FS/VFS.cpp

@@ -5,6 +5,8 @@
 #include "vfsDeviceLocalFile.h"
 #include "Ini.h"
 
+#undef CreateFile // TODO: what's wrong with it?
+
 int sort_devices(const void* _a, const void* _b)
 {
 	const vfsDevice& a =  **(const vfsDevice**)_a;

rpcs3/Emu/Io/XInput/XInputPadHandler.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #if defined (_WIN32)
 #include "Utilities/Log.h"
 #include "XInputPadHandler.h"

rpcs3/Emu/Memory/Memory.cpp

@@ -5,6 +5,8 @@
 
 #ifndef _WIN32
 #include <sys/mman.h>
+#else
+#include <Windows.h>
 #endif
 
 /* OS X uses MAP_ANON instead of MAP_ANONYMOUS */

rpcs3/Emu/Memory/Memory.h

@@ -365,7 +365,7 @@ public:
 
 	template<typename T> void WriteString(const T addr, const std::string& str)
 	{
-		strcpy((char*)GetMemFromAddr<T>(addr), str.c_str());
+		memcpy(GetMemFromAddr<T>(addr), str.c_str(), str.size());
 	}
 
 	u32 GetUserMemTotalSize()

rpcs3/Emu/Memory/MemoryBlock.h

@@ -2,7 +2,7 @@
 
 #define PAGE_4K(x) (x + 4095) & ~(4095)
 
-#include <emmintrin.h>
+//#include <emmintrin.h>
 
 struct MemInfo
 {

rpcs3/Emu/RSX/GL/OpenGL.h

@@ -4,6 +4,7 @@
 #endif
 
 #ifdef _WIN32
+#include <Windows.h>
 #include "GL/gl.h"
 #include "GL/glext.h"
 typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval);

rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp

@@ -3,6 +3,11 @@
 #include "Emu/System.h"
 #include "Emu/SysCalls/Modules.h"
 
+#include <wx/dialog.h>
+#include <wx/gauge.h>
+#include <wx/stattext.h>
+#include <wx/sizer.h>
+#include <wx/button.h>
 #include "Utilities/rMsgBox.h"
 #include "Emu/SysCalls/lv2/sys_time.h"
 #include "cellSysutil.h"

rpcs3/Emu/SysCalls/Modules/cellResc.cpp

@@ -3,6 +3,7 @@
 #include "Emu/System.h"
 #include "Emu/SysCalls/Modules.h"
 
+#include <wx/math.h>
 #include "cellSysutil.h"
 #include "Emu/RSX/sysutil_video.h"
 #include "Emu/RSX/GSManager.h"

rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp

@@ -161,7 +161,7 @@ int sceNpTrophyRegisterContext(u32 context, u32 handle, mem_func_ptr_t<SceNpTrop
 	const size_t kTargetBufferLength = 31;
 	char target[kTargetBufferLength+1];
 	target[kTargetBufferLength] = 0;
-	snprintf(target, kTargetBufferLength, "TROP_%02d.SFM", Ini.SysLanguage.GetValue());
+	strcpy_trunc(target, fmt::Format("TROP_%02d.SFM", Ini.SysLanguage.GetValue()));
 
 	if (trp.ContainsEntry(target)) {
 		trp.RemoveEntry("TROPCONF.SFM");
@@ -178,7 +178,7 @@ int sceNpTrophyRegisterContext(u32 context, u32 handle, mem_func_ptr_t<SceNpTrop
 
 	// Discard unnecessary TROP_XX.SFM files
 	for (int i=0; i<=18; i++) {
-		snprintf(target, kTargetBufferLength, "TROP_%02d.SFM", i);
+		strcpy_trunc(target, fmt::Format("TROP_%02d.SFM", i));
 		if (i != Ini.SysLanguage.GetValue())
 			trp.RemoveEntry(target);
 	}

rpcs3/Emu/SysCalls/lv2/sys_time.cpp

@@ -10,6 +10,9 @@
 #include "Emu/System.h"
 #include "Emu/SysCalls/SysCalls.h"
 
+#ifdef _WIN32
+#include <Windows.h>
+#endif
 #include "sys_time.h"
 
 SysCallBase sys_time("sys_time");

rpcs3/Emu/System.cpp

@@ -422,7 +422,7 @@ void Emulator::Pause()
 	//ConLog.Write("pause...");
 	SendDbgCommand(DID_PAUSE_EMU);
 
-	if (InterlockedCompareExchange((volatile unsigned long*)&m_status, Paused, Running) == Running)
+	if (InterlockedCompareExchange((volatile u32*)&m_status, Paused, Running) == Running)
 	{
 		SendDbgCommand(DID_PAUSED_EMU);
 	}
@@ -512,9 +512,10 @@ void Emulator::SavePoints(const std::string& path)
 
 void Emulator::LoadPoints(const std::string& path)
 {
-	struct stat buf;
+	if (!rExists(path)) return;
-	if (!stat(path.c_str(), &buf))
+	//struct stat buf;
-		return;
+	//if (!stat(path.c_str(), &buf))
+		//return;
 	std::ifstream f(path, std::ios::binary);
 	if (!f.is_open())
 		return;

rpcs3/Gui/AutoPauseManager.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Emu/System.h"
 #include "AutoPauseManager.h"
 #include <iomanip>

rpcs3/Gui/CompilerELF.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/rMsgBox.h"
 
 #include "Emu/Cell/PPUProgramCompiler.h"

rpcs3/Gui/ConLogFrame.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 
 #include <wx/listctrl.h>
 #include <wx/clipbrd.h>

rpcs3/Gui/Debugger.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include <wx/statline.h>
 
 #include "Emu/Memory/Memory.h"

rpcs3/Gui/DisAsmFrame.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"

rpcs3/Gui/GLGSFrame.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "GLGSFrame.h"
 #include "Utilities/Timer.h"
 

rpcs3/Gui/GSFrame.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "GSFrame.h"
 #include "Emu/System.h"
 #include "Emu/RSX/sysutil_video.h"

rpcs3/Gui/GameViewer.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/AutoPause.h"
 #include "Utilities/Log.h"
 #include "Utilities/rFile.h"

rpcs3/Gui/InterpreterDisAsm.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"

rpcs3/Gui/KernelExplorer.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"

rpcs3/Gui/MainFrame.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"

rpcs3/Gui/MemoryViewer.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 

rpcs3/Gui/PADManager.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"

rpcs3/Gui/RSXDebugger.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "rpcs3/Ini.h"
 #include "Utilities/rPlatform.h"
 #include "Utilities/Log.h"

rpcs3/Gui/SaveDataUtility.cpp

@@ -1,6 +1,5 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "SaveDataUtility.h"
-#include "stdafx.h"
 #include <iomanip>
 #include <sstream>
 #include "Utilities/Log.h"

rpcs3/Gui/TextInputDialog.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "TextInputDialog.h"
 
 TextInputDialog::TextInputDialog(wxWindow* parent, const std::string& defvalue, const std::string& label)

rpcs3/Gui/VFSManager.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"

rpcs3/Gui/VHDDManager.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Utilities/Log.h"
 #include "VHDDManager.h"
 #include "TextInputDialog.h"

rpcs3/emucore.vcxproj

@@ -29,6 +29,11 @@
   <ItemGroup>
     <ClCompile Include="..\Utilities\AutoPause.cpp" />
     <ClCompile Include="..\Utilities\Log.cpp" />
+    <ClCompile Include="..\Utilities\rFile.cpp" />
+    <ClCompile Include="..\Utilities\rMsgBox.cpp" />
+    <ClCompile Include="..\Utilities\rPlatform.cpp" />
+    <ClCompile Include="..\Utilities\rTime.cpp" />
+    <ClCompile Include="..\Utilities\rXml.cpp" />
     <ClCompile Include="..\Utilities\SMutex.cpp" />
     <ClCompile Include="..\Utilities\SSemaphore.cpp" />
     <ClCompile Include="..\Utilities\StrFmt.cpp" />
@@ -55,7 +60,6 @@
     <ClCompile Include="Emu\Cell\MFC.cpp" />
     <ClCompile Include="Emu\Cell\PPCDecoder.cpp" />
     <ClCompile Include="Emu\Cell\PPCThread.cpp" />
-    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" />
     <ClCompile Include="Emu\Cell\PPUThread.cpp" />
     <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
     <ClCompile Include="Emu\Cell\SPURecompilerCore.cpp" />
@@ -221,9 +225,10 @@
   <ItemGroup>
     <ClInclude Include="..\Utilities\AutoPause.h" />
     <ClInclude Include="..\Utilities\BEType.h" />
+    <ClInclude Include="..\Utilities\GNU.h" />
     <ClInclude Include="..\Utilities\MTRingbuffer.h" />
-    <ClInclude Include="..\Utilities\rFile.h" />
     <ClInclude Include="..\Utilities\Log.h" />
+    <ClInclude Include="..\Utilities\rFile.h" />
     <ClInclude Include="..\Utilities\rMsgBox.h" />
     <ClInclude Include="..\Utilities\rPlatform.h" />
     <ClInclude Include="..\Utilities\rTime.h" />
@@ -262,7 +267,6 @@
     <ClInclude Include="Emu\Cell\PPUInstrTable.h" />
     <ClInclude Include="Emu\Cell\PPUInterpreter.h" />
     <ClInclude Include="Emu\Cell\PPUOpcodes.h" />
-    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h" />
     <ClInclude Include="Emu\Cell\PPUThread.h" />
     <ClInclude Include="Emu\Cell\RawSPUThread.h" />
     <ClInclude Include="Emu\Cell\SPUDecoder.h" />
@@ -409,6 +413,9 @@
     <ClInclude Include="Loader\TRP.h" />
     <ClInclude Include="stdafx.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram.cd" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C4A10229-4712-4BD2-B63E-50D93C67A038}</ProjectGuid>
     <RootNamespace>emucore</RootNamespace>

rpcs3/emucore.vcxproj.filters

@@ -365,9 +365,6 @@
     <ClCompile Include="Emu\SysCalls\ModuleManager.cpp">
       <Filter>Emu\SysCalls</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp">
-      <Filter>Emu\Cell</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\SysCalls\Modules\cellBgdl.cpp">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClCompile>
@@ -608,6 +605,21 @@
     <ClCompile Include="Emu\SysCalls\Modules\cellFiber.cpp">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="..\Utilities\rFile.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rMsgBox.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rPlatform.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rTime.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Utilities\rXml.cpp">
+      <Filter>Utilities</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -919,9 +931,6 @@
     <ClInclude Include="Loader\TROPUSR.h">
       <Filter>Loader</Filter>
     </ClInclude>
-    <ClInclude Include="Loader\TRP.h">
-      <Filter>Loader</Filter>
-    </ClInclude>
     <ClInclude Include="stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -949,9 +958,6 @@
     <ClInclude Include="Emu\SysCalls\Static.h">
       <Filter>Emu\SysCalls</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\rFile.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
     <ClInclude Include="..\Utilities\simpleini\ConvertUTF.h">
       <Filter>Utilities\SimpleIni</Filter>
     </ClInclude>
@@ -961,21 +967,6 @@
     <ClInclude Include="Emu\DbgCommand.h">
       <Filter>Emu</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\rTime.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rXml.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rMsgBox.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rPlatform.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h">
-      <Filter>Emu\Cell</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\SysCalls\Modules\libsnd3.h">
       <Filter>Emu\SysCalls\currently_unused</Filter>
     </ClInclude>
@@ -1054,9 +1045,6 @@
     <ClInclude Include="Emu\SysCalls\lv2\lv2Fs.h">
       <Filter>Emu\SysCalls\lv2</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\MTRingbuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\Utilities\Log.h">
       <Filter>Utilities</Filter>
     </ClInclude>
@@ -1177,5 +1165,32 @@
     <ClInclude Include="Emu\SysCalls\Modules\SC_Mouse.h">
       <Filter>Emu\SysCalls\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="..\Utilities\MTRingbuffer.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rFile.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rMsgBox.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rPlatform.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rTime.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\rXml.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Utilities\GNU.h">
+      <Filter>Utilities</Filter>
+    </ClInclude>
+    <ClInclude Include="Loader\TRP.h">
+      <Filter>Loader</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram.cd" />
   </ItemGroup>
 </Project>

rpcs3/rpcs3.cpp

@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx_gui.h"
 #include "Emu/System.h"
 #include "rpcs3.h"
 #include "Ini.h"

rpcs3/rpcs3.vcxproj

@@ -82,6 +82,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <AdditionalIncludeDirectories>..\wxWidgets\include\msvc</AdditionalIncludeDirectories>
       <ExceptionHandling>Async</ExceptionHandling>
+      <PrecompiledHeaderFile>stdafx_gui.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)_gui.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,6 +108,8 @@
       <AdditionalIncludeDirectories>..\wxWidgets\include\msvc</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_UNICODE;UNICODE;MSVC_CRT_MEMLEAK_DETECTION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
+      <PrecompiledHeaderFile>stdafx_gui.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)_gui.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -136,6 +140,8 @@
       <ExceptionHandling>Async</ExceptionHandling>
       <EnablePREfast>false</EnablePREfast>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeaderFile>stdafx_gui.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName)_gui.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -155,14 +161,7 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Utilities\rFile.cpp" />
+    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" />
-    <ClCompile Include="..\Utilities\rMsgBox.cpp" />
-    <ClCompile Include="..\Utilities\rPlatform.cpp" />
-    <ClCompile Include="..\Utilities\rTime.cpp" />
-    <ClCompile Include="..\Utilities\rXml.cpp" />
-    <ClCompile Include="..\Utilities\SMutex.cpp" />
-    <ClCompile Include="..\Utilities\StrFmt.cpp" />
-    <ClCompile Include="..\Utilities\Thread.cpp" />
     <ClCompile Include="Emu\Io\XInput\XInputPadHandler.cpp" />
     <ClCompile Include="Gui\AutoPauseManager.cpp" />
     <ClCompile Include="Gui\CompilerELF.cpp" />
@@ -183,30 +182,18 @@
     <ClCompile Include="Gui\VFSManager.cpp" />
     <ClCompile Include="Gui\VHDDManager.cpp" />
     <ClCompile Include="rpcs3.cpp" />
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="stdafx_gui.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="rpcs3.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Utilities\BEType.h" />
-    <ClInclude Include="..\Utilities\IdManager.h" />
     <ClInclude Include="..\Utilities\MTProgressDialog.h" />
-    <ClInclude Include="..\Utilities\MTRingbuffer.h" />
+    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h" />
-    <ClInclude Include="..\Utilities\rFile.h" />
-    <ClInclude Include="..\Utilities\rMsgBox.h" />
-    <ClInclude Include="..\Utilities\rPlatform.h" />
-    <ClInclude Include="..\Utilities\rTime.h" />
-    <ClInclude Include="..\Utilities\rXml.h" />
-    <ClInclude Include="..\Utilities\SMutex.h" />
-    <ClInclude Include="..\Utilities\SQueue.h" />
-    <ClInclude Include="..\Utilities\StrFmt.h" />
-    <ClInclude Include="..\Utilities\Thread.h" />
-    <ClInclude Include="..\Utilities\Timer.h" />
     <ClInclude Include="Emu\Io\Windows\WindowsKeyboardHandler.h" />
     <ClInclude Include="Emu\Io\Windows\WindowsMouseHandler.h" />
     <ClInclude Include="Emu\Io\Windows\WindowsPadHandler.h" />
@@ -232,7 +219,7 @@
     <ClInclude Include="Gui\VFSManager.h" />
     <ClInclude Include="Gui\VHDDManager.h" />
     <ClInclude Include="rpcs3.h" />
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="stdafx_gui.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

rpcs3/rpcs3.vcxproj.filters

@@ -4,9 +4,6 @@
     <Filter Include="Gui">
       <UniqueIdentifier>{98fb6fa5-9a9a-48a6-a6b4-be4b9a69b76e}</UniqueIdentifier>
     </Filter>
-    <Filter Include="rpcs3">
-      <UniqueIdentifier>{47155d25-741d-42c0-8850-f22aafca082a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Utilities">
       <UniqueIdentifier>{9bd88f78-8528-48f3-b9e0-78e06476b04d}</UniqueIdentifier>
     </Filter>
@@ -19,14 +16,14 @@
     <Filter Include="Io\XInput">
       <UniqueIdentifier>{b30572ce-b602-4c10-ad69-bd3f1c8a0144}</UniqueIdentifier>
     </Filter>
+    <Filter Include="rpcs3">
+      <UniqueIdentifier>{47155d25-741d-42c0-8850-f22aafca082a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="rpcs3.cpp">
       <Filter>rpcs3</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>rpcs3</Filter>
-    </ClCompile>
     <ClCompile Include="Gui\MainFrame.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
@@ -45,9 +42,6 @@
     <ClCompile Include="Gui\GameViewer.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\Utilities\Thread.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
     <ClCompile Include="Gui\Debugger.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
@@ -66,27 +60,6 @@
     <ClCompile Include="Gui\PADManager.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
-    <ClCompile Include="..\Utilities\SMutex.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\StrFmt.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rFile.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rMsgBox.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rPlatform.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rTime.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Utilities\rXml.cpp">
-      <Filter>Utilities</Filter>
-    </ClCompile>
     <ClCompile Include="Gui\GLGSFrame.cpp">
       <Filter>Gui</Filter>
     </ClCompile>
@@ -108,35 +81,20 @@
     <ClCompile Include="Emu\Io\XInput\XInputPadHandler.cpp">
       <Filter>Io\XInput</Filter>
     </ClCompile>
+    <ClCompile Include="stdafx_gui.cpp">
+      <Filter>rpcs3</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp">
+      <Filter>Gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="rpcs3.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Utilities\IdManager.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
     <ClInclude Include="..\Utilities\MTProgressDialog.h">
       <Filter>Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\Thread.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\Timer.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\BEType.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\SMutex.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\SQueue.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\StrFmt.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
     <ClInclude Include="Gui\CompilerELF.h">
       <Filter>Gui</Filter>
     </ClInclude>
@@ -170,9 +128,6 @@
     <ClInclude Include="Gui\VHDDManager.h">
       <Filter>Gui</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
-      <Filter>rpcs3</Filter>
-    </ClInclude>
     <ClInclude Include="rpcs3.h">
       <Filter>rpcs3</Filter>
     </ClInclude>
@@ -185,21 +140,6 @@
     <ClInclude Include="Gui\AboutDialog.h">
       <Filter>Gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\rFile.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rMsgBox.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rPlatform.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rTime.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Utilities\rXml.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
     <ClInclude Include="Gui\GLGSFrame.h">
       <Filter>Gui</Filter>
     </ClInclude>
@@ -209,9 +149,6 @@
     <ClInclude Include="Gui\ConLogFrame.h">
       <Filter>Gui</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\MTRingbuffer.h">
-      <Filter>Utilities</Filter>
-    </ClInclude>
     <ClInclude Include="Gui\AutoPauseManager.h">
       <Filter>Gui</Filter>
     </ClInclude>
@@ -233,5 +170,11 @@
     <ClInclude Include="Emu\Io\XInput\XInputPadHandler.h">
       <Filter>Io\XInput</Filter>
     </ClInclude>
+    <ClInclude Include="stdafx_gui.h">
+      <Filter>rpcs3</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\Cell\PPUProgramCompiler.h">
+      <Filter>Gui</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

rpcs3/stdafx.h

@@ -7,30 +7,6 @@
 #endif
 
 #define NOMINMAX
-#ifndef QT_UI
-#include <wx/wxprec.h>
-#include <wx/config.h>
-#include <wx/string.h>
-#include <wx/propdlg.h>
-#include <wx/dcclient.h>
-
-#include <wx/wfstream.h>
-#include <wx/spinctrl.h>
-#include <wx/datetime.h>
-#include <wx/filepicker.h>
-#include <wx/menu.h>
-#include <wx/menuitem.h>
-#include <wx/stattext.h>
-#include <wx/msgdlg.h>
-#include <wx/gauge.h>
-#include <wx/stattext.h>
-#include <wx/scrolbar.h>
-#include <wx/frame.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/listctrl.h>
-#include <wx/aui/auibook.h>
-#endif
 
 #if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && !defined(DBG_NEW)
 	#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )

rpcs3/stdafx_gui.cpp

@@ -0,0 +1 @@
+#include "stdafx_gui.h"

rpcs3/stdafx_gui.h

@@ -0,0 +1,270 @@
+#pragma once
+
+#ifdef MSVC_CRT_MEMLEAK_DETECTION
+#define _CRTDBG_MAP_ALLOC
+#include <stdlib.h>
+#include <crtdbg.h>
+#endif
+
+#define NOMINMAX
+#ifndef QT_UI
+#include <wx/wxprec.h>
+#include <wx/config.h>
+#include <wx/string.h>
+#include <wx/propdlg.h>
+#include <wx/dcclient.h>
+
+#include <wx/wfstream.h>
+#include <wx/spinctrl.h>
+#include <wx/datetime.h>
+#include <wx/filepicker.h>
+#include <wx/menu.h>
+#include <wx/menuitem.h>
+#include <wx/stattext.h>
+#include <wx/msgdlg.h>
+#include <wx/gauge.h>
+#include <wx/stattext.h>
+#include <wx/scrolbar.h>
+#include <wx/frame.h>
+#include <wx/combobox.h>
+#include <wx/checkbox.h>
+#include <wx/listctrl.h>
+#include <wx/aui/auibook.h>
+#endif
+
+#if defined(MSVC_CRT_MEMLEAK_DETECTION) && defined(_DEBUG) && !defined(DBG_NEW)
+#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
+#define new DBG_NEW
+#endif
+
+// This header should be frontend-agnostic, so don't assume wx includes everything
+#include <cstdio>
+#include <cstring>
+#include <cassert>
+#include <cstdint>
+#include <cmath>
+#include <atomic>
+#include <mutex>
+#include <thread>
+#include <condition_variable>
+#include <memory>
+#include <vector>
+#include <set>
+#include <string>
+#include <ostream>
+#include <sstream>
+#include <functional>
+#include <algorithm>
+
+#include "Utilities/GNU.h"
+
+typedef unsigned int uint;
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
+
+union u128
+{
+	struct
+	{
+		u64 hi;
+		u64 lo;
+	};
+
+	u64 _u64[2];
+	u32 _u32[4];
+	u16 _u16[8];
+	u8  _u8[16];
+
+	operator u64() const { return _u64[0]; }
+	operator u32() const { return _u32[0]; }
+	operator u16() const { return _u16[0]; }
+	operator u8()  const { return _u8[0]; }
+
+	operator bool() const { return _u64[0] != 0 || _u64[1] != 0; }
+
+	static u128 From128(u64 hi, u64 lo)
+	{
+		u128 ret = { hi, lo };
+		return ret;
+	}
+
+	static u128 From64(u64 src)
+	{
+		u128 ret = { 0, src };
+		return ret;
+	}
+
+	static u128 From32(u32 src)
+	{
+		u128 ret;
+		ret._u32[0] = src;
+		ret._u32[1] = 0;
+		ret._u32[2] = 0;
+		ret._u32[3] = 0;
+		return ret;
+	}
+
+	static u128 FromBit(u32 bit)
+	{
+		u128 ret;
+		if (bit < 64)
+		{
+			ret.hi = 0;
+			ret.lo = (u64)1 << bit;
+		}
+		else if (bit < 128)
+		{
+			ret.hi = (u64)1 << (bit - 64);
+			ret.lo = 0;
+		}
+		else
+		{
+			ret.hi = 0;
+			ret.lo = 0;
+		}
+		return ret;
+	}
+
+	bool operator == (const u128& right) const
+	{
+		return (lo == right.lo) && (hi == right.hi);
+	}
+
+	bool operator != (const u128& right) const
+	{
+		return (lo != right.lo) || (hi != right.hi);
+	}
+
+	u128 operator | (const u128& right) const
+	{
+		return From128(hi | right.hi, lo | right.lo);
+	}
+
+	u128 operator & (const u128& right) const
+	{
+		return From128(hi & right.hi, lo & right.lo);
+	}
+
+	u128 operator ^ (const u128& right) const
+	{
+		return From128(hi ^ right.hi, lo ^ right.lo);
+	}
+
+	u128 operator ~ () const
+	{
+		return From128(~hi, ~lo);
+	}
+
+	static __forceinline u128 byteswap(const u128 val)
+	{
+		u128 ret;
+		ret.lo = _byteswap_uint64(val.hi);
+		ret.hi = _byteswap_uint64(val.lo);
+		return ret;
+	}
+};
+
+union s128
+{
+	struct
+	{
+		s64 hi;
+		s64 lo;
+	};
+
+	u64 _i64[2];
+	u32 _i32[4];
+	u16 _i16[8];
+	u8  _i8[16];
+
+	operator s64() const { return _i64[0]; }
+	operator s32() const { return _i32[0]; }
+	operator s16() const { return _i16[0]; }
+	operator s8()  const { return _i8[0]; }
+
+	operator bool() const { return _i64[0] != 0 || _i64[1] != 0; }
+
+	static s128 From64(s64 src)
+	{
+		s128 ret = { src, 0 };
+		return ret;
+	}
+
+	static s128 From32(s32 src)
+	{
+		s128 ret;
+		ret._i32[0] = src;
+		ret._i32[1] = 0;
+		ret.hi = 0;
+		return ret;
+	}
+
+	bool operator == (const s128& right) const
+	{
+		return (lo == right.lo) && (hi == right.hi);
+	}
+
+	bool operator != (const s128& right) const
+	{
+		return (lo != right.lo) || (hi != right.hi);
+	}
+};
+
+//TODO: SSE style
+/*
+struct u128
+{
+__m128 m_val;
+
+u128 GetValue128()
+{
+u128 ret;
+_mm_store_ps( (float*)&ret, m_val );
+return ret;
+}
+
+u64 GetValue64()
+{
+u64 ret;
+_mm_store_ps( (float*)&ret, m_val );
+return ret;
+}
+
+u32 GetValue32()
+{
+u32 ret;
+_mm_store_ps( (float*)&ret, m_val );
+return ret;
+}
+
+u16 GetValue16()
+{
+u16 ret;
+_mm_store_ps( (float*)&ret, m_val );
+return ret;
+}
+
+u8 GetValue8()
+{
+u8 ret;
+_mm_store_ps( (float*)&ret, m_val );
+return ret;
+}
+};
+*/
+
+#define AlignAddr(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
+
+#include "Utilities/StrFmt.h"
+#include "Utilities/BEType.h"
+
+#define _PRGNAME_ "RPCS3"
+#define _PRGVER_ "0.0.0.5"