Changeset 4738d84 in mainline for kernel/generic/include/macros.h

Timestamp:

2010-07-20T13:58:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46757a6

Parents:

e2650d3

Message:

explicitly use 64b types to avoid overflows in trivial cases
(overflow due to adding two large 64b values can still occur, but it is less likely)

File:

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

kernel/generic/include/macros.h

@@ -49 +49 @@
  *
  */
-NO_TRACE 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));
@@ -66 +66 @@
  *
  */
-NO_TRACE static inline int iswithin(uintptr_t s1, size_t sz1, uintptr_t s2,
-    size_t sz2)
+NO_TRACE static inline int iswithin(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 <= s2) && (e1 >= e2));