X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/8fdcd1575a97862975fa019f09c00453a2a7d8bb..45e1f8b055043e54be35462852ab6649d634da7c:/lunaix-os/kernel/spike.c?ds=sidebyside diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c index 5aa0137..4686b12 100644 --- 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) { - 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 @@ -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)); - spin(); // never reach + DO_SPIN // never reach } 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 }