Changeset 6527 in vbox

Timestamp:

Jan 28, 2008 2:42:18 PM (17 years ago)

Author:

vboxsync

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

27553

Message:

Free.iNext should be 16 bit and use UINT16_MAX instead of UINT32_MAX.

File:

• trunk/src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -225 +225 @@
     struct GMMPAGEFREE
     {
-        /** The index of the next page in the free list. */
-        uint32_t    iNext;
+        /** The index of the next page in the free list. UINT16_MAX is NIL. */
+        uint16_t    iNext;
         /** Reserved. Checksum or something? */
-        uint32_t    u30Reserved : 30;
+        uint16_t    u16Reserved0;
+        /** Reserved. Checksum or something? */
+        uint32_t    u30Reserved1 : 30;
         /** The page state. */
         uint32_t    u2State : 2;
@@ -268 +270 @@
     struct GMMPAGEFREE
     {
-        /** The index of the next page in the free list. */
-        uint32_t    iNext : 30;
+        /** The index of the next page in the free list. UINT16_MAX is NIL. */
+        uint32_t    iNext : 16;
+        /** Reserved. Checksum or something? */
+        uint32_t    u14Reserved : 14;
         /** The page state. */
         uint32_t    u2State : 2;
@@ -275 +279 @@
 #endif
 } GMMPAGE;
+AssertCompileSize(GMMPAGE, sizeof(RTHCUINTPTR));
 /** Pointer to a GMMPAGE. */
 typedef GMMPAGE *PGMMPAGE;
@@ -594 +599 @@
          * Check and see if RTR0MemObjAllocPhysNC works.
          */
+#if 0 /* later */
         RTR0MEMOBJ MemObj;
         rc = RTR0MemObjAllocPhysNC(&MemObj, _64K, NIL_RTHCPHYS);
@@ -605 +611 @@
         else
             SUPR0Printf("GMMR0Init: RTR0MemObjAllocPhysNC(,64K,Any) -> %d!\n", rc);
+#else
+        pGMM->fLegacyMode = true;
+#endif
 
         g_pGMM = pGMM;
@@ -637 +646 @@
 
     /*
-     * Undo what init did and free any resources we've acquired.
+     * Undo what init did and free all the resources we've acquired.
      */
     /* Destroy the fundamentals. */
@@ -1402 +1411 @@
         }
         pChunk->aPages[RT_ELEMENTS(pChunk->aPages) - 1].Free.u2State = GMM_PAGE_STATE_FREE;
-        /* XXX sizeof(iNext) < 32, please fix this!! */
-        pChunk->aPages[RT_ELEMENTS(pChunk->aPages) - 1].Free.iNext = UINT32_MAX;
+        pChunk->aPages[RT_ELEMENTS(pChunk->aPages) - 1].Free.iNext = UINT16_MAX;
 
         /*