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
refactor: full rewrite of signal feature
[lunaix-os.git]
/
lunaix-os
/
kernel
/
spike.c
diff --git
a/lunaix-os/kernel/spike.c
b/lunaix-os/kernel/spike.c
index 5aa0137421a7e5249aa4b51e8c5ea1d1a69ef044..4686b12ce3667f3b51f26ae609b78a0acf246a1c 100644
(file)
--- a/
lunaix-os/kernel/spike.c
+++ b/
lunaix-os/kernel/spike.c
@@
-7,7
+7,7
@@
static char buffer[1024];
void
__assert_fail(const char* expr, const char* file, unsigned int line)
{
void
__assert_fail(const char* expr, const char* file, unsigned int line)
{
- sprintf(buffer, "%s (%s:%u)", expr, file, line);
+
k
sprintf(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
@@
-15,12
+15,24
@@
__assert_fail(const char* expr, const char* file, unsigned int line)
// kernel/asm/x86/interrupts.c)
asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
// kernel/asm/x86/interrupts.c)
asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
-
spin();
// never reach
+
DO_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();
+ 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
}
}