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
Implement APIC, RTC, basic ACPI parser and timer support
[lunaix-os.git]
/
lunaix-os
/
kernel
/
spike.c
diff --git
a/lunaix-os/kernel/spike.c
b/lunaix-os/kernel/spike.c
index 8f42660930a23b91b65ff4e344de680f188e115e..4cb205105d84b6086fbfc9f7573574cdcc17e697 100644
(file)
--- a/
lunaix-os/kernel/spike.c
+++ b/
lunaix-os/kernel/spike.c
@@
-1,11
+1,11
@@
#include <lunaix/spike.h>
#include <arch/x86/interrupts.h>
#include <lunaix/spike.h>
#include <arch/x86/interrupts.h>
-#include <libc/stdio.h>
+#include <
k
libc/stdio.h>
static char buffer[1024];
void __assert_fail(const char* expr, const char* file, unsigned int line) {
static char buffer[1024];
void __assert_fail(const char* expr, const char* file, unsigned int line) {
- sprintf(buffer, "
[ASSERT]
%s (%s:%u)", expr, file, line);
+ 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
@@
-16,4
+16,12
@@
void __assert_fail(const char* expr, const char* file, unsigned int line) {
);
spin(); // never reach
);
spin(); // never reach
+}
+
+void panick(const char* msg) {
+ asm(
+ "int %0"
+ ::"i"(LUNAIX_SYS_PANIC), "D"(msg)
+ );
+ spin();
}
\ No newline at end of file
}
\ No newline at end of file