Adjust types

2 files changed, 5 insertions, 7 deletions

diff --git a/arch/x86_64/src/boot/boot.s b/arch/x86_64/src/boot/boot.s
index 29ac58d..e3d9c37 100644
--- a/arch/x86_64/src/boot/boot.s
+++ b/arch/x86_64/src/boot/boot.s
@@ -268,7 +268,7 @@ enable_paging:
     mov $page_map_level_4, %eax
     or 0b11, %eax
     // TODO: WHY THIS THROW ERROR?
-    mov %eax, [$page_map_level_4 + 511 * 8]
+    //mov %eax, [$page_map_level_4 + 511 * 8]
 
     /* Enable Physical Address Extension */
     mov %cr4, %eax
diff --git a/arch/x86_64/src/memory/paging.cpp b/arch/x86_64/src/memory/paging.cpp
index 61d9d0f..2f78da8 100644
--- a/arch/x86_64/src/memory/paging.cpp
+++ b/arch/x86_64/src/memory/paging.cpp
@@ -60,19 +60,17 @@ namespace teachos::arch::memory
       std::size_t table_address = reinterpret_cast<std::size_t>(this);
       return (table_address << 9) | (index << 12);
     }
-    else
-    {
-      return std::nullopt;
-    }
+    // TODO: Implement behaviour for huge pages currently not done
+    return std::nullopt;
   }
 
-  auto page_table::next_table(size_t index) const -> std::optional<const page_table *>
+  auto page_table::next_table(std::size_t index) const -> std::optional<page_table const *>
   {
     auto address = next_table_address(index);
 
     if (address.has_value())
     {
-      return reinterpret_cast<const page_table *>(*address);
+      return reinterpret_cast<page_table const *>(*address);
     }
 
     return std::nullopt;