2 files changed, 16 insertions, 12 deletions

diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index a27631f..22335d1 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -24,8 +24,9 @@ namespace teachos::arch::kernel
                      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();
+    temp_page.zero_entries(active_table);
 
     // memory::paging::map_next_free_page_to_frame(allocator, page, 0U);
     // auto optional_frame = memory::paging::translate_page(page);
diff --git a/arch/x86_64/src/memory/paging/temporary_page.cpp b/arch/x86_64/src/memory/paging/temporary_page.cpp
index 433f0ce..4a8f4da 100644
--- a/arch/x86_64/src/memory/paging/temporary_page.cpp
+++ b/arch/x86_64/src/memory/paging/temporary_page.cpp
@@ -1,35 +1,38 @@
 #include "arch/memory/paging/temporary_page.hpp"
 
 #include "arch/memory/paging/page_entry.hpp"
-#include "arch/memory/paging/page_mapper.hpp"
 
 namespace teachos::arch::memory::paging
 {
-  auto temporary_page::map_to_frame(allocator::physical_frame frame) -> virtual_address
+  auto temporary_page::map_to_frame(allocator::physical_frame frame,
+                                    active_page_table & active_table) -> virtual_address
   {
-    exception_handling::assert(!translate_page(page).has_value(), "[Temporary page] Page is already mapped");
+    exception_handling::assert(!active_table.translate_page(page).has_value(),
+                               "[Temporary page] Page is already mapped");
 
-    map_page_to_frame(allocator, page, frame, entry::WRITABLE);
+    active_table.map_page_to_frame(allocator, page, frame, entry::WRITABLE);
     return page.start_address();
   }
 
-  auto temporary_page::unmap() -> void { unmap_page(allocator, page); }
+  auto temporary_page::unmap(active_page_table & active_table) -> void { active_table.unmap_page(allocator, page); }
 
-  auto temporary_page::map_table_frame(allocator::physical_frame frame) -> page_table_handle
+  auto temporary_page::map_table_frame(allocator::physical_frame frame,
+                                       active_page_table & active_table) -> page_table_handle
   {
-    page_table_handle handle{reinterpret_cast<page_table *>(map_to_frame(frame)), page_table_handle::LEVEL1};
+    page_table_handle handle{reinterpret_cast<page_table *>(map_to_frame(frame, active_table)),
+                             page_table_handle::LEVEL1};
     return handle;
   }
 
-  auto temporary_page::zero_entries() -> void
+  auto temporary_page::zero_entries(active_page_table & active_table) -> void
   {
     auto frame = allocator.allocate_frame();
     exception_handling::assert(!frame.has_value(), "[Temporary Page] Tiny allocator could not allocate a frame");
 
-    page_table_handle handle = map_table_frame(frame.value());
+    page_table_handle handle = map_table_frame(frame.value(), active_table);
     handle.zero_entries();
     handle[511].set_entry(frame.value(), entry::PRESENT | entry::WRITABLE);
 
-    unmap();
+    unmap(active_table);
   }
-}  // namespace teachos::arch::memory::paging
\ No newline at end of file
+}  // namespace teachos::arch::memory::paging