Headers cleanup

This commit is contained in:
RipleyTom 2025-02-11 03:00:37 +01:00 committed by Megamouse
parent 63147fdede
commit cd87a64621
361 changed files with 211 additions and 558 deletions

View file

@ -1,8 +1,6 @@
#include "File.h" #include "File.h"
#include "mutex.h" #include "mutex.h"
#include "StrFmt.h" #include "StrFmt.h"
#include "StrUtil.h"
#include "Crypto/sha1.h"
#include <span> #include <span>
#include <unordered_map> #include <unordered_map>
@ -18,6 +16,8 @@ using namespace std::literals::string_literals;
#ifdef _WIN32 #ifdef _WIN32
#include "Utilities/StrUtil.h"
#include <cwchar> #include <cwchar>
#include <Windows.h> #include <Windows.h>

View file

@ -2,7 +2,6 @@
#include "StrUtil.h" #include "StrUtil.h"
#include "cfmt.h" #include "cfmt.h"
#include "util/endian.hpp" #include "util/endian.hpp"
#include "util/logs.hpp"
#include "util/v128.hpp" #include "util/v128.hpp"
#include <locale> #include <locale>

View file

@ -5,10 +5,6 @@
#include "util/shared_ptr.hpp" #include "util/shared_ptr.hpp"
#include <string> #include <string>
#include <concepts>
#include "mutex.h"
#include "lockless.h"
// Hardware core layout // Hardware core layout
enum class native_core_arrangement : u32 enum class native_core_arrangement : u32

View file

@ -2,7 +2,6 @@
#include "util/types.hpp" #include "util/types.hpp"
#include <string> #include <string>
#include <vector>
#include <algorithm> #include <algorithm>
#include "util/asm.hpp" #include "util/asm.hpp"

View file

@ -1,6 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "cheat_info.h" #include "cheat_info.h"
#include "Config.h"
#include "StrUtil.h" #include "StrUtil.h"
LOG_CHANNEL(log_cheat, "Cheat"); LOG_CHANNEL(log_cheat, "Cheat");

View file

@ -1,5 +1,4 @@
#include "cond.h" #include "cond.h"
#include "sync.h"
// use constants, increase signal space // use constants, increase signal space

View file

@ -2,7 +2,6 @@
#include <util/types.hpp> #include <util/types.hpp>
#include <unordered_set> #include <unordered_set>
#include <vector>
#include <string> #include <string>
// Patch utilities specific to PPU code // Patch utilities specific to PPU code

View file

@ -12,18 +12,12 @@
#include <Windows.h> #include <Windows.h>
#include <ctime> #include <ctime>
#elif __linux__ #elif __linux__
#include <errno.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/futex.h> #include <linux/futex.h>
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <algorithm>
#include <chrono>
#include <mutex>
#include <condition_variable>
#include <unordered_map>
#ifdef _WIN32 #ifdef _WIN32
DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout)); DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout));
@ -60,6 +54,9 @@ struct futex_waitv
}; };
#endif #endif
#else #else
#include <condition_variable>
enum enum
{ {
FUTEX_PRIVATE_FLAG = 0, FUTEX_PRIVATE_FLAG = 0,

View file

@ -1,6 +1,7 @@
#include "util/types.hpp" #include "util/types.hpp"
#include <vector> #include <vector>
#include <mutex> #include <mutex>
#include "Emu/Cell/timers.hpp"
// Thread-safe object pool with garbage collection // Thread-safe object pool with garbage collection
class universal_pool class universal_pool

View file

@ -2,7 +2,7 @@
// Licensed under the terms of the GNU GPL, version 2 // Licensed under the terms of the GNU GPL, version 2
// http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt // http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
#include "utils.h" #include "util/types.hpp"
#include <cstring> #include <cstring>
static inline int bn_compare(u8* a, u8* b, u32 n) static inline int bn_compare(u8* a, u8* b, u32 n)

View file

@ -2,6 +2,7 @@
// Licensed under the terms of the GNU GPL, version 2.0 or later versions. // Licensed under the terms of the GNU GPL, version 2.0 or later versions.
// http://www.gnu.org/licenses/gpl-2.0.txt // http://www.gnu.org/licenses/gpl-2.0.txt
#include <string.h>
#include "lz.h" #include "lz.h"
void decode_range(unsigned int *range, unsigned int *code, unsigned char **src) void decode_range(unsigned int *range, unsigned int *code, unsigned char **src)

View file

@ -6,8 +6,6 @@
// Reverse-engineered custom LempelZivMarkov based compression. // Reverse-engineered custom LempelZivMarkov based compression.
#include <string.h>
void decode_range(unsigned int *range, unsigned int *code, unsigned char **src); void decode_range(unsigned int *range, unsigned int *code, unsigned char **src);
int decode_bit(unsigned int *range, unsigned int *code, int *index, unsigned char **src, unsigned char *c); int decode_bit(unsigned int *range, unsigned int *code, int *index, unsigned char **src, unsigned char *c);
int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *range, unsigned int *code, unsigned char **src); int decode_number(unsigned char *ptr, int index, int *bit_flag, unsigned int *range, unsigned int *code, unsigned char **src);

View file

@ -4,6 +4,7 @@
#include "sha1.h" #include "sha1.h"
#include "lz.h" #include "lz.h"
#include "ec.h" #include "ec.h"
#include "utils.h"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"

View file

@ -1,9 +1,6 @@
#pragma once #pragma once
#include <array> #include <array>
#include "utils.h"
#include "Utilities/File.h" #include "Utilities/File.h"
constexpr u32 SDAT_FLAG = 0x01000000; constexpr u32 SDAT_FLAG = 0x01000000;

View file

@ -5,7 +5,6 @@
#include "util/logs.hpp" #include "util/logs.hpp"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Utilities/mutex.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "Emu/VFS.h" #include "Emu/VFS.h"

View file

@ -1,14 +1,11 @@
#include "stdafx.h" #include "stdafx.h"
#include "aes.h" #include "aes.h"
#include "utils.h"
#include "unself.h" #include "unself.h"
#include "Emu/VFS.h" #include "util/asm.hpp"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "Crypto/unzip.h" #include "Crypto/unzip.h"
#include <algorithm>
inline u8 Read8(const fs::file& f) inline u8 Read8(const fs::file& f)
{ {
u8 ret; u8 ret;

View file

@ -5,7 +5,6 @@
// http://www.gnu.org/licenses/gpl-2.0.txt // http://www.gnu.org/licenses/gpl-2.0.txt
#include "util/types.hpp" #include "util/types.hpp"
#include "util/asm.hpp"
#include <stdlib.h> #include <stdlib.h>

View file

@ -1,6 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "AudioBackend.h" #include "AudioBackend.h"
#include "Emu/system_config.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu//Cell/Modules/cellAudioOut.h" #include "Emu//Cell/Modules/cellAudioOut.h"

View file

@ -1,7 +1,5 @@
#pragma once #pragma once
#include <memory>
#include "Utilities/mutex.h"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"

View file

@ -4,7 +4,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "FAudioBackend.h" #include "FAudioBackend.h"
#include "Emu/system_config.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Audio/audio_device_enumerator.h" #include "Emu/Audio/audio_device_enumerator.h"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"

View file

@ -4,8 +4,6 @@
#error "FAudio support disabled but still being built." #error "FAudio support disabled but still being built."
#endif #endif
#include <memory>
#include "Utilities/mutex.h"
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
#include "FAudio.h" #include "FAudio.h"

View file

@ -3,7 +3,6 @@
#endif #endif
#include "Emu/Audio/FAudio/faudio_enumerator.h" #include "Emu/Audio/FAudio/faudio_enumerator.h"
#include <array>
#include <algorithm> #include <algorithm>
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "util/logs.hpp" #include "util/logs.hpp"

View file

@ -4,8 +4,6 @@
#error "XAudio2 can only be built on Windows." #error "XAudio2 can only be built on Windows."
#endif #endif
#include <memory>
#include "Utilities/mutex.h"
#include "Emu/Audio/AudioBackend.h" #include "Emu/Audio/AudioBackend.h"
#include <initguid.h> #include <initguid.h>

View file

@ -3,7 +3,6 @@
#include "CPUTranslator.h" #include "CPUTranslator.h"
#include "util/v128.hpp" #include "util/v128.hpp"
#include "util/simd.hpp"
#include "util/logs.hpp" #include "util/logs.hpp"
LOG_CHANNEL(llvm_log, "LLVM"); LOG_CHANNEL(llvm_log, "LLVM");

View file

@ -21,7 +21,6 @@
#include "llvm/IR/Module.h" #include "llvm/IR/Module.h"
#include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetMachine.h"
#include "llvm/Support/KnownBits.h" #include "llvm/Support/KnownBits.h"
#include "llvm/Support/ModRef.h"
#include "llvm/Analysis/ConstantFolding.h" #include "llvm/Analysis/ConstantFolding.h"
#include "llvm/Analysis/ValueTracking.h" #include "llvm/Analysis/ValueTracking.h"
#include "llvm/IR/IntrinsicsX86.h" #include "llvm/IR/IntrinsicsX86.h"
@ -37,7 +36,6 @@
#include "util/types.hpp" #include "util/types.hpp"
#include "util/sysinfo.hpp" #include "util/sysinfo.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include "Utilities/BitField.h"
#include "Utilities/JIT.h" #include "Utilities/JIT.h"
#include "util/v128.hpp" #include "util/v128.hpp"

View file

@ -4,7 +4,6 @@
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Emu/Cell/lv2/sys_spu.h" #include "Emu/Cell/lv2/sys_spu.h"
#include "Emu/Cell/lv2/sys_sync.h"
#include <thread> #include <thread>

View file

@ -3,9 +3,9 @@
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Audio/audio_utils.h" #include "Emu/Audio/audio_utils.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_process.h"
#include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_event.h"
#include "Emu/Cell/Modules/cellAudioOut.h"
#include "cellAudio.h" #include "cellAudio.h"
#include "util/video_provider.h" #include "util/video_provider.h"

View file

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "util/types.hpp" #include "util/types.hpp"
#include "util/endian.hpp"
// Error codes // Error codes
enum CellAudioInError : u32 enum CellAudioInError : u32

View file

@ -6,6 +6,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_event.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/timers.hpp"
#include <cmath> #include <cmath>

View file

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "Utilities/Timer.h"
#include "Emu/Cell/lv2/sys_memory.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Emu/Io/camera_handler_base.h" #include "Emu/Io/camera_handler_base.h"
#include "Emu/Memory/vm_ptr.h"
#include "Utilities/mutex.h"
#include <map> #include <map>

View file

@ -9,6 +9,8 @@
#include "util/asm.hpp" #include "util/asm.hpp"
#include <thread>
LOG_CHANNEL(cellDmux); LOG_CHANNEL(cellDmux);
template <> template <>

View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "cellPamf.h"
// Error Codes // Error Codes
enum CellDmuxError :u32 enum CellDmuxError :u32

View file

@ -2,7 +2,6 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "cellPamf.h"
#include "cellDmux.h" #include "cellDmux.h"
#include "cellDmuxPamf.h" #include "cellDmuxPamf.h"

View file

@ -6,6 +6,7 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "Emu/Cell/lv2/sys_sync.h" #include "Emu/Cell/lv2/sys_sync.h"

View file

@ -3,6 +3,7 @@
#include "cellCamera.h" #include "cellCamera.h"
#include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_event.h"
#include "Emu/Cell/lv2/sys_memory.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/timers.hpp" #include "Emu/Cell/timers.hpp"
#include "Emu/Io/MouseHandler.h" #include "Emu/Io/MouseHandler.h"

View file

@ -9,8 +9,6 @@
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "cellGifDec.h" #include "cellGifDec.h"
#include "util/asm.hpp"
LOG_CHANNEL(cellGifDec); LOG_CHANNEL(cellGifDec);
// Temporarily // Temporarily

View file

@ -9,8 +9,6 @@
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "cellJpgDec.h" #include "cellJpgDec.h"
#include "util/asm.hpp"
LOG_CHANNEL(cellJpgDec); LOG_CHANNEL(cellJpgDec);
// Temporarily // Temporarily

View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "cellKb.h" #include "Emu/Io/Keyboard.h"
LOG_CHANNEL(cellKey2char); LOG_CHANNEL(cellKey2char);

View file

@ -16,8 +16,6 @@ typedef const char *HostCode;
#include "cellL10n.h" #include "cellL10n.h"
#include "util/asm.hpp"
LOG_CHANNEL(cellL10n); LOG_CHANNEL(cellL10n);
// Translate code id to code name. some codepage may has another name. // Translate code id to code name. some codepage may has another name.

View file

@ -1,5 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
@ -10,6 +9,8 @@
#include <numeric> #include <numeric>
#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h"
LOG_CHANNEL(cellMic); LOG_CHANNEL(cellMic);
template<> template<>

View file

@ -1,9 +1,8 @@
#pragma once #pragma once
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Emu/Cell/timers.hpp" #include "3rdparty/OpenAL/openal-soft/include/AL/alc.h"
#include "Utilities/mutex.h"
#include "3rdparty/OpenAL/openal-soft/include/AL/alext.h"
// Error Codes // Error Codes
enum CellMicInError : u32 enum CellMicInError : u32

View file

@ -1,6 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Io/MouseHandler.h" #include "Emu/Io/MouseHandler.h"

View file

@ -12,9 +12,6 @@
#include "cellSysutil.h" #include "cellSysutil.h"
#include "util/media_utils.h" #include "util/media_utils.h"
#include <deque>
LOG_CHANNEL(cellMusicDecode); LOG_CHANNEL(cellMusicDecode);
template<> template<>

View file

@ -2,7 +2,6 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Utilities/StrUtil.h"
#include "cellSysutil.h" #include "cellSysutil.h"
LOG_CHANNEL(cellMusicExport); LOG_CHANNEL(cellMusicExport);

View file

@ -2,7 +2,6 @@
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/lv2/sys_sync.h"
#include "cellGame.h" #include "cellGame.h"
#include "cellSysutil.h" #include "cellSysutil.h"

View file

@ -1,6 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Io/interception.h" #include "Emu/Io/interception.h"
#include "Emu/Io/Keyboard.h" #include "Emu/Io/Keyboard.h"

View file

@ -3,7 +3,6 @@
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_process.h"
#include "Emu/Cell/lv2/sys_sync.h"
#include "Emu/Io/pad_types.h" #include "Emu/Io/pad_types.h"
#include "Emu/RSX/Overlays/overlay_debug_overlay.h" #include "Emu/RSX/Overlays/overlay_debug_overlay.h"
#include "Input/pad_thread.h" #include "Input/pad_thread.h"

View file

@ -1,6 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "cellSysutil.h" #include "cellSysutil.h"

View file

@ -2,7 +2,6 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Utilities/StrUtil.h"
#include "cellSysutil.h" #include "cellSysutil.h"
LOG_CHANNEL(cellPhotoExport); LOG_CHANNEL(cellPhotoExport);

View file

@ -1,5 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h"
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "Emu/RSX/Overlays/overlay_media_list_dialog.h" #include "Emu/RSX/Overlays/overlay_media_list_dialog.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"

View file

@ -2,7 +2,6 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "cellPngEnc.h" #include "cellPngEnc.h"
#include "png.h"
LOG_CHANNEL(cellPngEnc); LOG_CHANNEL(cellPngEnc);

View file

@ -3,6 +3,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/RSX/GCM.h" #include "Emu/RSX/GCM.h"
#include "Emu/RSX/gcm_enums.h"
#include "cellResc.h" #include "cellResc.h"
#include "cellVideoOut.h" #include "cellVideoOut.h"

View file

@ -2,8 +2,6 @@
#include "cellVpost.h" #include "cellVpost.h"
#include "Emu/Memory/vm_ptr.h"
// Error Codes // Error Codes
enum CellSailError : u32 enum CellSailError : u32
{ {

View file

@ -1,6 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "cellSail.h"
LOG_CHANNEL(cellSailRec); LOG_CHANNEL(cellSailRec);

View file

@ -8,6 +8,7 @@
#include "Emu/Cell/lv2/sys_sync.h" #include "Emu/Cell/lv2/sys_sync.h"
#include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_process.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/Modules/cellSysutil.h" #include "Emu/Cell/Modules/cellSysutil.h"
#include "Emu/Cell/Modules/cellUserInfo.h" #include "Emu/Cell/Modules/cellUserInfo.h"
#include "Emu/RSX/Overlays/overlay_message.h" #include "Emu/RSX/Overlays/overlay_message.h"
@ -19,6 +20,7 @@
#include "Loader/PSF.h" #include "Loader/PSF.h"
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/date_time.h" #include "Utilities/date_time.h"
#include "Utilities/sema.h"
#include <mutex> #include <mutex>
#include <algorithm> #include <algorithm>

View file

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "util/types.hpp" #include "util/types.hpp"
#include "util/endian.hpp"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include <string> #include <string>
#include <vector> #include <vector>

View file

@ -1,7 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/IdManager.h"
#include "Emu/Memory/vm_reservation.h" #include "Emu/Memory/vm_reservation.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPUThread.h"

View file

@ -4,6 +4,10 @@
#include "util/v128.hpp" #include "util/v128.hpp"
#include "Emu/Cell/lv2/sys_lwmutex.h"
#include "Emu/Cell/lv2/sys_lwcond.h"
#include "Emu/Cell/lv2/sys_spu.h"
struct CellSpurs; struct CellSpurs;
struct CellSpursTaskset; struct CellSpursTaskset;

View file

@ -1,9 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_spu.h"
#include "cellSpursJq.h"
LOG_CHANNEL(cellSpursJq); LOG_CHANNEL(cellSpursJq);
error_code cellSpursJobQueueAttributeInitialize() error_code cellSpursJobQueueAttributeInitialize()

View file

@ -4,9 +4,6 @@
#include "Emu/Memory/vm_reservation.h" #include "Emu/Memory/vm_reservation.h"
#include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPUThread.h"
#include "Emu/Cell/SPURecompiler.h" #include "Emu/Cell/SPURecompiler.h"
#include "Emu/Cell/lv2/sys_lwmutex.h"
#include "Emu/Cell/lv2/sys_lwcond.h"
#include "Emu/Cell/lv2/sys_spu.h"
#include "cellSpurs.h" #include "cellSpurs.h"
#include "util/asm.hpp" #include "util/asm.hpp"

View file

@ -2,7 +2,6 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Utilities/StrUtil.h"
#include "cellSysutil.h" #include "cellSysutil.h"
LOG_CHANNEL(cellVideoExport); LOG_CHANNEL(cellVideoExport);

View file

@ -1,8 +1,5 @@
#pragma once #pragma once
#include <unordered_map>
#include <deque>
// libvoice = 0x80310801 - 0x803108ff // libvoice = 0x80310801 - 0x803108ff
// libvoice version 100 // libvoice version 100

View file

@ -4,6 +4,8 @@
#include "cellWebBrowser.h" #include "cellWebBrowser.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "cellSysutil.h"
LOG_CHANNEL(cellSysutil); LOG_CHANNEL(cellSysutil);
struct browser_info struct browser_info

View file

@ -1,7 +1,5 @@
#pragma once #pragma once
#include "cellSysutil.h"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
//events //events

View file

@ -1,7 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "Emu/VFS.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/Modules/cellUserInfo.h" #include "Emu/Cell/Modules/cellUserInfo.h"
#include "Emu/Io/interception.h" #include "Emu/Io/interception.h"
@ -15,6 +14,7 @@
#include "sceNp.h" #include "sceNp.h"
#include "cellSysutil.h" #include "cellSysutil.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/lv2/sys_time.h" #include "Emu/Cell/lv2/sys_time.h"
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "Emu/Cell/lv2/sys_sync.h" #include "Emu/Cell/lv2/sys_sync.h"
@ -22,6 +22,7 @@
#include "Emu/NP/np_contexts.h" #include "Emu/NP/np_contexts.h"
#include "Emu/NP/np_helpers.h" #include "Emu/NP/np_helpers.h"
#include "Emu/NP/np_structs_extra.h" #include "Emu/NP/np_structs_extra.h"
#include "Emu/NP/signaling_handler.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/RSX/Overlays/overlay_manager.h" #include "Emu/RSX/Overlays/overlay_manager.h"

View file

@ -2,6 +2,7 @@
#include "cellRtc.h" #include "cellRtc.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include "util/shared_ptr.hpp"
#include <set> #include <set>

View file

@ -7,6 +7,7 @@
#include "Emu/NP/np_handler.h" #include "Emu/NP/np_handler.h"
#include "Emu/NP/np_contexts.h" #include "Emu/NP/np_contexts.h"
#include "Emu/NP/np_helpers.h" #include "Emu/NP/np_helpers.h"
#include "Emu/NP/signaling_handler.h"
#include "cellSysutil.h" #include "cellSysutil.h"
LOG_CHANNEL(sceNp2); LOG_CHANNEL(sceNp2);

View file

@ -4,6 +4,7 @@
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/Modules/cellMsgDialog.h" #include "Emu/Cell/Modules/cellMsgDialog.h"
#include "Utilities/rXml.h" #include "Utilities/rXml.h"

View file

@ -1,10 +1,10 @@
#pragma once #pragma once
#include "util/types.hpp" #include "util/types.hpp"
#include "util/endian.hpp"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include <vector> #include <vector>
#include <mutex>
// Error codes // Error codes
enum SceNpTrophyError : u32 enum SceNpTrophyError : u32

View file

@ -2,8 +2,6 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "sysPrxForUser.h"
LOG_CHANNEL(sysPrxForUser); LOG_CHANNEL(sysPrxForUser);
struct HeapInfo struct HeapInfo

View file

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/lv2/sys_lwmutex.h" #include "Emu/Cell/lv2/sys_lwmutex.h"
#include "Emu/Cell/lv2/sys_mutex.h" #include "Emu/Cell/lv2/sys_mutex.h"
#include "sysPrxForUser.h" #include "sysPrxForUser.h"

View file

@ -7,8 +7,6 @@
#include "Emu/Cell/lv2/sys_mutex.h" #include "Emu/Cell/lv2/sys_mutex.h"
#include "Emu/Cell/lv2/sys_cond.h" #include "Emu/Cell/lv2/sys_cond.h"
#include "sysPrxForUser.h"
LOG_CHANNEL(sysPrxForUser); LOG_CHANNEL(sysPrxForUser);
using sys_mempool_t = u32; using sys_mempool_t = u32;

View file

@ -1,7 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h"
#include "sys_net_.h" #include "sys_net_.h"
LOG_CHANNEL(libnet); LOG_CHANNEL(libnet);

View file

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "Emu/Cell/lv2/sys_net.h" #include "Emu/Cell/lv2/sys_net.h"
#include "Emu/Memory/vm.h"
struct sys_net_sockinfo_t struct sys_net_sockinfo_t
{ {

View file

@ -1,7 +1,5 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/IdManager.h"
#include "Emu/Cell/lv2/sys_ppu_thread.h" #include "Emu/Cell/lv2/sys_ppu_thread.h"
#include "Emu/Cell/lv2/sys_interrupt.h" #include "Emu/Cell/lv2/sys_interrupt.h"
#include "Emu/Cell/lv2/sys_lwmutex.h" #include "Emu/Cell/lv2/sys_lwmutex.h"

View file

@ -1,8 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "sysPrxForUser.h"
LOG_CHANNEL(sysPrxForUser); LOG_CHANNEL(sysPrxForUser);
error_code sys_rsxaudio_close_connection() error_code sys_rsxaudio_close_connection()

View file

@ -1,8 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "sysPrxForUser.h"
LOG_CHANNEL(sysPrxForUser); LOG_CHANNEL(sysPrxForUser);
void sys_spinlock_initialize(vm::ptr<atomic_be_t<u32>> lock) void sys_spinlock_initialize(vm::ptr<atomic_be_t<u32>> lock)

View file

@ -3,7 +3,6 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_spu.h" #include "Emu/Cell/lv2/sys_spu.h"
#include "Crypto/unself.h"
#include "Loader/ELF.h" #include "Loader/ELF.h"
#include "sysPrxForUser.h" #include "sysPrxForUser.h"

View file

@ -2,11 +2,9 @@
#include <string> #include <string>
#include <map> #include <map>
#include <set>
#include <deque> #include <deque>
#include <span> #include <span>
#include "util/types.hpp" #include "util/types.hpp"
#include "util/endian.hpp"
#include "util/asm.hpp" #include "util/asm.hpp"
#include "util/to_endian.hpp" #include "util/to_endian.hpp"

View file

@ -15,6 +15,7 @@
#include "Emu/Cell/PPUOpcodes.h" #include "Emu/Cell/PPUOpcodes.h"
#include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPUThread.h"
#include "Emu/Cell/PPUAnalyser.h" #include "Emu/Cell/PPUAnalyser.h"
#include "Emu/Cell/timers.hpp"
#include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_process.h"
#include "Emu/Cell/lv2/sys_prx.h" #include "Emu/Cell/lv2/sys_prx.h"

View file

@ -12,9 +12,9 @@
#include "Emu/Memory/vm_locking.h" #include "Emu/Memory/vm_locking.h"
#include "Emu/RSX/Core/RSXReservationLock.hpp" #include "Emu/RSX/Core/RSXReservationLock.hpp"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Emu/vfs_config.h"
#include "Emu/system_progress.hpp" #include "Emu/system_progress.hpp"
#include "Emu/system_utils.hpp" #include "Emu/system_utils.hpp"
#include "Emu/System.h"
#include "PPUThread.h" #include "PPUThread.h"
#include "PPUInterpreter.h" #include "PPUInterpreter.h"
#include "PPUAnalyser.h" #include "PPUAnalyser.h"
@ -65,6 +65,8 @@
#include "util/simd.hpp" #include "util/simd.hpp"
#include "util/sysinfo.hpp" #include "util/sysinfo.hpp"
#include "Utilities/sema.h"
#ifdef __APPLE__ #ifdef __APPLE__
#include <libkern/OSCacheControl.h> #include <libkern/OSCacheControl.h>
#endif #endif

View file

@ -1,4 +1,3 @@
#include <bit>
#ifdef LLVM_AVAILABLE #ifdef LLVM_AVAILABLE
#include "Emu/system_config.h" #include "Emu/system_config.h"

View file

@ -3,7 +3,7 @@
#include "Loader/ELF.h" #include "Loader/ELF.h"
#include "util/asm.hpp" #include "util/asm.hpp"
#include "Emu/Cell/RawSPUThread.h" #include "SPUThread.h"
inline void try_start(spu_thread& spu) inline void try_start(spu_thread& spu)
{ {

View file

@ -1,3 +1 @@
#pragma once #pragma once
#include "SPUThread.h"

View file

@ -5,15 +5,12 @@
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/timers.hpp" #include "Emu/Cell/timers.hpp"
#include "SPUDisAsm.h"
#include "SPUThread.h" #include "SPUThread.h"
#include "SPUInterpreter.h" #include "SPUInterpreter.h"
#include "PPUAnalyser.h"
#include "Crypto/sha1.h" #include "Crypto/sha1.h"
#include "util/asm.hpp" #include "util/asm.hpp"
#include "util/v128.hpp" #include "util/v128.hpp"
#include "util/simd.hpp"
#include "util/sysinfo.hpp" #include "util/sysinfo.hpp"
#include <cmath> #include <cmath>

View file

@ -1,7 +1,5 @@
#pragma once #pragma once
#include "util/types.hpp"
// SPU Instruction Type // SPU Instruction Type
struct spu_itype struct spu_itype
{ {

View file

@ -3,7 +3,6 @@
#include "Utilities/JIT.h" #include "Utilities/JIT.h"
#include "SPUThread.h" #include "SPUThread.h"
#include "Emu/Cell/Common.h"
#include "Emu/Cell/SPUAnalyser.h" #include "Emu/Cell/SPUAnalyser.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
@ -13,7 +12,6 @@
#include "util/sysinfo.hpp" #include "util/sysinfo.hpp"
#include <cmath> #include <cmath>
#include <cfenv>
#if !defined(_MSC_VER) #if !defined(_MSC_VER)
#pragma GCC diagnostic push #pragma GCC diagnostic push

View file

@ -8,6 +8,7 @@
#include "Loader/ELF.h" #include "Loader/ELF.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/System.h"
#include "Emu/perf_meter.hpp" #include "Emu/perf_meter.hpp"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
@ -23,7 +24,6 @@
#include "Emu/Cell/timers.hpp" #include "Emu/Cell/timers.hpp"
#include "Emu/RSX/Core/RSXReservationLock.hpp" #include "Emu/RSX/Core/RSXReservationLock.hpp"
#include "Emu/RSX/RSXThread.h"
#include <cmath> #include <cmath>
#include <cfenv> #include <cfenv>

View file

@ -10,6 +10,8 @@
#include "util/logs.hpp" #include "util/logs.hpp"
#include "util/to_endian.hpp" #include "util/to_endian.hpp"
#include "Utilities/mutex.h"
#include "Loader/ELF.h" #include "Loader/ELF.h"
#include <span> #include <span>

View file

@ -9,7 +9,6 @@
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
#include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPUThread.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include "Emu/Cell/MFC.h"
#include "sys_sync.h" #include "sys_sync.h"
#include "sys_lwmutex.h" #include "sys_lwmutex.h"
#include "sys_lwcond.h" #include "sys_lwcond.h"
@ -56,7 +55,7 @@
#include <algorithm> #include <algorithm>
#include <optional> #include <optional>
#include <deque> #include <deque>
#include <shared_mutex> #include <thread>
#include "util/tsc.hpp" #include "util/tsc.hpp"
#include "util/sysinfo.hpp" #include "util/sysinfo.hpp"
#include "util/init_mutex.hpp" #include "util/init_mutex.hpp"

View file

@ -1,5 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Memory/vm.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"

View file

@ -2,7 +2,6 @@
#include "util/serialization.hpp" #include "util/serialization.hpp"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/IPC.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"

View file

@ -1,6 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/System.h"
#include "Emu/Memory/vm.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Cell/lv2/sys_event.h" #include "Emu/Cell/lv2/sys_event.h"

View file

@ -1,11 +1,8 @@
#pragma once #pragma once
#include <map>
#include <list>
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "util/shared_ptr.hpp" #include "util/shared_ptr.hpp"
#include "Emu/Cell/timers.hpp"
/* /*
* sys_config is a "subscription-based data storage API" * sys_config is a "subscription-based data storage API"

View file

@ -2,13 +2,10 @@
#include "sys_event_flag.h" #include "sys_event_flag.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/IPC.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
#include <algorithm>
#include "util/asm.hpp" #include "util/asm.hpp"
LOG_CHANNEL(sys_event_flag); LOG_CHANNEL(sys_event_flag);

View file

@ -2,8 +2,8 @@
#include "sys_sync.h" #include "sys_sync.h"
#include "sys_fs.h" #include "sys_fs.h"
#include "sys_memory.h" #include "sys_memory.h"
#include "util/asm.hpp"
#include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
#include "Crypto/unedat.h" #include "Crypto/unedat.h"
#include "Emu/System.h" #include "Emu/System.h"

View file

@ -6,7 +6,6 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include <string> #include <string>
#include <mutex>
// Open Flags // Open Flags
enum : s32 enum : s32

View file

@ -10,6 +10,7 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#include "Emu/Cell/timers.hpp"
#include "sys_game.h" #include "sys_game.h"
LOG_CHANNEL(sys_game); LOG_CHANNEL(sys_game);

View file

@ -1,7 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "sys_hid.h" #include "sys_hid.h"
#include "Emu/Memory/vm.h"
#include "Emu/Memory/vm_var.h" #include "Emu/Memory/vm_var.h"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"

View file

@ -7,7 +7,6 @@
#include "Emu/Cell/SPUThread.h" #include "Emu/Cell/SPUThread.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "util/vm.hpp"
#include "util/asm.hpp" #include "util/asm.hpp"
LOG_CHANNEL(sys_memory); LOG_CHANNEL(sys_memory);

Some files were not shown because too many files have changed in this diff Show more