2 files changed, 39 insertions, 41 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index 59e453a..5cfd9b3 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -20,44 +20,42 @@ namespace teachos::arch::kernel
     auto const memory_information = memory::multiboot::read_multiboot2();
     memory::allocator::area_frame_allocator allocator(memory_information);
 
-    size_t address = 42 * memory::paging::PAGE_TABLE_ENTRY_COUNT * memory::paging::PAGE_TABLE_ENTRY_COUNT *
-                     memory::allocator::PAGE_FRAME_SIZE;  // 42th P3 entry
-    auto const page = memory::paging::virtual_page::containing_address(address);
-
-    auto & active_table = memory::paging::active_page_table::create_or_get();
-    memory::paging::temporary_page temp_page{page, allocator};
-    temp_page.zero_entries(active_table);
-
-    memory::paging::kernel_mapper kernel(allocator, memory_information);
-    kernel.remap_kernel();
-
-    // memory::paging::map_next_free_page_to_frame(allocator, page, 0U);
-    // auto optional_frame = memory::paging::translate_page(page);
-    // video::vga::text::newline();
-    // video::vga::text::write("Mapped physical frame: ", video::vga::text::common_attributes::green_on_black);
-    // video::vga::text::write_number(optional_frame.value().frame_number,
-    //                                video::vga::text::common_attributes::green_on_black);
-    // video::vga::text::write(" to virtual page: ", video::vga::text::common_attributes::green_on_black);
-    // video::vga::text::write_number(page.page_number, video::vga::text::common_attributes::green_on_black);
-
-    // memory::paging::unmap_page(allocator, page);
-    // video::vga::text::newline();
-    // video::vga::text::write("Unapped virtual page from physical frame: ",
-    //                         video::vga::text::common_attributes::green_on_black);
-    // optional_frame = memory::paging::translate_page(page);
-    // exception_handling::assert(!optional_frame.has_value(), "[Main] Ummapping failed");
-    // video::vga::text::write_number(page.page_number, video::vga::text::common_attributes::green_on_black);
-
-    auto last_allocated = allocator.allocate_frame();
-    auto allocated = last_allocated;
-    do
-    {
-      last_allocated = allocated;
-      allocated = allocator.allocate_frame();
-    } while (allocated);
-    video::vga::text::newline();
-    video::vga::text::write("Allocated Frames: ", video::vga::text::common_attributes::green_on_black);
-    video::vga::text::write_number(last_allocated.value().frame_number,
-                                   video::vga::text::common_attributes::green_on_black);
+    memory::paging::kernel_mapper kernel(memory_information);
+    kernel.remap_kernel(allocator);
+    video::vga::text::write("Kernel remapping successfull", video::vga::text::common_attributes::green_on_black);
+
+    /*
+        size_t address = 42 * memory::paging::PAGE_TABLE_ENTRY_COUNT * memory::paging::PAGE_TABLE_ENTRY_COUNT *
+                         memory::allocator::PAGE_FRAME_SIZE;  // 42th P3 entry
+        auto const page = memory::paging::virtual_page::containing_address(address);
+        memory::paging::map_next_free_page_to_frame(allocator, page, 0U);
+        auto optional_frame = memory::paging::translate_page(page);
+        video::vga::text::newline();
+        video::vga::text::write("Mapped physical frame: ", video::vga::text::common_attributes::green_on_black);
+        video::vga::text::write_number(optional_frame.value().frame_number,
+                                       video::vga::text::common_attributes::green_on_black);
+        video::vga::text::write(" to virtual page: ", video::vga::text::common_attributes::green_on_black);
+        video::vga::text::write_number(page.page_number, video::vga::text::common_attributes::green_on_black);
+
+        memory::paging::unmap_page(allocator, page);
+        video::vga::text::newline();
+        video::vga::text::write("Unapped virtual page from physical frame: ",
+                                video::vga::text::common_attributes::green_on_black);
+        optional_frame = memory::paging::translate_page(page);
+        exception_handling::assert(!optional_frame.has_value(), "[Main] Ummapping failed");
+        video::vga::text::write_number(page.page_number, video::vga::text::common_attributes::green_on_black);
+
+        auto last_allocated = allocator.allocate_frame();
+        auto allocated = last_allocated;
+        do
+        {
+          last_allocated = allocated;
+          allocated = allocator.allocate_frame();
+        } while (allocated);
+        video::vga::text::newline();
+        video::vga::text::write("Allocated Frames: ", video::vga::text::common_attributes::green_on_black);
+        video::vga::text::write_number(last_allocated.value().frame_number,
+                                       video::vga::text::common_attributes::green_on_black);
+    */
   }
 }  // namespace teachos::arch::kernel
diff --git a/arch/x86_64/src/memory/allocator/tiny_frame_allocator.cpp b/arch/x86_64/src/memory/allocator/tiny_frame_allocator.cpp
index d07398a..b9fd2c8 100644
--- a/arch/x86_64/src/memory/allocator/tiny_frame_allocator.cpp
+++ b/arch/x86_64/src/memory/allocator/tiny_frame_allocator.cpp
@@ -11,7 +11,7 @@ namespace teachos::arch::memory::allocator
       if (frame_option.has_value())
       {
         auto value = frame_option;
-        frame_option = std::nullopt;
+        frame_option.reset();
         return value;
       }
     }
@@ -24,7 +24,7 @@ namespace teachos::arch::memory::allocator
     {
       if (!frame_option.has_value())
       {
-        frame_option = physical_frame;
+        frame_option.emplace(physical_frame);
         return;
       }
     }