Merge branch 'fmorgner/develop-BA-FS26/x86-64-use-p1204-layout' into 'develop-BA-FS26'

chore: migrate 'arch' to p1204 project layout

See merge request teachos/kernel!28

1 files changed, 0 insertions, 71 deletions

diff --git a/arch/x86_64/pre/src/kernel/main.cpp b/arch/x86_64/pre/src/kernel/main.cpp
deleted file mode 100644
index 2658678..0000000
--- a/arch/x86_64/pre/src/kernel/main.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <arch/kernel/main.hpp>
-
-#include <arch/boot/pointers.hpp>
-#include <arch/context_switching/interrupt_descriptor_table/segment_selector.hpp>
-#include <arch/context_switching/main.hpp>
-#include <arch/kernel/cpu/if.hpp>
-#include <arch/kernel/cpu/segment_register.hpp>
-#include <arch/memory/heap/bump_allocator.hpp>
-#include <arch/memory/heap/global_heap_allocator.hpp>
-#include <arch/memory/main.hpp>
-#include <arch/memory/multiboot/reader.hpp>
-#include <arch/stl/vector.hpp>
-#include <arch/video/vga/text.hpp>
-
-namespace teachos::arch::kernel
-{
-  auto stack_overflow_test(int count) -> int
-  {
-    int test[5000] = {};
-    if (test[0] == 0xFFFF)
-    {
-      return count;
-    }
-    count = stack_overflow_test(count);
-    return count++;
-  }
-
-  auto heap_test() -> void
-  {
-    auto test2 = new memory::multiboot::memory_information{};
-    auto test3 = 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)
-    {
-      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;
-    delete test2;
-    delete test3;
-
-    auto test9 = new int(50);
-    delete test9;
-  }
-
-  auto main() -> void
-  {
-    video::vga::text::clear();
-    video::vga::text::cursor(false);
-    video::vga::text::write("TeachOS is starting up...", video::vga::text::common_attributes::green_on_black);
-    video::vga::text::newline();
-
-    memory::initialize_memory_management();
-    // stack_overflow_test(0);
-
-    memory::heap::global_heap_allocator::register_heap_allocator(memory::heap::heap_allocator_type::LINKED_LIST);
-    // heap_test();
-
-    auto address = memory::heap::global_heap_allocator::kmalloc(8U);
-    (void)address;
-
-    context_switching::switch_to_user_mode();
-  }
-}  // namespace teachos::arch::kernel