wip custom heap allocation functions for user mode

1 files changed, 15 insertions, 11 deletions

diff --git a/arch/x86_64/src/user/main.cpp b/arch/x86_64/src/user/main.cpp
index 3e7b0ec..4f6e688 100644
--- a/arch/x86_64/src/user/main.cpp
+++ b/arch/x86_64/src/user/main.cpp
@@ -1,8 +1,9 @@
 #include "arch/user/main.hpp"
 
 #include "arch/context_switching/syscall/main.hpp"
+#include "arch/memory/heap/global_heap_allocator.hpp"
 
-// TODO: Disallow this import
+// TODO: Disallow these imports
 #include "arch/kernel/cpu/if.hpp"
 #include "arch/video/vga/text.hpp"
 
@@ -11,20 +12,23 @@ namespace teachos::arch::user
   auto main() -> void
   {
     char constexpr syscall_message[] = "Successfully entered user mode and wrote to VGA buffer via syscall!";
-    auto const error = context_switching::syscall::syscall(context_switching::syscall::type::WRITE,
-                                                           {reinterpret_cast<uint64_t>(&syscall_message)});
+    context_switching::syscall::syscall(context_switching::syscall::type::WRITE,
+                                        {reinterpret_cast<uint64_t>(&syscall_message)});
 
-    kernel::cpu::clear_interrupt_flag();  // Causes crash Kernel Code (.text) is not mapped in User mMde
+    // kernel::cpu::clear_interrupt_flag();  // Causes crash Kernel Code (.text) is not mapped in User mMde
 
-    auto test = new int{20};  // Causes crash Heap is not mapped in User Mode
+    auto test = memory::heap::global_heap_allocator::malloc(20U);
     (void)test;
 
-    if (!error)
-    {
-      // Causes crash vga is not mapped in User Mode
-      video::vga::text::write("Successfully made a SYSCALL and returned with SYSRETQ!",
-                              video::vga::text::common_attributes::green_on_black);
-    }
+    // auto test = new int{20};  // Causes crash Heap is not mapped in User Mode
+    // (void)test;
+
+    // if (!error)
+    // {
+    //   // Causes crash vga is not mapped in User Mode
+    //   video::vga::text::write("Successfully made a SYSCALL and returned with SYSRETQ!",
+    //                           video::vga::text::common_attributes::green_on_black);
+    // }
 
     for (;;)
     {