Decoupling Architectural-specific Code (#35)

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

diff --git a/lunaix-os/kernel/spike.c b/lunaix-os/kernel/spike.c
index 5aa0137421a7e5249aa4b51e8c5ea1d1a69ef044..86eaf94ce67d83acac371388ac541c838369a3ce 100644 (file)
--- a/lunaix-os/kernel/spike.c
+++ b/lunaix-os/kernel/spike.c
@@ -1,26 +1,26 @@
-#include <arch/x86/interrupts.h>
-#include <klibc/stdio.h>
+#include <klibc/strfmt.h>

 #include <lunaix/spike.h>
 #include <lunaix/spike.h>

+#include <lunaix/hart_state.h>
+#include <lunaix/syslog.h>
+#include <lunaix/trace.h>
+#include <lunaix/failsafe.h>

 
 

-static char buffer[1024];
+LOG_MODULE("spike")

 
 

-void
+void noret

 __assert_fail(const char* expr, const char* file, unsigned int line)
 {
 __assert_fail(const char* expr, const char* file, unsigned int 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
-    //  print the panic message passed via %edi. (see
-    //  kernel/asm/x86/interrupts.c)
-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(buffer));
-
-    spin(); // never reach
+    // Don't do another trap, print it right-away, allow
+    //  the stack context being preserved
+    cpu_disable_interrupt();
+    ERROR("assertion fail (%s:%u)\n\t%s", file, line, expr);
+    
+    failsafe_diagnostic();

 }
 
 }
 

-void
+void noret

 panick(const char* msg)
 {
 panick(const char* msg)
 {

-    asm("int %0" ::"i"(LUNAIX_SYS_PANIC), "D"(msg));
+    cpu_trap_panic(msg);

     spin();
 }
     spin();
 }