From 6434de8ff75a9143847ef529bc209790ac4909b3 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Wed, 29 Oct 2025 11:09:42 +0100
Subject: kapi: move frame and address to KAPI

---
 arch/x86_64/src/memory/mmu.cpp              |  6 ++++--
 arch/x86_64/src/memory/region_allocator.cpp | 16 ++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'arch/x86_64/src/memory')

diff --git a/arch/x86_64/src/memory/mmu.cpp b/arch/x86_64/src/memory/mmu.cpp
index 31783fe..e573b4e 100644
--- a/arch/x86_64/src/memory/mmu.cpp
+++ b/arch/x86_64/src/memory/mmu.cpp
@@ -2,8 +2,10 @@
 
 #include "x86_64/cpu/registers.hpp"
 
-namespace teachos::x86_64::memory
+namespace teachos::memory::x86_64
 {
+  namespace cpu = cpu::x86_64;
+
   auto tlb_flush(linear_address address) -> void
   {
     asm volatile("invlpg (%[input])" : /* no output from call */ : [input] "r"(address) : "memory");
@@ -14,4 +16,4 @@ namespace teachos::x86_64::memory
     auto current_value = cpu::read_control_register(cpu::control_register::cr3);
     cpu::write_control_register(cpu::control_register::cr3, current_value);
   }
-}  // namespace teachos::x86_64::memory
+}  // namespace teachos::memory::x86_64
diff --git a/arch/x86_64/src/memory/region_allocator.cpp b/arch/x86_64/src/memory/region_allocator.cpp
index c9a98b4..91a5d49 100644
--- a/arch/x86_64/src/memory/region_allocator.cpp
+++ b/arch/x86_64/src/memory/region_allocator.cpp
@@ -1,22 +1,14 @@
-// #include "arch/memory/allocator/region_allocator.hpp"
-
-// #include "arch/exception_handling/assert.hpp"
-
-// #include <algorithm>
-// #include <array>
-// #include <ranges>
-
 #include "x86_64/memory/region_allocator.hpp"
 
-#include "x86_64/memory/address.hpp"
-#include "x86_64/memory/frame.hpp"
+#include "kapi/memory/address.hpp"
+#include "kapi/memory/frame.hpp"
 
 #include <multiboot2/information.hpp>
 
 #include <algorithm>
 #include <ranges>
 
-namespace teachos::x86_64::memory
+namespace teachos::memory::x86_64
 {
   namespace
   {
@@ -92,4 +84,4 @@ namespace teachos::x86_64::memory
   }
 
   auto region_allocator::deallocate_frame(frame const &) -> void {}
-}  // namespace teachos::x86_64::memory
+}  // namespace teachos::memory::x86_64
-- 
cgit v1.2.3