3 files changed, 40 insertions, 18 deletions
diff --git a/dev/launch/src/AppMain.cc b/dev/launch/src/AppMain.cc
new file mode 100644
index 00000000..eef95fba
--- /dev/null
+++ b/dev/launch/src/AppMain.cc
@@ -0,0 +1,31 @@
+/* -------------------------------------------
+
+   Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+
+   ------------------------------------------- */
+
+#include <LaunchKit/Foundation.h>
+#include <libSystem/SystemKit/Err.h>
+#include <libSystem/SystemKit/Syscall.h>
+
+/// @note This called by _NeMain from its own runtime.
+extern "C" SInt32 nelaunch_startup_fn(Void) {
+  /// @todo Start LaunchServices.fwrk services, make the launcher manageable too (via mgmt.launch)
+
+  NELAUNCH_INFO("Turning on launcher...");
+
+  UInt32* ret = (UInt32*) libsys_syscall_arg_1(libsys_hash_64("__launch_register_pid0"));
+
+  if (ret) {
+    switch (*ret) {
+      case kErrorSuccess: {
+        libsys_syscall_arg_1(libsys_hash_64("__launch_listen_as_root"));
+        return *ret;
+      }
+      default:
+        break;
+    }
+  }
+
+  return kErrorExecutable;
+}
diff --git a/dev/launch/src/CRT0.S b/dev/launch/src/CRuntimeZero.S
index 84a293e6..8892c661 100644
--- a/dev/launch/src/CRT0.S
+++ b/dev/launch/src/CRuntimeZero.S
@@ -4,15 +4,23 @@
 
    ------------------------------------------- */
 
- .text
+.text
 
 .extern nelaunch_startup_fn
+.extern ThrExitMainThread
 .globl _NeMain
 
 _NeMain:
   push %rbp
   movq %rsp, %rbp
   callq nelaunch_startup_fn
+  xor %rax, %rax
+  popq %rbp
+
+  push %rbp
+  movq %rsp, %rbp
+  movq %rcx, 0
+  callq ThrExitMainThread
   popq %rbp
 
   retq
diff --git a/dev/launch/src/LaunchSrv.cc b/dev/launch/src/LaunchSrv.cc
deleted file mode 100644
index b79fedf5..00000000
--- a/dev/launch/src/LaunchSrv.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -------------------------------------------
-
-   Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
-
-   ------------------------------------------- */
-
-#include <LaunchKit/LaunchKit.h>
-#include <libSystem/SystemKit/Err.h>
-
-/// @note This called by _NeMain from its own runtime.
-extern "C" SInt32 nelaunch_startup_fn(Void) {
-  /// @todo Start LaunchServices.fwrk services, make the launcher manageable too (via mgmt.launch)
-
-  NELAUNCH_INFO("Registering NeKernel Launcher...");
-
-  return kErrorSuccess;
-}