diff --git a/Utilities/SMutex.cpp b/Utilities/SMutex.cpp index 06820a7afa..b5ddd548d2 100644 --- a/Utilities/SMutex.cpp +++ b/Utilities/SMutex.cpp @@ -1,5 +1,10 @@ #include -#include +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/CPU/CPUThread.h" + +#include "Utilities/SMutex.h" __forceinline void SM_Sleep() { diff --git a/Utilities/SMutex.h b/Utilities/SMutex.h index fe856f501e..4023641c73 100644 --- a/Utilities/SMutex.h +++ b/Utilities/SMutex.h @@ -1,4 +1,5 @@ #pragma once +#include "BEType.h" extern void SM_Sleep(); extern size_t SM_GetCurrentThreadId(); diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 6ad547bfff..d18728fc5d 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/ConLog.h" + #include "Thread.h" #ifdef _WIN32 diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp index f7f44cf16f..3ca97bb917 100644 --- a/rpcs3/Crypto/unedat.cpp +++ b/rpcs3/Crypto/unedat.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "unedat.h" +#include "Emu/ConLog.h" void generate_key(int crypto_mode, int version, unsigned char *key_final, unsigned char *iv_final, unsigned char *key, unsigned char *iv) { diff --git a/rpcs3/Crypto/unpkg.cpp b/rpcs3/Crypto/unpkg.cpp index db5eed77e5..44261f6d33 100644 --- a/rpcs3/Crypto/unpkg.cpp +++ b/rpcs3/Crypto/unpkg.cpp @@ -2,6 +2,8 @@ #include "unpkg.h" #include +#include "Emu/ConLog.h" + // Decryption. bool CheckHeader(wxFile& pkg_f, PKGHeader* m_header) { diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp index 5fababbb02..60950e4c99 100644 --- a/rpcs3/Crypto/unself.cpp +++ b/rpcs3/Crypto/unself.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/FS/vfsLocalFile.h" #include "unself.h" SELFDecrypter::SELFDecrypter(vfsStream& s) diff --git a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp index 5aff8a50c6..ed38c8d96d 100644 --- a/rpcs3/Emu/ARMv7/ARMv7Thread.cpp +++ b/rpcs3/Emu/ARMv7/ARMv7Thread.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPCThread.h" + #include "ARMv7Thread.h" #include "ARMv7Decoder.h" #include "ARMv7DisAsm.h" @@ -99,4 +104,4 @@ void ARMv7Thread::DoStop() void ARMv7Thread::DoCode() { -} \ No newline at end of file +} diff --git a/rpcs3/Emu/Audio/AL/OpenALThread.cpp b/rpcs3/Emu/Audio/AL/OpenALThread.cpp index ef912dc0f2..f07b0eb1a4 100644 --- a/rpcs3/Emu/Audio/AL/OpenALThread.cpp +++ b/rpcs3/Emu/Audio/AL/OpenALThread.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "rpcs3/Ini.h" + #include "OpenALThread.h" ALenum g_last_al_error = AL_NO_ERROR; @@ -152,4 +157,4 @@ bool OpenALThread::AddBlock(const ALuint buffer_id, const ALsizei size, const vo checkForAlError("alBufferData"); return true; -} \ No newline at end of file +} diff --git a/rpcs3/Emu/Audio/AudioManager.cpp b/rpcs3/Emu/Audio/AudioManager.cpp index f0cbfc0d78..1207e61d6b 100644 --- a/rpcs3/Emu/Audio/AudioManager.cpp +++ b/rpcs3/Emu/Audio/AudioManager.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "rpcs3/Ini.h" #include "AudioManager.h" OpenALThread* m_audio_out; diff --git a/rpcs3/Emu/CPU/CPUDisAsm.h b/rpcs3/Emu/CPU/CPUDisAsm.h index 1a46e623c7..f15a1c6258 100644 --- a/rpcs3/Emu/CPU/CPUDisAsm.h +++ b/rpcs3/Emu/CPU/CPUDisAsm.h @@ -57,7 +57,7 @@ protected: std::string FixOp(std::string op) { - op.append(max(10 - (int)op.length(), 0),' '); + op.append(std::max(10 - (int)op.length(), 0),' '); return op; } }; diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 9ae338ce2d..cd8c35ad60 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -1,4 +1,11 @@ #include "stdafx.h" +#include "Emu/SysCalls/ErrorCodes.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "rpcs3/Ini.h" +#include "rpcs3.h" + #include "CPUThread.h" reservation_struct reservation; diff --git a/rpcs3/Emu/CPU/CPUThreadManager.cpp b/rpcs3/Emu/CPU/CPUThreadManager.cpp index d29c5e6373..f9a565ab19 100644 --- a/rpcs3/Emu/CPU/CPUThreadManager.cpp +++ b/rpcs3/Emu/CPU/CPUThreadManager.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" + #include "CPUThreadManager.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/SPUThread.h" diff --git a/rpcs3/Emu/Cell/PPCDecoder.cpp b/rpcs3/Emu/Cell/PPCDecoder.cpp index c9bf8139b2..fa7d5fc75e 100644 --- a/rpcs3/Emu/Cell/PPCDecoder.cpp +++ b/rpcs3/Emu/Cell/PPCDecoder.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" #include "PPCDecoder.h" u8 PPCDecoder::DecodeMemory(const u64 address) diff --git a/rpcs3/Emu/Cell/PPCThread.cpp b/rpcs3/Emu/Cell/PPCThread.cpp index f1d966cde7..14c5a2a795 100644 --- a/rpcs3/Emu/Cell/PPCThread.cpp +++ b/rpcs3/Emu/Cell/PPCThread.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "PPCThread.h" #include "Gui/InterpreterDisAsm.h" diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h index 03c2900927..5edea8545a 100644 --- a/rpcs3/Emu/Cell/PPUInterpreter.h +++ b/rpcs3/Emu/Cell/PPUInterpreter.h @@ -830,45 +830,45 @@ private: { for (uint w = 0; w < 4; w++) { - CPU.VPR[vd]._f[w] = max(CPU.VPR[va]._f[w], CPU.VPR[vb]._f[w]); + CPU.VPR[vd]._f[w] = std::max(CPU.VPR[va]._f[w], CPU.VPR[vb]._f[w]); } } void VMAXSB(u32 vd, u32 va, u32 vb) //nf { for (uint b = 0; b < 16; b++) - CPU.VPR[vd]._s8[b] = max(CPU.VPR[va]._s8[b], CPU.VPR[vb]._s8[b]); + CPU.VPR[vd]._s8[b] = std::max(CPU.VPR[va]._s8[b], CPU.VPR[vb]._s8[b]); } void VMAXSH(u32 vd, u32 va, u32 vb) { for (uint h = 0; h < 8; h++) { - CPU.VPR[vd]._s16[h] = max(CPU.VPR[va]._s16[h], CPU.VPR[vb]._s16[h]); + CPU.VPR[vd]._s16[h] = std::max(CPU.VPR[va]._s16[h], CPU.VPR[vb]._s16[h]); } } void VMAXSW(u32 vd, u32 va, u32 vb) { for (uint w = 0; w < 4; w++) { - CPU.VPR[vd]._s32[w] = max(CPU.VPR[va]._s32[w], CPU.VPR[vb]._s32[w]); + CPU.VPR[vd]._s32[w] = std::max(CPU.VPR[va]._s32[w], CPU.VPR[vb]._s32[w]); } } void VMAXUB(u32 vd, u32 va, u32 vb) { for (uint b = 0; b < 16; b++) - CPU.VPR[vd]._u8[b] = max(CPU.VPR[va]._u8[b], CPU.VPR[vb]._u8[b]); + CPU.VPR[vd]._u8[b] = std::max(CPU.VPR[va]._u8[b], CPU.VPR[vb]._u8[b]); } void VMAXUH(u32 vd, u32 va, u32 vb) { for (uint h = 0; h < 8; h++) { - CPU.VPR[vd]._u16[h] = max(CPU.VPR[va]._u16[h], CPU.VPR[vb]._u16[h]); + CPU.VPR[vd]._u16[h] = std::max(CPU.VPR[va]._u16[h], CPU.VPR[vb]._u16[h]); } } void VMAXUW(u32 vd, u32 va, u32 vb) { for (uint w = 0; w < 4; w++) { - CPU.VPR[vd]._u32[w] = max(CPU.VPR[va]._u32[w], CPU.VPR[vb]._u32[w]); + CPU.VPR[vd]._u32[w] = std::max(CPU.VPR[va]._u32[w], CPU.VPR[vb]._u32[w]); } } void VMHADDSHS(u32 vd, u32 va, u32 vb, u32 vc) @@ -915,49 +915,49 @@ private: { for (uint w = 0; w < 4; w++) { - CPU.VPR[vd]._f[w] = min(CPU.VPR[va]._f[w], CPU.VPR[vb]._f[w]); + CPU.VPR[vd]._f[w] = std::min(CPU.VPR[va]._f[w], CPU.VPR[vb]._f[w]); } } void VMINSB(u32 vd, u32 va, u32 vb) //nf { for (uint b = 0; b < 16; b++) { - CPU.VPR[vd]._s8[b] = min(CPU.VPR[va]._s8[b], CPU.VPR[vb]._s8[b]); + CPU.VPR[vd]._s8[b] = std::min(CPU.VPR[va]._s8[b], CPU.VPR[vb]._s8[b]); } } void VMINSH(u32 vd, u32 va, u32 vb) { for (uint h = 0; h < 8; h++) { - CPU.VPR[vd]._s16[h] = min(CPU.VPR[va]._s16[h], CPU.VPR[vb]._s16[h]); + CPU.VPR[vd]._s16[h] = std::min(CPU.VPR[va]._s16[h], CPU.VPR[vb]._s16[h]); } } void VMINSW(u32 vd, u32 va, u32 vb) { for (uint w = 0; w < 4; w++) { - CPU.VPR[vd]._s32[w] = min(CPU.VPR[va]._s32[w], CPU.VPR[vb]._s32[w]); + CPU.VPR[vd]._s32[w] = std::min(CPU.VPR[va]._s32[w], CPU.VPR[vb]._s32[w]); } } void VMINUB(u32 vd, u32 va, u32 vb) { for (uint b = 0; b < 16; b++) { - CPU.VPR[vd]._u8[b] = min(CPU.VPR[va]._u8[b], CPU.VPR[vb]._u8[b]); + CPU.VPR[vd]._u8[b] = std::min(CPU.VPR[va]._u8[b], CPU.VPR[vb]._u8[b]); } } void VMINUH(u32 vd, u32 va, u32 vb) { for (uint h = 0; h < 8; h++) { - CPU.VPR[vd]._u16[h] = min(CPU.VPR[va]._u16[h], CPU.VPR[vb]._u16[h]); + CPU.VPR[vd]._u16[h] = std::min(CPU.VPR[va]._u16[h], CPU.VPR[vb]._u16[h]); } } void VMINUW(u32 vd, u32 va, u32 vb) { for (uint w = 0; w < 4; w++) { - CPU.VPR[vd]._u32[w] = min(CPU.VPR[va]._u32[w], CPU.VPR[vb]._u32[w]); + CPU.VPR[vd]._u32[w] = std::min(CPU.VPR[va]._u32[w], CPU.VPR[vb]._u32[w]); } } void VMLADDUHM(u32 vd, u32 va, u32 vb, u32 vc) diff --git a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp index 06e913ff83..247e85ad99 100644 --- a/rpcs3/Emu/Cell/PPUProgramCompiler.cpp +++ b/rpcs3/Emu/Cell/PPUProgramCompiler.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" + #include "PPUProgramCompiler.h" using namespace PPU_instr; diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 7a824b30ec..10c2e09b55 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -1,5 +1,11 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" + #include "Emu/Cell/PPUDecoder.h" #include "Emu/Cell/PPUInterpreter.h" #include "Emu/Cell/PPUDisAsm.h" diff --git a/rpcs3/Emu/Cell/RawSPUThread.cpp b/rpcs3/Emu/Cell/RawSPUThread.cpp index 4cb01dcd9e..6d513b664d 100644 --- a/rpcs3/Emu/Cell/RawSPUThread.cpp +++ b/rpcs3/Emu/Cell/RawSPUThread.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/SysCalls/lv2/SC_Lwmutex.h" +#include "Emu/SysCalls/lv2/SC_Event_flag.h" + #include "Emu/Cell/RawSPUThread.h" RawSPUThread::RawSPUThread(u32 index, CPUThreadType type) diff --git a/rpcs3/Emu/Cell/SPUDisAsm.h b/rpcs3/Emu/Cell/SPUDisAsm.h index e1ee8fa932..a480fec7d1 100644 --- a/rpcs3/Emu/Cell/SPUDisAsm.h +++ b/rpcs3/Emu/Cell/SPUDisAsm.h @@ -28,7 +28,7 @@ private: private: std::string& FixOp(std::string& op) { - op.append(max(10 - (int)op.length(), 0),' '); + op.append(std::max(10 - (int)op.length(), 0),' '); return op; } void DisAsm(const char* op) diff --git a/rpcs3/Emu/Cell/SPURecompilerCore.cpp b/rpcs3/Emu/Cell/SPURecompilerCore.cpp index 839b2775e7..bc0e222d32 100644 --- a/rpcs3/Emu/Cell/SPURecompilerCore.cpp +++ b/rpcs3/Emu/Cell/SPURecompilerCore.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/SysCalls/lv2/SC_Lwmutex.h" +#include "Emu/SysCalls/lv2/SC_Event_flag.h" + #include "SPUInstrTable.h" #include "SPUDisAsm.h" #include "SPUInterpreter.h" diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 87c2956d1d..663e80d777 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1,4 +1,11 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/SysCalls/lv2/SC_Lwmutex.h" +#include "Emu/SysCalls/lv2/SC_Event_flag.h" + + #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPUDecoder.h" #include "Emu/Cell/SPUInterpreter.h" diff --git a/rpcs3/Emu/Cell/SPUThread.h b/rpcs3/Emu/Cell/SPUThread.h index 7845a48f12..c71b2d3d68 100644 --- a/rpcs3/Emu/Cell/SPUThread.h +++ b/rpcs3/Emu/Cell/SPUThread.h @@ -3,6 +3,7 @@ #include "Emu/event.h" #include "Emu/SysCalls/lv2/SC_SPU_Thread.h" #include "MFC.h" +#include "Emu/SysCalls/ErrorCodes.h" #include static const char* spu_reg_name[128] = @@ -653,7 +654,7 @@ public: ConLog.Write("*** list element(%d/%d): s = 0x%x, ts = 0x%x, low ea = 0x%x (lsa = 0x%x)", i, list_size, (u16)rec->s, (u16)rec->ts, (u32)rec->ea, lsa | (addr & 0xf)); - lsa += max(size, (u32)16); + lsa += std::max(size, (u32)16); if (rec->s & se16(0x8000)) { diff --git a/rpcs3/Gui/ConLog.h b/rpcs3/Emu/ConLog.h similarity index 78% rename from rpcs3/Gui/ConLog.h rename to rpcs3/Emu/ConLog.h index d39eb47d64..fffb6bda73 100644 --- a/rpcs3/Gui/ConLog.h +++ b/rpcs3/Emu/ConLog.h @@ -47,25 +47,4 @@ public: virtual void SkipLn(); }; -class LogFrame - : public wxPanel - , public ThreadBase -{ - wxListView& m_log; - -public: - LogFrame(wxWindow* parent); - ~LogFrame(); - - bool Close(bool force = false); - -private: - virtual void Task(); - - void OnQuit(wxCloseEvent& event); - - DECLARE_EVENT_TABLE(); -}; - extern LogWriter ConLog; -extern LogFrame* ConLogFrame; diff --git a/rpcs3/Emu/DbgConsole.cpp b/rpcs3/Emu/DbgConsole.cpp index bfd84fcfcc..712c3d0b77 100644 --- a/rpcs3/Emu/DbgConsole.cpp +++ b/rpcs3/Emu/DbgConsole.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "DbgConsole.h" BEGIN_EVENT_TABLE(DbgConsole, FrameBase) diff --git a/rpcs3/Emu/Event.cpp b/rpcs3/Emu/Event.cpp index a1fee9d086..06d9abfe38 100644 --- a/rpcs3/Emu/Event.cpp +++ b/rpcs3/Emu/Event.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "event.h" void EventManager::Init() diff --git a/rpcs3/Emu/FS/VFS.cpp b/rpcs3/Emu/FS/VFS.cpp index 0833c471b9..ac59b8636e 100644 --- a/rpcs3/Emu/FS/VFS.cpp +++ b/rpcs3/Emu/FS/VFS.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/ConLog.h" + #include "VFS.h" #include "Emu/HDD/HDD.h" #include "vfsDeviceLocalFile.h" diff --git a/rpcs3/Emu/FS/vfsDevice.cpp b/rpcs3/Emu/FS/vfsDevice.cpp index e1f2ac8cdf..9f2c537106 100644 --- a/rpcs3/Emu/FS/vfsDevice.cpp +++ b/rpcs3/Emu/FS/vfsDevice.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include #include "vfsDevice.h" vfsDevice::vfsDevice(const std::string& ps3_path, const std::string& local_path) @@ -25,7 +26,7 @@ void vfsDevice::SetPath(const std::string& ps3_path, const std::string& local_pa u32 vfsDevice::CmpPs3Path(const std::string& ps3_path) { - const u32 lim = min(m_ps3_path.length(), ps3_path.length()); + const u32 lim = std::min(m_ps3_path.length(), ps3_path.length()); u32 ret = 0; for(u32 i=0; i> 16) & 0xff; m_surface_height = (a0 >> 24) & 0xff; - switch (min((u32)6, count)) + switch (std::min((u32)6, count)) { case 6: m_surface_pitch_b = ARGS(5); case 5: m_surface_offset_b = ARGS(4); diff --git a/rpcs3/Emu/HDD/HDD.cpp b/rpcs3/Emu/HDD/HDD.cpp index 4d8937b4b5..9908a36a91 100644 --- a/rpcs3/Emu/HDD/HDD.cpp +++ b/rpcs3/Emu/HDD/HDD.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/ConLog.h" #include "HDD.h" vfsDeviceHDD::vfsDeviceHDD(const std::string& hdd_path) : m_hdd_path(hdd_path) diff --git a/rpcs3/Emu/HDD/HDD.h b/rpcs3/Emu/HDD/HDD.h index 8dc3767f68..f00cf41301 100644 --- a/rpcs3/Emu/HDD/HDD.h +++ b/rpcs3/Emu/HDD/HDD.h @@ -1,5 +1,7 @@ #pragma once +#include #include "Emu/FS/vfsDevice.h" +#include "Emu/FS/vfsLocalFile.h" static const u64 g_hdd_magic = *(u64*)"PS3eHDD\0"; static const u16 g_hdd_version = 0x0001; @@ -193,7 +195,7 @@ class vfsHDDFile { m_hdd.Seek(block * m_hdd_info.block_size); m_hdd.Write(&data, sizeof(vfsHDD_Entry)); - m_hdd.Write(name.c_str(), min(GetMaxNameLen() - 1, name.length() + 1)); + m_hdd.Write(name.c_str(), std::min(GetMaxNameLen() - 1, name.length() + 1)); } __forceinline u32 GetMaxNameLen() const @@ -267,7 +269,7 @@ public: //vfsDeviceLocker lock(m_hdd); const u32 block_size = m_hdd_info.block_size - sizeof(vfsHDD_Block); - u64 rsize = min(block_size - m_position, size); + u64 rsize = std::min(block_size - m_position, size); vfsHDD_Block cur_block_info; m_hdd.Seek(m_cur_block * m_hdd_info.block_size); @@ -291,7 +293,7 @@ public: } m_cur_block = cur_block_info.next_block; - rsize = min(block_size, size); + rsize = std::min(block_size, size); m_hdd.Seek(cur_block_info.next_block * m_hdd_info.block_size); m_hdd.Read(&cur_block_info, sizeof(vfsHDD_Block)); @@ -337,7 +339,7 @@ public: m_position = 0; } - u64 wsize = min(block_size - m_position, size); + u64 wsize = std::min(block_size - m_position, size); vfsHDD_Block block_info; ReadBlock(m_cur_block, block_info); @@ -371,7 +373,7 @@ public: } m_cur_block = new_block; - wsize = min(block_size, size); + wsize = std::min(block_size, size); block_info.next_block = m_cur_block; m_hdd.Seek(last_block * m_hdd_info.block_size); @@ -576,7 +578,7 @@ public: { m_hdd_file.Seek(block * m_hdd_info.block_size); m_hdd_file.Write(&data, sizeof(vfsHDD_Entry)); - m_hdd_file.Write(name.c_str(), min(GetMaxNameLen() - 1, name.length() + 1)); + m_hdd_file.Write(name.c_str(), std::min(GetMaxNameLen() - 1, name.length() + 1)); } bool Create(vfsHDD_EntryType type, const std::string& name) diff --git a/rpcs3/Emu/Io/Keyboard.cpp b/rpcs3/Emu/Io/Keyboard.cpp index b14ca37530..7181459973 100644 --- a/rpcs3/Emu/Io/Keyboard.cpp +++ b/rpcs3/Emu/Io/Keyboard.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "rpcs3/Ini.h" +#include "rpcs3.h" #include "Keyboard.h" #include "Null/NullKeyboardHandler.h" #include "Windows/WindowsKeyboardHandler.h" diff --git a/rpcs3/Emu/Io/Mouse.cpp b/rpcs3/Emu/Io/Mouse.cpp index 80d8cb4b97..2a75bb3846 100644 --- a/rpcs3/Emu/Io/Mouse.cpp +++ b/rpcs3/Emu/Io/Mouse.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "rpcs3/Ini.h" +#include "rpcs3.h" #include "Mouse.h" #include "Null/NullMouseHandler.h" #include "Windows/WindowsMouseHandler.h" diff --git a/rpcs3/Emu/Io/Pad.cpp b/rpcs3/Emu/Io/Pad.cpp index 48e9e67f46..486fd37ef4 100644 --- a/rpcs3/Emu/Io/Pad.cpp +++ b/rpcs3/Emu/Io/Pad.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "rpcs3/Ini.h" +#include "rpcs3.h" #include "Pad.h" #include "Null/NullPadHandler.h" #include "Windows/WindowsPadHandler.h" diff --git a/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp b/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp index 39b72a8466..3ac16baaff 100644 --- a/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp +++ b/rpcs3/Emu/Io/XInput/XInputPadHandler.cpp @@ -1,5 +1,7 @@ #include "stdafx.h" #if defined (_WIN32) +#include +#include "Emu/ConLog.h" #include "XInputPadHandler.h" #include diff --git a/rpcs3/Emu/Memory/Memory.cpp b/rpcs3/Emu/Memory/Memory.cpp index 349c7606fd..2bcdbdd215 100644 --- a/rpcs3/Emu/Memory/Memory.cpp +++ b/rpcs3/Emu/Memory/Memory.cpp @@ -1,7 +1,10 @@ #include "stdafx.h" +#include + +#include "Emu/ConLog.h" #include "Memory.h" #include "MemoryBlock.h" -#include +#include "Emu/System.h" MemoryBase Memory; diff --git a/rpcs3/Emu/Memory/Memory.h b/rpcs3/Emu/Memory/Memory.h index c489c75ded..7742a02027 100644 --- a/rpcs3/Emu/Memory/Memory.h +++ b/rpcs3/Emu/Memory/Memory.h @@ -1,4 +1,5 @@ #pragma once +#include "Emu/SysCalls/Callback.h" #include "MemoryBlock.h" #include @@ -1134,3 +1135,11 @@ typedef mem_list_ptr_t mem8_ptr_t; typedef mem_list_ptr_t mem16_ptr_t; typedef mem_list_ptr_t mem32_ptr_t; typedef mem_list_ptr_t mem64_ptr_t; + +//#define re(val) MemoryBase::Reverse(val) +#define re64(val) MemoryBase::Reverse64(val) +#define re32(val) MemoryBase::Reverse32(val) +#define re16(val) MemoryBase::Reverse16(val) + +template T re(const T val) { T res; se_t::func(res, val); return res; } +template void re(T1& dst, const T2 val) { se_t::func(dst, val); } diff --git a/rpcs3/Emu/SysCalls/Callback.cpp b/rpcs3/Emu/SysCalls/Callback.cpp index 73e7896744..3fbe1e4227 100644 --- a/rpcs3/Emu/SysCalls/Callback.cpp +++ b/rpcs3/Emu/SysCalls/Callback.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Callback.h" #include "Emu/Cell/PPCThread.h" diff --git a/rpcs3/Emu/SysCalls/FuncList.cpp b/rpcs3/Emu/SysCalls/FuncList.cpp index 9531ee7fad..2f1c22d06b 100644 --- a/rpcs3/Emu/SysCalls/FuncList.cpp +++ b/rpcs3/Emu/SysCalls/FuncList.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "SysCalls.h" #define FUNC_LOG_ERROR(x) ConLog.Error(x); return 0 diff --git a/rpcs3/Emu/SysCalls/Modules.cpp b/rpcs3/Emu/SysCalls/Modules.cpp index b240f0d635..836836be2b 100644 --- a/rpcs3/Emu/SysCalls/Modules.cpp +++ b/rpcs3/Emu/SysCalls/Modules.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "SysCalls.h" -#include "SC_FUNC.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include diff --git a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp index e26278f707..96f3f159b2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAdec.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" #include "cellPamf.h" extern SMutexGeneral g_mutex_avcodec_open2; diff --git a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp index 34ffeb5eff..6a95c1c3a2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAtrac.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" void cellAtrac_init(); Module cellAtrac(0x0013, cellAtrac_init); diff --git a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp index 713bbdbcbf..cc0afca787 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellAudio.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" #include "Utilities/SQueue.h" #include "Emu/Audio/cellAudio.h" #include "Emu/Audio/AudioManager.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp b/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp index ac1803e101..72879e8d3b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellBgdl.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -46,4 +47,5 @@ void cellBgdl_init() cellBgdl.AddFunc(0x2ab0d183, cellBGDLGetInfo2); cellBgdl.AddFunc(0x7e134a90, cellBGDLSetMode); cellBgdl.AddFunc(0x74e57bdf, cellBGDLGetMode); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp index 19e91bb08e..ee00c683fa 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCamera.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -239,4 +240,5 @@ void cellCamera_init() cellCamera.AddFunc(0x9b98d258, cellCameraRemoveNotifyEventQueue); cellCamera.AddFunc(0xa7fd2f5b, cellCameraSetNotifyEventQueue2); cellCamera.AddFunc(0x44673f07, cellCameraRemoveNotifyEventQueue2); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp b/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp index e061f648d3..70109e224a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCelp8Enc.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -81,4 +82,5 @@ void cellCelp8Enc_init() cellCelp8Enc.AddFunc(0x2099f86e, cellCelp8EncEncodeFrame); cellCelp8Enc.AddFunc(0x29da1ea6, cellCelp8EncWaitForOutput); cellCelp8Enc.AddFunc(0x48c5020d, cellCelp8EncGetAu); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp index 0e4dfec54a..90ba783cbf 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellCelpEnc.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -81,4 +82,5 @@ void cellCelpEnc_init() cellCelpEnc.AddFunc(0x81fe030c, cellCelpEncEncodeFrame); cellCelpEnc.AddFunc(0x9b244272, cellCelpEncWaitForOutput); cellCelpEnc.AddFunc(0x3773692f, cellCelpEncGetAu); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp index 4b9aef7444..9a636263e0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" #include "cellPamf.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp index f24bd211c9..9d6bb5eb5e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFiber.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -358,4 +359,5 @@ void cellFiber_init() cellFiber.AddFunc(0xc04e2438, cellFiberPpuUtilWorkerControlShutdown); cellFiber.AddFunc(0xea6dc1ad, cellFiberPpuUtilWorkerControlCheckFlags); cellFiber.AddFunc(0xf2ccad4f, cellFiberPpuUtilWorkerControlInitializeWithAttribute); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 085c04326f..460a4d9ef6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -1,6 +1,12 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" +#include "Emu/FS/vfsFile.h" #include "cellFont.h" #include "stblib/stb_truetype.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp index 174e06e53d..b421af3ac2 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFontFT.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" #include "cellFont.h" void cellFontFT_init(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp index 8afca34644..470d2dc66a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGame.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGame.cpp @@ -1,6 +1,12 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" +#include "Emu/FS/vfsFile.h" #include "Loader/PSF.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index c2b05a202a..3a12620323 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" #include "Emu/GS/GCM.h" void cellGcmSys_init(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp index 256927a8bd..a557e05673 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGem.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGem.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -281,4 +282,5 @@ void cellGem_init() //cellGem.AddFunc(, cellGemVideoConvertAttributeInitRgba); cellGem.AddFunc(0x1f6328d8, cellGemWriteExternalPort); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index f3ed4eab19..cc83f278e5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/SysCalls/SysCalls.h" #include "cellGifDec.h" #include "stblib/stb_image.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp b/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp index c5ddea4b0a..97f94de794 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellHttpUtil.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -150,4 +151,5 @@ void cellHttpUtil_init() cellHttpUtil.AddFunc(0x8e6c5bb9, cellHttpUtilFormUrlDecode); cellHttpUtil.AddFunc(0x83faa354, cellHttpUtilBase64Encoder); cellHttpUtil.AddFunc(0x8e52ee08, cellHttpUtilBase64Decoder); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp b/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp index d78d2293e9..b3dc1bd5da 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellImejp.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -303,4 +304,5 @@ void cellImejp_init() cellImejp.AddFunc(0x177bd218, cellImeJpGetCandidateSelect); cellImejp.AddFunc(0x1986f2cd, cellImeJpGetPredictList); cellImejp.AddFunc(0xeede898c, cellImeJpConfirmPrediction); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index c22cc072f5..e2ba8b24df 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "cellJpgDec.h" #include "stblib/stb_image.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp index 585aec3659..e8aa461f29 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgEnc.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -88,4 +89,5 @@ void cellJpgEnc_init() cellJpgEnc.AddFunc(0x9b4e3a74, cellJpgEncWaitForOutput); cellJpgEnc.AddFunc(0x4262e880, cellJpgEncGetStreamInfo); cellJpgEnc.AddFunc(0x0cf2b78b, cellJpgEncReset); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp b/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp index 125e718301..eef9eb72f7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellKey2char.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -54,4 +55,5 @@ void cellKey2char_init() cellKey2char.AddFunc(0x56776c0d, cellKey2CharGetChar); cellKey2char.AddFunc(0xbfc03768, cellKey2CharSetMode); cellKey2char.AddFunc(0x0dfbadfa, cellKey2CharSetArrangement); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp index c220409996..641322fb6f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellL10n.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" // Requires GCC 4.10 apparently.. #ifdef _MSC_VER diff --git a/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp b/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp index 58f959efd2..01dd518bba 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellLv2dbg.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -266,4 +267,5 @@ void cellLv2dbg_init() cellLv2dbg.AddFunc(0xd830062a, sys_dbg_signal_to_coredump_handler); cellLv2dbg.AddFunc(0xb9da87d3, sys_dbg_get_coredump_params); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp index 9fd5f7aef6..23b2a9f61a 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMic.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMic.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -328,4 +329,5 @@ void cellMic_init() cellMic.AddFunc(0xd127cd3e, cellMicSysShareInit); cellMic.AddFunc(0xf82bbf7c, cellMicSysShareEnd); cellMic.AddFunc(0xfdbbe469, cellMicGetDeviceIdentifier); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp index 5d7741121f..14c64aefd0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMusicDecode.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -97,4 +98,5 @@ void cellMusicDecode_init() cellMusicDecode.AddFunc(0xdbf70550, cellMusicDecodeGetSelectionContext); cellMusicDecode.AddFunc(0xb84f5c81, cellMusicDecodeSetSelectionContext); cellMusicDecode.AddFunc(0x58ab1999, cellMusicDecodeGetContentsId); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp index abce6c329d..7ded73fc72 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMusicExport.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -59,4 +60,5 @@ void cellMusicExport_init() cellMusicExport.AddFunc(0xe90effea, cellMusicExportFinalize); cellMusicExport.AddFunc(0xb202f0e8, cellMusicExportFromFile); cellMusicExport.AddFunc(0x92b50ebc, cellMusicExportProgress); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp index 1486bb32ee..aed1af162e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellNetCtl.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" void cellNetCtl_init(); Module cellNetCtl(0x0014, cellNetCtl_init); diff --git a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp index a747c07951..42ccbc8f80 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellOvis.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -43,4 +44,5 @@ void cellOvis_init() cellOvis.AddFunc(0xa876c911, cellOvisInitializeOverlayTable); cellOvis.AddFunc(0xce6cb776, cellOvisFixSpuSegments); cellOvis.AddFunc(0x629ba0c0, cellOvisInvalidateOverlappedSegments); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp index 99f33d230a..f3d20b252d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPamf.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "cellPamf.h" void cellPamf_init(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp index fc6eab17f3..fcf6521d86 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoDecode.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -63,4 +64,5 @@ void cellPhotoDecode_init() cellPhotoDecode.AddFunc(0x0f424ecb, cellPhotoDecodeInitialize2); cellPhotoDecode.AddFunc(0xad7d8f38, cellPhotoDecodeFinalize); cellPhotoDecode.AddFunc(0x28b22e44, cellPhotoDecodeFromFile); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp index b47b8cc348..71dd6f5bc9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoExport.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -60,4 +61,5 @@ void cellPhotoExport_init() cellPhotoExport.AddFunc(0x09ce84ac, cellPhotoExportFromFile); //cellPhotoExport.AddFunc(, cellPhotoExportFromFileWithCopy); cellPhotoExport.AddFunc(0xde509ead, cellPhotoExportProgress); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp b/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp index b8e1ffb0c0..c5815b9f5b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPhotoImport.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -58,4 +59,5 @@ void cellPhotoImport_init() { cellPhotoImport.AddFunc(0x0783bce0, _cellPhotoImport); cellPhotoImport.AddFunc(0x1ab8df55, _cellPhotoImport2); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index 88cb61db59..508e6234ea 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "cellPngDec.h" #include "stblib/stb_image.h" #include diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp index d614eb535e..4b59e80a26 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngEnc.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -81,4 +82,5 @@ void cellPngEnc_init() cellPngEnc.AddFunc(0x90ef2963, cellPngEncWaitForOutput); cellPngEnc.AddFunc(0x585269bc, cellPngEncGetStreamInfo); cellPngEnc.AddFunc(0x6ac91de3, cellPngEncReset); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp b/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp index c620eaa20f..191c53c1d8 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPrint.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -104,4 +105,5 @@ void cellPrint_init() cellPrint.AddFunc(0x865acf74, cellPrintStartPage); cellPrint.AddFunc(0x0d44f661, cellPrintEndPage); cellPrint.AddFunc(0x0a373522, cellPrintSendBand); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index ef7cea7e06..0a58d81acc 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -1,7 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" -#include "Emu/GS/GCM.h" +#include "Emu/SysCalls/Modules.h" #include "cellResc.h" void cellResc_init(); diff --git a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp index a6c03744a6..c82adf7415 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRtc.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "cellRtc.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp index a0792580df..6cef6bbf08 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellRudp.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -254,4 +255,5 @@ void cellRudp_init() cellRudp.AddFunc(0x6ee04954, cellRudpNetReceived); cellRudp.AddFunc(0xfade48b2, cellRudpProcessEvents); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp index 7d5037437c..b301af90b0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSail.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSail.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -917,4 +918,5 @@ void cellSail_init() cellSail.AddFunc(0xdbe32ed4, cellSailPlayerIsEsVideoMuted); cellSail.AddFunc(0xcc987ba6, cellSailPlayerDumpImage); cellSail.AddFunc(0x025b4974, cellSailPlayerUnregisterSource); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp index c0adc9b1b7..dce0b36acb 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSailRec.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -285,4 +286,5 @@ void cellSailRec_init() cellSailRec.AddFunc(0xd37fb694, cellSailRecorderCancel); cellSailRec.AddFunc(0x37aad85f, cellSailRecorderDumpImage); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp index af5f53c5c7..bcc77d5466 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellScreenshot.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -55,4 +56,5 @@ void cellScreenshot_init() cellScreenshot.AddFunc(0x7a9c2243, cellScreenShotSetOverlayImage); cellScreenshot.AddFunc(0x9e33ab8f, cellScreenShotEnable); cellScreenshot.AddFunc(0xfc6f4e74, cellScreenShotDisable); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp index 8a2aeaf029..8ba73eba86 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSearch.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -173,4 +174,5 @@ void cellSearch_init() cellSearch.AddFunc(0x35cda406, cellSearchGetContentInfoDeveloperData); cellSearch.AddFunc(0x8fe376a6, cellSearchCancel); cellSearch.AddFunc(0x774033d6, cellSearchEnd); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp b/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp index 9ec9baab78..ea15f3819f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSheap.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -145,4 +146,5 @@ void cellSheap_init() cellSheap.AddFunc(0xed136702, cellKeySheapRwmDelete); cellSheap.AddFunc(0x987e260e, cellKeySheapQueueNew); cellSheap.AddFunc(0x79a6abd0, cellKeySheapQueueDelete); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index 2f013119da..f67f97a5d0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -1,7 +1,12 @@ #include "stdafx.h" -#include "cellSpurs.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" + +#include "cellSpurs.h" void cellSpurs_init(); Module cellSpurs(0x000a, cellSpurs_init); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp b/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp index 47634069bc..c0a30dc9f7 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSsl.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -107,4 +108,5 @@ void cellSsl_init() cellSsl.AddFunc(0x766d3ca1, cellSslCertGetNameEntryCount); cellSsl.AddFunc(0x006c4900, cellSslCertGetNameEntryInfo); cellSsl.AddFunc(0x5e9253ca, cellSslCertGetMd5Fingerprint); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp index 8effb950c6..467f82d29d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSubdisplay.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -92,4 +93,5 @@ void cellSubdisplay_init() cellSubdisplay.AddFunc(0x8a264d71, cellSubDisplayGetPeerNum); cellSubdisplay.AddFunc(0xe2485f79, cellSubDisplayGetPeerList); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index 7bcb9496a2..fff44dd5a4 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" void cellSync_init(); Module cellSync("cellSync", cellSync_init); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp index b3e78f078d..1817f3c1b6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -251,4 +252,5 @@ void cellSync2_init() cellSync2.AddFunc(0x0c9a0ea9, cellSync2QueueTryPop); cellSync2.AddFunc(0x12f0a27d, cellSync2QueueGetSize); cellSync2.AddFunc(0xf0e1471c, cellSync2QueueGetDepth); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp index c73db9be67..992b9d5c73 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysmodule.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/Modules.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" void cellSysmodule_init(); Module cellSysmodule("cellSysmodule", cellSysmodule_init); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp index e7d5a7f2c2..369b1690d1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/FS/vfsFile.h" #include "Emu/Audio/sysutil_audio.h" #include "cellSysutil.h" @@ -886,16 +891,16 @@ int cellHddGameCheck(u32 version, u32 dirName_addr, u32 errDialog, mem_func_ptr_ get->getParam.resolution = psf.GetInteger("RESOLUTION"); get->getParam.soundFormat = psf.GetInteger("SOUND_FORMAT"); std::string title = psf.GetString("TITLE"); - memcpy(get->getParam.title, title.c_str(), min(CELL_HDDGAME_SYSP_TITLE_SIZE,title.length()+1)); + memcpy(get->getParam.title, title.c_str(), std::min(CELL_HDDGAME_SYSP_TITLE_SIZE,title.length()+1)); std::string app_ver = psf.GetString("APP_VER"); - memcpy(get->getParam.dataVersion, app_ver.c_str(), min(CELL_HDDGAME_SYSP_VERSION_SIZE,app_ver.length()+1)); - memcpy(get->getParam.titleId, dirName.c_str(), min(CELL_HDDGAME_SYSP_TITLEID_SIZE,dirName.length()+1)); + memcpy(get->getParam.dataVersion, app_ver.c_str(), std::min(CELL_HDDGAME_SYSP_VERSION_SIZE,app_ver.length()+1)); + memcpy(get->getParam.titleId, dirName.c_str(), std::min(CELL_HDDGAME_SYSP_TITLEID_SIZE,dirName.length()+1)); for (u32 i=0; igetParam.titleLang[i], title.c_str(), min(CELL_HDDGAME_SYSP_TITLE_SIZE, title.length() + 1)); + memcpy(get->getParam.titleLang[i], title.c_str(), std::min(CELL_HDDGAME_SYSP_TITLE_SIZE, title.length() + 1)); } } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp index 5244dda86b..7a45a5b5d5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutilAp.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" void cellSysutilAp_init(); Module cellSysutilAp(0x0039, cellSysutilAp_init); diff --git a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp index aeb8b8f2fc..29acae0df9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSysutil_SaveData.cpp @@ -1,6 +1,12 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/FS/vfsFile.h" +#include "Emu/FS/vfsDir.h" #include #include "cellSysutil_SaveData.h" @@ -253,13 +259,13 @@ s32 modifySaveDataFiles(mem_func_ptr_t& funcFile, mem_ { case CELL_SAVEDATA_FILEOP_READ: file = Emu.GetVFS().OpenFile(filepath, vfsRead); - fileGet->excSize = file->Read(buf, min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. + fileGet->excSize = file->Read(buf, std::min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. break; case CELL_SAVEDATA_FILEOP_WRITE: Emu.GetVFS().CreateFile(filepath); file = Emu.GetVFS().OpenFile(filepath, vfsWrite); - fileGet->excSize = file->Write(buf, min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. + fileGet->excSize = file->Write(buf, std::min(fileSet->fileSize, fileSet->fileBufSize)); // TODO: This may fail for big files because of the dest pointer. break; case CELL_SAVEDATA_FILEOP_DELETE: diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp index efeb9551a1..fa4323a05e 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUsbd.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -205,4 +206,5 @@ void cellUsbd_init() cellUsbd.AddFunc(0x074dbb39, cellUsbdAllocateMemory); cellUsbd.AddFunc(0x4e456e81, cellUsbdFreeMemory); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp index 406c6cc3b5..9ce3671f2d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUsbpspcm.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -213,4 +214,5 @@ void cellUsbpspcm_init() cellUsbpspcm.AddFunc(0xdb864d11, cellUsbPspcmWaitData); cellUsbpspcm.AddFunc(0x816799dd, cellUsbPspcmPollData); cellUsbpspcm.AddFunc(0xe76e79ab, cellUsbPspcmCancelWaitData); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp index 13a2f0377a..bbe3bcbc6b 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellUserInfo.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "cellUserInfo.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp index 692fa43772..6396e8a8cd 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVdec.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "cellPamf.h" SMutexGeneral g_mutex_avcodec_open2; diff --git a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp index e97c3bcf23..63dc1763d3 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVoice.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -268,4 +269,5 @@ void cellVoice_init() cellVoice.AddFunc(0x30f0b5ab, cellVoiceWriteToIPortEx); cellVoice.AddFunc(0x36472c57, cellVoiceReadFromOPort); cellVoice.AddFunc(0x20bafe31, cellVoiceDebugTopology); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp index 84c2e410e3..a8139c8856 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellVpost.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" extern "C" { diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp index d0feeb26e9..211211cf05 100644 --- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/Audio/cellAudio.h" #include "libmixer.h" diff --git a/rpcs3/Emu/SysCalls/Modules/libsnd3.cpp b/rpcs3/Emu/SysCalls/Modules/libsnd3.cpp index 758a22b620..4e1c84d384 100644 --- a/rpcs3/Emu/SysCalls/Modules/libsnd3.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libsnd3.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -324,4 +325,5 @@ s32 cellSnd3SMFGetKeyOnID() //u32 smfID, u32 midiChannel, u32 *keyOnID void libsnd3_init() { -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/libsnd3.h b/rpcs3/Emu/SysCalls/Modules/libsnd3.h index a3a49c7a0e..ade551315b 100644 --- a/rpcs3/Emu/SysCalls/Modules/libsnd3.h +++ b/rpcs3/Emu/SysCalls/Modules/libsnd3.h @@ -1,3 +1,4 @@ +#if 0 #pragma once //libsnd3 Error Codes @@ -51,4 +52,5 @@ struct CellSnd3RequestQueueCtx be_t frontQueueSize; void *rearQueue; be_t rearQueueSize; -}; \ No newline at end of file +}; +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp b/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp index bd0cf23d0e..0a6642efe1 100644 --- a/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/libsynth2.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#if 0 #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" @@ -156,4 +157,5 @@ void libsynth2_init() REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2VoiceTransStatus); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2SetCoreAttr); REG_SUB_EMPTY(libsynth2, "synth2", cellSoundSynth2Generate); -} \ No newline at end of file +} +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/libsynth2.h b/rpcs3/Emu/SysCalls/Modules/libsynth2.h index 8b1c428855..d7985c0742 100644 --- a/rpcs3/Emu/SysCalls/Modules/libsynth2.h +++ b/rpcs3/Emu/SysCalls/Modules/libsynth2.h @@ -1,3 +1,4 @@ +#if 0 #pragma once enum @@ -16,4 +17,5 @@ struct CellSoundSynth2EffectAttr be_t depth_R; be_t delay; be_t feedback; -}; \ No newline at end of file +}; +#endif diff --git a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp index a49aeba4b8..a144896681 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNp.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNp.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/FS/vfsDir.h" #include "Crypto/unedat.h" #include "sceNp.h" diff --git a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp index 1da7925a70..ab31e1097b 100644 --- a/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp @@ -1,6 +1,11 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/FS/vfsDir.h" #include "wx/xml/xml.h" #include "sceNp.h" diff --git a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp index b485a1ccbb..9bd4d52244 100644 --- a/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sysPrxForUser.cpp @@ -1,6 +1,12 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/FS/vfsFile.h" +#include "Emu/FS/vfsStreamMemory.h" #include "Emu/SysCalls/lv2/SC_SPU_Thread.h" #include "Loader/ELF.h" #include "Emu/Cell/RawSPUThread.h" diff --git a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp index 9a04eade1e..6895aea967 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp @@ -1,6 +1,10 @@ #include "stdafx.h" -#include "Emu/SysCalls/SysCalls.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" void sys_fs_init(); Module sys_fs(0x000e, sys_fs_init); @@ -177,7 +181,7 @@ void fsAioRead(u32 fd, mem_ptr_t aio, int xid, mem_func_ptr_t g_static_funcs_list; diff --git a/rpcs3/Emu/SysCalls/SysCalls.cpp b/rpcs3/Emu/SysCalls/SysCalls.cpp index a068fbab8b..df7124019f 100644 --- a/rpcs3/Emu/SysCalls/SysCalls.cpp +++ b/rpcs3/Emu/SysCalls/SysCalls.cpp @@ -1,7 +1,10 @@ #include "stdafx.h" -#include "SysCalls.h" -#include "Modules.h" -#include "SC_FUNC.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" namespace detail{ template<> bool CheckId(u32 id, ID*& _id,const std::string &name) diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Condition.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Condition.cpp index cf87992ab0..a5b97d88f3 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Condition.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Condition.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" + #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/lv2/SC_Condition.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Event.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Event.cpp index 26b4da0617..46bc43fcdb 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Event.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Event.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" + #include "Emu/SysCalls/SysCalls.h" #include "Emu/Cell/SPUThread.h" #include "Emu/event.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Event_flag.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Event_flag.cpp index f27ef4d934..02d551dbab 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Event_flag.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Event_flag.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" + #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/lv2/SC_Event_flag.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.cpp b/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.cpp index a706c4700a..921f135fb4 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_FileSystem.cpp @@ -1,4 +1,13 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" +#include "Emu/FS/vfsFile.h" +#include "Emu/FS/vfsDir.h" + #include "SC_FileSystem.h" #include "Emu/SysCalls/SysCalls.h" @@ -139,7 +148,7 @@ int cellFsRead(u32 fd, u32 buf_addr, u64 nbytes, mem64_t nread) if (count) if (u32 frag = buf_addr & 4095) // memory page fragment { - u32 req = min(count, 4096 - frag); + u32 req = std::min(count, 4096 - frag); u32 read = file->Read(Memory + buf_addr, req); buf_addr += req; res += read; diff --git a/rpcs3/Emu/SysCalls/lv2/SC_GCM.cpp b/rpcs3/Emu/SysCalls/lv2/SC_GCM.cpp index 5206dc5627..283072895c 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_GCM.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_GCM.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/SysCalls/SysCalls.h" #include "Emu/GS/GCM.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Heap.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Heap.cpp index 8f1b09dee1..2065564d4a 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Heap.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Heap.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" SysCallBase sc_heap("sys_heap"); diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp index 8cc7549b77..f0fd45d1cb 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Keyboard.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/Io/Keyboard.h" #include "Emu/SysCalls/SysCalls.h" @@ -121,7 +127,7 @@ int cellKbRead(u32 port_no, mem_class_t data) CellKbData& current_data = Emu.GetKeyboardManager().GetData(port_no); data += current_data.led; data += current_data.mkey; - data += min((u32)current_data.len, CELL_KB_MAX_KEYCODES); + data += std::min((u32)current_data.len, CELL_KB_MAX_KEYCODES); for(s32 i=0; i diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp index eefa0e97d8..3e8846c2d6 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Mouse.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/Io/Mouse.h" #include "Emu/SysCalls/SysCalls.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Mutex.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Mutex.cpp index 59095350e8..04e1e33a06 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Mutex.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Mutex.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SysCalls.h" #include "SC_Mutex.h" #include "Utilities/SMutex.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp b/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp index 8fd9e51796..1c8a82e4c6 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/SysCalls/SysCalls.h" extern Module sysPrxForUser; diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp index 403fce0ca2..dead7e5e58 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Pad.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "Emu/Io/Pad.h" #include "Emu/SysCalls/SysCalls.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp index 4da7dbf2ab..4f42e4bc23 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Process.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" SysCallBase sc_p("Process"); diff --git a/rpcs3/Emu/SysCalls/lv2/SC_RSX.cpp b/rpcs3/Emu/SysCalls/lv2/SC_RSX.cpp index 8ede1eaa83..3020518815 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_RSX.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_RSX.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" SysCallBase sys_rsx("sys_rsx"); diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Rwlock.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Rwlock.cpp index d69d224b85..88922f07e7 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Rwlock.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Rwlock.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "SC_Rwlock.h" #include "Emu/SysCalls/SysCalls.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp b/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp index e2c5201182..b71e02889c 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_SPU_Thread.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/FS/vfsFile.h" #include "SC_SPU_Thread.h" #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SC_FUNC.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Semaphore.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Semaphore.cpp index 5733801298..c92e38a0d8 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Semaphore.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Semaphore.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" SysCallBase sys_sem("sys_semaphore"); diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp index c866677099..c7a9bfd8aa 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Spinlock.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" #include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/lv2/SC_Spinlock.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_TTY.cpp b/rpcs3/Emu/SysCalls/lv2/SC_TTY.cpp index 0f3709dbb6..634075de82 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_TTY.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_TTY.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" int sys_tty_read(u32 ch, u64 buf_addr, u32 len, u64 preadlen_addr) diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Time.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Time.cpp index b718ce1ed9..12c4d3881d 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Time.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Time.cpp @@ -6,6 +6,9 @@ * GNU LGPL 2.1 license * */ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" #include "SC_Time.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Timer.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Timer.cpp index cf1c8c325b..5e58c41d5e 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Timer.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Timer.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "SC_Timer.h" #include "Emu/SysCalls/SysCalls.h" #include "Emu/event.h" diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Trace.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Trace.cpp index 56a28669f3..6361e880ca 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_Trace.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_Trace.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" SysCallBase sys_trace("sys_trace"); diff --git a/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp b/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp index 0b53f887df..c761abf6e1 100644 --- a/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp +++ b/rpcs3/Emu/SysCalls/lv2/SC_VM.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Emu/SysCalls/SysCalls.h" #include "SC_Memory.h" diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp index 1ed7dc1148..a6bbe584ae 100644 --- a/rpcs3/Emu/System.cpp +++ b/rpcs3/Emu/System.cpp @@ -1,11 +1,13 @@ #include "stdafx.h" -#include "System.h" +#include "Emu/ConLog.h" #include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "Ini.h" #include "Emu/Cell/PPUThread.h" #include "Emu/Cell/SPUThread.h" #include "Emu/Cell/PPUInstrTable.h" +#include "Emu/FS/vfsFile.h" #include "../Crypto/unself.h" #include diff --git a/rpcs3/Gui/CompilerELF.cpp b/rpcs3/Gui/CompilerELF.cpp index e5a94cca11..cbf283df6e 100644 --- a/rpcs3/Gui/CompilerELF.cpp +++ b/rpcs3/Gui/CompilerELF.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "CompilerELF.h" #include "Emu/Cell/PPUProgramCompiler.h" using namespace PPU_opcodes; diff --git a/rpcs3/Gui/ConLog.cpp b/rpcs3/Gui/ConLog.cpp index 6b4dbb6c33..2b103a2f57 100644 --- a/rpcs3/Gui/ConLog.cpp +++ b/rpcs3/Gui/ConLog.cpp @@ -1,10 +1,20 @@ #include "stdafx.h" -#include "Gui/ConLog.h" #include -#include "Ini.h" #include #include +#include + +#include "Ini.h" +#include "Utilities/Thread.h" +#include "Utilities/StrFmt.h" +#include "Emu/ConLog.h" +#include "Gui/ConLogFrame.h" + +#include "Utilities/BEType.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" + LogWriter ConLog; LogFrame* ConLogFrame; diff --git a/rpcs3/Gui/ConLogFrame.h b/rpcs3/Gui/ConLogFrame.h new file mode 100644 index 0000000000..2919a5cbae --- /dev/null +++ b/rpcs3/Gui/ConLogFrame.h @@ -0,0 +1,25 @@ +#pragma once +#include "Emu/ConLog.h" + + +class LogFrame + : public wxPanel + , public ThreadBase +{ + wxListView& m_log; + +public: + LogFrame(wxWindow* parent); + ~LogFrame(); + + bool Close(bool force = false); + +private: + virtual void Task(); + + void OnQuit(wxCloseEvent& event); + + DECLARE_EVENT_TABLE(); +}; + +extern LogFrame* ConLogFrame; \ No newline at end of file diff --git a/rpcs3/Gui/Debugger.cpp b/rpcs3/Gui/Debugger.cpp index 2e80468ecc..8f85cf4311 100644 --- a/rpcs3/Gui/Debugger.cpp +++ b/rpcs3/Gui/Debugger.cpp @@ -1,9 +1,14 @@ #include "stdafx.h" #include -#include "Debugger.h" +#include "Emu/ConLog.h" #include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "rpcs3.h" +#include "Debugger.h" #include "InterpreterDisAsm.h" +#include "Emu/Cell/PPCThread.h" + class DbgEmuPanel : public wxPanel { diff --git a/rpcs3/Gui/DisAsmFrame.cpp b/rpcs3/Gui/DisAsmFrame.cpp index 2391523fd5..993fa74091 100644 --- a/rpcs3/Gui/DisAsmFrame.cpp +++ b/rpcs3/Gui/DisAsmFrame.cpp @@ -1,8 +1,12 @@ #include "stdafx.h" -#include "DisAsmFrame.h" +#include "Emu/ConLog.h" #include "Emu/Memory/Memory.h" -#include "Emu/Cell/PPCThread.h" #include "Emu/System.h" +#include "Emu/SysCalls/lv2/SC_Lwmutex.h" +#include "Emu/SysCalls/lv2/SC_Event_flag.h" +#include "DisAsmFrame.h" +#include "Emu/FS/vfsLocalFile.h" +#include "Emu/Cell/PPCThread.h" #include "Gui/DisAsmFrame.h" #include "Emu/Cell/PPUDecoder.h" #include "Emu/Cell/PPUDisAsm.h" diff --git a/rpcs3/Gui/DisAsmFrame.h b/rpcs3/Gui/DisAsmFrame.h index 82290e2427..0f9f30b271 100644 --- a/rpcs3/Gui/DisAsmFrame.h +++ b/rpcs3/Gui/DisAsmFrame.h @@ -1,5 +1,7 @@ #pragma once +class PPCThread; + class DisAsmFrame : public wxFrame { static const uint LINES_OPCODES = 40; diff --git a/rpcs3/Gui/FnIdGenerator.cpp b/rpcs3/Gui/FnIdGenerator.cpp index e94aa348be..927f178eaf 100644 --- a/rpcs3/Gui/FnIdGenerator.cpp +++ b/rpcs3/Gui/FnIdGenerator.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" #include "FnIdGenerator.h" FnIdGenerator::FnIdGenerator(wxWindow* parent) diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp index da3d85d7df..2b72536d9b 100644 --- a/rpcs3/Gui/GameViewer.cpp +++ b/rpcs3/Gui/GameViewer.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/FS/vfsDir.h" +#include "Emu/FS/vfsFile.h" #include "GameViewer.h" #include "Loader/PSF.h" diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index c208d303ce..75d1016bc7 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "rpcs3.h" +#include "Emu/SysCalls/lv2/SC_Lwmutex.h" +#include "Emu/SysCalls/lv2/SC_Event_flag.h" #include "InterpreterDisAsm.h" #include "Emu/Cell/PPUDecoder.h" #include "Emu/Cell/PPUDisAsm.h" diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp index 0af99767c7..92d4e0e9d0 100644 --- a/rpcs3/Gui/MainFrame.cpp +++ b/rpcs3/Gui/MainFrame.cpp @@ -1,4 +1,9 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Gui/ConLogFrame.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "rpcs3.h" #include "MainFrame.h" #include "CompilerELF.h" #include "MemoryViewer.h" diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp index 0723e20230..407f9b7407 100644 --- a/rpcs3/Gui/MemoryViewer.cpp +++ b/rpcs3/Gui/MemoryViewer.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" + #include "MemoryViewer.h" MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent) diff --git a/rpcs3/Gui/PADManager.cpp b/rpcs3/Gui/PADManager.cpp index 58accb4581..925400aa04 100644 --- a/rpcs3/Gui/PADManager.cpp +++ b/rpcs3/Gui/PADManager.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "rpcs3.h" #include "PADManager.h" PADManager::PADManager(wxWindow* parent) diff --git a/rpcs3/Gui/RSXDebugger.cpp b/rpcs3/Gui/RSXDebugger.cpp index 3b73bf1cce..6846696888 100644 --- a/rpcs3/Gui/RSXDebugger.cpp +++ b/rpcs3/Gui/RSXDebugger.cpp @@ -1,10 +1,16 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" + #include "RSXDebugger.h" #include "Emu/GS/sysutil_video.h" #include "Emu/GS/GCM.h" #include "MemoryViewer.h" +#include + // TODO: Clear the object when restarting the emulator std::vector m_debug_programs; diff --git a/rpcs3/Gui/VFSManager.cpp b/rpcs3/Gui/VFSManager.cpp index 1223f7ee61..12d87a4f9e 100644 --- a/rpcs3/Gui/VFSManager.cpp +++ b/rpcs3/Gui/VFSManager.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/FS/VFS.h" #include "VFSManager.h" VFSEntrySettingsDialog::VFSEntrySettingsDialog(wxWindow* parent, VFSManagerEntry& entry) diff --git a/rpcs3/Gui/VHDDManager.cpp b/rpcs3/Gui/VHDDManager.cpp index c3c53cd00c..acd6e349ef 100644 --- a/rpcs3/Gui/VHDDManager.cpp +++ b/rpcs3/Gui/VHDDManager.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/ConLog.h" #include "VHDDManager.h" #include "TextInputDialog.h" #include diff --git a/rpcs3/Ini.cpp b/rpcs3/Ini.cpp index 968a762670..28372b9be2 100644 --- a/rpcs3/Ini.cpp +++ b/rpcs3/Ini.cpp @@ -1,6 +1,8 @@ #include "stdafx.h" #include "Ini.h" +#include "Utilities/StrFmt.h" + #include #include diff --git a/rpcs3/Loader/ELF32.cpp b/rpcs3/Loader/ELF32.cpp index 82d849a4ec..6de63abb6f 100644 --- a/rpcs3/Loader/ELF32.cpp +++ b/rpcs3/Loader/ELF32.cpp @@ -1,4 +1,6 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" #include "ELF32.h" void WriteEhdr(wxFile& f, Elf32_Ehdr& ehdr) diff --git a/rpcs3/Loader/ELF64.cpp b/rpcs3/Loader/ELF64.cpp index 665ec21019..2ddbc955df 100644 --- a/rpcs3/Loader/ELF64.cpp +++ b/rpcs3/Loader/ELF64.cpp @@ -1,4 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/Cell/PPUThread.h" +#include "Emu/SysCalls/SC_FUNC.h" +#include "Emu/SysCalls/Modules.h" #include "ELF64.h" #include "Emu/Cell/PPUInstrTable.h" using namespace PPU_instr; diff --git a/rpcs3/Loader/Loader.cpp b/rpcs3/Loader/Loader.cpp index be0ac775fc..54c41330b2 100644 --- a/rpcs3/Loader/Loader.cpp +++ b/rpcs3/Loader/Loader.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/ConLog.h" #include "Loader.h" #include "ELF.h" #include "SELF.h" diff --git a/rpcs3/Loader/PKG.cpp b/rpcs3/Loader/PKG.cpp index 3faf6fdb25..43512e16ba 100644 --- a/rpcs3/Loader/PKG.cpp +++ b/rpcs3/Loader/PKG.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/ConLog.h" #include "PKG.h" #include "../Crypto/unpkg.h" diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp index 03c5d7f124..6d4890756d 100644 --- a/rpcs3/Loader/PSF.cpp +++ b/rpcs3/Loader/PSF.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/ConLog.h" #include "PSF.h" PSFLoader::PSFLoader(vfsStream& f) : psf_f(f) diff --git a/rpcs3/Loader/SELF.cpp b/rpcs3/Loader/SELF.cpp index e6f522252d..6a95db6a2b 100644 --- a/rpcs3/Loader/SELF.cpp +++ b/rpcs3/Loader/SELF.cpp @@ -1,4 +1,5 @@ #include "stdafx.h" +#include "Emu/ConLog.h" #include "SELF.h" #include "ELF64.h" diff --git a/rpcs3/Loader/TROPUSR.cpp b/rpcs3/Loader/TROPUSR.cpp index 756b9366eb..8b97d6160a 100644 --- a/rpcs3/Loader/TROPUSR.cpp +++ b/rpcs3/Loader/TROPUSR.cpp @@ -1,4 +1,7 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "TROPUSR.h" #include "wx/xml/xml.h" diff --git a/rpcs3/Loader/TRP.cpp b/rpcs3/Loader/TRP.cpp index 5b2fd634f4..7ba04aa82c 100644 --- a/rpcs3/Loader/TRP.cpp +++ b/rpcs3/Loader/TRP.cpp @@ -1,4 +1,8 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" +#include "Emu/FS/vfsFile.h" #include "TRP.h" TRPLoader::TRPLoader(vfsStream& f) : trp_f(f) diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index ca418dc199..199a2d30a3 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -1,7 +1,10 @@ #include "stdafx.h" +#include "Emu/ConLog.h" +#include "Emu/Memory/Memory.h" +#include "Emu/System.h" #include "rpcs3.h" #include "Ini.h" -#include "Emu/System.h" +#include "Gui/ConLogFrame.h" #ifdef _WIN32 #include diff --git a/rpcs3/rpcs3.h b/rpcs3/rpcs3.h index 5727484759..4ee43a327c 100644 --- a/rpcs3/rpcs3.h +++ b/rpcs3/rpcs3.h @@ -1,16 +1,7 @@ #pragma once #include "Gui/MainFrame.h" -template T min(const T a, const T b) { return a < b ? a : b; } -template T max(const T a, const T b) { return a > b ? a : b; } - -//#define re(val) MemoryBase::Reverse(val) -#define re64(val) MemoryBase::Reverse64(val) -#define re32(val) MemoryBase::Reverse32(val) -#define re16(val) MemoryBase::Reverse16(val) - -template T re(const T val) { T res; se_t::func(res, val); return res; } -template void re(T1& dst, const T2 val) { se_t::func(dst, val); } +class CPUThread; wxDECLARE_EVENT(wxEVT_DBG_COMMAND, wxCommandEvent); diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 4ac2b51db7..1b6bc42dfd 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -1,4 +1,4 @@ - + @@ -383,33 +383,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -500,6 +535,7 @@ + @@ -580,6 +616,8 @@ + + @@ -588,7 +626,6 @@ - diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters index c949f78f34..b1380d6f2a 100644 --- a/rpcs3/rpcs3.vcxproj.filters +++ b/rpcs3/rpcs3.vcxproj.filters @@ -74,6 +74,9 @@ {a77ab520-4399-4c95-a7ee-985c9a5ad694} + + {c7dba541-6b78-47fd-b1aa-2325317a8bf0} + @@ -511,6 +514,111 @@ Emu\Io\XInput + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + @@ -567,9 +675,6 @@ Gui - - Gui - Gui @@ -999,5 +1104,14 @@ Emu\Io\XInput + + Emu + + + Emu\SysCalls\Modules\currently_unused + + + Emu\SysCalls\Modules\currently_unused + \ No newline at end of file diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h index 1622c29110..c53fe16278 100644 --- a/rpcs3/stdafx.h +++ b/rpcs3/stdafx.h @@ -36,6 +36,7 @@ #include #include #include "wx/app.h" +#include #include #endif @@ -279,11 +280,12 @@ enum Status #include "Utilities/IdManager.h" #include "Utilities/StrFmt.h" - +#ifdef _WIN32 #include "Emu/SysCalls/Callback.h" #include "Ini.h" #include "Gui/FrameBase.h" -#include "Gui/ConLog.h" +#include "Gui/ConLogFrame.h" +#include "Emu/ConLog.h" #include "Emu/Memory/Memory.h" #include "Emu/System.h" #include "Emu/Cell/PPUThread.h" @@ -300,6 +302,7 @@ enum Status #include "Emu/FS/vfsFile.h" #include "Emu/FS/vfsDir.h" #include "rpcs3.h" +#endif #define _PRGNAME_ "RPCS3" #define _PRGVER_ "0.0.0.4"