diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-05-29 17:19:57 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-05-29 17:19:57 +0200 |
| commit | 81027667166d9624ee12f45f011426678d1bbbf4 (patch) | |
| tree | d12fd352d23ae9c9a167c2c1b8b98c2c9cac2df7 /dev/kernel/NeKit | |
| parent | 3167f59dbb401d6a79b1524537e04218baf49ee3 (diff) | |
feat: Improve libSystem's architecture and implementation.
fix: Fix NeKit's Ref, and ErrorOr classes.
fix: Fix userland tools.
next:
- Finish the latest tickets and then release nekernel 0.0.3
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/NeKit')
| -rw-r--r-- | dev/kernel/NeKit/ErrorOr.h | 8 | ||||
| -rw-r--r-- | dev/kernel/NeKit/Ref.h | 37 |
2 files changed, 19 insertions, 26 deletions
diff --git a/dev/kernel/NeKit/ErrorOr.h b/dev/kernel/NeKit/ErrorOr.h index d7751b7e..5e983d09 100644 --- a/dev/kernel/NeKit/ErrorOr.h +++ b/dev/kernel/NeKit/ErrorOr.h @@ -18,13 +18,13 @@ using ErrorT = UInt; template <typename T> class ErrorOr final { public: - ErrorOr() = default; + explicit ErrorOr() = default; ~ErrorOr() = default; public: - explicit ErrorOr(Int32 err) : mId(err) {} + explicit ErrorOr(Int32 err) : mRef((T*)RTL_ALLOCA(sizeof(T))), mId(err) {} - explicit ErrorOr(nullPtr Null) {} + explicit ErrorOr(nullPtr) {} explicit ErrorOr(T* Class) : mRef(Class) {} @@ -48,7 +48,7 @@ class ErrorOr final { private: Ref<T> mRef; - UInt32 mId{0}; + Int32 mId{0}; }; using ErrorOrAny = ErrorOr<voidPtr>; diff --git a/dev/kernel/NeKit/Ref.h b/dev/kernel/NeKit/Ref.h index 9920aa6f..9380bab4 100644 --- a/dev/kernel/NeKit/Ref.h +++ b/dev/kernel/NeKit/Ref.h @@ -11,46 +11,39 @@ #include <KernelKit/HeapMgr.h> #include <NeKit/Defines.h> #include <NeKit/KernelPanic.h> +#include <CompilerKit/CompilerKit.h> namespace Kernel { template <typename T> class Ref final { public: - Ref() = default; - - ~Ref() { - if (mm_is_valid_ptr(fClass)) delete fClass; - } + explicit Ref() = default; + ~Ref() = default; public: - Ref(T* cls) : fClass(cls) {} - - Ref(T cls) : fClass(nullptr) { fClass = &cls; } + Ref(T* cls) : fClass(*cls) {} + Ref(T cls) : fClass(cls) {} Ref& operator=(T ref) { - fClass = &ref; + fClass = ref; return *this; } + NE_COPY_DEFAULT(Ref); + public: - T operator->() const { - MUST_PASS(*fClass); - return *fClass; - } + T operator->() const { return fClass; } - T& Leak() noexcept { return *fClass; } + T& Leak() noexcept { return fClass; } - T& TryLeak() const noexcept { - MUST_PASS(*fClass); - return *fClass; - } + T& TryLeak() const noexcept { return fClass; } - T operator*() { return *fClass; } + T operator*() { return fClass; } - operator bool() noexcept { return fClass; } + operator bool() noexcept { return true; } private: - T* fClass{nullptr}; + T fClass; }; template <typename T> @@ -70,7 +63,7 @@ class NonNullRef final { NonNullRef(const NonNullRef<T>& ref) = default; private: - Ref<T> fRef{nullptr}; + Ref<T> fRef{}; }; } // namespace Kernel |
