From 463e7472e737fb8259a30304e729772041ea5498 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 21 Nov 2025 09:09:33 +0100 Subject: feat: kernel: NeKit improvements and new TOML file. feat: frameworks: CoreFoundation improvements and new KTest framework. Signed-off-by: Amlal El Mahrouss --- dev/kernel/FSKit/OpenHeFS.h | 6 +-- dev/kernel/HALKit/AMD64/HalKernelMain.cc | 2 - dev/kernel/HALKit/AMD64/HalTimer.cc | 6 ++- dev/kernel/NeKit/ErrorOr.h | 3 ++ dev/kernel/NeKit/Function.h | 9 +++-- dev/kernel/NeKit/Json.h | 51 +++++++++++++++++--------- dev/kernel/NeKit/Ref.h | 1 + dev/kernel/NeKit/TOML.h | 15 ++++++++ dev/kernel/NeKit/Variant.h | 18 ++++++--- dev/kernel/src/BitMapMgr.cc | 23 +++++------- dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc | 13 +++---- dev/kernel/src/Json.cc | 3 +- dev/kernel/src/SoftwareTimer.cc | 2 + dev/kernel/src/Variant.cc | 4 +- 14 files changed, 99 insertions(+), 57 deletions(-) create mode 100644 dev/kernel/NeKit/TOML.h (limited to 'dev') diff --git a/dev/kernel/FSKit/OpenHeFS.h b/dev/kernel/FSKit/OpenHeFS.h index 4e44b948..04f07b8e 100644 --- a/dev/kernel/FSKit/OpenHeFS.h +++ b/dev/kernel/FSKit/OpenHeFS.h @@ -17,9 +17,9 @@ /// @file OpenHeFS.h /// @brief OpenHeFS filesystem support. -#define kHeFSVersion (0x0103) -#define kHeFSMagic " HeFS" -#define kHeFSMagicLen (8) +#define kHeFSVersion (0x0104) +#define kHeFSMagic "OpenHeFS" +#define kHeFSMagicLen (9U) #define kHeFSBlockLen (512U) #define kHeFSFileNameLen (256U) diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index bd7c207d..dfd71777 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -148,8 +148,6 @@ EXTERN_C Kernel::Void hal_real_init(Kernel::Void) { HAL::IDTLoader idt_loader; idt_loader.Load(idt_reg); - HAL::mp_init_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); - while (YES) ; } diff --git a/dev/kernel/HALKit/AMD64/HalTimer.cc b/dev/kernel/HALKit/AMD64/HalTimer.cc index 1f500ac9..f6488b05 100644 --- a/dev/kernel/HALKit/AMD64/HalTimer.cc +++ b/dev/kernel/HALKit/AMD64/HalTimer.cc @@ -15,7 +15,9 @@ #include #include -// timer slot 0 +/// ================================================================================ +/// @note timer slot 0 +/// ================================================================================ #define kHPETSignature ("HPET") @@ -24,9 +26,11 @@ #define kHPETCompRegValue (0x24) #define kHPETInterruptRegValue (0x2C) +/// ================================================================================ ///! BUGS: 0 ///! @file HalTimer.cc ///! @brief Hardware Timer (HPET) +/// ================================================================================ namespace Kernel::Detail { struct HPET_BLOCK : public Kernel::SDT { diff --git a/dev/kernel/NeKit/ErrorOr.h b/dev/kernel/NeKit/ErrorOr.h index 2e3afb46..4c924957 100644 --- a/dev/kernel/NeKit/ErrorOr.h +++ b/dev/kernel/NeKit/ErrorOr.h @@ -15,6 +15,9 @@ namespace Kernel { using ErrorT = Int32; +/// ================================================================================ +/// @brief ErrorOr class for error handling. +/// ================================================================================ template class ErrorOr final { public: diff --git a/dev/kernel/NeKit/Function.h b/dev/kernel/NeKit/Function.h index 45b1a5af..70242bc3 100644 --- a/dev/kernel/NeKit/Function.h +++ b/dev/kernel/NeKit/Function.h @@ -4,13 +4,15 @@ ======================================== */ -#ifndef _INC_FUNCTION_H_ -#define _INC_FUNCTION_H_ +#pragma once #include #include namespace Kernel { +/// ================================================================================ +/// @brief Function wrapper class. +/// ================================================================================ template class Function final { public: @@ -40,11 +42,10 @@ class Function final { private: T(*fFn) - (Args... args); + (Args... args){nullptr}; }; template using FunctionOr = ErrorOr>; } // namespace Kernel -#endif // !_INC_FUNCTION_H__ diff --git a/dev/kernel/NeKit/Json.h b/dev/kernel/NeKit/Json.h index 836a0995..1e804354 100644 --- a/dev/kernel/NeKit/Json.h +++ b/dev/kernel/NeKit/Json.h @@ -19,54 +19,68 @@ #define kNeJsonLen (256) #define kNeJsonNullArr "[]" #define kNeJsonNullObj "{}" +#define kNeJsonNullKey "null" +#define kNeJsonNullValue kNeJsonNullKey namespace Kernel { -/// @brief JavaScript object class +/// ================================================================================ +/// @brief JSON object representation. +/// ================================================================================ +template class JsonObject final { public: explicit JsonObject() { - auto len = kNeJsonMaxLen; - KBasicString<> key = KString(len); - key += kNeJsonNullObj; + KBasicString key = KString(kNeJsonMaxLen); + key += kNeJsonNullValue; this->AsKey() = key; - this->AsValue() = key; + this->AsValue() = key; } - explicit JsonObject(SizeT lhsLen, SizeT rhsLen) : fKey(lhsLen), fValue(rhsLen) {} + explicit JsonObject(SizeT lhsLen, SizeT rhsLen) : fKey(lhsLen), fValue(rhsLen) { + + KBasicString key = KString(lhsLen); + this->AsKey() = key; + + KBasicString value = KString(rhsLen); + this->AsValue() = value; + } ~JsonObject() = default; NE_COPY_DEFAULT(JsonObject) + NE_MOVE_DEFAULT(JsonObject) Bool& IsUndefined() { return fUndefined; } private: Bool fUndefined; // is this instance undefined? - KBasicString<> fKey; - KBasicString<> fValue; + KBasicString fKey; + KBasicString fValue; public: /// @brief returns the key of the json /// @return the key as string view. - KBasicString<>& AsKey() { return fKey; } + KBasicString& AsKey() { return fKey; } /// @brief returns the value of the json. /// @return the key as string view. - KBasicString<>& AsValue() { return fValue; } + KBasicString& AsValue() { return fValue; } - static JsonObject kNull; + STATIC JsonObject kNull; }; -/// @brief JsonObject stream reader helper. -struct JsonStreamReader final { - STATIC JsonObject In(const Char* full_array) { +/// ================================================================================ +/// @brief JsonObject stream reader helper for ASCII. +/// ================================================================================ +struct AsciiJsonStreamReader final { + STATIC JsonObject In(const Char* full_array) { auto start_val = '{'; auto end_val = '}'; Boolean probe_value = false; if (full_array[0] != start_val) { - if (full_array[0] != '[') return JsonObject::kNull; + if (full_array[0] != '[') return JsonObject{0, 0}; start_val = '['; end_val = ']'; @@ -79,7 +93,7 @@ struct JsonStreamReader final { SizeT key_len = 0; SizeT value_len = 0; - JsonObject type(kNeJsonMaxLen, kNeJsonMaxLen); + JsonObject type(kNeJsonMaxLen, kNeJsonMaxLen); for (SizeT i = 1; i < len; ++i) { if (full_array[i] == '\r' || full_array[i] == '\n') continue; @@ -125,5 +139,8 @@ struct JsonStreamReader final { } }; -using JsonStream = Stream; +/// ================================================================================ +/// @brief AsciiJsonStream type definition. +/// ================================================================================ +using AsciiJsonStream = Stream>; } // namespace Kernel diff --git a/dev/kernel/NeKit/Ref.h b/dev/kernel/NeKit/Ref.h index 9c244be5..dac701e0 100644 --- a/dev/kernel/NeKit/Ref.h +++ b/dev/kernel/NeKit/Ref.h @@ -56,6 +56,7 @@ class NonNullRef final { NonNullRef(nullPtr) = delete; NonNullRef(T* ref) : fRef(ref) { MUST_PASS(ref); } + NonNullRef(Ref ref) : fRef(ref) { MUST_PASS(ref); } Ref& operator->() { MUST_PASS(fRef); diff --git a/dev/kernel/NeKit/TOML.h b/dev/kernel/NeKit/TOML.h new file mode 100644 index 00000000..dee273ad --- /dev/null +++ b/dev/kernel/NeKit/TOML.h @@ -0,0 +1,15 @@ +/* ======================================== + + Copyright (C) 2025, Amlal El Mahrouss, licensed under the Apache 2.0 license. + +======================================== */ + +#pragma once + +namespace Kernel { +class TOMLObject final { + public: + explicit TOMLObject() = delete; + ~TOMLObject() = default; +}; +} // namespace Kernel \ No newline at end of file diff --git a/dev/kernel/NeKit/Variant.h b/dev/kernel/NeKit/Variant.h index 42a47bc0..7bcd0dff 100644 --- a/dev/kernel/NeKit/Variant.h +++ b/dev/kernel/NeKit/Variant.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -15,13 +16,13 @@ namespace Kernel { class Variant final { public: enum class VariantKind { - kString, + kInvalid = 0, + kString = 200, kBlob, kNull, kJson, - kXML, + kTOML, kSwap, - kInvalid, }; public: @@ -37,7 +38,9 @@ class Variant final { explicit Variant(KBasicString* stringView) : fPtr((VoidPtr) stringView), fKind(VariantKind::kString) {} - explicit Variant(JsonObject* json) : fPtr((VoidPtr) json), fKind(VariantKind::kJson) {} + explicit Variant(JsonObject<>* json) : fPtr((VoidPtr) json), fKind(VariantKind::kJson) {} + + explicit Variant(TOMLObject* toml) : fPtr((VoidPtr) toml), fKind(VariantKind::kTOML) {} explicit Variant(nullPtr ptr) : fPtr(ptr), fKind(VariantKind::kNull) {} @@ -47,10 +50,15 @@ class Variant final { public: const Char* ToString(); + + /// ======================================================================== + /// @brief Returns the underlying pointer. + /// @return the underlying pointer. + /// ======================================================================== VoidPtr Leak(); template - T* As() { + T* As() noexcept { return reinterpret_cast(fPtr); } diff --git a/dev/kernel/src/BitMapMgr.cc b/dev/kernel/src/BitMapMgr.cc index 2039e1c9..d7ecb810 100644 --- a/dev/kernel/src/BitMapMgr.cc +++ b/dev/kernel/src/BitMapMgr.cc @@ -88,9 +88,10 @@ namespace HAL { } VoidPtr base = reinterpret_cast((UIntPtr) base_ptr); - MUST_PASS(base); + if (!base) return nullptr; + STATIC SizeT biggest = 0UL; while (YES) { @@ -105,7 +106,7 @@ namespace HAL { this->GetBitMapStatus(ptr_bit_set); UInt32 flags = this->MakeMMFlags(wr, user); - mm_map_page(ptr_bit_set, ptr_bit_set, flags); + mm_map_page(ptr_bit_set, (VoidPtr)mm_get_page_addr(ptr_bit_set), flags); if (biggest < (size + pad)) biggest = size + pad; @@ -121,7 +122,7 @@ namespace HAL { this->GetBitMapStatus(ptr_bit_set); UInt32 flags = this->MakeMMFlags(wr, user); - mm_map_page(ptr_bit_set, ptr_bit_set, flags); + mm_map_page(ptr_bit_set, (VoidPtr)mm_get_page_addr(ptr_bit_set), flags); if (biggest < (size + pad)) biggest = (size + pad); @@ -136,7 +137,6 @@ namespace HAL { : ptr_bit_set[kBitMapSizeIdx]; base = reinterpret_cast(raw_base + offset); - if (base == nullptr) return nullptr; } @@ -166,9 +166,10 @@ namespace HAL { }; } // namespace Detail + STATIC Detail::IBitMapProxy kBitMapMgr; + auto mm_is_bitmap(VoidPtr ptr) -> BOOL { - Detail::IBitMapProxy bitmp; - return bitmp.IsBitMap(ptr); + return kBitMapMgr.IsBitMap(ptr); } /***********************************************************************************/ @@ -178,12 +179,10 @@ namespace HAL { /// @return a new bitmap allocated pointer. /***********************************************************************************/ auto mm_alloc_bitmap(Boolean wr, Boolean user, SizeT size, Bool is_page, SizeT pad) -> VoidPtr { - VoidPtr ptr_new = nullptr; - Detail::IBitMapProxy bitmp; - + VoidPtr ptr_new = nullptr; if (is_page) return nullptr; - ptr_new = bitmp.FindBitMap(kKernelBitMpStart, size, wr, user, pad); + ptr_new = kBitMapMgr.FindBitMap(kKernelBitMpStart, size, wr, user, pad); if (!ptr_new) { ke_panic(RUNTIME_CHECK_VIRTUAL_OUT_OF_MEM, "Out of memory bitmap"); @@ -200,9 +199,7 @@ namespace HAL { auto mm_free_bitmap(VoidPtr ptr) -> Bool { if (!ptr) return No; - Detail::IBitMapProxy bitmp; - Bool ret = bitmp.FreeBitMap(ptr); - + Bool ret = kBitMapMgr.FreeBitMap(ptr); return ret; } } // namespace HAL diff --git a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc b/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc index c79b6323..76a70f87 100644 --- a/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc +++ b/dev/kernel/src/FS/OpenHeFS+FileSystemParser.cc @@ -764,9 +764,6 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c if (drv_std_get_size() < kHeFSMinimumDiskSize) { (Void)(kout << "OpenHeFS recommends at least 128 GiB of free space." << kendl); - (Void)(kout << "The OS will still try to format a OpenHeFS disk here anyway, don't expect " - "perfect geometry." - << kendl); } HEFS_BOOT_NODE* boot = (HEFS_BOOT_NODE*) RTL_ALLOCA(sizeof(HEFS_BOOT_NODE)); @@ -880,12 +877,12 @@ _Output Bool HeFileSystemParser::Format(_Input _Output DriveTrait* mnt, _Input c return NO; } - constexpr const SizeT kHeFSPreallocateCount = 0x6UL; + /// AMLALE: Better way to create default directories than before. + const Utf8Char* kFileMap[] = {u8"/", u8"/boot", u8"/system", u8"/network", + u8"/devices", u8"/media", u8"/dev", (Utf8Char*) nullptr}; - const Utf8Char* kFileMap[kHeFSPreallocateCount] = {u8"/", u8"/boot", u8"/system", - u8"/network", u8"/devices", u8"/media"}; - - for (SizeT i = 0; i < kHeFSPreallocateCount; ++i) { + SizeT i = 0; + while (kFileMap[++i] != nullptr) { this->CreateINodeDirectory(mnt, kHeFSEncodingFlagsUTF8, kFileMap[i]); } diff --git a/dev/kernel/src/Json.cc b/dev/kernel/src/Json.cc index 8f073da8..198aed99 100644 --- a/dev/kernel/src/Json.cc +++ b/dev/kernel/src/Json.cc @@ -6,5 +6,4 @@ #include -/// @brief Undefined object, is null in length. -RTL_INIT_OBJECT(Kernel::JsonObject::kNull, Kernel::JsonObject); +namespace Kernel {} \ No newline at end of file diff --git a/dev/kernel/src/SoftwareTimer.cc b/dev/kernel/src/SoftwareTimer.cc index 167fc630..eafe8db6 100644 --- a/dev/kernel/src/SoftwareTimer.cc +++ b/dev/kernel/src/SoftwareTimer.cc @@ -6,8 +6,10 @@ #include +/// ================================================================================ /// @brief SoftwareTimer class, meant to be generic. ///! @author Amlal El Mahrouss (amlal@nekernel.org) +/// ================================================================================ using namespace Kernel; diff --git a/dev/kernel/src/Variant.cc b/dev/kernel/src/Variant.cc index 732dabd2..fcf2f443 100644 --- a/dev/kernel/src/Variant.cc +++ b/dev/kernel/src/Variant.cc @@ -9,8 +9,8 @@ namespace Kernel { const Char* Variant::ToString() { switch (fKind) { - case VariantKind::kXML: - return ("Class:{XML}"); + case VariantKind::kTOML: + return ("Class:{TOML}"); case VariantKind::kJson: return ("Class:{Json}"); case VariantKind::kString: -- cgit v1.2.3