Merge branch 'master' into sata-ahci-dev

[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 9cf4b7fee0e442873e7a39498ca8252d1ff568f1..6f91924dc19a174d280cb3bb7c98905f8cd91837 100644 (file)
--- a/lunaix-os/includes/lunaix/spike.h
+++ b/lunaix-os/includes/lunaix/spike.h
@@ -4,42 +4,62 @@
 // Some helper functions. As helpful as Spike the Dragon! :)
 
 // 除法向上取整
-#define CEIL(v, k)          (((v) + (1 << (k)) - 1) >> (k))
+#define CEIL(v, k) (((v) + (1 << (k)) - 1) >> (k))
+
+#define ICEIL(x, y) ((x) / (y) + ((x) % (y) != 0))
 
 // 除法向下取整
-#define FLOOR(v, k)         ((v) >> (k))
+#define FLOOR(v, k) ((v) >> (k))
 
 // 获取v最近的最大k倍数
-#define ROUNDUP(v, k)       (((v) + (k) - 1) & ~((k) - 1))
+#define ROUNDUP(v, k) (((v) + (k)-1) & ~((k)-1))
 
 // 获取v最近的最小k倍数
-#define ROUNDDOWN(v, k)     ((v) & ~((k) - 1))
+#define ROUNDDOWN(v, k) ((v) & ~((k)-1))
+
+#define __USER__ __attribute__((section(".usrtext")))
 
-inline static void spin() {
-    while(1);
+inline static void
+spin()
+{
+    while (1)
+        ;
 }
 
 #ifdef __LUNAIXOS_DEBUG__
-#define assert(cond)                                  \
-    if (!(cond)) {                                    \
-        __assert_fail(#cond, __FILE__, __LINE__);     \
+#define assert(cond)                                                           \
+    if (!(cond)) {                                                             \
+        __assert_fail(#cond, __FILE__, __LINE__);                              \
     }
 
-#define assert_msg(cond, msg)                         \
-    if (!(cond)) {                                    \
-        __assert_fail(msg, __FILE__, __LINE__);   \
+#define assert_msg(cond, msg)                                                  \
+    if (!(cond)) {                                                             \
+        __assert_fail(msg, __FILE__, __LINE__);                                \
     }
-void __assert_fail(const char* expr, const char* file, unsigned int line) __attribute__((noinline, noreturn));
+void
+__assert_fail(const char* expr, const char* file, unsigned int line)
+  __attribute__((noinline, noreturn));
 #else
-#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
 
-void panick(const char* msg);
-
+void
+panick(const char* msg);
 
-#define wait_until(cond)    while(!(cond));
-#define loop_until(cond)    while(!(cond));
+#define wait_until(cond)                                                       \
+    while (!(cond))                                                            \
+        ;
+#define loop_until(cond)                                                       \
+    while (!(cond))                                                            \
+        ;
 
+#define wait_until_expire(cond, max)                                           \
+    ({                                                                         \
+        unsigned int __wcounter__ = (max);                                     \
+        while (!(cond) && __wcounter__-- > 0)                                  \
+            ;                                                                  \
+        __wcounter__;                                                          \
+    })
 
 #endif /* __LUNAIX_SPIKE_H */