refactor: one more step towards arch-agnostic design

[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 5ea8d47b2b759068d41895ad1a622c7d9ce2fee7..ae193570f2b3bfaeb0af329d4e17f9ae94adb26e 100644 (file)
--- a/lunaix-os/includes/lunaix/spike.h
+++ b/lunaix-os/includes/lunaix/spike.h
@@ -1,6 +1,8 @@
 #ifndef __LUNAIX_SPIKE_H
 #define __LUNAIX_SPIKE_H
 
+#include <lunaix/compiler.h>
+
 /** Some helper functions. As helpful as Spike the Dragon! :) **/
 
 // 除法 v/(2^k) 向上取整
@@ -20,8 +22,6 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 
-#define likely(x) __builtin_expect((x), 1)
-
 /**
  * @brief Fast log base 2 for integer, utilizing constant unfolding.
  * Adopted from
@@ -64,13 +64,14 @@
                                                       : 0)                      \
                              : (31 - __builtin_clz(x)))
 
-#define __USER__ __attribute__((section(".usrtext")))
+#define DO_SPIN                                                                \
+    while (1)                                                                  \
+        ;
 
 inline static void
 spin()
 {
-    while (1)
-        ;
+    DO_SPIN
 }
 
 #ifndef __LUNAIXOS_NASSERT__
@@ -95,10 +96,10 @@ __assert_fail(const char* expr, const char* file, unsigned int line)
 
 #endif                                      // __LUNAIXOS_NASSERT__
 
-void
+void noret
 panick(const char* msg);
 
-void
+void noret
 panickf(const char* fmt, ...);
 
 #define wait_until(cond)                                                       \