X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a13ddcba315eaa75dca84dde30b17a78b2933354..81ecfb6240fdd3a8229f0740242612212e062a6c:/lunaix-os/includes/lunaix/spike.h

diff --git a/lunaix-os/includes/lunaix/spike.h b/lunaix-os/includes/lunaix/spike.h
index 91c92fc..a2a0e21 100644
--- 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
 
-// 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))
@@ -27,48 +29,48 @@
  *
  */
 #define ILOG2(x)                                                               \
-    __builtin_constant_p(x) ? ((x) == 0              ? 0                       \
-                               : ((x) & (1ul << 31)) ? 31                      \
-                               : ((x) & (1ul << 30)) ? 30                      \
-                               : ((x) & (1ul << 29)) ? 29                      \
-                               : ((x) & (1ul << 28)) ? 28                      \
-                               : ((x) & (1ul << 27)) ? 27                      \
-                               : ((x) & (1ul << 26)) ? 26                      \
-                               : ((x) & (1ul << 25)) ? 25                      \
-                               : ((x) & (1ul << 24)) ? 24                      \
-                               : ((x) & (1ul << 23)) ? 23                      \
-                               : ((x) & (1ul << 22)) ? 22                      \
-                               : ((x) & (1ul << 21)) ? 21                      \
-                               : ((x) & (1ul << 20)) ? 20                      \
-                               : ((x) & (1ul << 19)) ? 19                      \
-                               : ((x) & (1ul << 18)) ? 18                      \
-                               : ((x) & (1ul << 17)) ? 17                      \
-                               : ((x) & (1ul << 16)) ? 16                      \
-                               : ((x) & (1ul << 15)) ? 15                      \
-                               : ((x) & (1ul << 14)) ? 14                      \
-                               : ((x) & (1ul << 13)) ? 13                      \
-                               : ((x) & (1ul << 12)) ? 12                      \
-                               : ((x) & (1ul << 11)) ? 11                      \
-                               : ((x) & (1ul << 10)) ? 10                      \
-                               : ((x) & (1ul << 9))  ? 9                       \
-                               : ((x) & (1ul << 8))  ? 8                       \
-                               : ((x) & (1ul << 7))  ? 7                       \
-                               : ((x) & (1ul << 6))  ? 6                       \
-                               : ((x) & (1ul << 5))  ? 5                       \
-                               : ((x) & (1ul << 4))  ? 4                       \
-                               : ((x) & (1ul << 3))  ? 3                       \
-                               : ((x) & (1ul << 2))  ? 2                       \
-                               : ((x) & (1ul << 1))  ? 1                       \
-                                                     : 0)                       \
-                            : (31 - __builtin_clz(x))
-
-#define __USER__ __attribute__((section(".usrtext")))
-
-inline static void
+    (__builtin_constant_p(x) ? ((x) == 0              ? 0                      \
+                                : ((x) & (1ul << 31)) ? 31                     \
+                                : ((x) & (1ul << 30)) ? 30                     \
+                                : ((x) & (1ul << 29)) ? 29                     \
+                                : ((x) & (1ul << 28)) ? 28                     \
+                                : ((x) & (1ul << 27)) ? 27                     \
+                                : ((x) & (1ul << 26)) ? 26                     \
+                                : ((x) & (1ul << 25)) ? 25                     \
+                                : ((x) & (1ul << 24)) ? 24                     \
+                                : ((x) & (1ul << 23)) ? 23                     \
+                                : ((x) & (1ul << 22)) ? 22                     \
+                                : ((x) & (1ul << 21)) ? 21                     \
+                                : ((x) & (1ul << 20)) ? 20                     \
+                                : ((x) & (1ul << 19)) ? 19                     \
+                                : ((x) & (1ul << 18)) ? 18                     \
+                                : ((x) & (1ul << 17)) ? 17                     \
+                                : ((x) & (1ul << 16)) ? 16                     \
+                                : ((x) & (1ul << 15)) ? 15                     \
+                                : ((x) & (1ul << 14)) ? 14                     \
+                                : ((x) & (1ul << 13)) ? 13                     \
+                                : ((x) & (1ul << 12)) ? 12                     \
+                                : ((x) & (1ul << 11)) ? 11                     \
+                                : ((x) & (1ul << 10)) ? 10                     \
+                                : ((x) & (1ul << 9))  ? 9                      \
+                                : ((x) & (1ul << 8))  ? 8                      \
+                                : ((x) & (1ul << 7))  ? 7                      \
+                                : ((x) & (1ul << 6))  ? 6                      \
+                                : ((x) & (1ul << 5))  ? 5                      \
+                                : ((x) & (1ul << 4))  ? 4                      \
+                                : ((x) & (1ul << 3))  ? 3                      \
+                                : ((x) & (1ul << 2))  ? 2                      \
+                                : ((x) & (1ul << 1))  ? 1                      \
+                                                      : 0)                      \
+                             : (31 - __builtin_clz(x)))
+
+inline static void noret
 spin()
 {
-    while (1)
+    volatile int __infloop = 1;
+    while (__infloop)
         ;
+    __builtin_unreachable();
 }
 
 #ifndef __LUNAIXOS_NASSERT__
@@ -81,6 +83,9 @@ spin()
     if (!(cond)) {                                                             \
         __assert_fail(msg, __FILE__, __LINE__);                                \
     }
+
+#define fail(msg) __assert_fail(msg, __FILE__, __LINE__);
+
 void
 __assert_fail(const char* expr, const char* file, unsigned int line)
   __attribute__((noinline, noreturn));
@@ -90,10 +95,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)                                                       \