Merge branch 'master' of github.com:Minep/lunaix-os

[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..f73fbe1d2bb7e061c5492af6e4b367e20a12c186 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,7 +22,7 @@
 #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)
+#define is_pot(val) (((val) != 0) || ((val) & ((val)-1)) == 0)

 
 /**
  * @brief Fast log base 2 for integer, utilizing constant unfolding.
 
 /**
  * @brief Fast log base 2 for integer, utilizing constant unfolding.


@@ -62,43 +64,44 @@
                                 : ((x) & (1ul << 2))  ? 2                      \
                                 : ((x) & (1ul << 1))  ? 1                      \
                                                       : 0)                      \
                                 : ((x) & (1ul << 2))  ? 2                      \
                                 : ((x) & (1ul << 1))  ? 1                      \
                                                       : 0)                      \

-                             : (31 - __builtin_clz(x)))
-
-#define __USER__ __attribute__((section(".usrtext")))
-
-inline static void
-spin()
-{
-    while (1)
-        ;
-}
+                             : (31 - clz(x)))

 
 #ifndef __LUNAIXOS_NASSERT__
 #define assert(cond)                                                           \
 
 #ifndef __LUNAIXOS_NASSERT__
 #define assert(cond)                                                           \

-    if (!(cond)) {                                                             \
-        __assert_fail(#cond, __FILE__, __LINE__);                              \
-    }
+    do {                                                                       \
+        if (!(cond)) {                                                         \
+            __assert_fail(#cond, __FILE__, __LINE__);                          \
+        }                                                                      \
+    } while(0)

 
 #define assert_msg(cond, msg)                                                  \
 
 #define assert_msg(cond, msg)                                                  \

-    if (!(cond)) {                                                             \
-        __assert_fail(msg, __FILE__, __LINE__);                                \
-    }
+    do {                                                                       \
+        if (!(cond)) {                                                         \
+            __assert_fail(msg, __FILE__, __LINE__);                            \
+        }                                                                      \
+    } while(0)
+
+#define must_success(statement)                                                \
+    do {                                                                       \
+        int err = (statement);                                                 \
+        if (err) panickf(#statement "failed with errcode=%d", err);           \
+    } while(0)

 
 #define fail(msg) __assert_fail(msg, __FILE__, __LINE__);
 
 void
 __assert_fail(const char* expr, const char* file, unsigned int line)
 
 #define fail(msg) __assert_fail(msg, __FILE__, __LINE__);
 
 void
 __assert_fail(const char* expr, const char* file, unsigned int line)

-  __attribute__((noinline, noreturn));
+    __attribute__((noinline, noreturn));

 #else
 #define assert(cond) (void)(cond);          // assert nothing
 #define assert_msg(cond, msg) (void)(cond); // assert nothing
 
 #else
 #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)                                                       \