From 2315f84184a0bd03580ba25a59c3832e12bffbc8 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Wed, 10 Sep 2025 18:25:14 +0200 Subject: feat: kernel: abi: __cxa_guard inside CxxABI (AMD64) Signed-off-by: Amlal El Mahrouss --- dev/kernel/NeKit/CxxAbi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev/kernel/NeKit') diff --git a/dev/kernel/NeKit/CxxAbi.h b/dev/kernel/NeKit/CxxAbi.h index 164a257d..5abdf76a 100644 --- a/dev/kernel/NeKit/CxxAbi.h +++ b/dev/kernel/NeKit/CxxAbi.h @@ -17,10 +17,10 @@ struct atexit_func_entry_t { void* dso_handle; }; -typedef unsigned uarch_t; +typedef Kernel::UInt32 uarch_t; namespace cxxabiv1 { -typedef void* __guard; + typedef Kernel::SizeT* __guard; } #endif // __GNUC__ -- cgit v1.2.3 From c9f97e7ac1178bd7fba5b0ccd59aa1256900f4c2 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 11 Sep 2025 17:51:50 +0200 Subject: feat: libSystem: `Verify.h` include file, used to verify SCI's input and data. Signed-off-by: Amlal El Mahrouss --- dev/kernel/NeKit/CxxAbi.h | 2 +- dev/libSystem/SystemKit/Verify.h | 40 ++++++++++++++++++++++++++++++++++++++++ dev/libSystem/src/System.cc | 16 +++++----------- 3 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 dev/libSystem/SystemKit/Verify.h (limited to 'dev/kernel/NeKit') diff --git a/dev/kernel/NeKit/CxxAbi.h b/dev/kernel/NeKit/CxxAbi.h index 5abdf76a..839308cf 100644 --- a/dev/kernel/NeKit/CxxAbi.h +++ b/dev/kernel/NeKit/CxxAbi.h @@ -20,7 +20,7 @@ struct atexit_func_entry_t { typedef Kernel::UInt32 uarch_t; namespace cxxabiv1 { - typedef Kernel::SizeT* __guard; +typedef Kernel::SizeT* __guard; } #endif // __GNUC__ diff --git a/dev/libSystem/SystemKit/Verify.h b/dev/libSystem/SystemKit/Verify.h new file mode 100644 index 00000000..68e75d47 --- /dev/null +++ b/dev/libSystem/SystemKit/Verify.h @@ -0,0 +1,40 @@ +/* ------------------------------------------- + + Copyright (C) 2025, Amlal El Mahrouss, all rights reserved. + + File: Verify.h + Purpose: System Call Interface Verification Layer. + + ------------------------------------------- */ + +#pragma once + +#include + +namespace LibSystem::Detail { +/// @author 0xf00sec, and Amlal El Mahrouss +/// @brief safe cast operator. +template +static R sys_safe_cast(const T* ptr) { + _rtl_assert(ptr, "safe cast failed!"); + return static_cast(const_cast(ptr)); +} + +template +struct must_cast_traits { + constexpr static BOOL value = false; +}; + +template +struct must_cast_traits { + constexpr static BOOL value = true; +}; + +/// @author Amlal El Mahrouss +/// @brief Safe constexpr cast. +template +constexpr R* sys_constexpr_cast(T* ptr) { + static_assert(must_cast_traits::value, "constexpr cast failed! types are a mismatch!"); + return static_cast(ptr); +} +} // namespace LibSystem::Detail diff --git a/dev/libSystem/src/System.cc b/dev/libSystem/src/System.cc index 2215c4d8..da9931fe 100644 --- a/dev/libSystem/src/System.cc +++ b/dev/libSystem/src/System.cc @@ -7,14 +7,9 @@ #include #include #include +#include -namespace Detail { -template -static VoidPtr safe_void_cast(const T* ptr) { - _rtl_assert(ptr, "safe void cast failed!"); - return static_cast(const_cast(ptr)); -} -} // namespace Detail +using namespace LibSystem; IMPORT_C Void _rtl_assert(Bool expr, const Char* origin) { if (!expr) { @@ -151,9 +146,8 @@ IMPORT_C VoidPtr MmFillMemory(_Input VoidPtr dest, _Input SizeT len, _Input UInt } IMPORT_C Ref IoOpenFile(_Input const Char* path, _Input const Char* drv_letter) { - return static_cast(libsys_syscall_arg_3(SYSCALL_HASH("IoOpenFile"), - Detail::safe_void_cast(path), - Detail::safe_void_cast(drv_letter))); + return static_cast(libsys_syscall_arg_3( + SYSCALL_HASH("IoOpenFile"), Detail::sys_safe_cast(path), Detail::sys_safe_cast(drv_letter))); } IMPORT_C Void IoCloseFile(_Input Ref desc) { @@ -189,7 +183,7 @@ IMPORT_C SInt32 PrintOut(_Input IORef desc, const Char* fmt, ...) { // if truncated, `needed` >= kBufferSz; we still send truncated buffer auto ret_ptr = libsys_syscall_arg_3(SYSCALL_HASH("PrintOut"), static_cast(desc), - Detail::safe_void_cast(buf)); + Detail::sys_safe_cast(buf)); if (!ret_ptr) return -kErrorInvalidData; -- cgit v1.2.3 From 51023240ae3d6093c8c8fbe1ca8228bbddb54e0a Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 11 Sep 2025 17:53:39 +0200 Subject: fix: CxxAbi: Fix ifndef with updated NeCTI macro. Signed-off-by: Amlal El Mahrouss --- dev/kernel/NeKit/CxxAbi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev/kernel/NeKit') diff --git a/dev/kernel/NeKit/CxxAbi.h b/dev/kernel/NeKit/CxxAbi.h index 839308cf..4b7bf002 100644 --- a/dev/kernel/NeKit/CxxAbi.h +++ b/dev/kernel/NeKit/CxxAbi.h @@ -7,7 +7,7 @@ #include -#ifndef __TOOLCHAINKIT__ +#ifndef __NECTI__ #define kAtExitMacDestructors (128) @@ -23,4 +23,4 @@ namespace cxxabiv1 { typedef Kernel::SizeT* __guard; } -#endif // __GNUC__ +#endif // !__NECTI__ -- cgit v1.2.3 From 2d673e164b98db5eb08d4c41c6225fbe73ee82d7 Mon Sep 17 00:00:00 2001 From: 0xf00sec <159052166+0xf00sec@users.noreply.github.com> Date: Sun, 28 Sep 2025 15:10:46 +0300 Subject: ErrorOr.h: T.Value Introduced T& Value() to extract the underlying scalar value without implying ownership transfer. Kept Leak() to explicitly indicate heap ownership transfer. Signed-off-by: 0xf00sec <159052166+0xf00sec@users.noreply.github.com> --- dev/kernel/NeKit/ErrorOr.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'dev/kernel/NeKit') diff --git a/dev/kernel/NeKit/ErrorOr.h b/dev/kernel/NeKit/ErrorOr.h index b653e0ee..52f0d6a9 100644 --- a/dev/kernel/NeKit/ErrorOr.h +++ b/dev/kernel/NeKit/ErrorOr.h @@ -38,6 +38,8 @@ class ErrorOr final { return *this; } + T Value() const { return *mRef; } + Ref& Leak() { return mRef; } Int32 Error() { return mId; } -- cgit v1.2.3