aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/include
diff options
context:
space:
mode:
authorMatteo Gmür <matteo.gmuer1@ost.ch>2025-02-20 10:41:11 +0000
committerMatteo Gmür <matteo.gmuer1@ost.ch>2025-02-20 10:41:11 +0000
commit6c4ce82c3f9cc920bcde74fc10fdfd39b477b9f4 (patch)
tree03465649821a73db88489e4b1a0adc1f298bf64c /arch/x86_64/include
parentbff6c39a8d4571cd5c41e3926d5fc1428916f32c (diff)
downloadteachos-6c4ce82c3f9cc920bcde74fc10fdfd39b477b9f4.tar.xz
teachos-6c4ce82c3f9cc920bcde74fc10fdfd39b477b9f4.zip
Fix compilation issues
Diffstat (limited to 'arch/x86_64/include')
-rw-r--r--arch/x86_64/include/arch/memory/heap/global_heap_allocator.hpp33
1 files changed, 9 insertions, 24 deletions
diff --git a/arch/x86_64/include/arch/memory/heap/global_heap_allocator.hpp b/arch/x86_64/include/arch/memory/heap/global_heap_allocator.hpp
index b7b2073..871f4f8 100644
--- a/arch/x86_64/include/arch/memory/heap/global_heap_allocator.hpp
+++ b/arch/x86_64/include/arch/memory/heap/global_heap_allocator.hpp
@@ -10,37 +10,22 @@ namespace teachos::arch::memory::heap
static auto allocate(std::size_t size) -> void *;
static auto deallocate(void * pointer, std::size_t size) -> void;
+
+ private:
+ static linked_list_allocator allocator;
};
} // namespace teachos::arch::memory::heap
-auto operator new(std::size_t size) -> void *
-{
- return teachos::arch::memory::heap::global_heap_allocator::allocate(size);
-}
+auto operator new(std::size_t size) -> void *;
-auto operator delete(void * pointer) noexcept -> void
-{
- teachos::arch::memory::heap::global_heap_allocator::deallocate(pointer, 64);
-}
+auto operator delete(void * pointer) noexcept -> void;
-auto operator delete(void * pointer, std::size_t size) noexcept -> void
-{
- teachos::arch::memory::heap::global_heap_allocator::deallocate(pointer, size);
-}
+auto operator delete(void * pointer, std::size_t size) noexcept -> void;
-auto operator new[](std::size_t size) -> void *
-{
- return teachos::arch::memory::heap::global_heap_allocator::allocate(size);
-}
+auto operator new[](std::size_t size) -> void *;
-auto operator delete[](void * pointer) noexcept -> void
-{
- teachos::arch::memory::heap::global_heap_allocator::deallocate(pointer, 64);
-}
+auto operator delete[](void * pointer) noexcept -> void;
-auto operator delete[](void * pointer, std::size_t size) noexcept -> void
-{
- teachos::arch::memory::heap::global_heap_allocator::deallocate(pointer, size);
-}
+auto operator delete[](void * pointer, std::size_t size) noexcept -> void;
#endif // TEACHOS_ARCH_X86_64_MEMORY_HEAP_GLOBAL_HEAP_ALLOCATOR_HPP