aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorMatteo Gmür <matteo.gmuer1@ost.ch>2024-12-02 12:17:51 +0000
committerMatteo Gmür <matteo.gmuer1@ost.ch>2024-12-02 12:17:51 +0000
commit37de7b3b395a4b9cdf46a8b20ce6bb6a7d481354 (patch)
tree1b5dcd21d65129b35ad50342573063f1ca97fc03 /arch/x86_64
parentaa4de534ec7bf0b609aff032c4649484aa49823c (diff)
downloadteachos-37de7b3b395a4b9cdf46a8b20ce6bb6a7d481354.tar.xz
teachos-37de7b3b395a4b9cdf46a8b20ce6bb6a7d481354.zip
Finish testing (dealloc recombines correctly)
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/src/kernel/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index e68f0fe..a29c947 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -39,7 +39,6 @@ namespace teachos::arch::kernel
{
video::vga::text::write("Kernel remapping successfull", video::vga::text::common_attributes::green_on_black);
}
-
heap_allocator.deallocate(test, 1024);
auto test9 = heap_allocator.allocate(1024);
@@ -47,9 +46,10 @@ namespace teachos::arch::kernel
auto test11 = heap_allocator.allocate(1024);
heap_allocator.deallocate(test9, 1024);
auto test12 = heap_allocator.allocate(1024);
- heap_allocator.allocate(1024); // test 13
+ auto test13 = heap_allocator.allocate(1024);
heap_allocator.deallocate(test11, 1024);
heap_allocator.deallocate(test10, 1024);
+ heap_allocator.deallocate(test13, 1024);
heap_allocator.deallocate(test12, 1024);
}