From 693e7a38fa39bcd59ee6f1dbcfc6047e5da4309d Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Thu, 28 Aug 2014 20:29:05 +0400 Subject: [PATCH] Some std include moved --- Utilities/BEType.h | 5 ----- Utilities/Log.cpp | 8 ------- Utilities/Log.h | 7 ------ Utilities/MTRingbuffer.h | 4 ---- Utilities/SMutex.cpp | 2 +- Utilities/SMutex.h | 2 -- Utilities/SSemaphore.h | 3 --- Utilities/StrFmt.h | 6 ----- Utilities/Thread.h | 5 ----- Utilities/rFile.h | 2 -- Utilities/rPlatform.h | 2 -- Utilities/rXml.cpp | 3 --- rpcs3/Emu/CPU/CPUDecoder.h | 1 - rpcs3/Emu/CPU/CPUThread.cpp | 4 ++-- rpcs3/Emu/CPU/CPUThreadManager.h | 2 -- rpcs3/Emu/Cell/PPUProgramCompiler.h | 1 - rpcs3/Emu/Cell/PPUThread.cpp | 5 ----- rpcs3/Emu/Cell/PPUThread.h | 1 - rpcs3/Emu/Cell/SPUThread.h | 1 - rpcs3/Emu/FS/VFS.cpp | 2 -- rpcs3/Emu/FS/vfsDevice.cpp | 1 - rpcs3/Emu/FS/vfsDevice.h | 1 - rpcs3/Emu/FS/vfsDir.h | 1 - rpcs3/Emu/FS/vfsFile.h | 1 - rpcs3/Emu/HDD/HDD.h | 1 - rpcs3/Emu/IdManager.h | 2 -- rpcs3/Emu/Io/Keyboard.h | 2 -- rpcs3/Emu/Io/KeyboardHandler.h | 2 -- rpcs3/Emu/Io/Mouse.h | 2 -- rpcs3/Emu/Io/MouseHandler.h | 2 -- rpcs3/Emu/Io/Pad.h | 2 -- rpcs3/Emu/Io/PadHandler.h | 2 -- rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h | 3 --- rpcs3/Emu/Io/Windows/WindowsMouseHandler.h | 2 -- rpcs3/Emu/Io/Windows/WindowsPadHandler.h | 2 -- rpcs3/Emu/Io/XInput/XInputPadHandler.cpp | 2 -- rpcs3/Emu/Memory/Memory.cpp | 6 ++--- rpcs3/Emu/Memory/MemoryBlock.h | 2 -- rpcs3/Emu/RSX/RSXThread.cpp | 22 ++++++++++++++++--- rpcs3/Emu/RSX/RSXThread.h | 1 - rpcs3/Emu/SysCalls/Modules.cpp | 1 - .../SysCalls/Modules/cellSysutil_SaveData.cpp | 1 - rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp | 2 -- rpcs3/Emu/SysCalls/lv2/sys_spinlock.cpp | 1 - rpcs3/Emu/SysCalls/lv2/sys_spinlock.h | 2 -- rpcs3/Emu/SysCalls/lv2/sys_spu.cpp | 1 - rpcs3/Emu/SysCalls/lv2/sys_spu.h | 2 -- rpcs3/Emu/SysCalls/lv2/sys_timer.cpp | 1 - rpcs3/Emu/System.h | 10 +++++---- rpcs3/Gui/ConLogFrame.cpp | 3 --- rpcs3/Gui/ConLogFrame.h | 1 - rpcs3/Gui/VHDDManager.h | 1 - rpcs3/Ini.cpp | 1 - rpcs3/stdafx.h | 13 +++++++++++ 54 files changed, 44 insertions(+), 121 deletions(-) diff --git a/Utilities/BEType.h b/Utilities/BEType.h index fd45750cb1..0915a0b739 100644 --- a/Utilities/BEType.h +++ b/Utilities/BEType.h @@ -1,10 +1,5 @@ #pragma once -#include - -using std::min; -using std::max; - #define re16(val) _byteswap_ushort(val) #define re32(val) _byteswap_ulong(val) #define re64(val) _byteswap_uint64(val) diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index f95c2db3bc..46b72ca759 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -3,15 +3,7 @@ #include "Log.h" #include "rMsgBox.h" #include -#include #include -#include -#include -#include -#include -#include -#include -#include #include "Thread.h" #include "rFile.h" diff --git a/Utilities/Log.h b/Utilities/Log.h index a57cb3f0b5..c1826ef727 100644 --- a/Utilities/Log.h +++ b/Utilities/Log.h @@ -1,11 +1,4 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include #include #include "Utilities/MTRingbuffer.h" diff --git a/Utilities/MTRingbuffer.h b/Utilities/MTRingbuffer.h index 8d9a27b29f..991dbc077b 100644 --- a/Utilities/MTRingbuffer.h +++ b/Utilities/MTRingbuffer.h @@ -1,8 +1,4 @@ #pragma once -#include -#include -#include -#include //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 diff --git a/Utilities/SMutex.cpp b/Utilities/SMutex.cpp index efee7801f2..80b9fc849f 100644 --- a/Utilities/SMutex.cpp +++ b/Utilities/SMutex.cpp @@ -1,4 +1,4 @@ -#include +#include "stdafx.h" #include "Emu/System.h" #include "Emu/CPU/CPUThread.h" diff --git a/Utilities/SMutex.h b/Utilities/SMutex.h index 909d8ec87b..efd99b840f 100644 --- a/Utilities/SMutex.h +++ b/Utilities/SMutex.h @@ -1,7 +1,5 @@ #pragma once -#include - bool SM_IsAborted(); void SM_Sleep(); size_t SM_GetCurrentThreadId(); diff --git a/Utilities/SSemaphore.h b/Utilities/SSemaphore.h index 420d9e8469..2e61262959 100644 --- a/Utilities/SSemaphore.h +++ b/Utilities/SSemaphore.h @@ -1,8 +1,5 @@ #pragma once -#include -#include - class SSemaphore { const u32 m_max; diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index 596a4d1a9e..3fe2de28aa 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -1,10 +1,4 @@ #pragma once -#include -#include -#include -#include -#include -#include #if defined(_MSC_VER) #define snprintf _snprintf diff --git a/Utilities/Thread.h b/Utilities/Thread.h index ef210365a8..987a9ea3d2 100644 --- a/Utilities/Thread.h +++ b/Utilities/Thread.h @@ -1,9 +1,4 @@ #pragma once -#include -#include -#include -#include -#include static std::thread::id main_thread; diff --git a/Utilities/rFile.h b/Utilities/rFile.h index 7b596db7df..563b7475be 100644 --- a/Utilities/rFile.h +++ b/Utilities/rFile.h @@ -1,7 +1,5 @@ #pragma once -#include - struct FileInfo { std::string name; std::string fullName; diff --git a/Utilities/rPlatform.h b/Utilities/rPlatform.h index 716afd1db2..ce88b70ecc 100644 --- a/Utilities/rPlatform.h +++ b/Utilities/rPlatform.h @@ -1,6 +1,4 @@ #pragma once -#include -#include struct rPlatform { diff --git a/Utilities/rXml.cpp b/Utilities/rXml.cpp index 0a8fabf51c..7d2ed9a533 100644 --- a/Utilities/rXml.cpp +++ b/Utilities/rXml.cpp @@ -1,7 +1,4 @@ #include "stdafx.h" - -#include - #include "Utilities/rXml.h" #include diff --git a/rpcs3/Emu/CPU/CPUDecoder.h b/rpcs3/Emu/CPU/CPUDecoder.h index 95b168b7af..b9b47dd7f4 100644 --- a/rpcs3/Emu/CPU/CPUDecoder.h +++ b/rpcs3/Emu/CPU/CPUDecoder.h @@ -1,5 +1,4 @@ #pragma once -#include #include "CPUInstrTable.h" #pragma warning( disable : 4800 ) diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 3b28ea682d..30a0f94025 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/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); diff --git a/rpcs3/Emu/CPU/CPUThreadManager.h b/rpcs3/Emu/CPU/CPUThreadManager.h index ddf149fc72..480ef940f0 100644 --- a/rpcs3/Emu/CPU/CPUThreadManager.h +++ b/rpcs3/Emu/CPU/CPUThreadManager.h @@ -1,7 +1,5 @@ #pragma once -#include - class CPUThread; class RawSPUThread; enum CPUThreadType : unsigned char; diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.h b/rpcs3/Emu/Cell/PPUProgramCompiler.h index 6312331876..70c46b9952 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.h +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.h @@ -1,5 +1,4 @@ #pragma once -#include #include "PPUInstrTable.h" #include "Loader/ELF64.h" diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 5d59de0b27..5d4d02fef6 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -10,11 +10,6 @@ #include "Emu/Cell/PPUDecoder.h" #include "Emu/Cell/PPUInterpreter.h" -#include -#include - -//extern gcmInfo gcm_info; - PPUThread& GetCurrentPPUThread() { PPCThread* thread = GetCurrentPPCThread(); diff --git a/rpcs3/Emu/Cell/PPUThread.h b/rpcs3/Emu/Cell/PPUThread.h index 0e8ff47869..195994a2be 100644 --- a/rpcs3/Emu/Cell/PPUThread.h +++ b/rpcs3/Emu/Cell/PPUThread.h @@ -1,6 +1,5 @@ #pragma once #include "Emu/Cell/PPCThread.h" -#include enum { diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 3829db3c65..7736d821b8 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -2,7 +2,6 @@ #include "PPCThread.h" #include "Emu/Event.h" #include "MFC.h" -#include enum SPUchannels { diff --git a/rpcs3/Emu/FS/VFS.cpp b/rpcs3/Emu/FS/VFS.cpp index c4c75202ce..8cdd068371 100644 --- a/rpcs3/Emu/FS/VFS.cpp +++ b/rpcs3/Emu/FS/VFS.cpp @@ -1,6 +1,4 @@ #include "stdafx.h" -#include - #include "VFS.h" #include "vfsDirBase.h" #include "Emu/HDD/HDD.h" diff --git a/rpcs3/Emu/FS/vfsDevice.cpp b/rpcs3/Emu/FS/vfsDevice.cpp index d17917b6c2..84d7012102 100644 --- a/rpcs3/Emu/FS/vfsDevice.cpp +++ b/rpcs3/Emu/FS/vfsDevice.cpp @@ -1,5 +1,4 @@ #include "stdafx.h" -#include #include "vfsDevice.h" #include "Utilities/rFile.h" diff --git a/rpcs3/Emu/FS/vfsDevice.h b/rpcs3/Emu/FS/vfsDevice.h index c092df5d05..d3921a529a 100644 --- a/rpcs3/Emu/FS/vfsDevice.h +++ b/rpcs3/Emu/FS/vfsDevice.h @@ -1,5 +1,4 @@ #pragma once -#include struct vfsFileBase; class vfsDirBase; diff --git a/rpcs3/Emu/FS/vfsDir.h b/rpcs3/Emu/FS/vfsDir.h index 02f229eab5..09c8ee197d 100644 --- a/rpcs3/Emu/FS/vfsDir.h +++ b/rpcs3/Emu/FS/vfsDir.h @@ -1,5 +1,4 @@ #pragma once -#include #include "vfsDirBase.h" class vfsDir : public vfsDirBase diff --git a/rpcs3/Emu/FS/vfsFile.h b/rpcs3/Emu/FS/vfsFile.h index 4d4bcf7189..4ab9ddc87d 100644 --- a/rpcs3/Emu/FS/vfsFile.h +++ b/rpcs3/Emu/FS/vfsFile.h @@ -1,5 +1,4 @@ #pragma once -#include #include "vfsFileBase.h" class vfsFile : public vfsFileBase diff --git a/rpcs3/Emu/HDD/HDD.h b/rpcs3/Emu/HDD/HDD.h index 1c7cba7c5f..f71fa77f35 100644 --- a/rpcs3/Emu/HDD/HDD.h +++ b/rpcs3/Emu/HDD/HDD.h @@ -1,5 +1,4 @@ #pragma once -#include #include "Emu/FS/vfsDevice.h" #include "Emu/FS/vfsLocalFile.h" diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h index 06604ca47b..b1170cce04 100644 --- a/rpcs3/Emu/IdManager.h +++ b/rpcs3/Emu/IdManager.h @@ -1,7 +1,5 @@ #pragma once -#include #include -#include #define rID_ANY -1 // was wxID_ANY diff --git a/rpcs3/Emu/Io/Keyboard.h b/rpcs3/Emu/Io/Keyboard.h index ff01933bd0..bbcd8561b6 100644 --- a/rpcs3/Emu/Io/Keyboard.h +++ b/rpcs3/Emu/Io/Keyboard.h @@ -1,6 +1,4 @@ #pragma once - -#include #include "KeyboardHandler.h" class KeyboardManager diff --git a/rpcs3/Emu/Io/KeyboardHandler.h b/rpcs3/Emu/Io/KeyboardHandler.h index a934a28165..c2acaa3941 100644 --- a/rpcs3/Emu/Io/KeyboardHandler.h +++ b/rpcs3/Emu/Io/KeyboardHandler.h @@ -1,7 +1,5 @@ #pragma once -#include - 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 diff --git a/rpcs3/Emu/Io/Mouse.h b/rpcs3/Emu/Io/Mouse.h index 2ccc5611ce..c6dbdd61dd 100644 --- a/rpcs3/Emu/Io/Mouse.h +++ b/rpcs3/Emu/Io/Mouse.h @@ -1,6 +1,4 @@ #pragma once - -#include #include "MouseHandler.h" class MouseManager diff --git a/rpcs3/Emu/Io/MouseHandler.h b/rpcs3/Emu/Io/MouseHandler.h index 6029bda1ac..e21e0d0902 100644 --- a/rpcs3/Emu/Io/MouseHandler.h +++ b/rpcs3/Emu/Io/MouseHandler.h @@ -1,7 +1,5 @@ #pragma once -#include - enum MousePortStatus { CELL_MOUSE_STATUS_DISCONNECTED = 0x00000000, diff --git a/rpcs3/Emu/Io/Pad.h b/rpcs3/Emu/Io/Pad.h index f9758beb8a..e6a3260464 100644 --- a/rpcs3/Emu/Io/Pad.h +++ b/rpcs3/Emu/Io/Pad.h @@ -1,6 +1,4 @@ #pragma once - -#include #include "PadHandler.h" class PadManager diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h index 104af38a86..4937d90cbb 100644 --- a/rpcs3/Emu/Io/PadHandler.h +++ b/rpcs3/Emu/Io/PadHandler.h @@ -1,7 +1,5 @@ #pragma once -#include - enum PortStatus { CELL_PAD_STATUS_DISCONNECTED = 0x00000000, diff --git a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h index b7df34dda6..aab3f137e8 100644 --- a/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsKeyboardHandler.h @@ -1,7 +1,4 @@ #pragma once - -#include -#include #include "Emu/Io/KeyboardHandler.h" class WindowsKeyboardHandler final diff --git a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h index 06f095e9b4..a10dd123d4 100644 --- a/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsMouseHandler.h @@ -1,6 +1,4 @@ #pragma once - -#include #include "Emu/Io/MouseHandler.h" class WindowsMouseHandler final diff --git a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h index e67b659c30..47bdefa98b 100644 --- a/rpcs3/Emu/Io/Windows/WindowsPadHandler.h +++ b/rpcs3/Emu/Io/Windows/WindowsPadHandler.h @@ -1,6 +1,4 @@ #pragma once - -#include #include "Emu/Io/PadHandler.h" class WindowsPadHandler final diff --git a/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp b/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp index 36364d4522..484e362a83 100644 --- a/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp +++ b/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp @@ -1,9 +1,7 @@ #include "stdafx.h" #if defined (_WIN32) -#include #include "Utilities/Log.h" #include "XInputPadHandler.h" -#include namespace { const DWORD THREAD_TIMEOUT = 1000; diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index b376b23c76..741ae8ddff 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -1,9 +1,7 @@ #include "stdafx.h" -#include - #include "Utilities/Log.h" -#include "Memory.h" #include "Emu/System.h" +#include "Memory.h" #ifndef _WIN32 #include @@ -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 } diff --git a/rpcs3/Emu/Memory/MemoryBlock.h b/rpcs3/Emu/Memory/MemoryBlock.h index d5fdb4f375..e03192212b 100644 --- a/rpcs3/Emu/Memory/MemoryBlock.h +++ b/rpcs3/Emu/Memory/MemoryBlock.h @@ -2,8 +2,6 @@ #define PAGE_4K(x) (x + 4095) & ~(4095) -#include -#include #include struct MemInfo diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index bc261ca671..50d2c050da 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/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); + } } \ No newline at end of file diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index ed7ab000d9..031b004551 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -6,7 +6,6 @@ #include "Emu/SysCalls/Callback.h" #include -#include // For tracking a list of used gcm commands #include "Utilities/SSemaphore.h" #include "Utilities/Thread.h" diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp index b7fe76598e..3880c1bdab 100644 --- a/rpcs3/Emu/SysCalls/Modules.cpp +++ b/rpcs3/Emu/SysCalls/Modules.cpp @@ -4,7 +4,6 @@ #include "Emu/SysCalls/Modules.h" #include "Emu/SysCalls/Static.h" #include "Crypto/sha1.h" -#include #include "ModuleManager.h" u32 getFunctionId(const char* name) diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp index 0d69f762a7..978c7ce081 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp +++ b/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 extern Module *cellSysutil; diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp index fbfe7fe03c..44a2e43e20 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp @@ -13,8 +13,6 @@ #include "Emu/SysCalls/lv2/sys_time.h" #include "sceNp.h" #include "sceNpTrophy.h" -#include -#include //void sceNpTrophy_unload(); //void sceNpTrophy_init(); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spinlock.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spinlock.cpp index c700ff475b..454b23572b 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spinlock.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_spinlock.cpp @@ -3,7 +3,6 @@ #include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" -#include #include "sys_spinlock.h" SysCallBase sys_spinlock("sys_spinlock"); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spinlock.h b/rpcs3/Emu/SysCalls/lv2/sys_spinlock.h index cec77494c5..0dfaa371fc 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spinlock.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_spinlock.h @@ -1,7 +1,5 @@ #pragma once -#include - // SysCalls void sys_spinlock_initialize(mem_ptr_t>> lock); void sys_spinlock_lock(mem_ptr_t>> lock); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp b/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp index 5a1a75aea4..be21717207 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.cpp +++ b/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 static SysCallBase sys_spu("sys_spu"); diff --git a/rpcs3/Emu/SysCalls/lv2/sys_spu.h b/rpcs3/Emu/SysCalls/lv2/sys_spu.h index 732f62dd51..df56f7cb8b 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_spu.h +++ b/rpcs3/Emu/SysCalls/lv2/sys_spu.h @@ -1,7 +1,5 @@ #pragma once -#include - enum { SYS_SPU_THREAD_GROUP_TYPE_NORMAL = 0x00, diff --git a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp index 1b1667ddd3..7250394698 100644 --- a/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp +++ b/rpcs3/Emu/SysCalls/lv2/sys_timer.cpp @@ -4,7 +4,6 @@ #include "Emu/SysCalls/SysCalls.h" #include "Emu/Event.h" -#include #include "sys_timer.h" SysCallBase sys_timer("sys_timer"); diff --git a/rpcs3/Emu/System.h b/rpcs3/Emu/System.h index e600e5ceb6..2b3462ffad 100644 --- a/rpcs3/Emu/System.h +++ b/rpcs3/Emu/System.h @@ -1,8 +1,4 @@ #pragma once - -#include -#include -#include #include "Loader/Loader.h" enum Status @@ -90,6 +86,8 @@ class Emulator std::vector m_break_points; std::vector 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 x(Emu.GetCoreMutex()) + extern Emulator Emu; typedef void(*CallAfterCbType)(std::function func); diff --git a/rpcs3/Gui/ConLogFrame.cpp b/rpcs3/Gui/ConLogFrame.cpp index ead9009409..7cb9d10319 100644 --- a/rpcs3/Gui/ConLogFrame.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -3,9 +3,6 @@ #include #include #include -#include -#include -#include #include "Ini.h" #include "Utilities/Log.h" diff --git a/rpcs3/Gui/ConLogFrame.h b/rpcs3/Gui/ConLogFrame.h index 911d4f313e..cecff5fcf0 100644 --- a/rpcs3/Gui/ConLogFrame.h +++ b/rpcs3/Gui/ConLogFrame.h @@ -1,6 +1,5 @@ #pragma once #include -#include namespace Log { diff --git a/rpcs3/Gui/VHDDManager.h b/rpcs3/Gui/VHDDManager.h index b3b8ad9a49..ee9f8d128f 100644 --- a/rpcs3/Gui/VHDDManager.h +++ b/rpcs3/Gui/VHDDManager.h @@ -1,5 +1,4 @@ #pragma once -#include #include #include "Emu/HDD/HDD.h" diff --git a/rpcs3/Ini.cpp b/rpcs3/Ini.cpp index 2dccbfc0da..609d3c2855 100644 --- a/rpcs3/Ini.cpp +++ b/rpcs3/Ini.cpp @@ -3,7 +3,6 @@ #include "Utilities/StrFmt.h" #include "Ini.h" -#include #include #include diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 57405a0e08..eba339fe04 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -42,6 +42,19 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Utilities/GNU.h"