1 files changed, 18 insertions, 2 deletions
diff --git a/arch/x86_64/src/memory/main.cpp b/arch/x86_64/src/memory/main.cpp
index a920a20..3041a75 100644
--- a/arch/x86_64/src/memory/main.cpp
+++ b/arch/x86_64/src/memory/main.cpp
@@ -4,6 +4,8 @@
 #include "arch/kernel/cpu/control_register.hpp"
 #include "arch/kernel/cpu/msr.hpp"
 #include "arch/memory/allocator/area_frame_allocator.hpp"
+#include "arch/memory/allocator/concept.hpp"
+#include "arch/memory/allocator/stack_frame_allocator.hpp"
 #include "arch/memory/heap/heap_allocator.hpp"
 #include "arch/memory/paging/active_page_table.hpp"
 #include "arch/memory/paging/kernel_mapper.hpp"
@@ -12,7 +14,21 @@ namespace teachos::arch::memory
 {
   namespace
   {
-    auto remap_heap(allocator::area_frame_allocator allocator, paging::active_page_table & active_table) -> void
+    template<allocator::FrameAllocator T>
+    auto create_frame_allocator(multiboot::memory_information const & memory_information) -> T
+    {
+      return allocator::area_frame_allocator{memory_information};
+    }
+
+    template<>
+    auto create_frame_allocator(multiboot::memory_information const & memory_information)
+        -> allocator::stack_frame_allocator
+    {
+      return allocator::stack_frame_allocator{memory_information};
+    }
+
+    template<allocator::FrameAllocator T>
+    auto remap_heap(T & allocator, paging::active_page_table & active_table) -> void
     {
       auto const start_page = paging::virtual_page::containing_address(memory::heap::HEAP_START);
       auto const end_page =
@@ -36,7 +52,7 @@ namespace teachos::arch::memory
     has_been_called = true;
 
     auto const memory_information = multiboot::read_multiboot2();
-    allocator::area_frame_allocator allocator(memory_information);
+    auto allocator = create_frame_allocator<allocator::stack_frame_allocator>(memory_information);
 
     kernel::cpu::set_cr0_bit(kernel::cpu::cr0_flags::WRITE_PROTECT);
     kernel::cpu::set_efer_bit(kernel::cpu::efer_flags::NXE);