Changeset 27115 in vbox

Timestamp:

Mar 5, 2010 4:39:44 PM (15 years ago)

Author:

vboxsync

Message:

memobj-r0drv-solaris.c: corrected some assertions.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c

@@ -184 +184 @@
         return VERR_NO_MEMORY;
     }
-    Assert(physAddr < UINT64_MAX);
+    Assert(!(physAddr & PAGE_OFFSET_MASK));
     pMemSolaris->Core.pv = virtAddr;
     pMemSolaris->Core.u.Phys.PhysBase = physAddr;
@@ -210 +210 @@
          return VERR_NO_MEMORY;
 
-    if (PhysHighest == NIL_RTHCPHYS)
-        PhysHighest = UINT64_MAX - 1;
+     AssertCompile(NIL_RTHCPHYS == UINT64_MAX);
 
      /* Allocate physically contiguous memory aligned as specified. */
@@ -221 +220 @@
          return VERR_NO_CONT_MEMORY;
      }
-     Assert(physAddr < UINT64_MAX);
+     Assert(!(physAddr & PAGE_OFFSET_MASK));
+     Assert(physAddr < PhysHighest);
+     Assert(physAddr + cb <= PhysHighest);
      pMemSolaris->Core.pv = virtAddr;
      pMemSolaris->Core.u.Cont.Phys = physAddr;