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: add a async read/write variant to device ops, with allow async io to be...
[lunaix-os.git]
/
lunaix-os
/
kernel
/
spike.c
diff --git
a/lunaix-os/kernel/spike.c
b/lunaix-os/kernel/spike.c
index 67f9abe07eaa402d55df61d72169c644601ee03e..63414c25e4bac73508e6a16c484477572464cfdd 100644
(file)
--- a/
lunaix-os/kernel/spike.c
+++ b/
lunaix-os/kernel/spike.c
@@
-1,10
+1,10
@@
-#include <klibc/st
dio
.h>
+#include <klibc/st
rfmt
.h>
#include <lunaix/spike.h>
#include <sys/interrupts.h>
static char buffer[1024];
#include <lunaix/spike.h>
#include <sys/interrupts.h>
static char buffer[1024];
-void
+void
noret
__assert_fail(const char* expr, const char* file, unsigned int line)
{
ksprintf(buffer, "%s (%s:%u)", expr, file, line);
__assert_fail(const char* expr, const char* file, unsigned int line)
{
ksprintf(buffer, "%s (%s:%u)", expr, file, line);
@@
-15,14
+15,14
@@
__assert_fail(const char* expr, const char* file, unsigned int line)
// kernel/asm/x86/interrupts.c)
cpu_trap_panic(buffer);
// kernel/asm/x86/interrupts.c)
cpu_trap_panic(buffer);
-
DO_SPIN
// never reach
+
spin();
// never reach
}
void noret
panick(const char* msg)
{
cpu_trap_panic(msg);
}
void noret
panick(const char* msg)
{
cpu_trap_panic(msg);
- DO_SPIN
+ spin();
}
void
}
void
@@
-30,9
+30,9
@@
panickf(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
{
va_list args;
va_start(args, fmt);
-
__ksprintf_internal
(buffer, fmt, 1024, args);
+
ksnprintfv
(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));
- DO_SPIN
+ spin();
}
}