From 11c0d79045caac4588bc716f1a6eb9498ce09aa7 Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Tue, 31 Oct 2023 14:04:35 +0200 Subject: [PATCH] refactoring system service --- CMakeLists.txt | 6 +++--- src/Core/PS4/HLE/Libs.cpp | 4 ++-- .../HLE/Libraries/LibSystemService/system_service.h | 11 ----------- .../libraries/libsystemservice}/system_service.cpp | 8 ++++---- .../hle/libraries/libsystemservice/system_service.h | 11 +++++++++++ 5 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 src/Emulator/HLE/Libraries/LibSystemService/system_service.h rename src/{Emulator/HLE/Libraries/LibSystemService => core/hle/libraries/libsystemservice}/system_service.cpp (57%) create mode 100644 src/core/hle/libraries/libsystemservice/system_service.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f1dc3ba..31cbdc72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,8 @@ set(PAD_SOURCES src/core/hle/libraries/libpad/pad.cpp src/core/hle/libraries/libpad/pad.h ) -set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp - src/Emulator/HLE/Libraries/LibSystemService/system_service.h +set(SYSTEMSERVICE_SOURCES src/core/hle/libraries/libsystemservice/system_service.cpp + src/core/hle/libraries/libsystemservice/system_service.h ) set(FILESYSTEM_SOURCES src/core/hle/libraries/libkernel/file_system.cpp @@ -98,7 +98,7 @@ add_executable(shadps4 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/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) diff --git a/src/Core/PS4/HLE/Libs.cpp b/src/Core/PS4/HLE/Libs.cpp index 74a80786..18bc52ec 100644 --- a/src/Core/PS4/HLE/Libs.cpp +++ b/src/Core/PS4/HLE/Libs.cpp @@ -6,7 +6,7 @@ #include #include "core/hle/libraries/libuserservice/user_service.h" #include "core/hle/libraries/libpad/pad.h" -#include +#include namespace HLE::Libs { @@ -17,6 +17,6 @@ void Init_HLE_Libs(SymbolsResolver *sym) { LibSceGnmDriver::LibSceGnmDriver_Register(sym); Core::Libraries::LibUserService::userServiceSymbolsRegister(sym); Core::Libraries::LibPad::padSymbolsRegister(sym); - Emulator::HLE::Libraries::LibSystemService::libSystemService_Register(sym); + Core::Libraries::LibSystemService::systemServiceSymbolsRegister(sym); } } // namespace HLE::Libs \ No newline at end of file diff --git a/src/Emulator/HLE/Libraries/LibSystemService/system_service.h b/src/Emulator/HLE/Libraries/LibSystemService/system_service.h deleted file mode 100644 index bb4e98a0..00000000 --- a/src/Emulator/HLE/Libraries/LibSystemService/system_service.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -#include "core/PS4/Loader/SymbolsResolver.h" - -namespace Emulator::HLE::Libraries::LibSystemService { - -//HLE functions -s32 PS4_SYSV_ABI sceSystemServiceHideSplashScreen(); - -void libSystemService_Register(SymbolsResolver* sym); - -}; // namespace Emulator::HLE::Libraries::LibUserService \ No newline at end of file diff --git a/src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp b/src/core/hle/libraries/libsystemservice/system_service.cpp similarity index 57% rename from src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp rename to src/core/hle/libraries/libsystemservice/system_service.cpp index 354241ce..42b2b5e2 100644 --- a/src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp +++ b/src/core/hle/libraries/libsystemservice/system_service.cpp @@ -1,16 +1,16 @@ #include #include - +#include #include "system_service.h" -namespace Emulator::HLE::Libraries::LibSystemService { +namespace Core::Libraries::LibSystemService { s32 PS4_SYSV_ABI sceSystemServiceHideSplashScreen() { - // dummy + PRINT_DUMMY_FUNCTION_NAME(); return SCE_OK; } -void libSystemService_Register(SymbolsResolver* sym) { +void systemServiceSymbolsRegister(SymbolsResolver* sym) { LIB_FUNCTION("Vo5V8KAwCmk", "libSceSystemService", 1, "libSceSystemService", 1, 1, sceSystemServiceHideSplashScreen); } }; // namespace Emulator::HLE::Libraries::LibUserService \ No newline at end of file diff --git a/src/core/hle/libraries/libsystemservice/system_service.h b/src/core/hle/libraries/libsystemservice/system_service.h new file mode 100644 index 00000000..c786a848 --- /dev/null +++ b/src/core/hle/libraries/libsystemservice/system_service.h @@ -0,0 +1,11 @@ +#pragma once +#include "core/PS4/Loader/SymbolsResolver.h" + +namespace Core::Libraries::LibSystemService { + +//HLE functions +s32 PS4_SYSV_ABI sceSystemServiceHideSplashScreen(); + +void systemServiceSymbolsRegister(SymbolsResolver* sym); + +}; // namespace Emulator::HLE::Libraries::LibUserService \ No newline at end of file