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
Merge branch 'master' into prog-loader
[lunaix-os.git]
/
lunaix-os
/
kernel
/
spike.c
diff --git
a/lunaix-os/kernel/spike.c
b/lunaix-os/kernel/spike.c
index 87726b01fce4ab150fbc6f4f82513019577119b1..860b201d8f2b6542b0990f34f0500a3478e64812 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
@@
-30,7
+30,7
@@
panickf(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
{
va_list args;
va_start(args, fmt);
- __sprintf_internal(buffer, fmt, 1024, args);
+ __
k
sprintf_internal(buffer, fmt, 1024, args);
va_end(args);
asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
va_end(args);
asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));