diff --git a/CMakeLists.txt b/CMakeLists.txt index 53c4ac01..60b0cbfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories(third-party/zydis/include/Zydis) include_directories(third-party/winpthread/include) add_subdirectory("third-party") #=================== EXAMPLE =================== +include_directories(src) add_executable(shadps4 src/main.cpp diff --git a/src/Core/PS4/HLE/Kernel/MemMngCodes.h b/src/Core/PS4/HLE/Kernel/MemMngCodes.h index 71251a4f..fde25a08 100644 --- a/src/Core/PS4/HLE/Kernel/MemMngCodes.h +++ b/src/Core/PS4/HLE/Kernel/MemMngCodes.h @@ -1,11 +1,11 @@ #pragma once -#include "../../../../types.h" +#include // constants -constexpr u64 SCE_KERNEL_MAIN_DMEM_SIZE = 5376_MB;// ~ 6GB +constexpr u64 SCE_KERNEL_MAIN_DMEM_SIZE = 5376_MB; // ~ 6GB -//memory types -constexpr int SCE_KERNEL_WB_ONION = 0;//write - back mode (Onion bus) -constexpr int SCE_KERNEL_WC_GARLIC = 3;//write - combining mode (Garlic bus) -constexpr int SCE_KERNEL_WB_GARLIC = 10;//write - back mode (Garlic bus) +// memory types +constexpr int SCE_KERNEL_WB_ONION = 0; // write - back mode (Onion bus) +constexpr int SCE_KERNEL_WC_GARLIC = 3; // write - combining mode (Garlic bus) +constexpr int SCE_KERNEL_WB_GARLIC = 10; // write - back mode (Garlic bus) diff --git a/src/Core/PS4/HLE/Kernel/MemoryManagement.h b/src/Core/PS4/HLE/Kernel/MemoryManagement.h index 2ce4bf6d..3cc6a489 100644 --- a/src/Core/PS4/HLE/Kernel/MemoryManagement.h +++ b/src/Core/PS4/HLE/Kernel/MemoryManagement.h @@ -1,10 +1,10 @@ #pragma once -#include "../../../../types.h" +#include namespace HLE::Libs::LibKernel::MemoryManagement { - u64 PS4_SYSV_ABI sceKernelGetDirectMemorySize(); - int PS4_SYSV_ABI sceKernelAllocateDirectMemory(s64 searchStart, s64 searchEnd, u64 len, u64 alignment, int memoryType, s64* physAddrOut); +u64 PS4_SYSV_ABI sceKernelGetDirectMemorySize(); +int PS4_SYSV_ABI sceKernelAllocateDirectMemory(s64 searchStart, s64 searchEnd, u64 len, u64 alignment, int memoryType, s64* physAddrOut); -}; \ No newline at end of file +}; // namespace HLE::Libs::LibKernel::MemoryManagement \ No newline at end of file diff --git a/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h b/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h index 116f86e1..71d2e076 100644 --- a/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h +++ b/src/Core/PS4/HLE/Kernel/Objects/physical_memory.h @@ -1,7 +1,7 @@ #pragma once -#include +#include -#include "../../../../../types.h" +#include namespace HLE::Kernel::Objects {