Unifying the Lunaix's Physical Memory Model (#28)

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

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 8d55b58d46ffec89ff9783388290c9825e6b2344..4c1bb032b1cdf8ab5fbb3eee1428c22bb81ceb5d 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,38 +1,26 @@
-#include <arch/i386/interrupts.h>
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>
 #include <lunaix/spike.h>
+#include <lunaix/pcontext.h>
+#include <lunaix/syslog.h>
+#include <lunaix/trace.h>
+#include <lunaix/failsafe.h>
 
-static char buffer[1024];
+LOG_MODULE("spike")
 
-void
+void noret
 __assert_fail(const char* expr, const char* file, unsigned int line)
 {
-    ksprintf(buffer, "%s (%s:%u)", expr, file, line);
-
-    // 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)
-    cpu_trap_panic(buffer);
-
-    DO_SPIN // never reach
+    // 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();
 }
 
-void
+void noret
 panick(const char* msg)
-{       
-    cpu_trap_panic(msg);
-    DO_SPIN
-}
-
-void
-panickf(const char* fmt, ...)
 {
-    va_list args;
-    va_start(args, fmt);
-    __ksprintf_internal(buffer, fmt, 1024, args);
-    va_end(args);
-
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
-    DO_SPIN
+    cpu_trap_panic(msg);
+    spin();
 }