aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src/kernel/main.cpp
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/src/kernel/main.cpp
parentbff6c39a8d4571cd5c41e3926d5fc1428916f32c (diff)
downloadteachos-6c4ce82c3f9cc920bcde74fc10fdfd39b477b9f4.tar.xz
teachos-6c4ce82c3f9cc920bcde74fc10fdfd39b477b9f4.zip
Fix compilation issues
Diffstat (limited to 'arch/x86_64/src/kernel/main.cpp')
-rw-r--r--arch/x86_64/src/kernel/main.cpp28
1 files changed, 4 insertions, 24 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp
index f88ea41..ed9fc58 100644
--- a/arch/x86_64/src/kernel/main.cpp
+++ b/arch/x86_64/src/kernel/main.cpp
@@ -22,12 +22,8 @@ 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{};
+ auto test2 = new memory::multiboot::memory_information{};
+ auto test3 = new memory::multiboot::memory_information{};
auto test4 = *test2;
auto test5 = *test3;
test4.kernel_end = 5000;
@@ -42,24 +38,8 @@ namespace teachos::arch::kernel
test2->kernel_end = 2000;
test2->kernel_start = 1000;
test2->multiboot_start = 2000;
- heap_allocator.deallocate(test, 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);*/
-
- int * test = new int();
-
- if (test == nullptr)
- {
- }
+ delete test2;
+ delete test3;
}
auto main() -> void