From 237f6a297424840ca92c42a36681747f41586321 Mon Sep 17 00:00:00 2001
From: Aiken Harris <harraiken91@gmail.com>
Date: Sat, 13 Dec 2025 20:21:08 +0100
Subject: [PATCH] Refactor memory manager initialization into MM::Manager

---
 xtoskrnl/CMakeLists.txt                   |  2 +-
 xtoskrnl/includes/mm.hh                   |  2 +-
 xtoskrnl/includes/mm/{init.hh => mmgr.hh} | 12 ++++++------
 xtoskrnl/mm/{init.cc => mmgr.cc}          | 13 +++++++------
 4 files changed, 15 insertions(+), 14 deletions(-)
 rename xtoskrnl/includes/mm/{init.hh => mmgr.hh} (82%)
 rename xtoskrnl/mm/{init.cc => mmgr.cc} (92%)

diff --git a/xtoskrnl/CMakeLists.txt b/xtoskrnl/CMakeLists.txt
index 72e7bb8..64841e8 100644
--- a/xtoskrnl/CMakeLists.txt
+++ b/xtoskrnl/CMakeLists.txt
@@ -56,8 +56,8 @@ list(APPEND XTOSKRNL_SOURCE
     ${XTOSKRNL_SOURCE_DIR}/mm/${ARCH}/paging.cc
     ${XTOSKRNL_SOURCE_DIR}/mm/data.cc
     ${XTOSKRNL_SOURCE_DIR}/mm/hlpool.cc
-    ${XTOSKRNL_SOURCE_DIR}/mm/init.cc
     ${XTOSKRNL_SOURCE_DIR}/mm/kpool.cc
+    ${XTOSKRNL_SOURCE_DIR}/mm/mmgr.cc
     ${XTOSKRNL_SOURCE_DIR}/mm/paging.cc
     ${XTOSKRNL_SOURCE_DIR}/po/idle.cc
     ${XTOSKRNL_SOURCE_DIR}/rtl/${ARCH}/dispatch.cc
diff --git a/xtoskrnl/includes/mm.hh b/xtoskrnl/includes/mm.hh
index 3ac8950..2e3ef60 100644
--- a/xtoskrnl/includes/mm.hh
+++ b/xtoskrnl/includes/mm.hh
@@ -15,7 +15,7 @@
 #include XTOS_ARCH_HEADER(mm, paging.hh)
 
 #include <mm/hlpool.hh>
-#include <mm/init.hh>
 #include <mm/kpool.hh>
+#include <mm/mmgr.hh>
 
 #endif /* __XTOSKRNL_MM_HH */
diff --git a/xtoskrnl/includes/mm/init.hh b/xtoskrnl/includes/mm/mmgr.hh
similarity index 82%
rename from xtoskrnl/includes/mm/init.hh
rename to xtoskrnl/includes/mm/mmgr.hh
index e606876..2fc0e84 100644
--- a/xtoskrnl/includes/mm/init.hh
+++ b/xtoskrnl/includes/mm/mmgr.hh
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/mm/init.hh
- * DESCRIPTION:     Memory Manager initialization
+ * FILE:            xtoskrnl/includes/mm/mmgr.hh
+ * DESCRIPTION:     Memory Manager
  * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
  */
 
-#ifndef __XTOSKRNL_MM_INIT_HH
-#define __XTOSKRNL_MM_INIT_HH
+#ifndef __XTOSKRNL_MM_MMGR_HH
+#define __XTOSKRNL_MM_MMGR_HH
 
 #include <xtos.hh>
 
@@ -15,7 +15,7 @@
 /* Memory Manager */
 namespace MM
 {
-    class Init
+    class Manager
     {
         private:
             STATIC PLOADER_MEMORY_DESCRIPTOR FreeDescriptor;
@@ -36,4 +36,4 @@ namespace MM
        };
 }
 
-#endif /* __XTOSKRNL_MM_INIT_HH */
+#endif /* __XTOSKRNL_MM_MMGR_HH */
diff --git a/xtoskrnl/mm/init.cc b/xtoskrnl/mm/mmgr.cc
similarity index 92%
rename from xtoskrnl/mm/init.cc
rename to xtoskrnl/mm/mmgr.cc
index d7694d8..24135a5 100644
--- a/xtoskrnl/mm/init.cc
+++ b/xtoskrnl/mm/mmgr.cc
@@ -1,9 +1,10 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/mm/init.cc
- * DESCRIPTION:     Memory Manager initialization routines
+ * FILE:            xtoskrnl/mm/mmgr.cc
+ * DESCRIPTION:     Memory Manager
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ *                  Aiken Harris <harraiken91@gmail.com>
  */
 
 #include <xtos.hh>
@@ -18,7 +19,7 @@
  */
 XTAPI
 VOID
-MM::Init::InitializeMemoryManager(VOID)
+MM::Manager::InitializeMemoryManager(VOID)
 {
     /* Scan memory descriptors provided by the boot loader */
     ScanMemoryDescriptors();
@@ -44,7 +45,7 @@ MM::Init::InitializeMemoryManager(VOID)
  */
 XTAPI
 VOID
-MM::Init::ScanMemoryDescriptors(VOID)
+MM::Manager::ScanMemoryDescriptors(VOID)
 {
     PLIST_ENTRY LoaderMemoryDescriptors, MemoryMappings;
     PLOADER_MEMORY_DESCRIPTOR MemoryDescriptor;
@@ -124,7 +125,7 @@ MM::Init::ScanMemoryDescriptors(VOID)
  */
 XTAPI
 BOOLEAN
-MM::Init::VerifyMemoryTypeFree(LOADER_MEMORY_TYPE MemoryType)
+MM::Manager::VerifyMemoryTypeFree(LOADER_MEMORY_TYPE MemoryType)
 {
     return ((MemoryType == LoaderFree) || (MemoryType == LoaderFirmwareTemporary) ||
             (MemoryType == LoaderLoadedProgram) || (MemoryType == LoaderOsloaderStack));
@@ -142,7 +143,7 @@ MM::Init::VerifyMemoryTypeFree(LOADER_MEMORY_TYPE MemoryType)
  */
 XTAPI
 BOOLEAN
-MM::Init::VerifyMemoryTypeInvisible(LOADER_MEMORY_TYPE MemoryType)
+MM::Manager::VerifyMemoryTypeInvisible(LOADER_MEMORY_TYPE MemoryType)
 {
     return ((MemoryType == LoaderFirmwarePermanent) ||
             (MemoryType == LoaderSpecialMemory) ||