diff options
Diffstat (limited to 'arch/x86_64/src/memory')
| -rw-r--r-- | arch/x86_64/src/memory/heap/bump_allocator.cpp (renamed from arch/x86_64/src/memory/heap/allocator.cpp) | 7 | ||||
| -rw-r--r-- | arch/x86_64/src/memory/main.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86_64/src/memory/heap/allocator.cpp b/arch/x86_64/src/memory/heap/bump_allocator.cpp index bb61be4..486ece8 100644 --- a/arch/x86_64/src/memory/heap/allocator.cpp +++ b/arch/x86_64/src/memory/heap/bump_allocator.cpp @@ -1,4 +1,4 @@ -#include "arch/memory/heap/allocator.hpp" +#include "arch/memory/heap/bump_allocator.hpp" #include "arch/exception_handling/assert.hpp" @@ -17,10 +17,9 @@ namespace teachos::arch::memory::heap return reinterpret_cast<void *>(alloc_start); } - auto bump_allocator::deallocate(uint8_t * pointer) -> void + auto bump_allocator::deallocate(uint8_t * pointer, std::size_t size) -> void { - // Not implemented; leaking memory - if (pointer) + if (pointer || size) { } } diff --git a/arch/x86_64/src/memory/main.cpp b/arch/x86_64/src/memory/main.cpp index 80242cc..34ce113 100644 --- a/arch/x86_64/src/memory/main.cpp +++ b/arch/x86_64/src/memory/main.cpp @@ -4,7 +4,7 @@ #include "arch/memory/allocator/area_frame_allocator.hpp" #include "arch/memory/cpu/control_register.hpp" #include "arch/memory/cpu/msr.hpp" -#include "arch/memory/heap/allocator.hpp" +#include "arch/memory/heap/concept.hpp" #include "arch/memory/paging/active_page_table.hpp" #include "arch/memory/paging/kernel_mapper.hpp" |