From 1db039ca1c67e8daba8b5ec6d5158cb2110e1410 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 28 Nov 2025 16:06:15 +0100 Subject: x86_64: port basic page and page table abstractions --- arch/x86_64/src/memory/page_table.cpp | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 arch/x86_64/src/memory/page_table.cpp (limited to 'arch/x86_64/src/memory/page_table.cpp') diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp new file mode 100644 index 0000000..c716c5c --- /dev/null +++ b/arch/x86_64/src/memory/page_table.cpp @@ -0,0 +1,57 @@ +#include "x86_64/memory/page_table.hpp" + +#include + +namespace teachos::memory::x86_64 +{ + + auto page_table::entry::clear() -> void + { + m_raw = 0; + } + + auto page_table::entry::present() const -> bool + { + return (flags() & flags::present) != flags::empty; + } + + auto page_table::entry::huge() const -> bool + { + return (flags() & flags::huge_page) != flags::empty; + } + + auto page_table::entry::all_flags() const -> flags + { + return std::bit_cast(m_raw & ~frame_number_mask); + } + + auto page_table::entry::frame() const -> std::optional + { + if (present()) + { + return frame::containing(physical_address{m_raw & frame_number_mask}); + } + return std::nullopt; + } + + auto page_table::entry::frame(struct frame frame, flags flags) -> void + { + m_raw = (frame.start_address().raw() | static_cast(flags)); + }; + + auto page_table::operator[](std::size_t index) -> entry & + { + return m_entries.at(index); + } + + auto page_table::operator[](std::size_t index) const -> entry const & + { + return m_entries.at(index); + } + + auto page_table::clear() -> void + { + std::ranges::for_each(m_entries, &page_table::entry::clear); + } + +} // namespace teachos::memory::x86_64 -- cgit v1.2.3 From 57d140f41b462483b8f32a883cbb0b599b9feaed Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 30 Nov 2025 16:59:17 +0100 Subject: x86_64/memory: fix entry checks --- arch/x86_64/src/memory/page_table.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/x86_64/src/memory/page_table.cpp') diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp index c716c5c..1273676 100644 --- a/arch/x86_64/src/memory/page_table.cpp +++ b/arch/x86_64/src/memory/page_table.cpp @@ -12,12 +12,12 @@ namespace teachos::memory::x86_64 auto page_table::entry::present() const -> bool { - return (flags() & flags::present) != flags::empty; + return (all_flags() & flags::present) != flags::empty; } auto page_table::entry::huge() const -> bool { - return (flags() & flags::huge_page) != flags::empty; + return (all_flags() & flags::huge_page) != flags::empty; } auto page_table::entry::all_flags() const -> flags -- cgit v1.2.3 From a96b1b4b43a1ed962b412c3d28db0fe00661d96f Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 2 Dec 2025 18:40:10 +0100 Subject: x86_64/memory: extract PML4 injection --- arch/x86_64/src/memory/page_table.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/x86_64/src/memory/page_table.cpp') diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp index 1273676..60bf94d 100644 --- a/arch/x86_64/src/memory/page_table.cpp +++ b/arch/x86_64/src/memory/page_table.cpp @@ -54,4 +54,10 @@ namespace teachos::memory::x86_64 std::ranges::for_each(m_entries, &page_table::entry::clear); } + auto page_table::empty() const noexcept -> bool + { + return std::ranges::all_of(m_entries, + [](auto const & entry) -> auto { return entry.all_flags() == entry::flags::empty; }); + } + } // namespace teachos::memory::x86_64 -- cgit v1.2.3 From b9d445bf92725d79269becf978059e040519c00a Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 10 Dec 2025 16:51:44 +0100 Subject: x86_64/memory: implement simple kernel remapper --- arch/x86_64/src/memory/page_table.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'arch/x86_64/src/memory/page_table.cpp') diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp index 60bf94d..e797b22 100644 --- a/arch/x86_64/src/memory/page_table.cpp +++ b/arch/x86_64/src/memory/page_table.cpp @@ -1,6 +1,7 @@ #include "x86_64/memory/page_table.hpp" #include +#include namespace teachos::memory::x86_64 { @@ -25,6 +26,18 @@ namespace teachos::memory::x86_64 return std::bit_cast(m_raw & ~frame_number_mask); } + auto page_table::entry::all_flags(flags flags) -> void + { + m_raw = (m_raw & ~frame_number_mask) | std::to_underlying(flags); + } + + auto page_table::entry::operator|=(flags rhs) -> page_table::entry & + { + auto raw_flags = std::to_underlying(rhs) & ~frame_number_mask; + m_raw |= raw_flags; + return *this; + } + auto page_table::entry::frame() const -> std::optional { if (present()) -- cgit v1.2.3 From 998a001fc621ca0e7560ca09a8acd29469ae3373 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 11 Dec 2025 17:46:02 +0100 Subject: docs: improve documentation --- arch/x86_64/src/memory/page_table.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'arch/x86_64/src/memory/page_table.cpp') diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp index e797b22..0e404e5 100644 --- a/arch/x86_64/src/memory/page_table.cpp +++ b/arch/x86_64/src/memory/page_table.cpp @@ -6,39 +6,39 @@ namespace teachos::memory::x86_64 { - auto page_table::entry::clear() -> void + auto page_table::entry::clear() noexcept -> void { m_raw = 0; } - auto page_table::entry::present() const -> bool + auto page_table::entry::present() const noexcept -> bool { return (all_flags() & flags::present) != flags::empty; } - auto page_table::entry::huge() const -> bool + auto page_table::entry::huge() const noexcept -> bool { return (all_flags() & flags::huge_page) != flags::empty; } - auto page_table::entry::all_flags() const -> flags + auto page_table::entry::all_flags() const noexcept -> flags { return std::bit_cast(m_raw & ~frame_number_mask); } - auto page_table::entry::all_flags(flags flags) -> void + auto page_table::entry::all_flags(flags flags) noexcept -> void { m_raw = (m_raw & ~frame_number_mask) | std::to_underlying(flags); } - auto page_table::entry::operator|=(flags rhs) -> page_table::entry & + auto page_table::entry::operator|=(flags rhs) noexcept -> page_table::entry & { auto raw_flags = std::to_underlying(rhs) & ~frame_number_mask; m_raw |= raw_flags; return *this; } - auto page_table::entry::frame() const -> std::optional + auto page_table::entry::frame() const noexcept -> std::optional { if (present()) { @@ -47,7 +47,7 @@ namespace teachos::memory::x86_64 return std::nullopt; } - auto page_table::entry::frame(struct frame frame, flags flags) -> void + auto page_table::entry::frame(struct frame frame, flags flags) noexcept -> void { m_raw = (frame.start_address().raw() | static_cast(flags)); }; @@ -62,7 +62,7 @@ namespace teachos::memory::x86_64 return m_entries.at(index); } - auto page_table::clear() -> void + auto page_table::clear() noexcept -> void { std::ranges::for_each(m_entries, &page_table::entry::clear); } -- cgit v1.2.3 From 1945dd16716392e70e74efacd19e779f121bd1da Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 15 Dec 2025 16:46:51 +0100 Subject: chore: fix missing includes --- arch/x86_64/src/memory/page_table.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/x86_64/src/memory/page_table.cpp') diff --git a/arch/x86_64/src/memory/page_table.cpp b/arch/x86_64/src/memory/page_table.cpp index 0e404e5..2de099d 100644 --- a/arch/x86_64/src/memory/page_table.cpp +++ b/arch/x86_64/src/memory/page_table.cpp @@ -1,6 +1,12 @@ #include "x86_64/memory/page_table.hpp" +#include "kapi/memory.hpp" + #include +#include +#include +#include +#include #include namespace teachos::memory::x86_64 -- cgit v1.2.3