Some std include moved

Utilities/BEType.h

@@ -1,10 +1,5 @@
 #pragma once
 
-#include <algorithm>
-
-using std::min;
-using std::max;
-
 #define re16(val) _byteswap_ushort(val)
 #define re32(val) _byteswap_ulong(val)
 #define re64(val) _byteswap_uint64(val)

Utilities/Log.cpp

@@ -3,15 +3,7 @@
 #include "Log.h"
 #include "rMsgBox.h"
 #include <iostream>
-#include <string>
 #include <cinttypes>
-#include <memory>
-#include <vector>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
-#include <set>
-#include <array>
 #include "Thread.h"
 #include "rFile.h"
 

Utilities/Log.h

@@ -1,11 +1,4 @@
 #pragma once
-#include <iostream>
-#include <string>
-#include <cinttypes>
-#include <memory>
-#include <vector>
-#include <mutex>
-#include <set>
 #include <array>
 #include "Utilities/MTRingbuffer.h"
 

Utilities/MTRingbuffer.h

@@ -1,8 +1,4 @@
 #pragma once
-#include <thread>
-#include <array>
-#include <mutex>
-#include <algorithm>
 
 //Simple non-resizable FIFO Ringbuffer that can be simultaneously be read from and written to
 //if we ever get to use boost please replace this with boost::circular_buffer, there's no reason

Utilities/SMutex.cpp

@@ -1,4 +1,4 @@
-#include <stdafx.h>
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/CPU/CPUThread.h"
 

Utilities/SMutex.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <atomic>
-
 bool SM_IsAborted();
 void SM_Sleep();
 size_t SM_GetCurrentThreadId();

Utilities/SSemaphore.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <mutex>
-#include <condition_variable>
-
 class SSemaphore
 {
 	const u32 m_max;

Utilities/StrFmt.h

@@ -1,10 +1,4 @@
 #pragma once
-#include <string>
-#include <vector>
-#include <ostream>
-#include <sstream>
-#include <cstdio>
-#include <functional>
 
 #if defined(_MSC_VER)
 #define snprintf _snprintf

Utilities/Thread.h

@@ -1,9 +1,4 @@
 #pragma once
-#include <functional>
-#include <thread>
-#include <mutex>
-#include <atomic>
-#include <condition_variable>
 
 static std::thread::id main_thread;
 

Utilities/rFile.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <string>
-
 struct FileInfo {
 	std::string name;
 	std::string fullName;

Utilities/rPlatform.h

@@ -1,6 +1,4 @@
 #pragma once
-#include <vector>
-#include <string>
 
 struct rPlatform
 {

Utilities/rXml.cpp

@@ -1,7 +1,4 @@
 #include "stdafx.h"
-
-#include <memory>
-
 #include "Utilities/rXml.h"
 #include <wx/xml/xml.h>
 

rpcs3/Emu/CPU/CPUDecoder.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <algorithm>
 #include "CPUInstrTable.h"
 #pragma warning( disable : 4800 )
 

rpcs3/Emu/CPU/CPUThread.cpp

@@ -286,8 +286,6 @@ void _se_translator(unsigned int u, EXCEPTION_POINTERS* pExp)
 	if (u == EXCEPTION_ACCESS_VIOLATION && addr < 0x100000000)
 	{
 		// TODO: allow recovering from a page fault
-		//GetCurrentPPUThread().Stop();
-		Emu.Pause();
 		throw fmt::Format("Access violation: addr = 0x%x (last_syscall=0x%llx (%s))",
 			(u32)addr, (u64)GetCurrentCPUThread()->m_last_syscall, SysCalls::GetHLEFuncName((u64)GetCurrentCPUThread()->m_last_syscall).c_str());
 	}
@@ -364,10 +362,12 @@ void CPUThread::Task()
 	catch (const std::string& e)
 	{
 		LOG_ERROR(GENERAL, "Exception: %s", e.c_str());
+		Emu.Pause();
 	}
 	catch (const char* e)
 	{
 		LOG_ERROR(GENERAL, "Exception: %s", e);
+		Emu.Pause();
 	}
 
 	for (auto& v : trace) LOG_NOTICE(PPU, "PC = 0x%llx", v);

rpcs3/Emu/CPU/CPUThreadManager.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <mutex>
-
 class CPUThread;
 class RawSPUThread;
 enum CPUThreadType : unsigned char;

rpcs3/Emu/Cell/PPUProgramCompiler.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <vector>
 #include "PPUInstrTable.h"
 #include "Loader/ELF64.h"
 

rpcs3/Emu/Cell/PPUThread.cpp

@@ -10,11 +10,6 @@
 #include "Emu/Cell/PPUDecoder.h"
 #include "Emu/Cell/PPUInterpreter.h"
 
-#include <thread>
-#include <cmath>
-
-//extern gcmInfo gcm_info;
-
 PPUThread& GetCurrentPPUThread()
 {
 	PPCThread* thread = GetCurrentPPCThread();

rpcs3/Emu/Cell/PPUThread.h

@@ -1,6 +1,5 @@
 #pragma once
 #include "Emu/Cell/PPCThread.h"
-#include <cmath>
 
 enum
 {

rpcs3/Emu/Cell/SPUThread.h

@@ -2,7 +2,6 @@
 #include "PPCThread.h"
 #include "Emu/Event.h"
 #include "MFC.h"
-#include <mutex>
 
 enum SPUchannels 
 {

rpcs3/Emu/FS/VFS.cpp

@@ -1,6 +1,4 @@
 #include "stdafx.h"
-#include <memory>
-
 #include "VFS.h"
 #include "vfsDirBase.h"
 #include "Emu/HDD/HDD.h"

rpcs3/Emu/FS/vfsDevice.cpp

@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include <algorithm>
 #include "vfsDevice.h"
 #include "Utilities/rFile.h"
 

rpcs3/Emu/FS/vfsDevice.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <mutex>
 
 struct vfsFileBase;
 class vfsDirBase;

rpcs3/Emu/FS/vfsDir.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <memory>
 #include "vfsDirBase.h"
 
 class vfsDir : public vfsDirBase

rpcs3/Emu/FS/vfsFile.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <memory>
 #include "vfsFileBase.h"
 
 class vfsFile : public vfsFileBase

rpcs3/Emu/HDD/HDD.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <algorithm>
 #include "Emu/FS/vfsDevice.h"
 #include "Emu/FS/vfsLocalFile.h"
 

rpcs3/Emu/IdManager.h

@@ -1,7 +1,5 @@
 #pragma once
-#include <mutex>
 #include <unordered_map>
-#include <set>
 
 #define rID_ANY -1 // was wxID_ANY
 

rpcs3/Emu/Io/Keyboard.h

@@ -1,6 +1,4 @@
 #pragma once
-
-#include <memory>
 #include "KeyboardHandler.h"
 
 class KeyboardManager

rpcs3/Emu/Io/KeyboardHandler.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 extern u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode); // (TODO: Can it be problematic to place SysCalls in middle of nowhere?)
 
 enum KbPortStatus

rpcs3/Emu/Io/Mouse.h

@@ -1,6 +1,4 @@
 #pragma once
-
-#include <memory>
 #include "MouseHandler.h"
 
 class MouseManager

rpcs3/Emu/Io/MouseHandler.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 enum MousePortStatus
 {
 	CELL_MOUSE_STATUS_DISCONNECTED = 0x00000000,

rpcs3/Emu/Io/Pad.h

@@ -1,6 +1,4 @@
 #pragma once
-
-#include <memory>
 #include "PadHandler.h"
 
 class PadManager

rpcs3/Emu/Io/PadHandler.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <vector>
-
 enum PortStatus
 {
 	CELL_PAD_STATUS_DISCONNECTED   = 0x00000000,

rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h

@@ -1,7 +1,4 @@
 #pragma once
-
-#include <algorithm>
-#include <vector>
 #include "Emu/Io/KeyboardHandler.h"
 
 class WindowsKeyboardHandler final

rpcs3/Emu/Io/Windows/WindowsMouseHandler.h

@@ -1,6 +1,4 @@
 #pragma once
-
-#include <algorithm>
 #include "Emu/Io/MouseHandler.h"
 
 class WindowsMouseHandler final

rpcs3/Emu/Io/Windows/WindowsPadHandler.h

@@ -1,6 +1,4 @@
 #pragma once
-
-#include <algorithm>
 #include "Emu/Io/PadHandler.h"
 
 class WindowsPadHandler final

rpcs3/Emu/Io/XInput/XInputPadHandler.cpp

@@ -1,9 +1,7 @@
 #include "stdafx.h"
 #if defined (_WIN32)
-#include <algorithm>
 #include "Utilities/Log.h"
 #include "XInputPadHandler.h"
-#include <cstring>
 
 namespace {
 	const DWORD THREAD_TIMEOUT = 1000;

rpcs3/Emu/Memory/Memory.cpp

@@ -1,9 +1,7 @@
 #include "stdafx.h"
-#include <atomic>
-
 #include "Utilities/Log.h"
-#include "Memory.h"
 #include "Emu/System.h"
+#include "Memory.h"
 
 #ifndef _WIN32
 #include <sys/mman.h>
@@ -36,6 +34,7 @@ void MemoryBase::RegisterPages(u64 addr, u32 size)
 		if (m_pages[i])
 		{
 			LOG_ERROR(MEMORY, "Page already registered (addr=0x%llx)", i * 4096);
+			Emu.Pause();
 		}
 		m_pages[i] = 1; // TODO: define page parameters
 	}
@@ -56,6 +55,7 @@ void MemoryBase::UnregisterPages(u64 addr, u32 size)
 		if (!m_pages[i])
 		{
 			LOG_ERROR(MEMORY, "Page not registered (addr=0x%llx)", i * 4096);
+			Emu.Pause();
 		}
 		m_pages[i] = 0; // TODO: define page parameters
 	}

rpcs3/Emu/Memory/MemoryBlock.h

@@ -2,8 +2,6 @@
 
 #define PAGE_4K(x) (x + 4095) & ~(4095)
 
-#include <memory>
-#include <mutex>
 #include <emmintrin.h>
 
 struct MemInfo

rpcs3/Emu/RSX/RSXThread.cpp

@@ -2155,7 +2155,7 @@ void RSXThread::Task()
 	});
 	vblank.detach();
 
-	while(!TestDestroy())
+	while(!TestDestroy()) try
 	{
 		if (Emu.IsStopped())
 		{
@@ -2246,6 +2246,16 @@ void RSXThread::Task()
 		m_ctrl->get = get + (count + 1) * 4;
 		//memset(Memory.GetMemFromAddr(p.m_ioAddress + get), 0, (count + 1) * 4);
 	}
+	catch (const std::string& e)
+	{
+		LOG_ERROR(RSX, "Exception: %s", e.c_str());
+		Emu.Pause();
+	}
+	catch (const char* e)
+	{
+		LOG_ERROR(RSX, "Exception: %s", e);
+		Emu.Pause();
+	}
 
 	while (!is_vblank_stopped)
 	{
@@ -2278,11 +2288,17 @@ void RSXThread::Init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddres
 u32 RSXThread::ReadIO32(u32 addr)
 {
 	u32 value;
-	Memory.RSXIOMem.Read32(Memory.RSXIOMem.GetStartAddr() + addr, &value);
+	if (!Memory.RSXIOMem.Read32(Memory.RSXIOMem.GetStartAddr() + addr, &value))
+	{
+		throw fmt::Format("%s(rsxio_addr=0x%x): RSXIO memory not mapped", __FUNCTION__, addr);
+	}
 	return value;
 }
 
 void RSXThread::WriteIO32(u32 addr, u32 value)
 {
-	Memory.RSXIOMem.Write32(Memory.RSXIOMem.GetStartAddr() + addr, value);
+	if (!Memory.RSXIOMem.Write32(Memory.RSXIOMem.GetStartAddr() + addr, value))
+	{
+		throw fmt::Format("%s(rsxio_addr=0x%x): RSXIO memory not mapped", __FUNCTION__, addr);
+	}
 }

rpcs3/Emu/RSX/RSXThread.h

@@ -6,7 +6,6 @@
 #include "Emu/SysCalls/Callback.h"
 
 #include <stack>
-#include <set> // For tracking a list of used gcm commands
 #include "Utilities/SSemaphore.h"
 #include "Utilities/Thread.h"
 

rpcs3/Emu/SysCalls/Modules.cpp

@@ -4,7 +4,6 @@
 #include "Emu/SysCalls/Modules.h"
 #include "Emu/SysCalls/Static.h"
 #include "Crypto/sha1.h"
-#include <mutex>
 #include "ModuleManager.h"
 
 u32 getFunctionId(const char* name)

rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp

@@ -8,7 +8,6 @@
 #include "Emu/FS/vfsDir.h"
 #include "Loader/PSF.h"
 #include "cellSysutil_SaveData.h"
-#include <algorithm>
 
 extern Module *cellSysutil;
 

rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp

@@ -13,8 +13,6 @@
 #include "Emu/SysCalls/lv2/sys_time.h"
 #include "sceNp.h"
 #include "sceNpTrophy.h"
-#include <algorithm>
-#include <memory>
 
 //void sceNpTrophy_unload();
 //void sceNpTrophy_init();

rpcs3/Emu/SysCalls/lv2/sys_spinlock.cpp

@@ -3,7 +3,6 @@
 #include "Emu/System.h"
 #include "Emu/SysCalls/SysCalls.h"
 
-#include <thread>
 #include "sys_spinlock.h"
 
 SysCallBase sys_spinlock("sys_spinlock");

rpcs3/Emu/SysCalls/lv2/sys_spinlock.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <atomic>
-
 // SysCalls
 void sys_spinlock_initialize(mem_ptr_t<std::atomic<be_t<u32>>> lock);
 void sys_spinlock_lock(mem_ptr_t<std::atomic<be_t<u32>>> lock);

rpcs3/Emu/SysCalls/lv2/sys_spu.cpp

@@ -8,7 +8,6 @@
 #include "Emu/FS/vfsFile.h"
 #include "Loader/ELF.h"
 #include "sys_spu.h"
-#include <atomic>
 
 static SysCallBase sys_spu("sys_spu");
 

rpcs3/Emu/SysCalls/lv2/sys_spu.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <atomic>
-
 enum
 {
 	SYS_SPU_THREAD_GROUP_TYPE_NORMAL = 0x00,

rpcs3/Emu/SysCalls/lv2/sys_timer.cpp

@@ -4,7 +4,6 @@
 #include "Emu/SysCalls/SysCalls.h"
 
 #include "Emu/Event.h"
-#include <thread>
 #include "sys_timer.h"
 
 SysCallBase sys_timer("sys_timer");

rpcs3/Emu/System.h

@@ -1,8 +1,4 @@
 #pragma once
-
-#include <atomic>
-#include <memory>
-#include <vector>
 #include "Loader/Loader.h"
 
 enum Status
@@ -90,6 +86,8 @@ class Emulator
 	std::vector<u64> m_break_points;
 	std::vector<u64> m_marked_points;
 
+	std::recursive_mutex m_core_mutex;
+
 	CPUThreadManager* m_thread_manager;
 	PadManager* m_pad_manager;
 	KeyboardManager* m_keyboard_manager;
@@ -120,6 +118,8 @@ public:
 	void SetPath(const std::string& path, const std::string& elf_path = "");
 	void SetTitleID(const std::string& id);
 
+	std::recursive_mutex& GetCoreMutex()   { return m_core_mutex; }
+
 	CPUThreadManager& GetCPU()             { return *m_thread_manager; }
 	PadManager&       GetPadManager()      { return *m_pad_manager; }
 	KeyboardManager&  GetKeyboardManager() { return *m_keyboard_manager; }
@@ -175,6 +175,8 @@ public:
 	__forceinline bool IsReady()   const { return m_status == Ready; }
 };
 
+#define LV2_LOCK(x) std::lock_guard<std::recursive_mutex> x(Emu.GetCoreMutex())
+
 extern Emulator Emu;
 
 typedef void(*CallAfterCbType)(std::function<void()> func);

rpcs3/Gui/ConLogFrame.cpp

@@ -3,9 +3,6 @@
 #include <wx/listctrl.h>
 #include <wx/clipbrd.h>
 #include <fstream>
-#include <vector>
-#include <mutex>
-#include <atomic>
 
 #include "Ini.h"
 #include "Utilities/Log.h"

rpcs3/Gui/ConLogFrame.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <wx/dataobj.h>
-#include <memory>
 
 namespace Log
 {

rpcs3/Gui/VHDDManager.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <vector>
 #include <wx/dnd.h>
 #include "Emu/HDD/HDD.h"
 

rpcs3/Ini.cpp

@@ -3,7 +3,6 @@
 #include "Utilities/StrFmt.h"
 
 #include "Ini.h"
-#include <algorithm>
 #include <cctype>
 #include <regex>
 

rpcs3/stdafx.h

@@ -42,6 +42,19 @@
 #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"