Merge branch 'RPCSX:master' into devel

qurious-pixel · Oct 31, 2023 · 79e6593 · 79e6593
2 parents 44c744d + 9fe1fb8
commit 79e6593
Show file tree

Hide file tree

Showing 13 changed files with 342 additions and 141 deletions.
diff --git a/orbis-kernel/include/orbis/AppInfo.hpp b/orbis-kernel/include/orbis/AppInfo.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "orbis-config.hpp"
+
+namespace orbis {
+struct AppInfo {
+  uint32_t appId;
+  uint32_t unk0;
+  uint32_t unk1;
+  uint32_t appType;
+  char titleId[10];
+  uint16_t unk2;
+  uint32_t unk3;
+  slong unk4;
+  slong unk5;
+  slong unk6;
+  slong unk7;
+  slong unk8;
+};
+static_assert(sizeof(AppInfo) == 72);
+} // namespace orbis
diff --git a/orbis-kernel/include/orbis/evf.hpp b/orbis-kernel/include/orbis/evf.hpp
@@ -1,10 +1,8 @@
 #pragma once
 #include "KernelAllocator.hpp"
 #include "thread/Thread.hpp"
-#include "utils/SharedCV.hpp"
 #include "utils/SharedMutex.hpp"
 #include <atomic>
-#include <condition_variable>
 
 namespace orbis {
 enum {

diff --git a/orbis-kernel/include/orbis/thread/Process.hpp b/orbis-kernel/include/orbis/thread/Process.hpp
@@ -7,6 +7,7 @@
 #include "../thread/Thread.hpp"
 #include "../thread/types.hpp"
 #include "ProcessState.hpp"
+#include "orbis/AppInfo.hpp"
 #include "orbis/file.hpp"
 #include "orbis/module/Module.hpp"
 #include "orbis/utils/IdMap.hpp"
@@ -53,10 +54,10 @@ struct Process final {
   ptr<void> processParam = nullptr;
   uint64_t processParamSize = 0;
   const ProcessOps *ops = nullptr;
+  AppInfo appInfo{};
 
   std::uint64_t nextTlsSlot = 1;
   std::uint64_t lastTlsOffset = 0;
-  bool isSystem = false;
 
   utils::RcIdMap<EventFlag, sint, 4097, 1> evfMap;
   utils::RcIdMap<Semaphore, sint, 4097, 1> semMap;

diff --git a/orbis-kernel/include/orbis/thread/ProcessOps.hpp b/orbis-kernel/include/orbis/thread/ProcessOps.hpp
@@ -71,6 +71,8 @@ struct ProcessOps {
   SysResult (*thr_set_name)(Thread *thread, slong id, ptr<const char> name);
 
   SysResult (*fork)(Thread *thread, slong status);
+  SysResult (*execve)(Thread *thread, ptr<char> fname, ptr<ptr<char>> argv,
+                      ptr<ptr<char>> envv);
   SysResult (*exit)(Thread *thread, sint status);
 
   SysResult (*processNeeded)(Thread *thread);

diff --git a/orbis-kernel/src/sys/sys_event.cpp b/orbis-kernel/src/sys/sys_event.cpp
@@ -4,8 +4,10 @@
 #include "thread/Process.hpp"
 #include "utils/Logs.hpp"
 #include "utils/SharedMutex.hpp"
+#include <chrono>
 #include <list>
 #include <span>
+#include <thread>
 
 namespace orbis {
 struct KEvent {
@@ -110,7 +112,6 @@ orbis::SysResult orbis::sys_kevent(Thread *thread, sint fd,
     return orbis::ErrorCode::BADF;
   }
 
-
   if (nchanges != 0) {
     for (auto change : std::span(changelist, nchanges)) {
       ORBIS_LOG_TODO(__FUNCTION__, change.ident, change.filter, change.flags,
@@ -148,6 +149,12 @@ orbis::SysResult orbis::sys_kevent(Thread *thread, sint fd,
     if (note.event.filter == kEvFiltDisplay || note.event.filter == kEvFiltGraphicsCore) {
       result.push_back(note.event);
     }
+    if (note.event.filter == kEvFiltProc) {
+      // TODO
+      std::this_thread::sleep_for(std::chrono::milliseconds(500));
+      note.event.data = 0;
+      result.push_back(note.event);
+    }
   }
 
   std::memcpy(eventlist, result.data(), result.size() * sizeof(KEvent));

diff --git a/orbis-kernel/src/sys/sys_exec.cpp b/orbis-kernel/src/sys/sys_exec.cpp
@@ -2,6 +2,10 @@
 
 orbis::SysResult orbis::sys_execve(Thread *thread, ptr<char> fname,
                                    ptr<ptr<char>> argv, ptr<ptr<char>> envv) {
+  if (auto execve = thread->tproc->ops->execve) {
+    return execve(thread, fname, argv, envv);
+  }
+
   return ErrorCode::NOSYS;
 }
 orbis::SysResult orbis::sys_fexecve(Thread *thread, sint fd,

diff --git a/orbis-kernel/src/sys/sys_pipe.cpp b/orbis-kernel/src/sys/sys_pipe.cpp
@@ -1,9 +1,13 @@
 #include "sys/sysproto.hpp"
+#include "utils/Logs.hpp"
 #include <pipe.hpp>
 
 orbis::SysResult orbis::sys_pipe(Thread *thread) {
   auto pipe = createPipe();
-  thread->retval[0] = thread->tproc->fileDescriptors.insert(pipe);
-  thread->retval[1] = thread->tproc->fileDescriptors.insert(pipe);
+  auto fd0 = thread->tproc->fileDescriptors.insert(pipe);
+  auto fd1 = thread->tproc->fileDescriptors.insert(pipe);
+  ORBIS_LOG_ERROR(__FUNCTION__, fd0, fd1);
+  thread->retval[0] = fd0;
+  thread->retval[1] = fd1;
   return {};
 }