HCR-18: Fixed UEFI bootloader, loading stuff correctly.

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

7 files changed, 40 insertions, 39 deletions

diff --git a/Private/Source/Network/IP.cpp b/Private/Source/Network/IP.cpp
index 38cd6008..b1b45521 100644
--- a/Private/Source/Network/IP.cpp
+++ b/Private/Source/Network/IP.cpp
@@ -82,7 +82,7 @@ ErrorOr<StringView> IPFactory::ToStringView(Ref<RawIPAddress> ipv4) {
 bool IPFactory::IpCheckVersion4(const char* ip) {
   int cnter = 0;
 
-  for (Size base = 0; base < string_length(ip); ++base) {
+  for (Size base = 0; base < rt_string_len(ip); ++base) {
     if (ip[base] == '.') {
       cnter = 0;
     } else {
diff --git a/Private/Source/PEFSharedObjectRT.cxx b/Private/Source/PEFSharedObjectRT.cxx
index c6bec404..aceca259 100644
--- a/Private/Source/PEFSharedObjectRT.cxx
+++ b/Private/Source/PEFSharedObjectRT.cxx
@@ -64,7 +64,7 @@ extern "C" SharedObject *__LibInit() {
   }
 
   library->Get()->fImageEntrypointOffset =
-      library->Load<VoidPtr>(kPefStart, string_length(kPefStart, 0), kPefCode);
+      library->Load<VoidPtr>(kPefStart, rt_string_len(kPefStart, 0), kPefCode);
 
   kcout << "__LibInit: Task is successful!\n";
 
diff --git a/Private/Source/String.cxx b/Private/Source/String.cxx
index 045545cd..0e1b7f41 100644
--- a/Private/Source/String.cxx
+++ b/Private/Source/String.cxx
@@ -15,7 +15,7 @@ Char *StringView::Data() { return m_Data; }
 
 const Char *StringView::CData() { return m_Data; }
 
-Size StringView::Length() const { return string_length(m_Data); }
+Size StringView::Length() const { return rt_string_len(m_Data); }
 
 bool StringView::operator==(const StringView &rhs) const {
   if (rhs.Length() != this->Length()) return false;
@@ -28,9 +28,9 @@ bool StringView::operator==(const StringView &rhs) const {
 }
 
 bool StringView::operator==(const Char *rhs) const {
-  if (string_length(rhs) != this->Length()) return false;
+  if (rt_string_len(rhs) != this->Length()) return false;
 
-  for (Size index = 0; index < string_length(rhs); ++index) {
+  for (Size index = 0; index < rt_string_len(rhs); ++index) {
     if (rhs[index] != m_Data[index]) return false;
   }
 
@@ -48,9 +48,9 @@ bool StringView::operator!=(const StringView &rhs) const {
 }
 
 bool StringView::operator!=(const Char *rhs) const {
-  if (string_length(rhs) != this->Length()) return false;
+  if (rt_string_len(rhs) != this->Length()) return false;
 
-  for (Size index = 0; index < string_length(rhs); ++index) {
+  for (Size index = 0; index < rt_string_len(rhs); ++index) {
     if (rhs[index] == m_Data[index]) return false;
   }
 
@@ -60,7 +60,7 @@ bool StringView::operator!=(const Char *rhs) const {
 ErrorOr<StringView> StringBuilder::Construct(const Char *data) {
   if (!data || *data == 0) return {};
 
-  StringView view(string_length(data));
+  StringView view(rt_string_len(data));
 
   rt_copy_memory(reinterpret_cast<voidPtr>(const_cast<Char *>(data)),
                  reinterpret_cast<voidPtr>(view.Data()), view.Length());
@@ -71,7 +71,7 @@ ErrorOr<StringView> StringBuilder::Construct(const Char *data) {
 const char *StringBuilder::FromInt(const char *fmt, int i) {
   if (!fmt) return ("-1");
 
-  char *ret = (char *)__alloca(sizeof(char) * 8 + string_length(fmt));
+  char *ret = (char *)__alloca(sizeof(char) * 8 + rt_string_len(fmt));
 
   if (!ret) return ("-1");
 
@@ -81,8 +81,8 @@ const char *StringBuilder::FromInt(const char *fmt, int i) {
     return ("-1");
   }
 
-  const auto fmt_len = string_length(fmt);
-  const auto res_len = string_length(result);
+  const auto fmt_len = rt_string_len(fmt);
+  const auto res_len = rt_string_len(result);
 
   for (Size idx = 0; idx < fmt_len; ++idx) {
     if (fmt[idx] == '%') {
@@ -106,12 +106,12 @@ const char *StringBuilder::FromBool(const char *fmt, bool i) {
   if (!fmt) return ("?");
 
   const char *boolean_expr = i ? "true" : "false";
-  char *ret = (char *)__alloca((sizeof(char) * i) ? 4 : 5 + string_length(fmt));
+  char *ret = (char *)__alloca((sizeof(char) * i) ? 4 : 5 + rt_string_len(fmt));
 
   if (!ret) return ("?");
 
-  const auto fmt_len = string_length(fmt);
-  const auto res_len = string_length(boolean_expr);
+  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] == '%') {
@@ -132,9 +132,9 @@ const char *StringBuilder::FromBool(const char *fmt, bool i) {
 }
 
 bool StringBuilder::Equals(const char *lhs, const char *rhs) {
-  if (string_length(rhs) != string_length(lhs)) return false;
+  if (rt_string_len(rhs) != rt_string_len(lhs)) return false;
 
-  for (Size index = 0; index < string_length(rhs); ++index) {
+  for (Size index = 0; index < rt_string_len(rhs); ++index) {
     if (rhs[index] != lhs[index]) return false;
   }
 
@@ -145,14 +145,14 @@ const char *StringBuilder::Format(const char *fmt, const char *fmt2) {
   if (!fmt || !fmt2) return ("?");
 
   char *ret =
-      (char *)alloca(sizeof(char) * string_length(fmt2) + string_length(fmt2));
+      (char *)alloca(sizeof(char) * rt_string_len(fmt2) + rt_string_len(fmt2));
 
   if (!ret) return ("?");
 
-  for (Size idx = 0; idx < string_length(fmt); ++idx) {
+  for (Size idx = 0; idx < rt_string_len(fmt); ++idx) {
     if (fmt[idx] == '%') {
       Size result_cnt = idx;
-      for (Size y_idx = 0; y_idx < string_length(fmt2); ++y_idx) {
+      for (Size y_idx = 0; y_idx < rt_string_len(fmt2); ++y_idx) {
         ret[result_cnt] = fmt2[y_idx];
         ++result_cnt;
       }
@@ -167,27 +167,27 @@ const char *StringBuilder::Format(const char *fmt, const char *fmt2) {
 }
 
 static void string_append(char *lhs, char *rhs, int cur) {
-  if (lhs && rhs && cur < string_length(lhs)) {
-    SizeT sz_rhs = string_length(rhs);
+  if (lhs && rhs && cur < rt_string_len(lhs)) {
+    SizeT sz_rhs = rt_string_len(rhs);
 
     rt_copy_memory(rhs, lhs + cur, sz_rhs);
   }
 }
 
 StringView &StringView::operator+=(const Char *rhs) {
-  if (string_length(rhs) > string_length(this->m_Data)) return *this;
+  if (rt_string_len(rhs) > rt_string_len(this->m_Data)) return *this;
 
   string_append(this->m_Data, const_cast<char *>(rhs), this->m_Cur);
-  this->m_Cur += string_length(rhs);
+  this->m_Cur += rt_string_len(rhs);
 
   return *this;
 }
 
 StringView &StringView::operator+=(const StringView &rhs) {
-  if (string_length(rhs.m_Data) > string_length(this->m_Data)) return *this;
+  if (rt_string_len(rhs.m_Data) > rt_string_len(this->m_Data)) return *this;
 
   string_append(this->m_Data, const_cast<char *>(rhs.m_Data), this->m_Cur);
-  this->m_Cur += string_length(const_cast<char *>(rhs.m_Data));
+  this->m_Cur += rt_string_len(const_cast<char *>(rhs.m_Data));
 
   return *this;
 }
diff --git a/Private/Source/URL.cxx b/Private/Source/URL.cxx
index ab289a66..e471c0c1 100644
--- a/Private/Source/URL.cxx
+++ b/Private/Source/URL.cxx
@@ -32,19 +32,19 @@ constexpr const int kProtosCount = 8;
 constexpr const int kRangeSz = 4096;
 
 static ErrorOr<StringView> url_extract_location(const char *url) {
-  if (!url || *url == 0 || string_length(url, kRangeSz) > kRangeSz)
+  if (!url || *url == 0 || rt_string_len(url, kRangeSz) > kRangeSz)
     return ErrorOr<StringView>{-1};
 
-  StringView view(string_length(url));
+  StringView view(rt_string_len(url));
 
   SizeT i = 0;
   bool scheme_found = false;
 
-  for (; i < string_length(url); ++i) {
+  for (; i < rt_string_len(url); ++i) {
     if (!scheme_found) {
       for (int y = 0; kProtosCount; ++y) {
         if (rt_string_in_string(view.CData(), kURLProtocols[y])) {
-          i += string_length(kURLProtocols[y]) + kUrlOutSz;
+          i += rt_string_len(kURLProtocols[y]) + kUrlOutSz;
           scheme_found = true;
 
           break;
@@ -59,7 +59,7 @@ static ErrorOr<StringView> url_extract_location(const char *url) {
 }
 
 static ErrorOr<StringView> url_extract_protocol(const char *url) {
-  if (!url || *url == 0 || string_length(url, kRangeSz) > kRangeSz)
+  if (!url || *url == 0 || rt_string_len(url, kRangeSz) > kRangeSz)
     return ErrorOr<StringView>{-1};
 
   ErrorOr<StringView> view{-1};
diff --git a/Private/Source/UserHeap.cxx b/Private/Source/UserHeap.cxx
index 5b086111..9b985ed4 100644
--- a/Private/Source/UserHeap.cxx
+++ b/Private/Source/UserHeap.cxx
@@ -46,7 +46,7 @@ Boolean HeapManager::s_PoolsAreEnabled = true;
 Array<Ref<PTEWrapper*>, kPoolMaxSz> HeapManager::s_Pool;
 
 STATIC VoidPtr ke_find_unused_heap(Int flags);
-STATIC void ke_free_heap_internal(VoidPtr vaddr);
+STATIC Void ke_free_heap_internal(VoidPtr vaddr);
 STATIC VoidPtr ke_make_heap(VoidPtr vaddr, Int flags);
 STATIC Boolean ke_check_and_free_heap(const SizeT& index, VoidPtr ptr);
 
@@ -92,7 +92,7 @@ STATIC VoidPtr ke_make_heap(VoidPtr virtualAddress, Int flags) {
   return nullptr;
 }
 
-STATIC void ke_free_heap_internal(VoidPtr virtualAddress) {
+STATIC Void ke_free_heap_internal(VoidPtr virtualAddress) {
   HeapHeader* poolHdr = reinterpret_cast<HeapHeader*>(
       reinterpret_cast<UIntPtr>(virtualAddress) - sizeof(HeapHeader));
 
diff --git a/Private/Source/Utils.cxx b/Private/Source/Utils.cxx
index 6072ccd3..01975192 100644
--- a/Private/Source/Utils.cxx
+++ b/Private/Source/Utils.cxx
@@ -10,7 +10,7 @@
 #include <NewKit/Utils.hpp>
 
 namespace HCore {
-Int string_compare(const Char *src, const Char *cmp, Size size) {
+Int rt_string_cmp(const Char *src, const Char *cmp, Size size) {
   Int32 counter = 0;
 
   for (Size index = 0; index < size; ++index) {
@@ -24,7 +24,7 @@ void rt_zero_memory(voidPtr pointer, Size len) {
   rt_set_memory(pointer, 0, len);
 }
 
-Size string_length(const Char *str, SizeT _len) {
+Size rt_string_len(const Char *str, SizeT _len) {
   if (*str == '\0') return 0;
 
   Size len{0};
@@ -39,7 +39,7 @@ Size string_length(const Char *str, SizeT _len) {
   return len;
 }
 
-Size string_length(const Char *str) {
+Size rt_string_len(const Char *str) {
   if (*str == '\0') return 0;
 
   Size len{0};
@@ -98,12 +98,12 @@ Int rt_copy_memory(const voidPtr src, voidPtr dst, Size len) {
 const Char *alloc_string(const Char *text) {
   if (!text) return nullptr;
 
-  const Char *string = new Char[string_length(text)];
+  const Char *string = new Char[rt_string_len(text)];
   if (!string) return nullptr;
 
   voidPtr vText = reinterpret_cast<voidPtr>(const_cast<char *>(text));
   voidPtr vStr = reinterpret_cast<voidPtr>(const_cast<char *>(string));
-  rt_copy_memory(vText, vStr, string_length(text));
+  rt_copy_memory(vText, vStr, rt_string_len(text));
   return string;
 }
 
@@ -144,8 +144,8 @@ Boolean is_space(Char chr) { return chr == ' '; }
 Boolean is_newln(Char chr) { return chr == '\n'; }
 
 voidPtr rt_string_in_string(const char *in, const char *needle) {
-  for (size_t i = 0; i < string_length(in); ++i) {
-    if (string_compare(in + i, needle, string_length(needle)) == 0)
+  for (size_t i = 0; i < rt_string_len(in); ++i) {
+    if (rt_string_cmp(in + i, needle, rt_string_len(needle)) == 0)
       return reinterpret_cast<voidPtr>(const_cast<char *>(in + i));
   }
 
diff --git a/Private/Source/compile_flags.txt b/Private/Source/compile_flags.txt
index 1b0ad789..b2809811 100644
--- a/Private/Source/compile_flags.txt
+++ b/Private/Source/compile_flags.txt
@@ -3,3 +3,4 @@
 -std=c++20
 -I../
 -I$(HOME)/
+-D__USE_NEWFS__