aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src/memory
diff options
context:
space:
mode:
authorMatteo Gmür <matteo.gmuer1@ost.ch>2024-11-11 14:16:18 +0000
committerMatteo Gmür <matteo.gmuer1@ost.ch>2024-11-11 14:16:18 +0000
commit0ca0c40c197c214288ad2ed1179ae9ae28c50194 (patch)
treedf2127d7e6a39de96c70c2458140dee75ae3c49e /arch/x86_64/src/memory
parent0f3c5c2bc02d7aa48f8edbe42a67dd91821032b7 (diff)
downloadteachos-0ca0c40c197c214288ad2ed1179ae9ae28c50194.tar.xz
teachos-0ca0c40c197c214288ad2ed1179ae9ae28c50194.zip
Improve calculation of kernel end and start address.
Diffstat (limited to 'arch/x86_64/src/memory')
-rw-r--r--arch/x86_64/src/memory/multiboot/reader.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86_64/src/memory/multiboot/reader.cpp b/arch/x86_64/src/memory/multiboot/reader.cpp
index 1dd18ff..2bf5b25 100644
--- a/arch/x86_64/src/memory/multiboot/reader.cpp
+++ b/arch/x86_64/src/memory/multiboot/reader.cpp
@@ -6,6 +6,7 @@
#include "arch/memory/multiboot/info.hpp"
#include <algorithm>
+#include <ranges>
namespace teachos::arch::memory::multiboot
{
@@ -56,11 +57,15 @@ namespace teachos::arch::memory::multiboot
elf_section_header_container sections{begin, end};
+ auto allocated_sections = sections | std::views::filter([](auto const & section) {
+ return section.flags.contains_flags(elf_section_flags::OCCUPIES_MEMORY);
+ });
+
auto const elf_section_with_lowest_physical_address = std::ranges::min_element(
- sections, [](auto const & a, auto const & b) { return a.physical_address < b.physical_address; });
+ allocated_sections, [](auto const & a, auto const & b) { return a.physical_address < b.physical_address; });
auto const elf_section_with_highest_physical_address =
- std::ranges::max_element(sections, [](auto const & a, auto const & b) {
+ std::ranges::max_element(allocated_sections, [](auto const & a, auto const & b) {
auto a_physical_address_end = a.physical_address + a.section_size;
auto b_physical_address_end = b.physical_address + b.section_size;
return a_physical_address_end < b_physical_address_end;