add lunaix dynamic linker as submodule

[lunaix-os.git] / lunaix-os / kernel / spike.c

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 860b201d8f2b6542b0990f34f0500a3478e64812..67f9abe07eaa402d55df61d72169c644601ee03e 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,6 +1,6 @@
-#include <arch/x86/interrupts.h>
 #include <klibc/stdio.h>
 #include <lunaix/spike.h>
+#include <sys/interrupts.h>
 
 static char buffer[1024];
 
@@ -13,16 +13,16 @@ __assert_fail(const char* expr, const char* file, unsigned int line)
     //  This is a convention we made that the LUNAIX_SYS_PANIC syscall will
     //  print the panic message passed via %edi. (see
     //  kernel/asm/x86/interrupts.c)
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
+    cpu_trap_panic(buffer);
 
-    spin(); // never reach
+    DO_SPIN // never reach
 }
 
-void
+void noret
 panick(const char* msg)
 {
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(msg));
-    spin();
+    cpu_trap_panic(msg);
+    DO_SPIN
 }
 
 void
@@ -34,5 +34,5 @@ panickf(const char* fmt, ...)
     va_end(args);
 
     asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
-    spin();
+    DO_SPIN
 }