aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/src')
-rw-r--r--arch/x86_64/src/kernel/main.cpp4
-rw-r--r--arch/x86_64/src/memory/allocator/area_frame_allocator.cpp2
-rw-r--r--arch/x86_64/src/memory/allocator/physical_frame.cpp123
-rw-r--r--arch/x86_64/src/memory/multiboot/reader.cpp18
-rw-r--r--arch/x86_64/src/memory/paging/inactive_page_table.cpp2
-rw-r--r--arch/x86_64/src/memory/paging/kernel_mapper.cpp31
6 files changed, 140 insertions, 40 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index c89ae44..59e453a 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -3,6 +3,7 @@
#include "arch/exception_handling/assert.hpp"
#include "arch/memory/allocator/area_frame_allocator.hpp"
#include "arch/memory/multiboot/reader.hpp"
+#include "arch/memory/paging/kernel_mapper.hpp"
#include "arch/memory/paging/temporary_page.hpp"
#include "arch/video/vga/text.hpp"
@@ -27,6 +28,9 @@ namespace teachos::arch::kernel
memory::paging::temporary_page temp_page{page, allocator};
temp_page.zero_entries(active_table);
+ memory::paging::kernel_mapper kernel(allocator, memory_information);
+ kernel.remap_kernel();
+
// memory::paging::map_next_free_page_to_frame(allocator, page, 0U);
// auto optional_frame = memory::paging::translate_page(page);
// video::vga::text::newline();
diff --git a/arch/x86_64/src/memory/allocator/area_frame_allocator.cpp b/arch/x86_64/src/memory/allocator/area_frame_allocator.cpp
index 1e87147..5d56a2a 100644
--- a/arch/x86_64/src/memory/allocator/area_frame_allocator.cpp
+++ b/arch/x86_64/src/memory/allocator/area_frame_allocator.cpp
@@ -8,7 +8,7 @@
namespace teachos::arch::memory::allocator
{
- area_frame_allocator::area_frame_allocator(multiboot::memory_information mem_info)
+ area_frame_allocator::area_frame_allocator(multiboot::memory_information const & mem_info)
: next_free_frame(0U)
, current_area(std::nullopt)
, memory_areas(mem_info.begin_area, mem_info.end_area)
diff --git a/arch/x86_64/src/memory/allocator/physical_frame.cpp b/arch/x86_64/src/memory/allocator/physical_frame.cpp
index bef9322..9307602 100644
--- a/arch/x86_64/src/memory/allocator/physical_frame.cpp
+++ b/arch/x86_64/src/memory/allocator/physical_frame.cpp
@@ -14,4 +14,127 @@ namespace teachos::arch::memory::allocator
}
auto physical_frame::start_address() const -> physical_address { return frame_number * PAGE_FRAME_SIZE; }
+
+ /**
+ * @brief Constructor.
+ *
+ * @param value Underlying value the iterator should point too
+ */
+ physical_frame_iterator::physical_frame_iterator(physical_frame_iterator::value_type value)
+ : value(value)
+ {
+ // Nothing to do
+ }
+
+ /**
+ * @brief Dereferences the initally given pointer to its value.
+ *
+ * @return Reference to the value.
+ */
+ auto physical_frame_iterator::operator*() -> physical_frame_iterator::value_type & { return value; }
+
+ /**
+ * @brief Get underlying value, which is the intially passed pointer.
+ *
+ * @return Underlying value passed intially.
+ */
+ auto physical_frame_iterator::operator->() -> physical_frame_iterator::value_type * { return &value; }
+
+ /**
+ * @brief Post increment operator. Returns a copy of the value.
+ *
+ * @return Copy of the incremented underlying address.
+ */
+ auto physical_frame_iterator::operator++(int) -> physical_frame_iterator
+ {
+ physical_frame_iterator const old_value = *this;
+ ++value.frame_number;
+ return old_value;
+ }
+
+ /**
+ * @brief Pre increment operator. Returns a reference to the changed value.
+ *
+ * @return Reference to the incremented underlying address.
+ */
+ auto physical_frame_iterator::operator++() -> physical_frame_iterator &
+ {
+ ++value.frame_number;
+ return *this;
+ }
+
+ /**
+ * @brief Addition assignment operator. Returns a reference to the changed value.
+ *
+ * @param operand Value we want to add to the underlying address.
+ * @return Reference to the changed underlying address.
+ */
+ auto
+ physical_frame_iterator::operator+=(physical_frame_iterator::difference_type operand) -> physical_frame_iterator &
+ {
+ value.frame_number += operand;
+ return *this;
+ }
+
+ /**
+ * @brief Subtraction assignment operator. Returns a reference to the changed value.
+ *
+ * @param operand Value we want to subtract from the underlying address.
+ * @return Reference to the changed underlying address.
+ */
+ auto
+ physical_frame_iterator::operator-=(physical_frame_iterator::difference_type operand) -> physical_frame_iterator &
+ {
+ value.frame_number -= operand;
+ return *this;
+ }
+
+ /**
+ * @brief Addition operator. Returns the changed value.
+ *
+ * @param operand Value we want to add to a copy of the underlying address.
+ * @return Copy of underlying address incremented by the given value.
+ */
+ auto
+ physical_frame_iterator::operator+(physical_frame_iterator::difference_type operand) const -> physical_frame_iterator
+ {
+ return physical_frame_iterator{physical_frame_iterator::value_type{value.frame_number + operand}};
+ }
+
+ /**
+ * @brief Subtraction operator. Returns the changed value.
+ *
+ * @param operand Value we want to subtrcat from a copy of the underlying address.
+ * @return Copy of underlying address decremented by the given value.
+ */
+ auto
+ physical_frame_iterator::operator-(physical_frame_iterator::difference_type operand) const -> physical_frame_iterator
+ {
+ return physical_frame_iterator{physical_frame_iterator::value_type{value.frame_number - operand}};
+ }
+
+ /**
+ * @brief Subtraction operator. Returns the size difference between two iterators.
+ *
+ * @param other Other iterator we want to substract the underlying address with ours.
+ * @return Size difference between the underlying address of this instance and the given iterator.
+ */
+ auto physical_frame_iterator::operator-(const physical_frame_iterator & other) const
+ -> physical_frame_iterator::difference_type
+ {
+ return value.frame_number - other.value.frame_number;
+ }
+
+ /**
+ * @brief Index operator overload. Returns a reference to the value at the given index. Simply returns the
+ * dereferenced underlying pointer incremented by the given index.
+ *
+ * @param index Index we want to access and get the value from.
+ * @return Reference to the value at the given index.
+ */
+ auto physical_frame_iterator::operator[](physical_frame_iterator::difference_type index) const
+ -> physical_frame_iterator::value_type
+ {
+ return physical_frame_iterator::value_type{value.frame_number + index};
+ }
} // namespace teachos::arch::memory::allocator
diff --git a/arch/x86_64/src/memory/multiboot/reader.cpp b/arch/x86_64/src/memory/multiboot/reader.cpp
index c3a78df..e35baf3 100644
--- a/arch/x86_64/src/memory/multiboot/reader.cpp
+++ b/arch/x86_64/src/memory/multiboot/reader.cpp
@@ -34,8 +34,9 @@ namespace teachos::arch::memory::multiboot
end_area = begin_area + number_of_entries;
}
- auto process_elf_sections(elf_symbols_section_header * symbol, uint64_t & kernel_start,
- uint64_t & kernel_end) -> void
+ auto process_elf_sections(elf_symbols_section_header * symbol, std::size_t & kernel_start, std::size_t & kernel_end,
+ elf_section_header_container::iterator & begin_kernel,
+ elf_section_header_container::iterator & end_kernel) -> void
{
auto const expected_entry_size = symbol->entry_size;
auto constexpr actual_entry_size = sizeof(elf_section_header);
@@ -49,12 +50,12 @@ namespace teachos::arch::memory::multiboot
exception_handling::assert(expected_total_size == actual_total_size,
"[Multiboot Reader] Unexpected elf symbols section header total size");
- auto const begin = elf_section_header_container::iterator{reinterpret_cast<elf_section_header *>(&symbol->end)};
- auto const end = begin + symbol->number_of_sections;
- exception_handling::assert(begin->is_null(),
+ begin_kernel = elf_section_header_container::iterator{reinterpret_cast<elf_section_header *>(&symbol->end)};
+ end_kernel = begin_kernel + symbol->number_of_sections;
+ exception_handling::assert(begin_kernel->is_null(),
"[Multiboot Reader] Elf symbols section not starting with SHT_NULL section");
- elf_section_header_container container{begin, end};
+ elf_section_header_container container{begin_kernel, end_kernel};
auto const elf_section_with_lowest_virtual_address =
std::ranges::min_element(container, [](elf_section_header const & a, elf_section_header const & b) {
@@ -93,6 +94,8 @@ namespace teachos::arch::memory::multiboot
{
memory_information mem_info{UINT64_MAX,
0U,
+ elf_section_header_container::iterator{},
+ elf_section_header_container::iterator{},
boot::multiboot_information_pointer,
0U,
memory_area_container::iterator{},
@@ -108,7 +111,8 @@ namespace teachos::arch::memory::multiboot
{
case tag_type::ELF_SECTIONS: {
auto const symbol = reinterpret_cast<elf_symbols_section_header *>(tag);
- process_elf_sections(symbol, mem_info.kernel_start, mem_info.kernel_end);
+ process_elf_sections(symbol, mem_info.kernel_start, mem_info.kernel_end, mem_info.begin_kernel,
+ mem_info.end_kernel);
break;
}
case tag_type::MEMORY_MAP: {
diff --git a/arch/x86_64/src/memory/paging/inactive_page_table.cpp b/arch/x86_64/src/memory/paging/inactive_page_table.cpp
index afba1f0..de0421d 100644
--- a/arch/x86_64/src/memory/paging/inactive_page_table.cpp
+++ b/arch/x86_64/src/memory/paging/inactive_page_table.cpp
@@ -2,7 +2,7 @@
namespace teachos::arch::memory::paging
{
- inactive_page_table::inactive_page_table(allocator::physical_frame frame, active_page_table active_page_table,
+ inactive_page_table::inactive_page_table(allocator::physical_frame frame, active_page_table & active_page_table,
temporary_page temporary_page)
: page_table_level_4_frame{frame}
{
diff --git a/arch/x86_64/src/memory/paging/kernel_mapper.cpp b/arch/x86_64/src/memory/paging/kernel_mapper.cpp
deleted file mode 100644
index 07d55ff..0000000
--- a/arch/x86_64/src/memory/paging/kernel_mapper.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "arch/memory/paging/kernel_mapper.hpp"
-
-#include "arch/memory/allocator/physical_frame.hpp"
-#include "arch/memory/paging/tlb.hpp"
-
-namespace teachos::arch::memory::paging
-{
- kernel_mapper::kernel_mapper(active_page_table & active_table)
- : active_table(active_table)
- {
- // Nothing to do
- }
-
- auto kernel_mapper::with(inactive_page_table inactive_page_table, temporary_page temporary_page,
- active_page_table::function f) -> void
- {
- auto backup = allocator::physical_frame::containing_address(PAGE_TABLE_LEVEL_4_ADDRESS);
- auto page_table_level4 = temporary_page.map_table_frame(backup, active_table);
-
- active_table.active_handle[511].set_entry(inactive_page_table.page_table_level_4_frame,
- entry::PRESENT | entry::WRITABLE);
- tlb_flush_all();
-
- f(active_table);
-
- page_table_level4[511].set_entry(backup, entry::PRESENT | entry::WRITABLE);
- tlb_flush_all();
-
- temporary_page.unmap(active_table);
- }
-} // namespace teachos::arch::memory::paging
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-19 23:49:32 +0000