Merge branch 'master' into isa/arm64

[lunaix-os.git] / lunaix-os / kernel / spike.c

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 4cb205105d84b6086fbfc9f7573574cdcc17e697..ba8f8049bedbab65b0b66dfbebbccf5d987517c2 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,27 +1,21 @@
+#include <klibc/strfmt.h>

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

-#include <arch/x86/interrupts.h>
-#include <klibc/stdio.h>
+#include <lunaix/hart_state.h>
+#include <lunaix/syslog.h>
+#include <lunaix/trace.h>
+#include <lunaix/failsafe.h>

 
 

-static char buffer[1024];
+#include <asm/cpu.h>

 
 

-void __assert_fail(const char* expr, const char* file, unsigned int line) {
-    sprintf(buffer, "%s (%s:%u)", expr, file, line);
+LOG_MODULE("spike")

 
 

-    // Here we load the buffer's address into %edi ("D" constraint)
-    //  This is a convention we made that the LUNAIX_SYS_PANIC syscall will
-    //  print the panic message passed via %edi. (see kernel/asm/x86/interrupts.c)
-    asm(
-        "int %0"
-        ::"i"(LUNAIX_SYS_PANIC), "D"(buffer)
-    );
-
-    spin();     // never reach
-}
-
-void panick(const char* msg) {
-    asm(
-        "int %0"
-        ::"i"(LUNAIX_SYS_PANIC), "D"(msg)
-    );
-    spin();
+void noret
+__assert_fail(const char* expr, const char* file, unsigned int line)
+{
+    // Don't do another trap, print it right-away, allow
+    //  the stack context being preserved
+    cpu_disable_interrupt();
+    ERROR("assertion fail (%s:%u)\n\t%s", file, line, expr);
+    
+    failsafe_diagnostic();

 }
\ No newline at end of file
 }
\ No newline at end of file