4 files changed, 16 insertions, 12 deletions
diff --git a/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp b/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
index 1e53140f..73c995c4 100644
--- a/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
+++ b/Private/HALKit/AMD64/HalCoreMultiProcessingAMD64.cpp
@@ -96,8 +96,8 @@ static Madt kApicMadtList[256];
 Madt* system_find_core(Madt* madt) {
   madt = madt + sizeof(Madt);
 
-  if (string_compare(madt->fMag, kApicSignature,
-                     string_length(kApicSignature)) == 0)
+  if (rt_string_cmp(madt->fMag, kApicSignature,
+                    rt_string_len(kApicSignature)) == 0)
     return madt;
 
   return nullptr;
diff --git a/Private/HALKit/AMD64/HalDebugOutput.cxx b/Private/HALKit/AMD64/HalDebugOutput.cxx
index ac16cf70..ba8770fe 100644
--- a/Private/HALKit/AMD64/HalDebugOutput.cxx
+++ b/Private/HALKit/AMD64/HalDebugOutput.cxx
@@ -60,7 +60,7 @@ void ke_io_print(const char *bytes) {
   Detail::kState = kStateTransmit;
 
   SizeT index = 0;
-  SizeT len = string_length(bytes, 256);
+  SizeT len = rt_string_len(bytes, 256);
 
   while (index < len) {
     HAL::Out8(Detail::PORT, bytes[index]);
diff --git a/Private/HALKit/AMD64/HalPageAlloc.hpp b/Private/HALKit/AMD64/HalPageAlloc.hpp
index d6912318..9ca2c580 100644
--- a/Private/HALKit/AMD64/HalPageAlloc.hpp
+++ b/Private/HALKit/AMD64/HalPageAlloc.hpp
@@ -17,13 +17,17 @@
 
 #include <NewKit/Defines.hpp>
 
-#ifndef PTE_MAX
-#define PTE_MAX (0x200)
-#endif  //! PTE_MAX
+#ifndef kPTEMax
+#define kPTEMax (0x200)
+#endif  //! kPTEMax
 
-#ifndef PTE_ALIGN
-#define PTE_ALIGN (0x1000)
-#endif  //! PTE_ALIGN
+#ifndef kPTEAlign
+#define kPTEAlign (0x1000)
+#endif  //! kPTEAlign
+
+#ifndef kPTESize
+#define kPTESize (0x1000)
+#endif  // !kPTESize
 
 extern "C" void flush_tlb(HCore::UIntPtr VirtualAddr);
 extern "C" void write_cr3(HCore::UIntPtr pde);
@@ -68,7 +72,7 @@ inline UInt8 control_register_cast(ControlRegisterBits reg) {
 }  // namespace Detail
 
 struct PageDirectory64 final {
-  PageTable64 ALIGN(PTE_ALIGN) Pte[PTE_MAX];
+  PageTable64 ALIGN(kPTEAlign) Pte[kPTEMax];
 };
 
 PageTable64* hal_alloc_page(SizeT sz, Boolean rw, Boolean user);
diff --git a/Private/HALKit/PowerPC/HalHardware.cxx b/Private/HALKit/PowerPC/HalHardware.cxx
index 89b1a6ae..a5f11449 100644
--- a/Private/HALKit/PowerPC/HalHardware.cxx
+++ b/Private/HALKit/PowerPC/HalHardware.cxx
@@ -13,7 +13,7 @@
 extern "C" void flush_tlb() {}
 extern "C" void rt_wait_for_io() {}
 
-extern "C" HCore::HAL::StackFrame* rt_get_current_context() {}
+extern "C" HCore::HAL::StackFrame* rt_get_current_context() { return nullptr; }
 
 namespace HCore {
 namespace HAL {
@@ -37,7 +37,7 @@ void ke_com_print(const Char* bytes) {
   if (!bytes) return;
 
   SizeT index = 0;
-  SizeT len = string_length(bytes, 256);
+  SizeT len = rt_string_len(bytes, 256);
 
   while (index < len) {
     // TODO