Changeset 18430 in vbox

Timestamp:

Mar 28, 2009 2:03:31 AM (16 years ago)

Author:

vboxsync

Message:

MMR3HyperAllocOnceNoRel: Another size_t/uint32_t warning from MSC/64. Use this opportunity to optimize the fallback to not wase hyper heap on unnecessary alignment.

File:

• trunk/src/VBox/VMM/MMHyper.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -892 +892 @@
      * Allocate the pages and map them into HMA space.
      */
-    cb = RT_ALIGN(cb, PAGE_SIZE);
-    uint32_t const  cPages = cb >> PAGE_SHIFT;
-    PSUPPAGE        paPages = (PSUPPAGE)RTMemTmpAlloc(cPages * sizeof(paPages[0]));
+    uint32_t const  cbAligned = RT_ALIGN_32(cb, PAGE_SIZE);
+    AssertReturn(cbAligned >= cb, VERR_INVALID_PARAMETER);
+    uint32_t const  cPages    = cbAligned >> PAGE_SHIFT;
+    PSUPPAGE        paPages   = (PSUPPAGE)RTMemTmpAlloc(cPages * sizeof(paPages[0]));
     if (!paPages)
         return VERR_NO_TMP_MEMORY;
@@ -916 +917 @@
         pvR0 = (uintptr_t)pvPages;
 #endif
-        memset(pvPages, 0, cb);
+        memset(pvPages, 0, cbAligned);
 
         RTGCPTR GCPtr;
@@ -929 +930 @@
         {
             *ppv = pvPages;
-            Log2(("MMR3HyperAllocOnceNoRel: cb=%#x uAlignment=%#x returns VINF_SUCCESS and *ppv=%p\n",
-                  cb, uAlignment, *ppv));
+            Log2(("MMR3HyperAllocOnceNoRel: cbAligned=%#x uAlignment=%#x returns VINF_SUCCESS and *ppv=%p\n",
+                  cbAligned, uAlignment, *ppv));
             MMR3HyperReserve(pVM, PAGE_SIZE, "fence", NULL);
             return rc;
         }
-        AssertMsgFailed(("Failed to allocate %zd bytes! %Rrc\n", cb, rc));
+        AssertMsgFailed(("Failed to allocate %zd bytes! %Rrc\n", cbAligned, rc));
         SUPR3PageFreeEx(pvPages, cPages);
 
@@ -943 +944 @@
          */
         /** @todo make a proper fix for this so we will never end up in this kind of situation! */
-        Log(("MMR3HyperAllocOnceNoRel: MMR3HyperMapHCRam failed with rc=%Rrc, try MMHyperAlloc(,%#d,,) instead\n",  rc, cb));
+        Log(("MMR3HyperAllocOnceNoRel: MMR3HyperMapHCRam failed with rc=%Rrc, try MMHyperAlloc(,%#x,,) instead\n",  rc, cb));
         int rc2 = MMHyperAlloc(pVM, cb, uAlignment, enmTag, ppv);
         if (RT_SUCCESS(rc2))
@@ -953 +954 @@
     }
     else
-        AssertMsgFailed(("Failed to allocate %zd bytes! %Rrc\n", cb, rc));
+        AssertMsgFailed(("Failed to allocate %zd bytes! %Rrc\n", cbAligned, rc));
 
     if (rc == VERR_NO_MEMORY)