diff options
Diffstat (limited to 'arch/x86_64/src/kernel')
| -rw-r--r-- | arch/x86_64/src/kernel/main.cpp | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp index 681f960..a41132d 100644 --- a/arch/x86_64/src/kernel/main.cpp +++ b/arch/x86_64/src/kernel/main.cpp @@ -22,38 +22,33 @@ namespace teachos::arch::kernel auto heap_test() -> void { - memory::heap::linked_list_allocator heap_allocator{memory::heap::HEAP_START, - memory::heap::HEAP_START + memory::heap::HEAP_SIZE}; - auto test = heap_allocator.allocate(1024); - auto test2 = new (test) memory::multiboot::memory_information{}; - auto test3 = new (static_cast<void *>(static_cast<memory::multiboot::memory_information *>(test) + 1)) - memory::multiboot::memory_information{}; + memory::heap::linked_list_allocator kernel_heap(memory::heap::HEAP_START, + memory::heap::HEAP_START + memory::heap::HEAP_SIZE); + + auto test2 = new memory::multiboot::memory_information{}; auto test4 = *test2; - auto test5 = *test3; test4.kernel_end = 5000; - test5.kernel_end = 3000; auto test6 = test4.kernel_end; - auto test7 = test5.kernel_end; auto test8 = memory::multiboot::read_multiboot2(); - if (test6 && test7 && test8.kernel_end) + if (test6 && test8.kernel_end) { video::vga::text::write("Heap test successful", video::vga::text::common_attributes::green_on_black); } test2->kernel_end = 2000; test2->kernel_start = 1000; test2->multiboot_start = 2000; - heap_allocator.deallocate(test, 1024); + delete test2; - auto test9 = heap_allocator.allocate(1024); - auto test10 = heap_allocator.allocate(1024); - auto test11 = heap_allocator.allocate(1024); - heap_allocator.deallocate(test9, 1024); - auto test12 = heap_allocator.allocate(1024); - 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); + // auto test9 = heap_allocator.allocate(1024); + // auto test10 = heap_allocator.allocate(1024); + // auto test11 = heap_allocator.allocate(1024); + // heap_allocator.deallocate(test9, 1024); + // auto test12 = heap_allocator.allocate(1024); + // 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); } auto main() -> void |
