7-ps2_keyboard.md and 8-multitasking.md (#29)

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

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 4686b12ce3667f3b51f26ae609b78a0acf246a1c..91fe9f69694c3cc8939d34964d448a108e4e3a94 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,38 +1,26 @@
-#include <arch/x86/interrupts.h>
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>

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

+#include <lunaix/pcontext.h>
+#include <lunaix/syslog.h>
+#include <lunaix/trace.h>

 
 

-static char buffer[1024];
+LOG_MODULE("spike")

 
 

-void
+void noret

 __assert_fail(const char* expr, const char* file, unsigned int line)
 {
 __assert_fail(const char* expr, const char* file, unsigned int line)
 {

-    ksprintf(buffer, "%s (%s:%u)", expr, file, 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);
+    trace_printstack();

 
 

-    // 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));
-
-    DO_SPIN // never reach
+    spin(); // never reach

 }
 
 }
 

-void
+void noret

 panick(const char* msg)
 {
 panick(const char* msg)
 {

-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(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();

 }
 }