Unifying the Lunaix's Physical Memory Model (#28)

[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 9e2d427e42bc59150faaa77359040ea34a32a7ef..cf40bab54d4c0079c06b7a8434ad2cdda496a626 100644 (file)
--- a/lunaix-os/includes/lunaix/spike.h
+++ b/lunaix-os/includes/lunaix/spike.h
@@ -68,14 +68,24 @@
 
 #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__);
 
 
 #define fail(msg) __assert_fail(msg, __FILE__, __LINE__);
 


@@ -91,9 +101,6 @@ __assert_fail(const char* expr, const char* file, unsigned int line)
 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))                                                            \
         ;