Merge pull request #136 from shadps4-emu/more_kernel_stuff_and_others

More kernel stuff and others

src/core/libraries/kernel/event_queues.cpp

@@ -64,13 +64,17 @@ int PS4_SYSV_ABI sceKernelWaitEqueue(SceKernelEqueue eq, SceKernelEvent* ev, int
     if (timo != nullptr) {
         // Only events that have already arrived at the time of this function call can be received
         if (*timo == 0) {
-            UNREACHABLE();
+            *out = eq->getTriggeredEvents(ev, num);
         } else {
             // Wait until an event arrives with timing out
-            UNREACHABLE();
+            *out = eq->waitForEvents(ev, num, *timo);
         }
     }
 
+    if (*out == 0) {
+        return ORBIS_KERNEL_ERROR_ETIMEDOUT;
+    }
+
     return ORBIS_OK;
 }
 

src/core/libraries/kernel/libkernel.cpp

@@ -23,6 +23,7 @@
 #else
 #include <sys/mman.h>
 #endif
+#include <core/file_format/psf.h>
 
 namespace Libraries::Kernel {
 
@@ -181,6 +182,21 @@ int PS4_SYSV_ABI sceKernelConvertUtcToLocaltime(time_t time, time_t* local_time,
     return ORBIS_OK;
 }
 
+int PS4_SYSV_ABI sceKernelGetCompiledSdkVersion(int* ver) {
+    auto* param_sfo = Common::Singleton<PSF>::Instance();
+    int version = param_sfo->GetInteger("SYSTEM_VER");
+    LOG_INFO(Kernel, "returned system version = {:#x}", version);
+    *ver = version;
+    return ORBIS_OK;
+}
+
+s64 PS4_SYSV_ABI ps4__read(int d, void* buf, u64 nbytes) {
+    ASSERT_MSG(d == 0, "d is not 0!");
+
+    return static_cast<s64>(
+        strlen(std::fgets(static_cast<char*>(buf), static_cast<int>(nbytes), stdin)));
+}
+
 void LibKernel_Register(Core::Loader::SymbolsResolver* sym) {
     // obj
     LIB_OBJ("f7uOxY9mM1U", "libkernel", 1, "libkernel", 1, 1, &g_stack_chk_guard);
@@ -207,6 +223,8 @@ void LibKernel_Register(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("YSHRBRLn2pI", "libkernel", 1, "libkernel", 1, 1, _writev);
     LIB_FUNCTION("959qrazPIrg", "libkernel", 1, "libkernel", 1, 1, sceKernelGetProcParam);
     LIB_FUNCTION("-o5uEDpN+oY", "libkernel", 1, "libkernel", 1, 1, sceKernelConvertUtcToLocaltime);
+    LIB_FUNCTION("WB66evu8bsU", "libkernel", 1, "libkernel", 1, 1, sceKernelGetCompiledSdkVersion);
+    LIB_FUNCTION("DRuBt2pvICk", "libkernel", 1, "libkernel", 1, 1, ps4__read);
 
     Libraries::Kernel::fileSystemSymbolsRegister(sym);
     Libraries::Kernel::timeSymbolsRegister(sym);

src/core/libraries/kernel/thread_management.cpp

@@ -987,6 +987,10 @@ int PS4_SYSV_ABI scePthreadMutexTrylock(ScePthreadMutex* mutex) {
     }
 }
 
+int PS4_SYSV_ABI scePthreadEqual(ScePthread thread1, ScePthread thread2) {
+    return (thread1 == thread2 ? 1 : 0);
+}
+
 void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("4+h9EzwKF4I", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrSetschedpolicy);
     LIB_FUNCTION("-Wreprtu0Qs", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrSetdetachstate);
@@ -995,6 +999,7 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) {
     LIB_FUNCTION("nsYoNRywwNg", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrInit);
     LIB_FUNCTION("62KCwEMmzcM", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrDestroy);
     LIB_FUNCTION("4qGrR6eoP9Y", "libkernel", 1, "libkernel", 1, 1, scePthreadDetach);
+    LIB_FUNCTION("3PtV6p3QNX4", "libkernel", 1, "libkernel", 1, 1, scePthreadEqual);
 
     LIB_FUNCTION("aI+OeCz8xrQ", "libkernel", 1, "libkernel", 1, 1, scePthreadSelf);
     LIB_FUNCTION("EotR8a3ASf4", "libkernel", 1, "libkernel", 1, 1, pthread_self);