Changeset 914 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Feb 14, 2007 11:23:08 PM (18 years ago)

Author:

vboxsync

Message:

PVMR0 changes for darwin.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDRVIOC.h (modified) (2 diffs)
• SUPDRVShared.c (modified) (3 diffs)
• SUPLib.cpp (modified) (9 diffs)
• testcase/tstInt.cpp (modified) (3 diffs)

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

@@ -300 +300 @@
 {
     /** The address of the ring-0 mapping of the allocated memory. */
-    void       *pvR0;
+    RTR0PTR     pvR0;
     /** The address of the ring-3 mapping of the allocated memory. */
-    void       *pvR3;
+    RTR3PTR     pvR3;
     /** The physical address of the allocation. */
     RTHCPHYS    HCPhys;
@@ -458 +458 @@
     uint32_t    u32SessionCookie;
     /** The VM handle. */
-    PVM         pVM;
+    PVMR0       pVMR0;
     /** Which operation to execute. */
     uint32_t    uOperation;

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

@@ -1145 +1145 @@
              * Execute.
              */
-            pOut->rc = pDevExt->pfnVMMR0Entry(pIn->pVM, pIn->uOperation, pIn->pvArg);
+            pOut->rc = pDevExt->pfnVMMR0Entry(pIn->pVMR0, pIn->uOperation, pIn->pvArg);
             *pcbReturned = sizeof(*pOut);
             return 0;
@@ -1837 +1837 @@
  * @param   pHCPhys     Where to put the physical address of allocated memory.
  */
-SUPR0DECL(int) SUPR0ContAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, void **ppvR3, PRTHCPHYS pHCPhys)
+SUPR0DECL(int) SUPR0ContAlloc(PSUPDRVSESSION pSession, unsigned cb, void **ppvR0, PRTR3PTR ppvR3, PRTHCPHYS pHCPhys)
 {
     int             rc;
@@ -2832 +2832 @@
     *u.pb++ = 0xf8;
 
-    /* 
+    /*
      * Call VMMR0Entry
-     *      We don't have to push the arguments here, but we have to 
+     *      We don't have to push the arguments here, but we have to
      *      reserve some stack space for the interrupt forwarding.
      */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -79 +79 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef DECLCALLBACK(int) FNCALLVMMR0(PVM pVM, unsigned uOperation, void *pvArg);
+typedef DECLCALLBACK(int) FNCALLVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg);
 typedef FNCALLVMMR0 *PFNCALLVMMR0;
 
@@ -356 +356 @@
 }
 
-SUPR3DECL(int) SUPCallVMMR0Ex(PVM pVM, unsigned uOperation, void *pvArg, unsigned cbArg)
+SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned uOperation, void *pvArg, unsigned cbArg)
 {
     /*
@@ -364 +364 @@
     In.u32Cookie        = g_u32Cookie;
     In.u32SessionCookie = g_u32SessionCookie;
-    In.pVM              = pVM;
+    In.pVMR0            = pVMR0;
     In.uOperation       = uOperation;
     In.cbArg            = cbArg;
@@ -377 +377 @@
 
 
-SUPR3DECL(int) SUPCallVMMR0(PVM pVM, unsigned uOperation, void *pvArg)
+SUPR3DECL(int) SUPCallVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg)
 {
 #ifndef VBOX_WITHOUT_IDT_PATCHING
-    return g_pfnCallVMMR0(pVM, uOperation, pvArg);
+    return g_pfnCallVMMR0(pVMR0, uOperation, pvArg);
 
 #else
-    if (uOperation == VMMR0_DO_RAW_RUN)
+    if (RT_LIKELY(uOperation == VMMR0_DO_RAW_RUN))
     {
         Assert(!pvArg);
         return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_RAW_RUN);
     }
-    if (uOperation == VMMR0_DO_HWACC_RUN)
+    if (RT_LIKELY(uOperation == VMMR0_DO_HWACC_RUN))
     {
         Assert(!pvArg);
@@ -398 +398 @@
         return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_NOP);
     }
-    return SUPCallVMMR0Ex(pVM, uOperation, pvArg, pvArg ? sizeof(pvArg) : 0);
+    return SUPCallVMMR0Ex(pVMR0, uOperation, pvArg, pvArg ? sizeof(pvArg) : 0);
 #endif
 }
@@ -478 +478 @@
 SUPR3DECL(void *) SUPContAlloc(unsigned cb, PRTHCPHYS pHCPhys)
 {
-    return SUPContAlloc2(cb, NULL, pHCPhys);
-}
-
-
-SUPR3DECL(void *) SUPContAlloc2(unsigned cb, void **ppvR0, PRTHCPHYS pHCPhys)
+    return SUPContAlloc2(cb, NIL_RTR0PTR, pHCPhys);
+}
+
+
+SUPR3DECL(void *) SUPContAlloc2(unsigned cb, PRTR0PTR pR0Ptr, PRTHCPHYS pHCPhys)
 {
     /*
@@ -490 +490 @@
     AssertPtr(pHCPhys);
     *pHCPhys = NIL_RTHCPHYS;
+    AssertPtrNull(pR0Ptr);
+    if (pR0Ptr)
+        *pR0Ptr = NIL_RTR0PTR;
 
     /*
@@ -506 +509 @@
         rc = SUPPageAlloc(In.cb >> PAGE_SHIFT, &Out.pvR3);
         Out.HCPhys = (uintptr_t)Out.pvR3 + (PAGE_SHIFT * 1024);
-        Out.pvR0 = Out.pvR3;
+        Out.pvR0 = (uintptr_t)Out.pvR3;
     }
     if (VBOX_SUCCESS(rc))
     {
         *pHCPhys = (RTHCPHYS)Out.HCPhys;
-        if (ppvR0)
-            *ppvR0 = Out.pvR0;
+        if (pR0Ptr)
+            *pR0Ptr = Out.pvR0;
         return Out.pvR3;
     }
@@ -717 +720 @@
      * reg params:
      *      <GCC>   <MSC>   <argument>
-     *      rdi     rcx     pVM
+     *      rdi     rcx     pVMR0
      *      esi     edx     uOperation
      *      rdx     r8      pvArg

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

@@ -89 +89 @@
             PVMR0 pVMR0;
             RTHCPHYS HCPhysVM;
-            PVM pVM = (PVM)SUPContAlloc2(sizeof(*pVM), (void **)&pVMR0, &HCPhysVM);
+            PVM pVM = (PVM)SUPContAlloc2(sizeof(*pVM), &pVMR0, &HCPhysVM);
             if (pVM)
             {
                 pVM->pVMGC = 0;
-                pVM->pVMHC = pVM;
+                pVM->pVMR3 = pVM;
+                pVM->pVMR0 = pVMR0;
                 pVM->HCPhysVM = HCPhysVM;
                 pVM->pSession = pSession;
@@ -108 +109 @@
                     for (i = cIterations; i > 0; i--)
                     {
-                        rc = SUPCallVMMR0((PVM)pVMR0, VMMR0_DO_NOP, NULL);
+                        rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
                         if (rc != VINF_SUCCESS)
                         {
@@ -130 +131 @@
                         {
                             uint64_t OneStartTick = ASMReadTSC();
-                            rc = SUPCallVMMR0((PVM)pVMR0, VMMR0_DO_NOP, NULL);
+                            rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
                             uint64_t Ticks = ASMReadTSC() - OneStartTick;
                             if (Ticks < MinTicks)