2 files changed, 24 insertions, 12 deletions

diff --git a/arch/x86_64/src/memory/paging/page_entry.cpp b/arch/x86_64/src/memory/paging/page_entry.cpp
index 692f8ae..0dbbae1 100644
--- a/arch/x86_64/src/memory/paging/page_entry.cpp
+++ b/arch/x86_64/src/memory/paging/page_entry.cpp
@@ -33,10 +33,10 @@ namespace teachos::arch::memory::paging
 
   auto entry::contains_flags(std::bitset<64U> other) const -> bool { return (flags & other) == other; }
 
-  auto entry::set_address(allocator::physical_frame frame) -> void
+  auto entry::set_entry(allocator::physical_frame frame, std::bitset<64U> additional_flags) -> void
   {
     exception_handling::assert((frame.start_address() & ~0x000fffff'fffff000) == 0,
                                "Start address is not aligned with Page");
-    flags = std::bitset<64U>(frame.start_address()) | flags;
+    flags = std::bitset<64U>(frame.start_address()) | additional_flags;
   }
 }  // namespace teachos::arch::memory::paging
diff --git a/arch/x86_64/src/memory/paging/page_mapper.cpp b/arch/x86_64/src/memory/paging/page_mapper.cpp
index e68bc68..ec1d5d5 100644
--- a/arch/x86_64/src/memory/paging/page_mapper.cpp
+++ b/arch/x86_64/src/memory/paging/page_mapper.cpp
@@ -1,6 +1,6 @@
+#include "arch/memory/paging/page_mapper.hpp"
+
 #include "arch/exception_handling/assert.hpp"
-#include "arch/memory/allocator/area_frame_allocator.hpp"
-#include "arch/memory/paging/virtual_page.hpp"
 
 namespace teachos::arch::memory::paging
 {
@@ -9,8 +9,6 @@ namespace teachos::arch::memory::paging
     page_table page_table{};
     bool is_valid = false;
 
-    auto huge_page = [&]() -> std::optional<allocator::physical_frame> {};
-
     for (auto level = page_table::LEVEL4; level != page_table::LEVEL1; level--)
     {
       is_valid = page_table.next_table(page.get_level_index(level));
@@ -82,12 +80,26 @@ namespace teachos::arch::memory::paging
   auto map_page_to_frame(memory::allocator::area_frame_allocator & allocator, const virtual_page & page,
                          const memory::allocator::physical_frame & frame, entry::bitset flags) -> void
   {
-    auto p4 = reinterpret_cast<P4 *>(P4);  // Assuming P4 is defined somewhere
-    auto p3 = p4->next_table_create(page.p4_index(), allocator);
-    auto p2 = p3->next_table_create(page.p3_index(), allocator);
-    auto p1 = p2->next_table_create(page.p2_index(), allocator);
+    page_table page_table{};
+    bool is_valid = false;
+
+    for (auto level = page_table::LEVEL4; level != page_table::LEVEL1; level--)
+    {
+      std::size_t level_index = page.get_level_index(level);
+      is_valid = page_table.next_table(level_index);
+      page_table[level_index].set_entry(frame, entry::PRESENT | entry::WRITABLE);
+      page_table.zero_entries();
+
+      if (!is_valid)
+      {
+        break;
+      }
+    }
 
-    assert(p1[page.p1_index()].is_unused());
-    p1[page.p1_index()].set(frame, flags | PRESENT);
+    entry page_table_entry = page_table[page.get_level_index(page_table::LEVEL1)];
+    arch::exception_handling::assert(!page_table_entry.contains_flags(entry::HUGE_PAGE),
+                                     "[Page Mapper]: Unable to map huge pages");
+    arch::exception_handling::assert(!page_table_entry.is_unused(), "[Page Mapper]: Page table entry is already used");
+    page_table_entry.set_entry(frame, flags | entry::PRESENT);
   }
 }  // namespace teachos::arch::memory::paging
\ No newline at end of file