src: Move certain headers in common

src/core/FsFile.cpp

@@ -1,93 +0,0 @@
-#include "FsFile.h"
-
-namespace Common::FS {
-
-File::File() = default;
-
-File::File(const std::string& path, OpenMode mode) {
-    open(path, mode);
-}
-
-File::~File() {
-    close();
-}
-
-bool File::open(const std::string& path, OpenMode mode) {
-    close();
-#ifdef _WIN64
-    fopen_s(&m_file, path.c_str(), getOpenMode(mode));
-#else
-    m_file = std::fopen(path.c_str(), getOpenMode(mode));
-#endif
-    return isOpen();
-}
-
-bool File::close() {
-    if (!isOpen() || std::fclose(m_file) != 0) [[unlikely]] {
-            m_file = nullptr;
-            return false;
-    }
-
-    m_file = nullptr;
-    return true;
-}
-
-bool File::write(std::span<const u08> data) {
-    return isOpen() && std::fwrite(data.data(), 1, data.size(), m_file) == data.size();
-}
-
-bool File::read(void* data, u64 size) const {
-    return isOpen() && std::fread(data, 1, size, m_file) == size;
-}
-
-bool File::seek(s64 offset, SeekMode mode) {
-#ifdef _WIN64
-    if (!isOpen() || _fseeki64(m_file, offset, getSeekMode(mode)) != 0) {
-        return false;
-    }
-#else
-    if (!isOpen() || fseeko64(m_file, offset, getSeekMode(mode)) != 0) {
-        return false;
-    }
-#endif
-    return true;
-}
-
-u64 File::tell() const {
-    if (isOpen()) [[likely]] {
-#ifdef _WIN64
-            return _ftelli64(m_file);
-#else
-            return ftello64(m_file);
-#endif
-    }
-
-    return -1;
-}
-
-u64 File::getFileSize() {
-#ifdef _WIN64
-    const u64 pos = _ftelli64(m_file);
-    if (_fseeki64(m_file, 0, SEEK_END) != 0) {
-            return 0;
-    }
-
-    const u64 size = _ftelli64(m_file);
-    if (_fseeki64(m_file, pos, SEEK_SET) != 0) {
-            return 0;
-    }
-#else
-    const u64 pos = ftello64(m_file);
-    if (fseeko64(m_file, 0, SEEK_END) != 0) {
-            return 0;
-    }
-
-    const u64 size = ftello64(m_file);
-    if (fseeko64(m_file, pos, SEEK_SET) != 0) {
-            return 0;
-    }
-#endif
-    return size;
-}
-
-} // namespace Common::FS

src/core/FsFile.h

@@ -1,87 +0,0 @@
-#pragma once
-
-#include <bit>
-#include <cstdio>
-#include <string>
-#include <span>
-#include <vector>
-
-#include "../types.h"
-
-namespace Common::FS {
-
-enum class OpenMode : u32 {
-    Read = 0x1,
-    Write = 0x2,
-    ReadWrite = Read | Write
-};
-
-enum class SeekMode : u32 {
-    Set,
-    Cur,
-    End,
-};
-
-class File {
-  public:
-    File();
-    explicit File(const std::string& path, OpenMode mode = OpenMode::Read);
-    ~File();
-
-    bool open(const std::string& path, OpenMode mode = OpenMode::Read);
-    bool close();
-    bool read(void* data, u64 size) const;
-    bool write(std::span<const u08> data);
-    bool seek(s64 offset, SeekMode mode);
-    u64 getFileSize();
-    u64 tell() const;
-
-    template <typename T>
-    bool read(T& data) const {
-        return read(&data, sizeof(T));
-    }
-
-    template <typename T>
-    bool read(std::vector<T>& data) const {
-        return read(data.data(), data.size() * sizeof(T));
-    }
-
-    bool isOpen() const {
-        return m_file != nullptr;
-    }
-
-    const char* getOpenMode(OpenMode mode) const {
-        switch (mode) {
-            case OpenMode::Read:
-                return "rb";
-            case OpenMode::Write:
-                return "wb";
-            case OpenMode::ReadWrite:
-                return "r+b";
-            default:
-                return "r";
-        }
-    }
-
-    int getSeekMode(SeekMode mode) const {
-        switch (mode) {
-            case SeekMode::Set:
-                return SEEK_SET;
-            case SeekMode::Cur:
-                return SEEK_CUR;
-            case SeekMode::End:
-                return SEEK_END;
-            default:
-                return SEEK_SET;
-        }
-    }
-
-    [[nodiscard]] std::FILE* fileDescr() const {
-        return m_file;
-    }
-
-  private:
-    std::FILE* m_file{};
-};
-
-} // namespace Common::FS

src/core/PS4/GPU/gpu_memory.cpp

@@ -2,7 +2,7 @@
 
 #include <xxh3.h>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 
 void* GPU::memoryCreateObj(u64 submit_id, HLE::Libs::Graphics::GraphicCtx* ctx, void* todo /*CommandBuffer?*/, u64 virtual_addr, u64 size,
                            const GPUObject& info) {

src/core/PS4/GPU/gpu_memory.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <core/PS4/HLE/Graphics/graphics_ctx.h>
-#include <types.h>
+#include "common/types.h"
 #include <mutex>
 #include <vector>
 

src/core/PS4/GPU/tile_manager.cpp

@@ -1,5 +1,5 @@
 #include "tile_manager.h"
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include <mutex>
 
 namespace GPU {

src/core/PS4/GPU/tile_manager.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 
 namespace GPU {
 

src/core/PS4/GPU/video_out_buffer.cpp

@@ -1,8 +1,8 @@
 #include "video_out_buffer.h"
 
-#include <Util/log.h>
+#include "common/log.h"
 
-#include "debug.h"
+#include "common/debug.h"
 #include <vulkan_util.h>
 #include "tile_manager.h"
 

src/core/PS4/GPU/video_out_buffer.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include "gpu_memory.h"
 

src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp

@@ -1,7 +1,7 @@
 #include "video_out_ctx.h"
 
 #include <core/PS4/HLE/LibKernel.h>
-#include <debug.h>
+#include "common/debug.h"
 #include <core/hle/libraries/libkernel/time_management.h>
 
 namespace HLE::Graphics::Objects {

src/core/PS4/HLE/Graphics/graphics_ctx.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 #include <vector>
 #include <vulkan/vulkan_core.h>
 #include <mutex>

src/core/PS4/HLE/Graphics/graphics_render.cpp

@@ -1,6 +1,6 @@
 #include "graphics_render.h"
 #include <fmt/core.h>
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "emulator.h"
 
 static thread_local GPU::CommandPool g_command_pool;

src/core/PS4/HLE/Graphics/video_out.cpp

@@ -7,15 +7,15 @@
 #include <core/PS4/HLE/Libs.h>
 #include <core/PS4/HLE/UserManagement/UsrMngCodes.h>
 #include <Util/config.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <stdio.h>
 
 #include <magic_enum.hpp>
 #include <string>
 
 #include "Objects/video_out_ctx.h"
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "emulator.h"
 #include "graphics_render.h"
 

src/core/PS4/HLE/Graphics/video_out.h

@@ -1,7 +1,6 @@
 #pragma once
 #include <core/PS4/HLE/Kernel/event_queues.h>
 #include <core/PS4/Loader/SymbolsResolver.h>
-#include <types.h>
 
 #include <string>
 
@@ -111,4 +110,4 @@ s32 PS4_SYSV_ABI sceVideoOutGetFlipStatus(s32 handle, SceVideoOutFlipStatus* sta
 s32 PS4_SYSV_ABI sceVideoOutGetResolutionStatus(s32 handle, SceVideoOutResolutionStatus* status);
 s32 PS4_SYSV_ABI sceVideoOutOpen(SceUserServiceUserId userId, s32 busType, s32 index, const void* param);
 s32 PS4_SYSV_ABI sceVideoOutClose(s32 handle);
-}  // namespace HLE::Libs::Graphics::VideoOut
+}  // namespace HLE::Libs::Graphics::VideoOut

src/core/PS4/HLE/Kernel/Objects/event_queue.cpp

@@ -2,7 +2,7 @@
 
 #include <Lib/Timer.h>
 
-#include "debug.h"
+#include "common/debug.h"
 
 namespace HLE::Kernel::Objects {
 EqueueInternal::~EqueueInternal() {}

src/core/PS4/HLE/Kernel/Objects/event_queue.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 #include <mutex>
 #include <string>
 #include <vector>
@@ -76,4 +76,4 @@ class EqueueInternal {
     std::vector<EqueueEvent> m_events;
     std::condition_variable m_cond;
 };
-};  // namespace HLE::Kernel::Objects
+};  // namespace HLE::Kernel::Objects

src/core/PS4/HLE/Kernel/Objects/physical_memory.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 #include <core/virtual_memory.h>
 #include <core/PS4/GPU/gpu_memory.h>
 #include <mutex>

src/core/PS4/HLE/Kernel/ThreadManagement.cpp

@@ -1,6 +1,6 @@
 #include "ThreadManagement.h"
 
-#include <debug.h>
+#include "common/debug.h"
 
 #include "../ErrorCodes.h"
 

src/core/PS4/HLE/Kernel/ThreadManagement.h

@@ -3,7 +3,7 @@
 
 #include <pthread.h>
 #include <sched.h>
-#include "../../../../types.h"
+#include "common/types.h"
 #include <string>
 
 namespace HLE::Libs::LibKernel::ThreadManagement {

src/core/PS4/HLE/Kernel/cpu_management.cpp

@@ -1,6 +1,6 @@
 #include "cpu_management.h"
 #include "Util/config.h"
-#include <Util/log.h>
+#include "common/log.h"
 #include <core/PS4/HLE/Libs.h>
 
 namespace HLE::Libs::LibKernel::CPUManagement {

src/core/PS4/HLE/Kernel/cpu_management.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 
 namespace HLE::Libs::LibKernel::CPUManagement {
 int PS4_SYSV_ABI sceKernelIsNeoMode();

src/core/PS4/HLE/Kernel/event_queues.cpp

@@ -2,8 +2,8 @@
 
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 namespace HLE::Libs::LibKernel::EventQueues {
 constexpr bool log_file_equeues = true;  // disable it to disable logging

src/core/PS4/HLE/Kernel/event_queues.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <types.h>
-
 #include "Objects/event_queue.h"
 
 namespace HLE::Libs::LibKernel::EventQueues {
@@ -11,4 +9,4 @@ using SceKernelEqueue = Kernel::Objects::EqueueInternal*;
 int PS4_SYSV_ABI sceKernelCreateEqueue(SceKernelEqueue* eq, const char* name);
 int PS4_SYSV_ABI sceKernelWaitEqueue(SceKernelEqueue eq, HLE::Kernel::Objects::SceKernelEvent* ev, int num, int* out, SceKernelUseconds *timo);
 
-};  // namespace HLE::Libs::LibKernel::EventQueues
+};  // namespace HLE::Libs::LibKernel::EventQueues

src/core/PS4/HLE/Kernel/memory_management.cpp

@@ -2,13 +2,13 @@
 
 #include <core/PS4/GPU/gpu_memory.h>
 #include <core/virtual_memory.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 #include <bit>
 #include <magic_enum.hpp>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "../ErrorCodes.h"
 #include "../Libs.h"
 #include "Objects/physical_memory.h"

src/core/PS4/HLE/Kernel/memory_management.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 // constants
 

src/core/PS4/HLE/LibKernel.cpp

@@ -1,10 +1,10 @@
 #include "LibKernel.h"
 
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <windows.h>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "../Loader/Elf.h"
 #include "Kernel/Objects/physical_memory.h"
 #include "Kernel/cpu_management.h"

src/core/PS4/HLE/LibSceGnmDriver.cpp

@@ -1,8 +1,8 @@
 #include "LibSceGnmDriver.h"
 #include "Libs.h"
 #include "../Loader/Elf.h"
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <core/PS4/GPU/gpu_memory.h>
 #include <emulator.h>
 

src/core/PS4/Linker.cpp

@@ -1,9 +1,9 @@
 #include "Linker.h"
 #include "../virtual_memory.h"
-#include <Util/log.h>
+#include "common/log.h"
 #include <fmt/core.h>
 #include <Zydis/Zydis.h>
-#include <Util/string_util.h>
+#include "common/string_util.h"
 #include "Util/aerolib.h"
 #include "Loader/SymbolsResolver.h"
 #include "HLE/Kernel/ThreadManagement.h"

src/core/PS4/Loader/Elf.cpp

@@ -1,7 +1,7 @@
 #include "Elf.h"
 
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 #include <fmt/core.h>
 
 constexpr bool log_file_loader = true;  // disable it to disable logging

src/core/PS4/Loader/Elf.h

@@ -5,8 +5,8 @@
 #include <span>
 #include <vector>
 
-#include "../../../types.h"
-#include "../../FsFile.h"
+#include "common/types.h"
+#include "common/fs_file.h"
 
 struct self_header
 {

src/core/PS4/Loader/SymbolsResolver.cpp

@@ -1,6 +1,6 @@
-#include "../../../types.h"
+#include "common/types.h"
 #include "SymbolsResolver.h"
-#include <Util/log.h>
+#include "common/log.h"
 
 void SymbolsResolver::AddSymbol(const SymbolRes& s, u64 virtual_addr)
 {

src/core/PS4/Loader/SymbolsResolver.h

@@ -3,8 +3,7 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include "../../../types.h"
-
+#include "common/types.h"
 
 struct SymbolRecord
 {
@@ -37,4 +36,4 @@ public:
 
 private:
 	std::vector<SymbolRecord>            m_symbols;
-};
+};

src/core/PS4/Stubs.cpp

@@ -2,7 +2,7 @@
 
 #include "Util/aerolib.h"
 
-#include "Util/log.h"
+#include "common/log.h"
 
 // Helper to provide stub implementations for missing functions
 // 

src/core/PS4/Stubs.h

@@ -1,4 +1,4 @@
-#include "types.h"
+#include "common/types.h"
 
 u64 UnresolvedStub();
 u64 GetStub(const char *nid);

src/core/PS4/Util/aerolib.cpp

@@ -1,10 +1,10 @@
 #include "aerolib.h"
 
-#include "types.h"
+#include "common/types.h"
 
 #include <string.h>
 
-#include "Util/log.h"
+#include "common/log.h"
 
 namespace aerolib {
 

src/core/hle/libraries/libc/libc.cpp

@@ -1,10 +1,10 @@
 #include "libc.h"
 
-#include <debug.h>
+#include "common/debug.h"
 #include <stdlib.h>
 
-#include "Emulator/Util/singleton.h"
-#include "Util/log.h"
+#include "common/singleton.h"
+#include "common/log.h"
 #include "core/PS4/HLE/Libs.h"
 #include "core/hle/libraries/libc/libc.h"
 #include "core/hle/libraries/libc/libc_cxa.h"

src/core/hle/libraries/libc/libc.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 #include "core/PS4/Loader/SymbolsResolver.h"
 
 namespace Core::Libraries::LibC {

src/core/hle/libraries/libc/libc_cxa.cpp

@@ -1,7 +1,7 @@
 #include "libc_cxa.h"
 
-#include "Util/log.h"
-#include "debug.h"
+#include "common/log.h"
+#include "common/debug.h"
 
 // adapted from https://opensource.apple.com/source/libcppabi/libcppabi-14/src/cxa_guard.cxx.auto.html
 

src/core/hle/libraries/libc/libc_cxa.h

@@ -2,7 +2,7 @@
 #define _TIMESPEC_DEFINED
 
 #include <pthread.h>
-#include <types.h>
+#include "common/types.h"
 
 namespace Core::Libraries::LibC {
 int PS4_SYSV_ABI __cxa_guard_acquire(u64* guard_object);

src/core/hle/libraries/libc/libc_math.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 namespace Core::Libraries::LibC {
 float PS4_SYSV_ABI atan2f(float y, float x);

src/core/hle/libraries/libc/libc_stdio.cpp

@@ -1,7 +1,7 @@
 #include "libc_stdio.h"
 
-#include <debug.h>
-#include <Util/log.h>
+#include "common/debug.h"
+#include "common/log.h"
 
 namespace Core::Libraries::LibC {
 constexpr bool log_file_libc = true;  // disable it to disable logging

src/core/hle/libraries/libc/libc_stdio.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include "printf.h"
 

src/core/hle/libraries/libc/libc_stdlib.cpp

@@ -1,7 +1,7 @@
 #include "libc_stdlib.h"
 
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 #include <cstdlib>
 

src/core/hle/libraries/libc/libc_stdlib.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include <cstddef>
 

src/core/hle/libraries/libc/libc_string.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <types.h>
+#include "common/types.h"
 
 #include <cstddef>
 

src/core/hle/libraries/libc/va_ctx.h

@@ -1,4 +1,4 @@
-#include <types.h>
+#include "common/types.h"
 #include <xmmintrin.h>
 
 #define VA_ARGS                                                                                                                             \

src/core/hle/libraries/libkernel/file_system.cpp

@@ -1,8 +1,8 @@
 #include "file_system.h"
 
 #include <core/PS4/HLE/Libs.h>
-#include <Util/log.h>
-#include <debug.h>
+#include "common/log.h"
+#include "common/debug.h"
 
 namespace Core::Libraries::LibKernel {
 constexpr bool log_file_fs = true;  // disable it to disable logging

src/core/hle/libraries/libkernel/file_system.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 #include "core/PS4/Loader/SymbolsResolver.h"
 
 namespace Core::Libraries::LibKernel {

src/core/hle/libraries/libkernel/time_management.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "common/types.h"
 #include "core/PS4/Loader/SymbolsResolver.h"
 
 namespace Core::Libraries::LibKernel {

src/core/hle/libraries/libpad/pad.cpp

@@ -3,10 +3,10 @@
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
 
-#include "Emulator/Util/singleton.h"
+#include "common/singleton.h"
 #include "Emulator/Host/controller.h"
-#include <debug.h>
-#include <Util/log.h>
+#include "common/debug.h"
+#include "common/log.h"
 
 namespace Core::Libraries::LibPad {
 

src/core/hle/libraries/libpad/pad.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 
 #include "core/PS4/Loader/SymbolsResolver.h"
 #include "core/hle/libraries/libuserservice/user_service.h"

src/core/hle/libraries/libsystemservice/system_service.cpp

@@ -1,6 +1,6 @@
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
-#include <Util/log.h>
+#include "common/log.h"
 #include "system_service.h"
 
 namespace Core::Libraries::LibSystemService {

src/core/hle/libraries/libuserservice/user_service.cpp

@@ -3,7 +3,7 @@
 #include <core/PS4/HLE/ErrorCodes.h>
 #include <core/PS4/HLE/Libs.h>
 
-#include "Util/log.h"
+#include "common/log.h"
 
 namespace Core::Libraries::LibUserService {
 

src/core/virtual_memory.cpp

@@ -1,5 +1,6 @@
+#include "common/debug.h"
+#include "common/log.h"
 #include "virtual_memory.h"
-
 #include "core/PS4/Loader/Elf.h"
 
 #ifdef _WIN64
@@ -19,10 +20,6 @@ enum PosixPageProtection {
 };
 #endif
 
-#include <debug.h>
-
-#include "../Util/Log.h"
-
 namespace VirtualMemory {
 static u32 convertMemoryMode(MemoryMode mode) {
     switch (mode) {

src/core/virtual_memory.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <types.h>
+#include "common/types.h"
 
 constexpr u64 SYSTEM_RESERVED = 0x800000000u;
 constexpr u64 CODE_BASE_OFFSET = 0x100000000u;