From 738833a0470ce93b7809ca4bdea253677f27fb57 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 21 Aug 2025 13:37:34 +0200 Subject: feat!: Breaking changes, reworked the KString API inside the ne_kernel. Signed-off-by: Amlal El Mahrouss --- dev/kernel/NeKit/KString.inl | 181 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 dev/kernel/NeKit/KString.inl (limited to 'dev/kernel/NeKit/KString.inl') diff --git a/dev/kernel/NeKit/KString.inl b/dev/kernel/NeKit/KString.inl new file mode 100644 index 00000000..a0dd3623 --- /dev/null +++ b/dev/kernel/NeKit/KString.inl @@ -0,0 +1,181 @@ +/* ------------------------------------------- + + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + +------------------------------------------- */ + +#include + +/// @file BasicKString<>.cc +/// @brief Kernel String manipulation file. + +namespace Kernel { +inline void rt_string_append(Char* lhs, const Char* rhs, Int32 cur) { + SizeT sz_rhs = rt_string_len(rhs); + SizeT rhs_i = 0; + + for (; rhs_i < sz_rhs; ++rhs_i) { + lhs[rhs_i + cur] = rhs[rhs_i]; + } +} + +template<> +inline Char* BasicKString<>::Data() { + return this->fData; +} + +template<> +inline const Char* BasicKString<>::CData() const { + return const_cast(this->fData); +} + +template<> +inline SizeT BasicKString<>::Length() const { + return this->fDataSz; +} + +template<> +inline bool BasicKString<>::operator==(const BasicKString<>& rhs) const { + if (rhs.Length() != this->Length()) return false; + + for (Size index = 0; index < this->Length(); ++index) { + if (rhs.fData[index] != this->fData[index]) return false; + } + + return true; +} + +template<> +inline bool BasicKString<>::operator==(const Char* rhs) const { + if (rt_string_len(rhs) != this->Length()) return false; + + for (Size index = 0; index < rt_string_len(rhs); ++index) { + if (rhs[index] != this->fData[index]) return false; + } + + return true; +} + +template<> +inline bool BasicKString<>::operator!=(const BasicKString<>& rhs) const { + if (rhs.Length() != this->Length()) return false; + + for (Size index = 0; index < rhs.Length(); ++index) { + if (rhs.fData[index] == this->fData[index]) return false; + } + + return true; +} + +template<> +inline bool BasicKString<>::operator!=(const Char* rhs) const { + if (rt_string_len(rhs) != this->Length()) return false; + + for (Size index = 0; index < rt_string_len(rhs); ++index) { + if (rhs[index] == this->fData[index]) return false; + } + + return true; +} + +template<> +inline BasicKString<>& BasicKString<>::operator+=(const BasicKString<>& rhs) { + if (rt_string_len(rhs.fData) > this->Length()) return *this; + + rt_string_append(this->fData, const_cast(rhs.fData), this->fCur); + this->fCur += rt_string_len(const_cast(rhs.fData)); + + return *this; +} + +template<> +inline BasicKString<>& BasicKString<>::operator+=(const Char* rhs) { + rt_string_append(this->fData, const_cast(rhs), this->fCur); + this->fCur += rt_string_len(const_cast(rhs)); + + return *this; +} + +inline ErrorOr> KStringBuilder::Construct(const Char* data) { + if (!data || *data == 0) return ErrorOr>(new BasicKString<>(0)); + + BasicKString<>* view = new BasicKString<>(rt_string_len(data)); + (*view) += data; + + return ErrorOr>(*view); +} + +inline const Char* KStringBuilder::FromBool(const Char* fmt, bool i) { + if (!fmt) return ("?"); + + const Char* boolean_expr = i ? "YES" : "NO"; + Char* ret = (Char*) RTL_ALLOCA(rt_string_len(boolean_expr) + rt_string_len(fmt)); + + if (!ret) return ("?"); + + const auto fmt_len = rt_string_len(fmt); + const auto res_len = rt_string_len(boolean_expr); + + for (Size idx = 0; idx < fmt_len; ++idx) { + if (fmt[idx] == '%') { + SizeT result_cnt = idx; + + for (auto y_idx = idx; y_idx < res_len; ++y_idx) { + ret[result_cnt] = boolean_expr[y_idx]; + ++result_cnt; + } + + break; + } + + ret[idx] = fmt[idx]; + } + + return ret; +} + +inline bool KStringBuilder::Equals(const Char* lhs, const Char* rhs) { + if (rt_string_len(rhs) != rt_string_len(lhs)) return false; + + for (Size index = 0; index < rt_string_len(rhs); ++index) { + if (rhs[index] != lhs[index]) return false; + } + + return true; +} + +inline bool KStringBuilder::Equals(const Utf8Char* lhs, const Utf8Char* rhs) { + if (urt_string_len(rhs) != urt_string_len(lhs)) return false; + + for (Size index = 0; rhs[index] != 0; ++index) { + if (rhs[index] != lhs[index]) return false; + } + + return true; +} + +inline const Char* KStringBuilder::Format(const Char* fmt, const Char* fmt2) { + if (!fmt || !fmt2) return ("?"); + + Char* ret = (Char*) RTL_ALLOCA(sizeof(char) * (rt_string_len(fmt2) + rt_string_len(fmt))); + + if (!ret) return ("?"); + + const auto len = rt_string_len(fmt); + + for (Size idx = 0; idx < len; ++idx) { + if (fmt[idx] == '%' && idx < rt_string_len(fmt) && fmt[idx] == 's') { + Size result_cnt = idx; + + for (Size y_idx = 0; y_idx < rt_string_len(fmt2); ++y_idx) { + ret[result_cnt] = fmt2[y_idx]; + ++result_cnt; + } + } + + ret[idx] = fmt[idx]; + } + + return ret; +} +} // namespace Kernel -- cgit v1.2.3 From b6ce3d25357b4e01daf212a955a6093133bc2fe4 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 21 Aug 2025 15:19:01 +0200 Subject: feat: Reworked `hefsi_hash_64` to follow the codebase's conventions. Signed-off-by: Amlal El Mahrouss --- dev/kernel/CFKit/Property.h | 6 +++--- dev/kernel/KernelKit/KernelTaskScheduler.h | 2 +- dev/kernel/KernelKit/UserProcessScheduler.h | 2 +- dev/kernel/NeKit/Json.h | 4 ++-- dev/kernel/NeKit/KString.inl | 18 +++++++++--------- dev/kernel/src/FS/HeFS+FileSystemParser.cc | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'dev/kernel/NeKit/KString.inl') diff --git a/dev/kernel/CFKit/Property.h b/dev/kernel/CFKit/Property.h index e872896d..7fc9bf07 100644 --- a/dev/kernel/CFKit/Property.h +++ b/dev/kernel/CFKit/Property.h @@ -32,9 +32,9 @@ class Property { Property& operator=(const Property&) = default; Property(const Property&) = default; - BOOL StringEquals(BasicKString<>& name); - PropertyId& GetValue(); - BasicKString<>& GetKey(); + BOOL StringEquals(BasicKString<>& name); + PropertyId& GetValue(); + BasicKString<>& GetKey(); private: KString fName{kMaxPropLen}; diff --git a/dev/kernel/KernelKit/KernelTaskScheduler.h b/dev/kernel/KernelKit/KernelTaskScheduler.h index 78aea53c..527da9f0 100644 --- a/dev/kernel/KernelKit/KernelTaskScheduler.h +++ b/dev/kernel/KernelKit/KernelTaskScheduler.h @@ -28,7 +28,7 @@ class KERNEL_TASK final { HAL::StackFramePtr StackFrame{nullptr}; UInt8* StackReserve{nullptr}; SizeT StackSize{kSchedMaxStackSz}; - ProcessImage Image{}; + ProcessImage Image{}; /// @brief a KID is a Kernel Identification Descriptor, it is used to find a task running within /// the kernel. KID Kid{0}; diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h index 9fa15f17..69a631be 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.h +++ b/dev/kernel/KernelKit/UserProcessScheduler.h @@ -48,7 +48,7 @@ class USER_PROCESS final { AffinityKind Affinity{AffinityKind::kStandard}; ProcessStatusKind Status{ProcessStatusKind::kKilled}; UInt8 StackReserve[kSchedMaxStackSz]; - ProcessImage Image{}; + ProcessImage Image{}; SizeT StackSize{kSchedMaxStackSz}; IDylibObject* DylibDelegate{nullptr}; SizeT MemoryCursor{0UL}; diff --git a/dev/kernel/NeKit/Json.h b/dev/kernel/NeKit/Json.h index ebd4acf9..24357dd7 100644 --- a/dev/kernel/NeKit/Json.h +++ b/dev/kernel/NeKit/Json.h @@ -25,7 +25,7 @@ namespace Kernel { class Json final { public: explicit Json() { - auto len = kJSONMaxLen; + auto len = kJSONMaxLen; BasicKString<> key = KString(len); key += kJSONNullObj; @@ -42,7 +42,7 @@ class Json final { Bool& IsUndefined() { return fUndefined; } private: - Bool fUndefined; // is this instance undefined? + Bool fUndefined; // is this instance undefined? BasicKString<> fKey; BasicKString<> fValue; diff --git a/dev/kernel/NeKit/KString.inl b/dev/kernel/NeKit/KString.inl index a0dd3623..1faefb08 100644 --- a/dev/kernel/NeKit/KString.inl +++ b/dev/kernel/NeKit/KString.inl @@ -19,22 +19,22 @@ inline void rt_string_append(Char* lhs, const Char* rhs, Int32 cur) { } } -template<> +template <> inline Char* BasicKString<>::Data() { return this->fData; } -template<> +template <> inline const Char* BasicKString<>::CData() const { return const_cast(this->fData); } -template<> +template <> inline SizeT BasicKString<>::Length() const { return this->fDataSz; } -template<> +template <> inline bool BasicKString<>::operator==(const BasicKString<>& rhs) const { if (rhs.Length() != this->Length()) return false; @@ -45,7 +45,7 @@ inline bool BasicKString<>::operator==(const BasicKString<>& rhs) const { return true; } -template<> +template <> inline bool BasicKString<>::operator==(const Char* rhs) const { if (rt_string_len(rhs) != this->Length()) return false; @@ -56,7 +56,7 @@ inline bool BasicKString<>::operator==(const Char* rhs) const { return true; } -template<> +template <> inline bool BasicKString<>::operator!=(const BasicKString<>& rhs) const { if (rhs.Length() != this->Length()) return false; @@ -67,7 +67,7 @@ inline bool BasicKString<>::operator!=(const BasicKString<>& rhs) const { return true; } -template<> +template <> inline bool BasicKString<>::operator!=(const Char* rhs) const { if (rt_string_len(rhs) != this->Length()) return false; @@ -78,7 +78,7 @@ inline bool BasicKString<>::operator!=(const Char* rhs) const { return true; } -template<> +template <> inline BasicKString<>& BasicKString<>::operator+=(const BasicKString<>& rhs) { if (rt_string_len(rhs.fData) > this->Length()) return *this; @@ -88,7 +88,7 @@ inline BasicKString<>& BasicKString<>::operator+=(const BasicKString<>& rhs) { return *this; } -template<> +template <> inline BasicKString<>& BasicKString<>::operator+=(const Char* rhs) { rt_string_append(this->fData, const_cast(rhs), this->fCur); this->fCur += rt_string_len(const_cast(rhs)); diff --git a/dev/kernel/src/FS/HeFS+FileSystemParser.cc b/dev/kernel/src/FS/HeFS+FileSystemParser.cc index 344369d5..f1531b4c 100644 --- a/dev/kernel/src/FS/HeFS+FileSystemParser.cc +++ b/dev/kernel/src/FS/HeFS+FileSystemParser.cc @@ -91,14 +91,14 @@ namespace Detail { STATIC UInt64 hefsi_hash_64(const Utf8Char* path) { if (!path || *path == 0) return 0; - const UInt64 FNV_OFFSET_BASIS = 0xcbf29ce484222325ULL; - const UInt64 FNV_PRIME = 0x100000001b3ULL; + const UInt64 kFnvBaseOffset = 0xcbf29ce484222325ULL; + const UInt64 kFnvPrimeNumber = 0x100000001b3ULL; - UInt64 hash = FNV_OFFSET_BASIS; + UInt64 hash = kFnvBaseOffset; while (*path) { hash ^= (Utf8Char) (*path++); - hash *= FNV_PRIME; + hash *= kFnvPrimeNumber; } return hefsi_to_big_endian_64(hash); -- cgit v1.2.3