Changeset 5606 in vbox

Timestamp:

Nov 1, 2007 7:43:40 PM (17 years ago)

Author:

vboxsync

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

25897

Message:

ALIGNP SIZEOFMEMB

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp (modified) (1 diff)
• src/VBox/Additions/linux/module/vboxmod.c (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDRVShared.c (modified) (1 diff)
• src/VBox/HostDrivers/Support/testcase/tstPin.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstHeapSimple.cpp (modified) (1 diff)
• src/VBox/VMM/MMPhys.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/MMAllHyper.cpp (modified) (3 diffs)
• src/VBox/VMM/testcase/tstMMHyperHeap.cpp (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -1030 +1030 @@
  */
 #ifndef RT_NO_DEPRECATED_MACROS
-/** @copydoc RT_ALIGN_P
- * @deprecated use RT_ALIGN_P. */
-# define ALIGNP(pv, uAlignment)         RT_ALIGN_P(pv, uAlignment)
-/** @copydoc RT_SIZEOFMEMB
- * @deprecated Use RT_SIZEOFMEMB. */
-# define SIZEOFMEMB(type, member)       RT_SIZEOFMEMB(type, member)
 /** @copydoc RT_ELEMENTS
  * @deprecated use RT_ELEMENTS. */

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -1467 +1467 @@
             dprintf(("VBoxGuest::reserveHypervisorMemory: MmMapIoSpace returned %p\n", pDevExt->hypervisorMapping));
             dprintf(("VBoxGuest::reserveHypervisorMemory: communicating %p to host\n",
-                    ALIGNP(pDevExt->hypervisorMapping, 0x400000)));
+                    RT_ALIGN_P(pDevExt->hypervisorMapping, 0x400000)));
 
             /* align at 4MB */
-            req->hypervisorStart = (RTGCPTR)ALIGNP(pDevExt->hypervisorMapping, 0x400000);
+            req->hypervisorStart = (RTGCPTR)RT_ALIGN_P(pDevExt->hypervisorMapping, 0x400000);
 
             req->header.requestType = VMMDevReq_SetHypervisorInfo;

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -525 +525 @@
             {
                 /* communicate result to VMM, align at 4MB */
-                req->hypervisorStart    = (vmmDevHypPtr)ALIGNP(hypervisorArea, 0x400000);
+                req->hypervisorStart    = (vmmDevHypPtr)RT_ALIGN_P(hypervisorArea, 0x400000);
                 req->header.requestType = VMMDevReq_SetHypervisorInfo;
                 req->header.rc          = VERR_GENERAL_FAILURE;

trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c

@@ -2981 +2981 @@
      */
     pImage = (PSUPDRVLDRIMAGE)pv;
-    pImage->pvImage         = ALIGNP(pImage + 1, 32);
+    pImage->pvImage         = RT_ALIGN_P(pImage + 1, 32);
     pImage->cbImage         = pReq->u.In.cbImage;
     pImage->pfnModuleInit   = NULL;

trunk/src/VBox/HostDrivers/Support/testcase/tstPin.cpp

@@ -73 +73 @@
             aPinnings[i].pv = NULL;
             SUPPageAlloc(0x10000 >> PAGE_SHIFT, &aPinnings[i].pv);
-            aPinnings[i].pvAligned = ALIGNP(aPinnings[i].pv, PAGE_SIZE);
+            aPinnings[i].pvAligned = RT_ALIGN_P(aPinnings[i].pv, PAGE_SIZE);
             rc = SUPPageLock(aPinnings[i].pvAligned, 0xf000 >> PAGE_SHIFT, &aPinnings[i].aPages[0]);
             if (!rc)

trunk/src/VBox/Runtime/testcase/tstHeapSimple.cpp

@@ -102 +102 @@
         }
         memset(aOps[i].pvAlloc, szFill[i], aOps[i].cb);
-        if (ALIGNP(aOps[i].pvAlloc, (aOps[i].uAlignment ? aOps[i].uAlignment : 8)) != aOps[i].pvAlloc)
+        if (RT_ALIGN_P(aOps[i].pvAlloc, (aOps[i].uAlignment ? aOps[i].uAlignment : 8)) != aOps[i].pvAlloc)
         {
             RTPrintf("Failure: RTHeapSimpleAlloc(%p, %#x, %#x,) -> %p\n", (void *)Heap, aOps[i].cb, aOps[i].uAlignment, i);

trunk/src/VBox/VMM/MMPhys.cpp

@@ -83 +83 @@
     AssertMsg(pVM, ("Invalid VM pointer\n"));
     if (pvRam)
-        AssertReturn(ALIGNP(pvRam, PAGE_SIZE) == pvRam, VERR_INVALID_PARAMETER);
+        AssertReturn(RT_ALIGN_P(pvRam, PAGE_SIZE) == pvRam, VERR_INVALID_PARAMETER);
     else
         AssertReturn(fFlags & MM_RAM_FLAGS_DYNAMIC_ALLOC, VERR_INVALID_PARAMETER);

trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp

@@ -568 +568 @@
         pFree->cb -= cb;
         pvRet = (char *)(&pFree->core + 1) + pFree->cb;
-        AssertMsg(ALIGNP(pvRet, PAGE_SIZE) == pvRet, ("pvRet=%p cb=%#x pFree=%p pFree->cb=%#x\n", pvRet, cb, pFree, pFree->cb));
+        AssertMsg(RT_ALIGN_P(pvRet, PAGE_SIZE) == pvRet, ("pvRet=%p cb=%#x pFree=%p pFree->cb=%#x\n", pvRet, cb, pFree, pFree->cb));
         Log3(("mmHyperAllocPages: cbFree %d -> %d (%d)\n", pHeap->cbFree, pHeap->cbFree - cb, -(int)cb));
         pHeap->cbFree -= cb;
@@ -712 +712 @@
     if (!pv)
         return VINF_SUCCESS;
-    AssertMsgReturn(ALIGNP(pv, MMHYPER_HEAP_ALIGN_MIN) == pv,
+    AssertMsgReturn(RT_ALIGN_P(pv, MMHYPER_HEAP_ALIGN_MIN) == pv,
                     ("Invalid pointer %p!\n", pv),
                     VERR_INVALID_POINTER);
@@ -740 +740 @@
 #ifdef VBOX_WITH_STATISTICS
     PMMHYPERSTAT    pStat = (PMMHYPERSTAT)((uintptr_t)pChunk + pChunk->offStat);
-    AssertMsgReturn(    ALIGNP(pStat, MMHYPER_HEAP_ALIGN_MIN) == (void *)pStat
+    AssertMsgReturn(    RT_ALIGN_P(pStat, MMHYPER_HEAP_ALIGN_MIN) == (void *)pStat
                     &&  pChunk->offStat,
                     ("%p: offStat=%#RX32!\n", pv, pChunk->offStat),

trunk/src/VBox/VMM/testcase/tstMMHyperHeap.cpp

@@ -117 +117 @@
         }
         memset(aOps[i].pvAlloc, szFill[i], aOps[i].cb);
-        if (ALIGNP(aOps[i].pvAlloc, (aOps[i].uAlignment ? aOps[i].uAlignment : 8)) != aOps[i].pvAlloc)
+        if (RT_ALIGN_P(aOps[i].pvAlloc, (aOps[i].uAlignment ? aOps[i].uAlignment : 8)) != aOps[i].pvAlloc)
         {
             RTPrintf("Failure: MMHyperAlloc(, %#x, %#x,) -> %p, invalid alignment!\n", aOps[i].cb, aOps[i].uAlignment, aOps[i].pvAlloc);