git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: refine symbolic link support.
[lunaix-os.git]
/
lunaix-os
/
kernel
/
spike.c
diff --git
a/lunaix-os/kernel/spike.c
b/lunaix-os/kernel/spike.c
index 4cb205105d84b6086fbfc9f7573574cdcc17e697..860b201d8f2b6542b0990f34f0500a3478e64812 100644
(file)
--- a/
lunaix-os/kernel/spike.c
+++ b/
lunaix-os/kernel/spike.c
@@
-1,27
+1,38
@@
-#include <lunaix/spike.h>
#include <arch/x86/interrupts.h>
#include <klibc/stdio.h>
#include <arch/x86/interrupts.h>
#include <klibc/stdio.h>
+#include <lunaix/spike.h>
static char buffer[1024];
static char buffer[1024];
-void __assert_fail(const char* expr, const char* file, unsigned int line) {
- sprintf(buffer, "%s (%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
// 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));
- spin();
// never reach
+ spin(); // never reach
}
}
-void panick(const char* msg) {
- asm(
- "int %0"
- ::"i"(LUNAIX_SYS_PANIC), "D"(msg)
- );
+void
+panick(const char* msg)
+{
+ asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(msg));
spin();
spin();
-}
\ No newline at end of file
+}
+
+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));
+ spin();
+}