X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/8c06c883e7b13c115d5ff207f79d4b68fccd5ad6..69777bdcab284335651a8002e2896f3862fa423d:/lunaix-os/kernel/spike.c?ds=sidebyside

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 63414c2..91fe9f6 100644
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,19 +1,19 @@
 #include <klibc/strfmt.h>
 #include <lunaix/spike.h>
-#include <sys/interrupts.h>
+#include <lunaix/pcontext.h>
+#include <lunaix/syslog.h>
+#include <lunaix/trace.h>
 
-static char buffer[1024];
+LOG_MODULE("spike")
 
 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);
+    // 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);
+    trace_printstack();
 
     spin(); // never reach
 }
@@ -24,15 +24,3 @@ panick(const char* msg)
     cpu_trap_panic(msg);
     spin();
 }
-
-void
-panickf(const char* fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    ksnprintfv(buffer, fmt, 1024, args);
-    va_end(args);
-
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
-    spin();
-}