hotfix: a better hinting on non-returning spin function

[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..a2a0e21d5f66c1c56e33e2947306fb930d78ca2e 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
 
 #ifndef __LUNAIX_SPIKE_H
 #define __LUNAIX_SPIKE_H
 

+#include <lunaix/compiler.h>
+

 /** Some helper functions. As helpful as Spike the Dragon! :) **/
 
 // 除法 v/(2^k) 向上取整
 /** 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 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
 /**
  * @brief Fast log base 2 for integer, utilizing constant unfolding.
  * Adopted from


@@ -64,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,12 +93,12 @@ __assert_fail(const char* expr, const char* file, unsigned int line)
 #define assert(cond) (void)(cond);          // assert nothing
 #define assert_msg(cond, msg) (void)(cond); // assert nothing
 
 #define assert(cond) (void)(cond);          // assert nothing
 #define assert_msg(cond, msg) (void)(cond); // assert nothing
 

-#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)                                                       \