File cleanup pt3

CMakeLists.txt

@@ -208,10 +208,10 @@ set(KERNEL_LIB src/core/libraries/kernel/threads/condvar.cpp
                src/core/libraries/kernel/threads/pthread.h
                src/core/libraries/kernel/threads/thread_state.cpp
                src/core/libraries/kernel/threads/thread_state.h
-               src/core/libraries/kernel/cpu_management.cpp
-               src/core/libraries/kernel/cpu_management.h
-               src/core/libraries/kernel/event_queues.cpp
-               src/core/libraries/kernel/event_queues.h
+               src/core/libraries/kernel/process.cpp
+               src/core/libraries/kernel/process.h
+               src/core/libraries/kernel/equeue.cpp
+               src/core/libraries/kernel/equeue.h
                src/core/libraries/kernel/file_system.cpp
                src/core/libraries/kernel/file_system.h
                src/core/libraries/kernel/kernel.cpp

src/core/libraries/gnmdriver/gnmdriver.cpp

@@ -12,7 +12,7 @@
 #include "core/address_space.h"
 #include "core/debug_state.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/cpu_management.h"
+#include "core/libraries/kernel/process.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/videoout/video_out.h"
 #include "core/platform.h"

src/core/libraries/gnmdriver/gnmdriver.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include "common/types.h"
-#include "core/libraries/kernel/event_queues.h"
+#include "core/libraries/kernel/equeue.h"
 
 namespace Core::Loader {
 class SymbolsResolver;

src/core/libraries/kernel/cpu_management.cpp

@@ -1,23 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "common/config.h"
-#include "common/elf_info.h"
-#include "common/logging/log.h"
-#include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/cpu_management.h"
-
-namespace Libraries::Kernel {
-
-int PS4_SYSV_ABI sceKernelIsNeoMode() {
-    LOG_DEBUG(Kernel_Sce, "called");
-    return Config::isNeoMode();
-}
-
-int PS4_SYSV_ABI sceKernelGetCompiledSdkVersion(int* ver) {
-    int version = Common::ElfInfo::Instance().RawFirmwareVer();
-    *ver = version;
-    return (version > 0) ? ORBIS_OK : ORBIS_KERNEL_ERROR_EINVAL;
-}
-
-} // namespace Libraries::Kernel

src/core/libraries/kernel/equeue.cpp

@@ -5,7 +5,7 @@
 #include "common/debug.h"
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/event_queues.h"
+#include "core/libraries/kernel/equeue.h"
 #include "core/libraries/libs.h"
 
 namespace Libraries::Kernel {

src/core/libraries/kernel/kernel.cpp

@@ -13,11 +13,11 @@
 #include "common/thread.h"
 #include "core/file_sys/fs.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/cpu_management.h"
-#include "core/libraries/kernel/event_queues.h"
+#include "core/libraries/kernel/equeue.h"
 #include "core/libraries/kernel/file_system.h"
 #include "core/libraries/kernel/kernel.h"
 #include "core/libraries/kernel/memory.h"
+#include "core/libraries/kernel/process.h"
 #include "core/libraries/kernel/threads.h"
 #include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
@@ -69,11 +69,6 @@ static void KernelServiceThread(std::stop_token stoken) {
     }
 }
 
-static void* PS4_SYSV_ABI sceKernelGetProcParam() {
-    auto* linker = Common::Singleton<Core::Linker>::Instance();
-    return reinterpret_cast<void*>(linker->GetProcParam());
-}
-
 static PS4_SYSV_ABI void stack_chk_fail() {
     UNREACHABLE();
 }
@@ -277,10 +272,6 @@ int PS4_SYSV_ABI sceKernelDebugRaiseException() {
     return 0;
 }
 
-int PS4_SYSV_ABI sceKernelGetCpumode() {
-    return 0;
-}
-
 void PS4_SYSV_ABI sched_yield() {
     return std::this_thread::yield();
 }
@@ -338,6 +329,7 @@ void RegisterKernel(Core::Loader::SymbolsResolver* sym) {
     Libraries::Kernel::RegisterKernelEventFlag(sym);
     Libraries::Kernel::RegisterMemory(sym);
     Libraries::Kernel::RegisterEventQueue(sym);
+    Libraries::Kernel::RegisterProcess(sym);
 
     LIB_OBJ("f7uOxY9mM1U", "libkernel", 1, "libkernel", 1, 1, &g_stack_chk_guard);
     LIB_FUNCTION("JGfTMBOdUJo", "libkernel", 1, "libkernel", 1, 1, sceKernelGetFsSandboxRandomWord);
@@ -348,14 +340,10 @@ void RegisterKernel(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("LwG8g3niqwA", "libkernel", 1, "libkernel", 1, 1, sceKernelDlsym);
     LIB_FUNCTION("RpQJJVKTiFM", "libkernel", 1, "libkernel", 1, 1, sceKernelGetModuleInfoForUnwind);
     LIB_FUNCTION("f7KBOafysXo", "libkernel", 1, "libkernel", 1, 1, sceKernelGetModuleInfoFromAddr);
-    LIB_FUNCTION("VOx8NGmHXTs", "libkernel", 1, "libkernel", 1, 1, sceKernelGetCpumode);
     LIB_FUNCTION("Xjoosiw+XPI", "libkernel", 1, "libkernel", 1, 1, sceKernelUuidCreate);
-    LIB_FUNCTION("WslcK1FQcGI", "libkernel", 1, "libkernel", 1, 1, sceKernelIsNeoMode);
     LIB_FUNCTION("Ou3iL1abvng", "libkernel", 1, "libkernel", 1, 1, stack_chk_fail);
     LIB_FUNCTION("9BcDykPmo1I", "libkernel", 1, "libkernel", 1, 1, __Error);
     LIB_FUNCTION("YSHRBRLn2pI", "libkernel", 1, "libkernel", 1, 1, _writev);
-    LIB_FUNCTION("959qrazPIrg", "libkernel", 1, "libkernel", 1, 1, sceKernelGetProcParam);
-    LIB_FUNCTION("WB66evu8bsU", "libkernel", 1, "libkernel", 1, 1, sceKernelGetCompiledSdkVersion);
     LIB_FUNCTION("DRuBt2pvICk", "libkernel", 1, "libkernel", 1, 1, ps4__read);
     LIB_FUNCTION("k+AXqu2-eBc", "libScePosix", 1, "libkernel", 1, 1, posix_getpagesize);
     LIB_FUNCTION("NWtTN10cJzE", "libSceLibcInternalExt", 1, "libSceLibcInternal", 1, 1,

src/core/libraries/kernel/process.cpp

@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "common/config.h"
+#include "common/elf_info.h"
+#include "common/logging/log.h"
+#include "core/libraries/error_codes.h"
+#include "core/libraries/kernel/process.h"
+#include "core/libraries/libs.h"
+#include "core/linker.h"
+
+namespace Libraries::Kernel {
+
+int PS4_SYSV_ABI sceKernelIsNeoMode() {
+    LOG_DEBUG(Kernel_Sce, "called");
+    return Config::isNeoMode();
+}
+
+int PS4_SYSV_ABI sceKernelGetCompiledSdkVersion(int* ver) {
+    int version = Common::ElfInfo::Instance().RawFirmwareVer();
+    *ver = version;
+    return (version > 0) ? ORBIS_OK : ORBIS_KERNEL_ERROR_EINVAL;
+}
+
+int PS4_SYSV_ABI sceKernelGetCpumode() {
+    return 0;
+}
+
+void* PS4_SYSV_ABI sceKernelGetProcParam() {
+    auto* linker = Common::Singleton<Core::Linker>::Instance();
+    return linker->GetProcParam();
+}
+
+void RegisterProcess(Core::Loader::SymbolsResolver* sym) {
+    LIB_FUNCTION("WB66evu8bsU", "libkernel", 1, "libkernel", 1, 1, sceKernelGetCompiledSdkVersion);
+    LIB_FUNCTION("WslcK1FQcGI", "libkernel", 1, "libkernel", 1, 1, sceKernelIsNeoMode);
+    LIB_FUNCTION("VOx8NGmHXTs", "libkernel", 1, "libkernel", 1, 1, sceKernelGetCpumode);
+    LIB_FUNCTION("959qrazPIrg", "libkernel", 1, "libkernel", 1, 1, sceKernelGetProcParam);
+}
+
+} // namespace Libraries::Kernel

src/core/libraries/kernel/process.h

@@ -5,10 +5,16 @@
 
 #include "common/types.h"
 
+namespace Core::Loader {
+class SymbolsResolver;
+}
+
 namespace Libraries::Kernel {
 
 int PS4_SYSV_ABI sceKernelIsNeoMode();
 
 int PS4_SYSV_ABI sceKernelGetCompiledSdkVersion(int* ver);
 
+void RegisterProcess(Core::Loader::SymbolsResolver* sym);
+
 } // namespace Libraries::Kernel

src/core/libraries/rtc/rtc.cpp

@@ -5,7 +5,7 @@
 
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
-#include "core/libraries/kernel/cpu_management.h"
+#include "core/libraries/kernel/process.h"
 #include "core/libraries/kernel/time.h"
 #include "core/libraries/libs.h"
 #include "core/libraries/rtc/rtc.h"

src/core/libraries/videoout/video_out.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "core/libraries/kernel/event_queues.h"
+#include "core/libraries/kernel/equeue.h"
 #include "core/libraries/videoout/buffer.h"
 
 namespace Core::Loader {