fix: argv, envp passing

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

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 91f597db4b5055c2e890785906bde3a9f8b3aa21..4686b12ce3667f3b51f26ae609b78a0acf246a1c 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,19 +1,38 @@
-#include <lunaix/spike.h>
 #include <arch/x86/interrupts.h>
-#include <libc/stdio.h>
+#include <klibc/stdio.h>
+#include <lunaix/spike.h>
 
 static char buffer[1024];
 
-void __assert_fail(const char* expr, const char* file, unsigned int line) {
-    sprintf(buffer, "Assert %s failed (%s:%u)", expr, file, line);
+void
+__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)
-    asm(
-        "int %0"
-        ::"i"(LUNAIX_SYS_PANIC), "D"(buffer)
-    );
+    //  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
+}
+
+void
+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);
 
-    spin();     // never reach
-}
\ No newline at end of file
+    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
+    DO_SPIN
+}