Changeset 1480

Timestamp:

03/14/07 19:27:47 (2 years ago)

Author:

vboxsync

Message:

No longer require contiguous memory for the VM structure.
Did long overdue IOCtl cleanup wrt R3/R0 pointers.

Files:

• trunk/include/VBox/mm.h (modified) (2 diffs)
• trunk/include/VBox/sup.h (modified) (4 diffs)
• trunk/include/VBox/vm.h (modified) (3 diffs)
• trunk/include/VBox/vm.mac (modified) (1 diff)
• trunk/include/VBox/vmapi.h (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDRV.h (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDRVIOC.h (modified) (6 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c (modified) (54 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (6 diffs)
• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (8 diffs)
• trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/testcase/tstLow.cpp (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Support/win32/SUPDrv-win32.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/MM.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/MMHyper.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/MMInternal.h (modified) (3 diffs)
• trunk/src/VBox/VMM/MMPagePool.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/SELM.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/SELMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VM.cpp (modified) (6 diffs)
• trunk/src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (2 diffs)

trunk/include/VBox/mm.h

@@ -25 +25 @@
-#include <VBox/types.h>
-#include <VBox/x86.h>
+#include <VBox/sup.h>
-
-
@@ -767 +768 @@
-
-/**
+ * Maps locked R3 virtual memory into the hypervisor region in the GC.
+ *
+ * @return VBox status code.
+ *
+ * @param   pVM         VM handle.
+ * @param   pvR3        The ring-3 address of the memory, must be page aligned.
+ * @param   pvR0        The ring-0 address of the memory, must be page aligned. (optional)
+ * @param   cPages      The number of pages.
+ * @param   paPages     The page descriptors.
+ * @param   pszDesc     Mapping description.
+ * @param   pGCPtr      Where to store the GC address corresponding to pvHC.
+ */
+MMR3DECL(int) MMR3HyperMapPages(PVM pVM, void *pvR3, RTR0PTR pvR0, size_t cPages, PCSUPPAGE paPages, const char *pszDesc, PRTGCPTR pGCPtr);
+
+/**
- * Reserves a hypervisor memory area.
- * Most frequent usage is fence pages and dynamically mappings like the guest PD and PDPTR.

trunk/include/VBox/sup.h

@@ -33 +33 @@
- */
-
-
+
+
- */
-#pragma pack(4) /* space is more important. */
@@ -42 +43 @@
-    /** Reserved entry for internal use by the caller. */
-    RTHCUINTPTR     uReserved;
-, *PSUPPAGE
+
-#pragma pack()
+/** Pointer to a page descriptor. */
+typedef SUPPAGE *PSUPPAGE;
+/** Pointer to a const page descriptor. */
+typedef const SUPPAGE *PCSUPPAGE;
-
-/**
@@ -428 +433 @@
- *                      The pointer stored here on success must be passed to SUPLowFree when
- *                      the memory should be released.
+ * @param   ppvPagesR0  Where to store the ring-0 pointer to the allocated memory. optional.
- * @param   paPages     Where to store the physical addresses of the individual pages.
- */
-
+RTR0PTR ppvPagesR0, P
-
-/**
@@ -537 +543 @@
-SUPR0DECL(int) SUPR0ObjVerifyAccess(void *pvObj, PSUPDRVSESSION pSession, const char *pszObjName);
-
-void *pvR3, unsigned
-void *
-nsigned cb, void **
-void *pv
-nsigned cPages, void **
-void *pv
-nsigned cb, void **ppvR0, void **
-void *pv
-void *pv
-RTHCPHYS *
+RTR3PTR pvR3, uint32_t
+RTR3PTR 
+int32_t cb, PRTR0PTR 
+RTHCUINTPTR uPtr
+int32_t cPages, PRTR0PTR ppvR0, PRTR3PTR 
+RTHCUINTPTR uPtr
+int32_t cb, PRTR0PTR ppvR0, PRTR3PTR 
+RTHCUINTPTR uPtr
+RTHCUINTPTR uPtr
+PRTHCPHYS 
-SUPR0DECL(int) SUPR0GipUnmap(PSUPDRVSESSION pSession);
-SUPR0DECL(int) SUPR0Printf(const char *pszFormat, ...);

trunk/include/VBox/vm.h

@@ -28 +28 @@
-#include <VBox/stam.h>
-#include <VBox/vmapi.h>
+#include <VBox/sup.h>
-
-
@@ -227 +228 @@
-     */
-    volatile uint32_t           fForcedActions;
-hysical address (real) of this structure
-THCPHYS                    HCPhysVM
+ointer to the array of page descriptors for the VM structure allocation
+3PTRTYPE(PSUPPAGE)         paVMPagesR3
-    /** Session handle. For use when calling SUPR0 APIs. */
-    HCPTRTYPE(PSUPDRVSESSION)   pSession;
@@ -318 +319 @@
-
-    /* padding to make gnuc put the StatQemuToGC where msc does. */
-
+/*
-    uint32_t            padding0;
-
+*/
-
-    /** Profiling the total time from Qemu to GC. */

trunk/include/VBox/vm.mac

@@ -40 +40 @@
-    .enmVMState         resd 1
-    .fForcedActions     resd 1
-HCPhysVM           resq
+paVMPagesR3        RTR3PTR_RES
-    .pSession           RTR3PTR_RES 1
-    .pNext              RTHCPTR_RES 1

trunk/include/VBox/vmapi.h

@@ -36 +36 @@
- * @{ */
-
-/** @def VM_PHYS_ADDR
- * Converts address of data within the VM structure to the equivalent
- * physical address.
- *
- * @returns physical address.
- * @param   pVM     Pointer to the VM.
- * @param   pvInVM  Pointer within the VM.
- */
-#define VM_PHYS_ADDR(pVM, pvInVM)   ( pVM->PhysVM + (uint32_t)((uintptr_t)pvInVM - (uintptr_t)pVM) )
-
-/** @def VM_GUEST_ADDR
-hos
+a current contex
- * guest address.
- *
- * @returns guest virtual address.
- * @param   pVM     Pointer to the VM.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/** @def VM_HOST_ADDR
@@ -63 +92 @@
- * @param   pVM     Pointer to the VM.
- * @param   pvInVM  GC Pointer within the VM.
+ * @deprecated
- */
-#define VM_HOST_ADDR(pVM, pvInVM)     ( (RTHCPTR)((RTHCUINTPTR)pVM->pVMHC + (uint32_t)((uintptr_t)(pvInVM) - (uintptr_t)pVM->pVMGC)) )
+
-
-

trunk/src/VBox/HostDrivers/Support/SUPDRV.h

@@ -357 +357 @@
-    /** Pointer to the R3 mapping of the memory.
-     * Set to NULL if N/A. */
-void               *
+RTR3PTR             
-    /** Size of the locked memory. */
-    unsigned            cb;
@@ -662 +662 @@
-int  VBOXCALL   supdrvOSLockMemOne(PSUPDRVMEMREF pMem, PSUPPAGE paPages);
-void VBOXCALL   supdrvOSUnlockMemOne(PSUPDRVMEMREF pMem);
-void **ppvR0, void **
+PRTR0PTR ppvR0, PRTR3PTR 
-void VBOXCALL   supdrvOSContFreeOne(PSUPDRVMEMREF pMem);
-void **
+PRTR0PTR ppvR0, PRTR3PTR 
-void VBOXCALL   supdrvOSLowFreeOne(PSUPDRVMEMREF pMem);
-void **ppvR0, void **
+PRTR0PTR ppvR0, PRTR3PTR 
-void VBOXCALL   supdrvOSMemGetPages(PSUPDRVMEMREF pMem, PSUPPAGE paPages);
-void VBOXCALL   supdrvOSMemFreeOne(PSUPDRVMEMREF pMem);

trunk/src/VBox/HostDrivers/Support/SUPDRVIOC.h

@@ -181 +181 @@
-#define SUPCOOKIE_MAGIC             "The Magic Word!"
-/** Current interface version. */
-0
+1
-
-/** SUP_IOCTL_COOKIE Output. */
@@ -263 +263 @@
-    uint32_t    u32SessionCookie;
-    /** Start of page range. Must be PAGE aligned. */
-void       *pv
+RTR3PTR     pvR3
-    /** Size of the range. Must be PAGE aligned. */
-    uint32_t    cb;
@@ -285 +285 @@
-    uint32_t    u32SessionCookie;
-    /** Start of page range of a range previuosly pinned. */
-void        *pv
+RTR3PTR     pvR3
-} SUPUNPINPAGES_IN, *PSUPUNPINPAGES_IN;
-
@@ -320 +320 @@
-    /** Session cookie. */
-    uint32_t    u32SessionCookie;
-address (virtual, not physical address)
-void       *pv
+ring-3 address
+RTR3PTR     pvR3
-} SUPCONTFREE_IN, *PSUPCONTFREE_IN;
-
@@ -511 +511 @@
-typedef struct SUPLOWALLOC_OUT
-{
-
-
+
+
+
+
-    /** Array of pages. */
-    SUPPAGE     aPages[1];
@@ -525 +527 @@
-    /** Session cookie. */
-    uint32_t    u32SessionCookie;
-address (virtual, not physical address)
-void       *pv
+ring-3 address
+RTR3PTR     pvR3
-} SUPLOWFREE_IN, *PSUPLOWFREE_IN;
-

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

@@ -146 +146 @@
-__BEGIN_DECLS
-static int      supdrvMemAdd(PSUPDRVMEMREF pMem, PSUPDRVSESSION pSession);
-void *pv
+RTHCUINTPTR uPtr
-#ifndef VBOX_WITHOUT_IDT_PATCHING
-static int      supdrvIOCtl_IdtInstall(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession, PSUPIDTINSTALL_IN pIn, PSUPIDTINSTALL_OUT pOut);
@@ -644 +644 @@
-                ||  cbOut != sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -685 +685 @@
-                ||  cbOut < sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -723 +723 @@
-                ||  cbOut != sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -756 +756 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -788 +788 @@
-                ||  cbOut < sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -799 +799 @@
-                return SUPDRV_ERR_INVALID_MAGIC;
-            }
-
-
-pIn->pv
+R3
+
+(void *)pIn->pvR3
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -815 +815 @@
-             */
-            *pcbReturned = RT_OFFSETOF(SUPPINPAGES_OUT, aPages[pIn->cb >> PAGE_SHIFT]);
-
+R3
-            if (rc)
-                *pcbReturned = 0;
@@ -832 +832 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -847 +847 @@
-             * Execute.
-             */
-
+R3
-        }
-
@@ -862 +862 @@
-                ||  cbOut < sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -894 +894 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -909 +909 @@
-             * Execute.
-             */
-pIn->pv
+(RTHCUINTPTR)pIn->pvR3
-        }
-
@@ -924 +924 @@
-                ||  cbOut != sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -972 +972 @@
-                ||  cbOut != 0)
-            {
-d expected greater than %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected greater than %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1055 +1055 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1102 +1102 @@
-            if (pszEnd - &pIn->szSymbol[0] >= 1024)
-            {
-
-pszEnd - &pIn->szSymbol[0]
+l
+(long)(pszEnd - &pIn->szSymbol[0])
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1125 +1125 @@
-                ||  cbOut != sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1164 +1164 @@
-                ||  cbOut != sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1199 +1199 @@
-                ||  cbOut < sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1221 +1221 @@
-             */
-            *pcbReturned = RT_OFFSETOF(SUPLOWALLOC_OUT, aPages[pIn->cPages]);
-Virt
+R0, &pOut->pvR3
-            if (rc)
-                *pcbReturned = 0;
@@ -1238 +1238 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1253 +1253 @@
-             * Execute.
-             */
-pIn->pv
+(RTHCUINTPTR)pIn->pvR3
-        }
-
@@ -1269 +1269 @@
-                ||  cbOut != sizeof(*pOut))
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1304 +1304 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1333 +1333 @@
-                ||  cbOut != 0)
-            {
-d expected %d. cbOut=%d expected %
-cbIn, sizeof(*pIn), cbOut, 
+ld expected %ld. cbOut=%ld expected %l
+(long)cbIn, (long)sizeof(*pIn), (long)cbOut, (long)
-                return SUPDRV_ERR_INVALID_PARAM;
-            }
@@ -1732 +1732 @@
- *                      This must be page aligned.
- */
-void *pvR3, unsigned
+RTR3PTR pvR3, uint32_t
-{
-    int             rc;
-    SUPDRVMEMREF    Mem = {0};
-    dprintf(("SUPR0LockMem: pSession=%p pvR3=%p cb=%d paPages=%p\n",
-
+(void *)
-
-    /*
-     * Verify input.
-     */
-void *
-
-
+RTR3PTR
+
+(void *)
-        return SUPDRV_ERR_INVALID_PARAM;
-    }
-
+_Z
-    {
-        dprintf(("cb (%u) must be page aligned!\n", cb));
@@ -1822 +1822 @@
- * @param   pvR3        Memory to unlock.
- */
-void *
-
-
-
+RTR3PTR 
+
+(void *)
+(RTHCUINTPTR)
-}
-
@@ -1837 +1837 @@
- * @param   pSession    Session data.
- * @param   cb          Number of bytes to allocate.
- optional
+
- * @param   ppvR3       Where to put the address of Ring-3 mapping the allocated memory.
- * @param   pHCPhys     Where to put the physical address of allocated memory.
- */
-nsigned cb, void **
+int32_t cb, PRTR0PTR 
-{
-    int             rc;
@@ -1850 +1850 @@
-     * Validate input.
-     */
-
-
-
-
+pvR0 || !p
+
+0=%p ppvR
+0, ppvR
-        return SUPDRV_ERR_INVALID_PARAM;
-
@@ -1879 +1879 @@
-            if (!rc)
-            {
-
-
-
+
+
-                *pHCPhys = RTR0MemObjGetPagePhysAddr(Mem.MemObj, 0);
-                return 0;
@@ -1899 +1898 @@
-     */
-    Mem.pvR0    = NULL;
-ULL
+IL_RTR3PTR
-    Mem.eType   = MEMREF_TYPE_CONT;
-    Mem.cb      = cb;
@@ -1926 +1925 @@
- * @returns SUPDRV_ERR_* on failure.
- * @param   pSession    The session to which the memory was allocated.
-pv          Pointer to the memory
-
-void *pv
-
-pv=%p\n", pSession, pv
-pv
+uPtr        Pointer to the memory (ring-3 or ring-0)
+
+RTHCUINTPTR uPtr
+
+uPtr=%p\n", pSession, (void *)uPtr
+uPtr
-}
-
@@ -1942 +1941 @@
- * @param   pSession    Session data.
- * @param   cPages      Number of pages to allocate.
+ * @param   ppvR0       Where to put the address of Ring-0 mapping of the allocated memory.
- * @param   ppvR3       Where to put the address of Ring-3 mapping of the allocated memory.
- * @param   paPages     Where to put the physical addresses of allocated memory.
- */
-nsigned cPages, void **
+int32_t cPages, PRTR0PTR ppvR0, PRTR3PTR 
-{
-    unsigned        iPage;
-    int             rc;
-    SUPDRVMEMREF    Mem = {0};
-aPages=%p\n", pSession, cPages, ppvR3
+pvR0=%p paPages=%p\n", pSession, cPages, ppvR3, ppvR0
-
-    /*
-     * Validate input.
-     */
-
-
-
-
+pvR0 || !p
+
+pvR0=%p p
+pvR0, p
-        return SUPDRV_ERR_INVALID_PARAM;
-
@@ -1990 +1990 @@
-                    AssertMsg(!(paPages[iPage].Phys & (PAGE_SIZE - 1)), ("iPage=%d Phys=%VHp\n", paPages[iPage].Phys));
-                }
-
-
+
-                *ppvR3 = RTR0MemObjAddress(Mem.MapObjR3);
-                return 0;
@@ -2010 +2009 @@
-     */
-    Mem.pvR0    = NULL;
-ULL
+IL_RTR3PTR
-    Mem.eType   = MEMREF_TYPE_LOW;
-    Mem.cb      = cPages << PAGE_SHIFT;
-
+0, ppvR
-    if (rc)
-        return rc;
-    AssertMsg(!((uintptr_t)*ppvR3 & (PAGE_SIZE - 1)), ("Memory is not page aligned! virt=%p\n", *ppvR3));
+    AssertMsg(!((uintptr_t)*ppvR0 & (PAGE_SIZE - 1)), ("Memory is not page aligned! virt=%p\n", *ppvR0));
-    for (iPage = 0; iPage < cPages; iPage++)
-        AssertMsg(!(paPages[iPage].Phys & (PAGE_SIZE - 1)), ("iPage=%d Phys=%VHp\n", paPages[iPage].Phys));
@@ -2037 +2037 @@
- * @returns SUPDRV_ERR_* on failure.
- * @param   pSession    The session to which the memory was allocated.
-pv          Pointer to the memory
-
-void *pv
-
-pv=%p\n", pSession, pv
-pv
+uPtr        Pointer to the memory (ring-3 or ring-0)
+
+RTHCUINTPTR uPtr
+
+uPtr=%p\n", pSession, (void *)uPtr
+uPtr
-}
-
@@ -2057 +2057 @@
- * @param   ppvR3       Where to store the address of the Ring-3 mapping.
- */
-nsigned cb, void **ppvR0, void **
+int32_t cb, PRTR0PTR ppvR0, PRTR3PTR 
-{
-    int             rc;
@@ -2096 +2096 @@
-            {
-                *ppvR0 = RTR0MemObjAddress(Mem.MemObj);
-
+(RTR3PTR)
-                return 0;
-            }
@@ -2113 +2113 @@
-     */
-    Mem.pvR0    = NULL;
-ULL
+IL_RTR3PTR
-    Mem.eType   = MEMREF_TYPE_MEM;
-    Mem.cb      = cb;
@@ -2139 +2139 @@
- * @returns SUPDRV_ERR_* on failure.
- * @param   pSession        The session to which the memory was allocated.
-
-
-
+
+
+
+
-{
-    PSUPDRVBUNDLE pBundle;
-    RTSPINLOCKTMP SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
-pv=%p paPages=%p\n", pSession, pv
+uPtr=%p paPages=%p\n", pSession, (void *)uPtr
-
-    /*
@@ -2155 +2156 @@
-        return SUPDRV_ERR_INVALID_PARAM;
-    }
-pv
-
-pv=%p or/and paPages=%p\n", pv
+uPtr
+
+uPtr=%p or/and paPages=%p\n", (void *)uPtr
-        return SUPDRV_ERR_INVALID_PARAM;
-    }
@@ -2175 +2176 @@
-                if (    pBundle->aMem[i].eType == MEMREF_TYPE_MEM
-                    &&  pBundle->aMem[i].MemObj != NIL_RTR0MEMOBJ
-RTR0MemObjAddress(pBundle->aMem[i].MemObj) == pv
+(RTHCUINTPTR)RTR0MemObjAddress(pBundle->aMem[i].MemObj) == uPtr
-                         || (   pBundle->aMem[i].MapObjR3 != NIL_RTR0MEMOBJ
-RTR0MemObjAddress(pBundle->aMem[i].MapObjR3) == pv
+(RTHCUINTPTR)RTR0MemObjAddress(pBundle->aMem[i].MapObjR3) == uPtr
-                        )
-                   )
@@ -2193 +2194 @@
-#else /* !USE_NEW_OS_INTERFACE */
-                if (    pBundle->aMem[i].eType == MEMREF_TYPE_MEM
-pBundle->aMem[i].pvR0 == pv
-pBundle->aMem[i].pvR3 == pv
+(RTHCUINTPTR)pBundle->aMem[i].pvR0 == uPtr
+(RTHCUINTPTR)pBundle->aMem[i].pvR3 == uPtr
-                {
-                    supdrvOSMemGetPages(&pBundle->aMem[i], paPages);
@@ -2205 +2206 @@
-    }
-    RTSpinlockRelease(pSession->Spinlock, &SpinlockTmp);
-pv
+(void *)uPtr
-    return SUPDRV_ERR_INVALID_PARAM;
-}
@@ -2216 +2217 @@
- * @returns SUPDRV_ERR_* on failure.
- * @param   pSession        The session owning the allocation.
-pv  
-
-void *pv
-
-pv=%p\n", pSession, pv
-pv
+uPtr
+
+RTHCUINTPTR uPtr
+
+uPtr=%p\n", pSession, (void *)uPtr
+uPtr
-}
-
@@ -2238 +2239 @@
- *          and remove the session as a GIP user.
- */
-RTHCPHYS *
+PRTHCPHYS 
-{
-    int                     rc = 0;
@@ -2461 +2462 @@
- * @returns SUPDRV_ERR_INVALID_PARAM on failure.
- * @param   pSession    Session data.
-pv  
+uPtr
- * @param   eType       Memory type.
- */
-void *pv
+RTHCUINTPTR uPtr
-{
-    PSUPDRVBUNDLE pBundle;
@@ -2477 +2478 @@
-        return SUPDRV_ERR_I