From fca7e2533bfd9ed5fd678aeec2600d1c13a2c5c8 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 15 Mar 2026 13:04:33 +0100 Subject: [CHORE] Add PThread core features and NeLaunch ProgramData feature. Signed-off-by: Amlal El Mahrouss --- src/launch/src/CRuntimeZero.S | 18 ++++++++++++++++-- src/launch/src/RuntimeMain.cpp | 4 ++-- src/libPThread/PThreadKit/Thread.h | 14 ++++++++++++++ src/libPThread/PThreadKit/pthread.h | 14 -------------- src/libPThread/src/PThreadHandle.cpp | 0 src/libPThread/src/Thread.cpp | 33 +++++++++++++++++++++++++++++++++ src/libSystem/SystemKit/System.h | 1 + 7 files changed, 66 insertions(+), 18 deletions(-) create mode 100644 src/libPThread/PThreadKit/Thread.h delete mode 100644 src/libPThread/PThreadKit/pthread.h delete mode 100644 src/libPThread/src/PThreadHandle.cpp create mode 100644 src/libPThread/src/Thread.cpp (limited to 'src') diff --git a/src/launch/src/CRuntimeZero.S b/src/launch/src/CRuntimeZero.S index 7dd283c9..2a7b195d 100644 --- a/src/launch/src/CRuntimeZero.S +++ b/src/launch/src/CRuntimeZero.S @@ -20,7 +20,21 @@ _NeMain: callq launch_startup_fn movq %rcx, 0 - callq ThrExitMainThread - popq %rbp + +.data +.global _ProgramData +_ProgramData: + //;; ident + .word 0xffeecc + //;; version + .word 0x0110 + //;; kind: 0x0 = LaunchSystem + .word 0x0 + //;; flags + .word 0x0 + //;; Launcher name + .asciz "NeKernel Launcher" + + diff --git a/src/launch/src/RuntimeMain.cpp b/src/launch/src/RuntimeMain.cpp index 3216dad0..833a2f55 100644 --- a/src/launch/src/RuntimeMain.cpp +++ b/src/launch/src/RuntimeMain.cpp @@ -12,13 +12,13 @@ IMPORT_C SInt32 launch_startup_fn(Void) { /// Start LaunchHelpers.fwrk services, and make the launcher manageable too (via mgmt.launch) UInt32* ret = - static_cast(libsys_syscall_arg_1(libsys_hash_64("__launch_register_service"))); + static_cast(libsys_syscall_arg_1(libsys_hash_64("__launch_register_service"))); // Register service based on program data. if (ret) { switch (*ret) { case kErrorSuccess: { ret = - static_cast(libsys_syscall_arg_1(libsys_hash_64("__launch_listen_as_super"))); + static_cast(libsys_syscall_arg_1(libsys_hash_64("__launch_attach_service"))); // Attach this program as the service process. return *ret; } default: diff --git a/src/libPThread/PThreadKit/Thread.h b/src/libPThread/PThreadKit/Thread.h new file mode 100644 index 00000000..053885e7 --- /dev/null +++ b/src/libPThread/PThreadKit/Thread.h @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/nekernel + +#ifndef LIBPOSIX_POSIXKIT_THREAD_H +#define LIBPOSIX_POSIXKIT_THREAD_H + +#include + +#define PTHREAD_UNSAFE /* hint */ +#define PTHREAD_SAFE /* hint */ + +#endif // LIBPOSIX_POSIXKIT_THREAD_H diff --git a/src/libPThread/PThreadKit/pthread.h b/src/libPThread/PThreadKit/pthread.h deleted file mode 100644 index 053885e7..00000000 --- a/src/libPThread/PThreadKit/pthread.h +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/nekernel - -#ifndef LIBPOSIX_POSIXKIT_THREAD_H -#define LIBPOSIX_POSIXKIT_THREAD_H - -#include - -#define PTHREAD_UNSAFE /* hint */ -#define PTHREAD_SAFE /* hint */ - -#endif // LIBPOSIX_POSIXKIT_THREAD_H diff --git a/src/libPThread/src/PThreadHandle.cpp b/src/libPThread/src/PThreadHandle.cpp deleted file mode 100644 index e69de29b..00000000 diff --git a/src/libPThread/src/Thread.cpp b/src/libPThread/src/Thread.cpp new file mode 100644 index 00000000..34a610cd --- /dev/null +++ b/src/libPThread/src/Thread.cpp @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/nekernel + +#include + +namespace POSIXKit::Detail { + + /// @brief Max path structure. + constexpr auto kMaxPathLen = 255; + static constexpr auto kCanaryValue = 0xf0f0488f; + + /// @brief Thread Information Structure. + struct ThreadFrameParams final { + SInt64 fCanary; + VoidPtr fStackPtr; + VoidPtr fCodePtr; + SizeT fCodeSz; + SizeT fStackSz; + SInt64 fThrdID; + SInt64 fUsrID, fGrpID; + SInt64* fFD{}; + SizeT fFDCnt; + Char fCWD[kMaxPathLen]; + Char fRoot[kMaxPathLen]; + ThreadRef fRef; + }; + +} // namespace POSIX::Detail + + + diff --git a/src/libSystem/SystemKit/System.h b/src/libSystem/SystemKit/System.h index 1a7298d8..4e766d9d 100644 --- a/src/libSystem/SystemKit/System.h +++ b/src/libSystem/SystemKit/System.h @@ -14,6 +14,7 @@ /// @brief Secure TTY device path. #define kSecurePrintDevicePath "/devices/stty{}{}" +/// @brief Laser-disc path (Blu-ray, DVD, CD, etc.) #define kCDDevicePath "/devices/dvd{}{}" // ------------------------------------------------------------------------------------------ // -- cgit v1.2.3