From 0adf3b9b215ab90533b0a4b07d6bf4c12dad74bf Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 5 Sep 2025 13:28:23 +0200 Subject: feat: libSystem: `libsys_hash_64` is now defined in `src/System.cc` Signed-off-by: Amlal El Mahrouss --- dev/libSystem/SystemKit/Syscall.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'dev/libSystem/SystemKit') diff --git a/dev/libSystem/SystemKit/Syscall.h b/dev/libSystem/SystemKit/Syscall.h index a1505b46..35bfc6f8 100644 --- a/dev/libSystem/SystemKit/Syscall.h +++ b/dev/libSystem/SystemKit/Syscall.h @@ -14,22 +14,8 @@ IMPORT_C VoidPtr libsys_syscall_arg_2(SizeT id, VoidPtr arg1); IMPORT_C VoidPtr libsys_syscall_arg_3(SizeT id, VoidPtr arg1, VoidPtr arg3); IMPORT_C VoidPtr libsys_syscall_arg_4(SizeT id, VoidPtr arg1, VoidPtr arg3, VoidPtr arg4); -inline UInt64 libsys_hash_64(const Char* path) { - if (!path || *path == 0) return 0; - - const UInt64 FNV_OFFSET_BASIS = 0xcbf29ce484222325ULL; - const UInt64 FNV_PRIME = 0x100000001b3ULL; - - UInt64 hash = FNV_OFFSET_BASIS; - - while (*path) { - hash ^= (Char) (*path++); - hash *= FNV_PRIME; - } - - return hash; -} +IMPORT_C UInt64 libsys_hash_64(const Char* path); #ifndef SYSCALL_HASH #define SYSCALL_HASH(str) libsys_hash_64(str) -#endif // !SYSCALL_HASH \ No newline at end of file +#endif // !SYSCALL_HASH -- 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/libSystem/SystemKit') 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 ecff424e9c78418f6d2bd79b7d4f50f42c29860e Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 11 Sep 2025 18:00:19 +0200 Subject: fix: SystemKit/Verify.h: fix future link issues with `inline` Signed-off-by: Amlal El Mahrouss --- dev/libSystem/SystemKit/Verify.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev/libSystem/SystemKit') diff --git a/dev/libSystem/SystemKit/Verify.h b/dev/libSystem/SystemKit/Verify.h index 68e75d47..cbf85830 100644 --- a/dev/libSystem/SystemKit/Verify.h +++ b/dev/libSystem/SystemKit/Verify.h @@ -15,7 +15,7 @@ namespace LibSystem::Detail { /// @author 0xf00sec, and Amlal El Mahrouss /// @brief safe cast operator. template -static R sys_safe_cast(const T* ptr) { +inline R sys_safe_cast(const T* ptr) { _rtl_assert(ptr, "safe cast failed!"); return static_cast(const_cast(ptr)); } @@ -33,7 +33,7 @@ struct must_cast_traits { /// @author Amlal El Mahrouss /// @brief Safe constexpr cast. template -constexpr R* sys_constexpr_cast(T* ptr) { +inline constexpr R* sys_constexpr_cast(T* ptr) { static_assert(must_cast_traits::value, "constexpr cast failed! types are a mismatch!"); return static_cast(ptr); } -- cgit v1.2.3