Changes in kernel/generic/include/macros.h [8f4bc1f:052f535] in mainline

File:

• kernel/generic/include/macros.h (modified) (4 diffs)

kernel/generic/include/macros.h

@@ -38 +38 @@
 #ifndef __ASM__
 
-#include <arch/types.h>
+#include <typedefs.h>
+#include <trace.h>
 
 /** Return true if the intervals overlap.
@@ -46 +47 @@
  * @param s2  Start address of the second interval.
  * @param sz2 Size of the second interval.
+ *
  */
-static inline int overlaps(uintptr_t s1, size_t sz1, uintptr_t s2, size_t sz2)
+NO_TRACE static inline int overlaps(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
 {
-        uintptr_t e1 = s1 + sz1;
-        uintptr_t e2 = s2 + sz2;
+        uint64_t e1 = s1 + sz1;
+        uint64_t e2 = s2 + sz2;
         
         return ((s1 < e2) && (s2 < e1));
+}
+
+/** Return true if the second interval is within the first interval.
+ *
+ * @param s1  Start address of the first interval.
+ * @param sz1 Size of the first interval.
+ * @param s2  Start address of the second interval.
+ * @param sz2 Size of the second interval.
+ *
+ */
+NO_TRACE static inline int iswithin(uint64_t s1, uint64_t sz1, uint64_t s2,
+    uint64_t sz2)
+{
+        uint64_t e1 = s1 + sz1;
+        uint64_t e2 = s2 + sz2;
+        
+        return ((s1 <= s2) && (e1 >= e2));
 }
 
@@ -72 +92 @@
 
 /* Compute overlapping of physical addresses */
-#define PA_overlaps(x, szx, y, szy) \
+#define PA_OVERLAPS(x, szx, y, szy) \
         overlaps(KA2PA((x)), (szx), KA2PA((y)), (szy))
 
@@ -84 +104 @@
 #define STRING_ARG(arg)  #arg
 
-#define LOWER32(arg)  ((arg) & 0xffffffff)
-#define UPPER32(arg)  (((arg) >> 32) & 0xffffffff)
+#define LOWER32(arg)  (((uint64_t) (arg)) & UINT32_C(0xffffffff))
+#define UPPER32(arg)  (((((uint64_t) arg)) >> 32) & UINT32_C(0xffffffff))
 
 #define MERGE_LOUP32(lo, up) \
-        ((((uint64_t) (lo)) & 0xffffffff) \
-            | ((((uint64_t) (up)) & 0xffffffff) << 32))
+        ((((uint64_t) (lo)) & UINT32_C(0xffffffff)) \
+            | ((((uint64_t) (up)) & UINT32_C(0xffffffff)) << 32))
 
 /** Pseudorandom generator