From 6288868ebd728720236d6a857df2658bff2d6547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matteo=20Gm=C3=BCr?= Date: Sun, 29 Sep 2024 07:02:25 +0000 Subject: Pass multiboot info to main function --- src/kernel/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/kernel/main.cpp b/src/kernel/main.cpp index 07a9955..a1ef159 100644 --- a/src/kernel/main.cpp +++ b/src/kernel/main.cpp @@ -1,3 +1,6 @@ #include "arch/kernel/main.hpp" -extern "C" auto kernel_main() -> void { teachos::arch::kernel::main(); } \ No newline at end of file +extern "C" auto kernel_main(size_t multiboot_information_address) -> void +{ + teachos::arch::kernel::main(multiboot_information_address); +} -- cgit v1.2.3 From eeee7967c17704fee443a3b5b02d53a580f18b73 Mon Sep 17 00:00:00 2001 From: TheSoeren Date: Sun, 29 Sep 2024 08:52:28 +0000 Subject: use multiboot_information_pointer public variable --- src/kernel/main.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') diff --git a/src/kernel/main.cpp b/src/kernel/main.cpp index a1ef159..4799b29 100644 --- a/src/kernel/main.cpp +++ b/src/kernel/main.cpp @@ -1,6 +1,3 @@ #include "arch/kernel/main.hpp" -extern "C" auto kernel_main(size_t multiboot_information_address) -> void -{ - teachos::arch::kernel::main(multiboot_information_address); -} +extern "C" auto kernel_main() -> void { teachos::arch::kernel::main(); } -- cgit v1.2.3 From b865b36b38d951de28cc4df5fa67338b8245a1c3 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 17 Oct 2024 13:12:29 +0200 Subject: Implement support for `std::terminate` via `::abort` --- src/kernel/main.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/kernel/main.cpp b/src/kernel/main.cpp index 4799b29..36c6d92 100644 --- a/src/kernel/main.cpp +++ b/src/kernel/main.cpp @@ -1,3 +1,9 @@ #include "arch/kernel/main.hpp" -extern "C" auto kernel_main() -> void { teachos::arch::kernel::main(); } +#include "arch/exception_handling/panic.hpp" + +extern "C" auto kernel_main() -> void +{ + teachos::arch::kernel::main(); + teachos::arch::exception_handling::panic("Architecture specific main returned!"); +} -- cgit v1.2.3