refactoring Core folder to core
This commit is contained in:
parent
cfdc45dfcb
commit
93e75481c7
|
@ -43,8 +43,8 @@ set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_ser
|
|||
src/Emulator/HLE/Libraries/LibSystemService/system_service.h
|
||||
)
|
||||
|
||||
set(FILESYSTEM_SOURCES "src/Core/hle/libraries/libkernel/file_system.cpp"
|
||||
"src/Core/hle/libraries/libkernel/file_system.h"
|
||||
set(FILESYSTEM_SOURCES "src/core/hle/libraries/libkernel/file_system.cpp"
|
||||
"src/core/hle/libraries/libkernel/file_system.h"
|
||||
|
||||
|
||||
)
|
||||
|
@ -68,37 +68,37 @@ add_executable(shadps4
|
|||
src/Lib/Timer.h
|
||||
src/main.cpp
|
||||
src/types.h
|
||||
src/Core/FsFile.cpp
|
||||
src/Core/FsFile.h
|
||||
src/Core/PS4/Loader/Elf.cpp
|
||||
src/Core/PS4/Loader/Elf.h
|
||||
src/core/FsFile.cpp
|
||||
src/core/FsFile.h
|
||||
src/core/PS4/Loader/Elf.cpp
|
||||
src/core/PS4/Loader/Elf.h
|
||||
src/GUI/ElfViewer.cpp
|
||||
src/GUI/ElfViewer.h
|
||||
src/Util/log.h
|
||||
src/Util/log.cpp
|
||||
src/Util/config.cpp
|
||||
src/Util/config.h
|
||||
src/Core/virtual_memory.cpp
|
||||
src/Core/virtual_memory.h
|
||||
src/Core/PS4/Linker.cpp
|
||||
src/Core/PS4/Linker.h
|
||||
src/Core/PS4/Stubs.cpp
|
||||
src/Core/PS4/Stubs.h
|
||||
src/Core/PS4/Util/aerolib.cpp
|
||||
src/Core/PS4/HLE/Kernel/Objects/physical_memory.h
|
||||
src/Core/PS4/HLE/Kernel/Objects/physical_memory.cpp
|
||||
src/core/virtual_memory.cpp
|
||||
src/core/virtual_memory.h
|
||||
src/core/PS4/Linker.cpp
|
||||
src/core/PS4/Linker.h
|
||||
src/core/PS4/Stubs.cpp
|
||||
src/core/PS4/Stubs.h
|
||||
src/core/PS4/Util/aerolib.cpp
|
||||
src/core/PS4/HLE/Kernel/Objects/physical_memory.h
|
||||
src/core/PS4/HLE/Kernel/Objects/physical_memory.cpp
|
||||
src/Util/string_util.cpp
|
||||
src/Util/string_util.cpp
|
||||
src/Core/PS4/HLE/Graphics/video_out.cpp
|
||||
src/Core/PS4/HLE/Graphics/video_out.h
|
||||
src/core/PS4/HLE/Graphics/video_out.cpp
|
||||
src/core/PS4/HLE/Graphics/video_out.h
|
||||
src/discord.h
|
||||
src/discord.cpp
|
||||
src/Core/PS4/HLE/Kernel/event_queues.cpp
|
||||
src/Core/PS4/HLE/Kernel/event_queues.h
|
||||
src/Core/PS4/HLE/Kernel/cpu_management.cpp
|
||||
src/Core/PS4/HLE/Kernel/cpu_management.h
|
||||
src/core/PS4/HLE/Kernel/event_queues.cpp
|
||||
src/core/PS4/HLE/Kernel/event_queues.h
|
||||
src/core/PS4/HLE/Kernel/cpu_management.cpp
|
||||
src/core/PS4/HLE/Kernel/cpu_management.h
|
||||
|
||||
"src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/Core/PS4/Util/aerolib.h" "src/Core/PS4/Loader/SymbolsResolver.h" "src/Core/PS4/Loader/SymbolsResolver.cpp" "src/Core/PS4/HLE/Libs.cpp" "src/Core/PS4/HLE/Libs.h" "src/Core/PS4/HLE/LibC.cpp" "src/Core/PS4/HLE/LibC.h" "src/Core/PS4/HLE/LibKernel.cpp" "src/Core/PS4/HLE/LibKernel.h" "src/Core/PS4/HLE/LibSceGnmDriver.cpp" "src/Core/PS4/HLE/LibSceGnmDriver.h" "src/Core/PS4/HLE/Kernel/ThreadManagement.cpp" "src/Core/PS4/HLE/Kernel/ThreadManagement.h" "src/Core/PS4/HLE/ErrorCodes.h" "src/debug.h" "src/Core/PS4/HLE/Kernel/memory_management.cpp" "src/Core/PS4/HLE/Kernel/memory_management.h" "src/Core/PS4/GPU/gpu_memory.cpp" "src/Core/PS4/GPU/gpu_memory.h" "src/emulator.cpp" "src/emulator.h" "src/Core/PS4/HLE/Kernel/Objects/event_queue.h" "src/Core/PS4/HLE/Kernel/Objects/event_queue.cpp" "src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp" "src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.h" "src/Core/PS4/HLE/Graphics/graphics_ctx.h" "src/vulkan_util.cpp" "src/vulkan_util.h" "src/Core/PS4/GPU/video_out_buffer.cpp" "src/Core/PS4/GPU/video_out_buffer.h" "src/Core/PS4/HLE/Graphics/graphics_render.cpp" "src/Core/PS4/HLE/Graphics/graphics_render.h" "src/Core/PS4/GPU/tile_manager.cpp" "src/Core/PS4/GPU/tile_manager.h" "src/version.h" "src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp" "src/Emulator/HLE/Libraries/LibSystemService/system_service.h" "src/emuTimer.cpp" "src/emuTimer.h" "src/Core/hle/libraries/libkernel/time_management.cpp" "src/Core/hle/libraries/libkernel/time_management.h")
|
||||
"src/Util/Disassembler.cpp" "src/Util/Disassembler.h" "src/core/PS4/Util/aerolib.h" "src/core/PS4/Loader/SymbolsResolver.h" "src/core/PS4/Loader/SymbolsResolver.cpp" "src/core/PS4/HLE/Libs.cpp" "src/core/PS4/HLE/Libs.h" "src/core/PS4/HLE/LibC.cpp" "src/core/PS4/HLE/LibC.h" "src/core/PS4/HLE/LibKernel.cpp" "src/core/PS4/HLE/LibKernel.h" "src/core/PS4/HLE/LibSceGnmDriver.cpp" "src/core/PS4/HLE/LibSceGnmDriver.h" "src/core/PS4/HLE/Kernel/ThreadManagement.cpp" "src/core/PS4/HLE/Kernel/ThreadManagement.h" "src/core/PS4/HLE/ErrorCodes.h" "src/debug.h" "src/core/PS4/HLE/Kernel/memory_management.cpp" "src/core/PS4/HLE/Kernel/memory_management.h" "src/core/PS4/GPU/gpu_memory.cpp" "src/core/PS4/GPU/gpu_memory.h" "src/emulator.cpp" "src/emulator.h" "src/core/PS4/HLE/Kernel/Objects/event_queue.h" "src/core/PS4/HLE/Kernel/Objects/event_queue.cpp" "src/core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp" "src/core/PS4/HLE/Graphics/Objects/video_out_ctx.h" "src/core/PS4/HLE/Graphics/graphics_ctx.h" "src/vulkan_util.cpp" "src/vulkan_util.h" "src/core/PS4/GPU/video_out_buffer.cpp" "src/core/PS4/GPU/video_out_buffer.h" "src/core/PS4/HLE/Graphics/graphics_render.cpp" "src/core/PS4/HLE/Graphics/graphics_render.h" "src/core/PS4/GPU/tile_manager.cpp" "src/core/PS4/GPU/tile_manager.h" "src/version.h" "src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp" "src/Emulator/HLE/Libraries/LibSystemService/system_service.h" "src/emuTimer.cpp" "src/emuTimer.h" "src/core/hle/libraries/libkernel/time_management.cpp" "src/core/hle/libraries/libkernel/time_management.h")
|
||||
|
||||
find_package(OpenGL REQUIRED)
|
||||
target_link_libraries(shadps4 PUBLIC fmt mincore spdlog IMGUI SDL3-shared ${OPENGL_LIBRARY} vulkan-1 spirv-tools-opt spirv-tools)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <Core/PS4/HLE/Graphics/graphics_ctx.h>
|
||||
#include <core/PS4/HLE/Graphics/graphics_ctx.h>
|
||||
#include <types.h>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include "video_out_ctx.h"
|
||||
|
||||
#include <Core/PS4/HLE/LibKernel.h>
|
||||
#include <core/PS4/HLE/LibKernel.h>
|
||||
#include <debug.h>
|
||||
#include <Core/hle/libraries/libkernel/time_management.h>
|
||||
#include <core/hle/libraries/libkernel/time_management.h>
|
||||
|
||||
namespace HLE::Graphics::Objects {
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#include <condition_variable>
|
||||
#include <mutex>
|
||||
#include <Core/PS4/HLE/Graphics/video_out.h>
|
||||
#include <Core/PS4/HLE/Graphics/graphics_ctx.h>
|
||||
#include <core/PS4/HLE/Graphics/video_out.h>
|
||||
#include <core/PS4/HLE/Graphics/graphics_ctx.h>
|
||||
#include <emulator.h>
|
||||
|
||||
using namespace HLE::Libs::Graphics::VideoOut;
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include "video_out.h"
|
||||
|
||||
#include <Core/PS4/GPU/gpu_memory.h>
|
||||
#include <Core/PS4/GPU/video_out_buffer.h>
|
||||
#include <Core/PS4/HLE/ErrorCodes.h>
|
||||
#include <Core/PS4/HLE/LibSceGnmDriver.h>
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <Core/PS4/HLE/UserManagement/UsrMngCodes.h>
|
||||
#include <core/PS4/GPU/gpu_memory.h>
|
||||
#include <core/PS4/GPU/video_out_buffer.h>
|
||||
#include <core/PS4/HLE/ErrorCodes.h>
|
||||
#include <core/PS4/HLE/LibSceGnmDriver.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/UserManagement/UsrMngCodes.h>
|
||||
#include <Util/config.h>
|
||||
#include <Util/log.h>
|
||||
#include <debug.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
#include <Core/PS4/HLE/Kernel/event_queues.h>
|
||||
#include <Core/PS4/Loader/SymbolsResolver.h>
|
||||
#include <core/PS4/HLE/Kernel/event_queues.h>
|
||||
#include <core/PS4/Loader/SymbolsResolver.h>
|
||||
#include <types.h>
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
#include <types.h>
|
||||
#include <Core/virtual_memory.h>
|
||||
#include <Core/PS4/GPU/gpu_memory.h>
|
||||
#include <core/virtual_memory.h>
|
||||
#include <core/PS4/GPU/gpu_memory.h>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "cpu_management.h"
|
||||
#include "Util/config.h"
|
||||
#include <Util/log.h>
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
|
||||
namespace HLE::Libs::LibKernel::CPUManagement {
|
||||
int PS4_SYSV_ABI sceKernelIsNeoMode() {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "event_queues.h"
|
||||
|
||||
#include <Core/PS4/HLE/ErrorCodes.h>
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/ErrorCodes.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
#include <Util/log.h>
|
||||
#include <debug.h>
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "memory_management.h"
|
||||
|
||||
#include <Core/PS4/GPU/gpu_memory.h>
|
||||
#include <Core/virtual_memory.h>
|
||||
#include <core/PS4/GPU/gpu_memory.h>
|
||||
#include <core/virtual_memory.h>
|
||||
#include <Util/log.h>
|
||||
#include <debug.h>
|
||||
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
#include "Kernel/event_queues.h"
|
||||
#include "Kernel/memory_management.h"
|
||||
#include "Libs.h"
|
||||
#include "Core/hle/libraries/libkernel/file_system.h"
|
||||
#include "Core/hle/libraries/libkernel/time_management.h"
|
||||
#include "core/hle/libraries/libkernel/file_system.h"
|
||||
#include "core/hle/libraries/libkernel/time_management.h"
|
||||
|
||||
namespace HLE::Libs::LibKernel {
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include "../Loader/Elf.h"
|
||||
#include <Util/log.h>
|
||||
#include <debug.h>
|
||||
#include <Core/PS4/GPU/gpu_memory.h>
|
||||
#include <core/PS4/GPU/gpu_memory.h>
|
||||
#include <emulator.h>
|
||||
|
||||
namespace HLE::Libs::LibSceGnmDriver {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include "LibC.h"
|
||||
#include "LibKernel.h"
|
||||
#include "LibSceGnmDriver.h"
|
||||
#include <Core/PS4/HLE/Graphics/video_out.h>
|
||||
#include <core/PS4/HLE/Graphics/video_out.h>
|
||||
#include "Emulator/HLE/Libraries/LibUserService/user_service.h"
|
||||
#include "Emulator/HLE/Libraries/LibPad/pad.h"
|
||||
#include <Emulator/HLE/Libraries/LibSystemService/system_service.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
#include "../Loader/SymbolsResolver.h"
|
||||
#include <Core/PS4/Loader/Elf.h>
|
||||
#include <core/PS4/Loader/Elf.h>
|
||||
|
||||
#define LIB_FUNCTION(nid, lib, libversion, mod, moduleVersionMajor, moduleVersionMinor, function) \
|
||||
{\
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "file_system.h"
|
||||
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
#include <Util/log.h>
|
||||
#include <debug.h>
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
#include <types.h>
|
||||
#include "Core/PS4/Loader/SymbolsResolver.h"
|
||||
#include "core/PS4/Loader/SymbolsResolver.h"
|
||||
|
||||
namespace Core::Libraries::LibKernel {
|
||||
int PS4_SYSV_ABI sceKernelOpen(const char *path, int flags, /* SceKernelMode*/ u16 mode);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "time_management.h"
|
||||
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
#include "Lib/Timer.h"
|
||||
#include "emuTimer.h"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "types.h"
|
||||
#include "Core/PS4/Loader/SymbolsResolver.h"
|
||||
#include "core/PS4/Loader/SymbolsResolver.h"
|
||||
|
||||
namespace Core::Libraries::LibKernel {
|
||||
u64 PS4_SYSV_ABI sceKernelGetProcessTime();
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "virtual_memory.h"
|
||||
|
||||
#include "Core/PS4/Loader/Elf.h"
|
||||
#include "core/PS4/Loader/Elf.h"
|
||||
|
||||
#ifdef _WIN64
|
||||
#include <windows.h>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "pad.h"
|
||||
|
||||
#include <Core/PS4/HLE/ErrorCodes.h>
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/ErrorCodes.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
|
||||
#include "Emulator/Util/singleton.h"
|
||||
#include "Emulator/Host/controller.h"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include <Emulator/HLE/Libraries/LibUserService/user_service.h>
|
||||
#include <types.h>
|
||||
|
||||
#include "Core/PS4/Loader/SymbolsResolver.h"
|
||||
#include "core/PS4/Loader/SymbolsResolver.h"
|
||||
|
||||
namespace Emulator::HLE::Libraries::LibPad {
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include <Core/PS4/HLE/ErrorCodes.h>
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/ErrorCodes.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
|
||||
#include "system_service.h"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
#include "Core/PS4/Loader/SymbolsResolver.h"
|
||||
#include "core/PS4/Loader/SymbolsResolver.h"
|
||||
|
||||
namespace Emulator::HLE::Libraries::LibSystemService {
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "user_service.h"
|
||||
|
||||
#include <Core/PS4/HLE/ErrorCodes.h>
|
||||
#include <Core/PS4/HLE/Libs.h>
|
||||
#include <core/PS4/HLE/ErrorCodes.h>
|
||||
#include <core/PS4/HLE/Libs.h>
|
||||
|
||||
namespace Emulator::HLE::Libraries::LibUserService {
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
#include "Core/PS4/Loader/SymbolsResolver.h"
|
||||
#include "core/PS4/Loader/SymbolsResolver.h"
|
||||
|
||||
namespace Emulator::HLE::Libraries::LibUserService {
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "controller.h"
|
||||
#include <Core/hle/libraries/libkernel/time_management.h>
|
||||
#include <core/hle/libraries/libkernel/time_management.h>
|
||||
|
||||
namespace Emulator::Host::Controller {
|
||||
GameController::GameController() { m_states_num = 0;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
#include "../Core/PS4/Loader/Elf.h"
|
||||
#include "../core/PS4/Loader/Elf.h"
|
||||
|
||||
class ElfViewer {
|
||||
private:
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#include "emulator.h"
|
||||
|
||||
#include <Core/PS4/HLE/Graphics/graphics_render.h>
|
||||
#include <core/PS4/HLE/Graphics/graphics_render.h>
|
||||
#include <Emulator/Host/controller.h>
|
||||
#include <Lib/Timer.h>
|
||||
#include <fmt/core.h>
|
||||
#include <vulkan_util.h>
|
||||
|
||||
#include "Core/PS4/HLE/Graphics/video_out.h"
|
||||
#include "core/PS4/HLE/Graphics/video_out.h"
|
||||
#include "Emulator/HLE/Libraries/LibPad/pad.h"
|
||||
#include "Emulator/Util/singleton.h"
|
||||
#include "version.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <Core/PS4/HLE/Graphics/graphics_ctx.h>
|
||||
#include <core/PS4/HLE/Graphics/graphics_ctx.h>
|
||||
#include <SDL.h>
|
||||
|
||||
#include <mutex>
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
#include <fmt/core.h>
|
||||
#include "types.h"
|
||||
#include "Util/log.h"
|
||||
#include <Core/PS4/HLE/Graphics/video_out.h>
|
||||
#include <core/PS4/HLE/Graphics/video_out.h>
|
||||
#include <Util/config.h>
|
||||
#include <Zydis/Zydis.h>
|
||||
#include <emulator.h>
|
||||
#include <cinttypes>
|
||||
#include <thread>
|
||||
#include "Core/PS4/HLE/Libs.h"
|
||||
#include "Core/PS4/Linker.h"
|
||||
#include "core/PS4/HLE/Libs.h"
|
||||
#include "core/PS4/Linker.h"
|
||||
#include "Emulator/Util\singleton.h"
|
||||
#include "discord.h"
|
||||
#include "emuTimer.h"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "vulkan_util.h"
|
||||
#include <fmt/core.h>
|
||||
#include <Core/PS4/GPU/gpu_memory.h>
|
||||
#include <core/PS4/GPU/gpu_memory.h>
|
||||
#include <SDL_vulkan.h>
|
||||
#include <Emulator/Util/singleton.h>
|
||||
#include <Util/log.h>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#pragma once
|
||||
#include <Core/PS4/HLE/Graphics/graphics_render.h>
|
||||
#include <core/PS4/HLE/Graphics/graphics_render.h>
|
||||
#include <SDL.h>
|
||||
#include <src/video/khronos/vulkan/vulkan_core.h>
|
||||
|
||||
|
|
Loading…
Reference in New Issue