Change typedefs for vm_offset_t, vm_size_t, and vm_pindex_t, add szmin/sz/max

* Generally change these types from unsigned int to unsigned long in
  order to better catch int/long issues on both 32 and 64 bit builds.

* Add szmin() and szmax() inlines which take and return size_t.

diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 525892e..60b6783 100644 (file)
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -347,6 +347,8 @@ static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
 static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
 static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
 static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
+static __inline size_t szmax(size_t a, size_t b) { return (a > b ? a : b); }
+static __inline size_t szmin(size_t a, size_t b) { return (a < b ? a : b); }
 
 /* swaps (undocumented, useful?) */
 #ifdef __i386__

diff --git a/sys/cpu/amd64/include/types.h b/sys/cpu/amd64/include/types.h
index ba03ddc..cd610b4 100644 (file)
--- a/sys/cpu/amd64/include/types.h
+++ b/sys/cpu/amd64/include/types.h
@@ -40,21 +40,19 @@
 #define        _CPU_TYPES_H_
 
 #if defined(__amd64__)
-typedef        __uint64_t      vm_offset_t;    /* address space bounded offset */
-typedef        __uint64_t      vm_size_t;      /* address space bounded size */
-typedef        __uint64_t      vm_pindex_t;    /* physical page index */
 typedef        __int64_t       __segsz_t;      /* segment size */
 typedef        __int64_t       register_t;
 typedef        __uint64_t      u_register_t;
 #elif defined(__i386__)
-typedef unsigned int   vm_offset_t;    /* address space bounded offset */
-typedef unsigned int   vm_size_t;      /* address space bounded size */
-typedef unsigned int   vm_pindex_t;    /* physical page index */
 typedef        __int32_t       __segsz_t;      /* segment size */
 typedef        __int32_t       register_t;
 typedef        __uint32_t      u_register_t;
 #endif
 
+typedef unsigned long  vm_offset_t;    /* address space bounded offset */
+typedef unsigned long  vm_size_t;      /* address space bounded size */
+typedef unsigned long  vm_pindex_t;    /* physical page index */
+
 typedef        __int64_t       vm_ooffset_t;   /* VM object bounded offset */
 typedef __uint64_t     vm_poff_t;      /* physical offset */
 typedef __uint64_t     vm_paddr_t;     /* physical addr (same as vm_poff_t) */

diff --git a/sys/cpu/i386/include/types.h b/sys/cpu/i386/include/types.h
index 1afee7f..8658ced 100644 (file)
--- a/sys/cpu/i386/include/types.h
+++ b/sys/cpu/i386/include/types.h
@@ -42,10 +42,10 @@
 #include <machine/stdint.h>
 #endif
 
-typedef        unsigned int    vm_offset_t;    /* address space bounded offset */
-typedef        unsigned int    vm_size_t;      /* address space bounded size */
+typedef        unsigned long   vm_offset_t;    /* address space bounded offset */
+typedef        unsigned long   vm_size_t;      /* address space bounded size */
 typedef        __int64_t       vm_ooffset_t;   /* VM object bounded offset */
-typedef        unsigned int    vm_pindex_t;    /* physical page index */
+typedef        unsigned long   vm_pindex_t;    /* physical page index */
 typedef __uint64_t     vm_poff_t;      /* physical offset */
 typedef __uint64_t     vm_paddr_t;     /* physical addr (same as vm_poff_t) */
 

diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index d286c66..d52763f 100644 (file)
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -81,6 +81,8 @@ static __inline u_int64_t u64max(u_int64_t a, u_int64_t b) { return (a > b ? a :
 static __inline u_int64_t u64min(u_int64_t a, u_int64_t b) { return (a < b ? a : b); }
 static __inline int64_t i64max(int64_t a, int64_t b) { return (a > b ? a : b); }
 static __inline int64_t i64min(int64_t a, int64_t b) { return (a < b ? a : b); }
+static __inline size_t szmax(size_t a, size_t b) { return (a > b ? a : b); }
+static __inline size_t szmin(size_t a, size_t b) { return (a < b ? a : b); }
 
 
 /* Prototypes for non-quad routines. */