diff options
| author | Fabian Imhof <fabian.imhof@ost.ch> | 2025-05-07 14:06:25 +0000 |
|---|---|---|
| committer | Fabian Imhof <fabian.imhof@ost.ch> | 2025-05-07 14:06:25 +0000 |
| commit | be32189323ba8c46091d6deaf091cf41147426b4 (patch) | |
| tree | 499d4626c82dcae9fac683983e6605d88a0d6f95 /arch/x86_64/src/memory/main.cpp | |
| parent | c9f46f3773e7943ce114af888a44f50061c2ac1d (diff) | |
| download | teachos-be32189323ba8c46091d6deaf091cf41147426b4.tar.xz teachos-be32189323ba8c46091d6deaf091cf41147426b4.zip | |
wip custom heap allocation functions for user mode
Diffstat (limited to 'arch/x86_64/src/memory/main.cpp')
| -rw-r--r-- | arch/x86_64/src/memory/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/src/memory/main.cpp b/arch/x86_64/src/memory/main.cpp index bd094e0..558fbce 100644 --- a/arch/x86_64/src/memory/main.cpp +++ b/arch/x86_64/src/memory/main.cpp @@ -5,7 +5,7 @@ #include "arch/kernel/cpu/msr.hpp" #include "arch/memory/allocator/area_frame_allocator.hpp" #include "arch/memory/allocator/concept.hpp" -#include "arch/memory/heap/heap_allocator.hpp" +#include "arch/memory/heap/global_heap_allocator.hpp" #include "arch/memory/paging/active_page_table.hpp" #include "arch/memory/paging/kernel_mapper.hpp" @@ -22,9 +22,9 @@ namespace teachos::arch::memory template<allocator::FrameAllocator T> auto remap_heap(T & allocator, paging::active_page_table & active_table) -> void { - auto const start_page = paging::virtual_page::containing_address(memory::heap::HEAP_START); + auto const start_page = paging::virtual_page::containing_address(heap::KERNEL_HEAP_START); auto const end_page = - ++(paging::virtual_page::containing_address(memory::heap::HEAP_START + memory::heap::HEAP_SIZE - 1)); + ++(paging::virtual_page::containing_address(heap::KERNEL_HEAP_START + heap::KERNEL_HEAP_SIZE - 1)); paging::page_container::iterator const begin{start_page}; paging::page_container::iterator const end{end_page}; paging::page_container const pages{begin, end}; |
