aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatteo Gmür <matteo.gmuer1@ost.ch>2024-10-17 13:12:29 +0200
committerMatteo Gmür <matteo.gmuer1@ost.ch>2024-10-17 13:12:29 +0200
commitf9ddd266e1ab1a7fcd4952a066083ca19fba63cf (patch)
tree694825047086e18855bdb34fc24698292f6258ff /src
parentd539ed1f4f26a42959bcae6ea3050b7f99f5f872 (diff)
parentb865b36b38d951de28cc4df5fa67338b8245a1c3 (diff)
downloadteachos-f9ddd266e1ab1a7fcd4952a066083ca19fba63cf.tar.xz
teachos-f9ddd266e1ab1a7fcd4952a066083ca19fba63cf.zip
Merge branch 'fmorgner/abort' into 'feat_memory_manager'
Implement support for `std::terminate` via `::abort` See merge request teachos/kernel!2
Diffstat (limited to 'src')
-rw-r--r--src/kernel/main.cpp8
1 files changed, 7 insertions, 1 deletions
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!");
+}