Decoupling Architectural-specific Code (#35)

[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 356e4b392bcca12b28dd5f93b2f56fc81e3c3910..cf40bab54d4c0079c06b7a8434ad2cdda496a626 100644 (file)
--- a/lunaix-os/includes/lunaix/spike.h
+++ b/lunaix-os/includes/lunaix/spike.h
@@ -22,6 +22,8 @@
 #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 is_pot(val) (((val) != 0) || ((val) & ((val)-1)) == 0)
+

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


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

-                             : (31 - __builtin_clz(x)))
-
-#define DO_SPIN                                                                \
-    {                                                                          \
-        volatile int __infloop = 1;                                            \
-        while (__infloop)                                                      \
-            ;                                                                  \
-    }
-
-inline static void noret
-spin()
-{
-    DO_SPIN
-}
+                             : (31 - clz(x)))

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

-    if (!(cond)) {                                                             \
-        __assert_fail(#cond, __FILE__, __LINE__);                              \
-    }
+    do {                                                                       \
+        if (unlikely(!(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 (unlikely(!(cond))) {                                                         \
+            __assert_fail(msg, __FILE__, __LINE__);                            \
+        }                                                                      \
+    } while(0)
+
+#define must_success(statement)                                                \
+    do {                                                                       \
+        int err = (statement);                                                 \
+        if (err) fail(#statement " failed");                                   \
+    } 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 noret
 panick(const char* msg);
 
 
 void noret
 panick(const char* msg);
 

-void noret
-panickf(const char* fmt, ...);
-

 #define wait_until(cond)                                                       \
     while (!(cond))                                                            \
         ;
 #define wait_until(cond)                                                       \
     while (!(cond))                                                            \
         ;