Merge branch 'feat_inital_context_switching' into 'develop_ba'

Implement Context Switching

See merge request teachos/kernel!6

1 files changed, 11 insertions, 1 deletions

diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 472aed5..43b5f90 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -1,9 +1,15 @@
 #include "arch/kernel/main.hpp"
 
+#include "arch/boot/pointers.hpp"
+#include "arch/context_switching/interrupt_descriptor_table/segment_selector.hpp"
+#include "arch/context_switching/main.hpp"
+#include "arch/kernel/cpu/if.hpp"
+#include "arch/kernel/cpu/segment_register.hpp"
 #include "arch/memory/heap/bump_allocator.hpp"
 #include "arch/memory/heap/global_heap_allocator.hpp"
 #include "arch/memory/main.hpp"
 #include "arch/memory/multiboot/reader.hpp"
+#include "arch/stl/vector.hpp"
 #include "arch/video/vga/text.hpp"
 
 namespace teachos::arch::kernel
@@ -55,7 +61,11 @@ namespace teachos::arch::kernel
     // stack_overflow_test(0);
 
     memory::heap::global_heap_allocator::register_heap_allocator(memory::heap::heap_allocator_type::LINKED_LIST);
+    // heap_test();
 
-    heap_test();
+    auto address = memory::heap::global_heap_allocator::kmalloc(8U);
+    (void)address;
+
+    context_switching::switch_to_user_mode();
   }
 }  // namespace teachos::arch::kernel