Changeset 647 in vbox

Timestamp:

Feb 5, 2007 6:33:16 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

18280

Message:

VALID_PTR update: when running 32-bit in compatability mode, there might be close to 4GB of memory available.

File:

• trunk/include/iprt/cdefs.h (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -1029 +1029 @@
  * @param   ptr
  */
-#ifdef IN_RING3
-# ifdef __L4__
-#  define VALID_PTR(ptr) ( (uintptr_t)(ptr) + 0x10000 >= 0x11000 )
-# elif defined(__DARWIN__)
-#  define VALID_PTR(ptr) ( (uintptr_t)(ptr) + 0x200000 >= 0x201000 )
-# else
-#  define VALID_PTR(ptr) ( (uintptr_t)(ptr) + 0x10000 >= 0x20000 )
-# endif
-#else
-#  define VALID_PTR(ptr) ( (uintptr_t)(ptr) + 0x1000 >= 0x2000 )
+#if defined(__AMD64__)
+# ifdef IN_RING3
+#  if defined(__DARWIN__) /* first 4GB is reserved for legacy kernel. */
+#   define VALID_PTR(ptr)   (   (uintptr_t)(ptr) >= _4G \
+                             && !((uintptr_t)(ptr) & 0xffff800000000000ULL) )
+#  else
+#   define VALID_PTR(ptr)   (   (uintptr_t)(ptr) + 0x1000U >= 0x2000U \
+                             && !((uintptr_t)(ptr) & 0xffff800000000000ULL) )
+#  endif                
+# else /* !IN_RING3 */
+#  define VALID_PTR(ptr)    (   (uintptr_t)(ptr) + 0x1000U >= 0x2000U \
+                             && (   ((uintptr_t)(ptr) & 0xffff800000000000ULL) == 0xffff800000000000ULL \
+                                 || ((uintptr_t)(ptr) & 0xffff800000000000ULL) == 0) )
+# endif /* !IN_RING3 */
+#elif defined(__X86__)
+# define VALID_PTR(ptr)     ( (uintptr_t)(ptr) + 0x1000U >= 0x2000U )
+#else
+# error "Architecture identifier missing / not implemented." 
 #endif