feat: standard vga support (mode switching, framebuffer remapping)

[lunaix-os.git] / lunaix-os / includes / lunaix / spike.h

diff --git a/lunaix-os/includes/lunaix/spike.h b/lunaix-os/includes/lunaix/spike.h
index 6cece75784b807cd6c5e32a60d11a948edac5e54..a2a0e21d5f66c1c56e33e2947306fb930d78ca2e 100644 (file)
--- a/lunaix-os/includes/lunaix/spike.h
+++ b/lunaix-os/includes/lunaix/spike.h
@@ -1,7 +1,9 @@
 #ifndef __LUNAIX_SPIKE_H
 #define __LUNAIX_SPIKE_H
 
 #ifndef __LUNAIX_SPIKE_H
 #define __LUNAIX_SPIKE_H
 

-// Some helper functions. As helpful as Spike the Dragon! :)
+#include <lunaix/compiler.h>
+
+/** Some helper functions. As helpful as Spike the Dragon! :) **/

 
 // 除法 v/(2^k) 向上取整
 #define CEIL(v, k) (((v) + (1 << (k)) - 1) >> (k))
 
 // 除法 v/(2^k) 向上取整
 #define CEIL(v, k) (((v) + (1 << (k)) - 1) >> (k))


@@ -62,13 +64,13 @@
                                                       : 0)                      \
                              : (31 - __builtin_clz(x)))
 
                                                       : 0)                      \
                              : (31 - __builtin_clz(x)))
 

-#define __USER__ __attribute__((section(".usrtext")))
-
-inline static void
+inline static void noret

 spin()
 {
 spin()
 {

-    while (1)
+    volatile int __infloop = 1;
+    while (__infloop)

         ;
         ;

+    __builtin_unreachable();

 }
 
 #ifndef __LUNAIXOS_NASSERT__
 }
 
 #ifndef __LUNAIXOS_NASSERT__


@@ -93,10 +95,10 @@ __assert_fail(const char* expr, const char* file, unsigned int line)
 
 #endif // __LUNAIXOS_NASSERT__
 
 
 #endif // __LUNAIXOS_NASSERT__
 

-void
+void noret

 panick(const char* msg);
 
 panick(const char* msg);
 

-void
+void noret

 panickf(const char* fmt, ...);
 
 #define wait_until(cond)                                                       \
 panickf(const char* fmt, ...);
 
 #define wait_until(cond)                                                       \