aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src/memory
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/src/memory')
-rw-r--r--arch/x86_64/src/memory/multiboot/reader.cpp1
-rw-r--r--arch/x86_64/src/memory/paging/page_table.cpp2
-rw-r--r--arch/x86_64/src/memory/paging/virtual_page.cpp1
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/src/memory/multiboot/reader.cpp b/arch/x86_64/src/memory/multiboot/reader.cpp
index 156b437..565f604 100644
--- a/arch/x86_64/src/memory/multiboot/reader.cpp
+++ b/arch/x86_64/src/memory/multiboot/reader.cpp
@@ -111,6 +111,7 @@ namespace teachos::arch::memory::multiboot
break;
}
}
+
return mem_info;
}
} // namespace teachos::arch::memory::multiboot
diff --git a/arch/x86_64/src/memory/paging/page_table.cpp b/arch/x86_64/src/memory/paging/page_table.cpp
index 9857294..3fb7a3f 100644
--- a/arch/x86_64/src/memory/paging/page_table.cpp
+++ b/arch/x86_64/src/memory/paging/page_table.cpp
@@ -45,7 +45,7 @@ namespace teachos::arch::memory::paging
if (entry.contains_flags(entry::PRESENT) && !entry.contains_flags(entry::HUGE_PAGE))
{
std::size_t const table_address = reinterpret_cast<std::size_t>(current_table);
- return (table_address << 9) | (table_index << 12);
+ return ((table_address << 9) | (table_index << 12));
}
// TODO: Implement behaviour for huge pages currently not done
return std::nullopt;
diff --git a/arch/x86_64/src/memory/paging/virtual_page.cpp b/arch/x86_64/src/memory/paging/virtual_page.cpp
index dcdec7f..9b803d2 100644
--- a/arch/x86_64/src/memory/paging/virtual_page.cpp
+++ b/arch/x86_64/src/memory/paging/virtual_page.cpp
@@ -1,7 +1,6 @@
#include "arch/memory/paging/virtual_page.hpp"
#include "arch/exception_handling/assert.hpp"
-#include "arch/memory/allocator/physical_frame.hpp"
namespace teachos::arch::memory::paging
{