aboutsummaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
authorMatteo Gmür <matteo.gmuer1@ost.ch>2025-02-18 10:59:05 +0100
committerMatteo Gmür <matteo.gmuer1@ost.ch>2025-02-18 10:59:05 +0100
commitcd42c21f2460751428b3e1b4ae07ea0b924967bc (patch)
treee3e410f399c3eead444f2a242a19448571fd979a /src/kernel
parent47879f42d70755fcf5473ffb82798b515cb2e21b (diff)
parent3d488e53a1d15fcc01a7b1d23b9585ca7a724864 (diff)
downloadteachos-cd42c21f2460751428b3e1b4ae07ea0b924967bc.tar.xz
teachos-cd42c21f2460751428b3e1b4ae07ea0b924967bc.zip
Merge branch 'feat_memory_manager' into 'develop_sa'
Finish inital draft of Memory Manager See merge request teachos/kernel!3
Diffstat (limited to 'src/kernel')
-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 07a9955..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(); } \ No newline at end of file
+#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!");
+}