FIX: Fixing ARM64 execution when booting from bootloader.

FIX: Now works both for ARM64 and AMD64 EFI backends.
TODO: The ACB backend needs to be done too.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

1 files changed, 20 insertions, 1 deletions

diff --git a/dev/ZKAKit/KernelKit/ThreadLocalStorage.inl b/dev/ZKAKit/KernelKit/ThreadLocalStorage.inl
index d9850c01..3683bc4b 100644
--- a/dev/ZKAKit/KernelKit/ThreadLocalStorage.inl
+++ b/dev/ZKAKit/KernelKit/ThreadLocalStorage.inl
@@ -7,6 +7,7 @@
 //! @file ThreadLocalStorage.inl
 //! @brief Allocate resources from the process's heap storage.
 
+#include "NewKit/ErrorOr.h"
 #ifndef INC_PROCESS_SCHEDULER_H
 #include <KernelKit/UserProcessScheduler.h>
 #endif
@@ -40,7 +41,25 @@ inline Kernel::Bool tls_delete_ptr(T* obj) noexcept
 	auto ref_process = UserProcessScheduler::The().GetCurrentProcess();
 	MUST_PASS(ref_process);
 
-	return ref_process.Leak().Delete(obj, sizeof(T));
+	ErrorOr<T*> obj_wrapped{obj};
+
+	return ref_process.Leak().Delete(obj_wrapped, sizeof(T));
+}
+
+//! @brief Delete process pointer.
+//! @param obj The pointer to delete.
+template <typename T>
+inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept
+{
+	return tls_delete_ptr(obj.Leak());
+}
+
+//! @brief Delete process pointer.
+//! @param obj The pointer to delete.
+template <typename T>
+inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept
+{
+	return tls_delete_ptr(obj->Leak());
 }
 
 /// @brief Allocate a C++ class, and then call the constructor of it.