教程介绍和环境搭建 (#19)

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

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 5aa0137421a7e5249aa4b51e8c5ea1d1a69ef044..63414c25e4bac73508e6a16c484477572464cfdd 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,26 +1,38 @@
-#include <arch/x86/interrupts.h>
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>
 #include <lunaix/spike.h>
+#include <sys/interrupts.h>
 
 static char buffer[1024];
 
-void
+void noret
 __assert_fail(const char* expr, const char* file, unsigned int line)
 {
-    sprintf(buffer, "%s (%s:%u)", expr, file, 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)
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
+    cpu_trap_panic(buffer);
 
     spin(); // never reach
 }
 
-void
+void noret
 panick(const char* msg)
 {
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(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();
 }