Changeset 914 in vbox for trunk/include/VBox

Timestamp:

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

Author:

vboxsync

Message:

PVMR0 changes for darwin.

Location:

trunk/include/VBox

Files:

• pgm.h (modified) (2 diffs)
• sup.h (modified) (8 diffs)

trunk/include/VBox/pgm.h

@@ -1382 +1382 @@
  * @returns VBox status code.
  * @param   pVM         The virtual machine.
- * @param   pvAddr      Intermediate context address of the mapping. This must be entriely below 4GB!
+ * @param   Addr        Intermediate context address of the mapping.
  * @param   HCPhys      Start of the range of physical pages. This must be entriely below 4GB!
  * @param   cbPages     Number of bytes to map.
@@ -1388 +1388 @@
  * @remark  This API shall not be used to anything but mapping the switcher code.
  */
-PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, void *pvAddr, RTHCPHYS HCPhys, unsigned cbPages);
+PGMR3DECL(int) PGMR3MapIntermediate(PVM pVM, RTUINTPTR Addr, RTHCPHYS HCPhys, unsigned cbPages);
 
 /**

trunk/include/VBox/sup.h

@@ -169 +169 @@
 {
     PCSUPGLOBALINFOPAGE pGIP;
-    __asm__ __volatile__ ("movabs g_SUPGlobalInfoPage,%0\n\t" 
+    __asm__ __volatile__ ("movabs g_SUPGlobalInfoPage,%0\n\t"
                           : "=a" (pGIP));
     return pGIP;
@@ -176 +176 @@
 # else
 #  define g_pSUPGlobalInfoPage         (&g_SUPGlobalInfoPage)
-#endif 
+#endif
 #else
 extern DECLIMPORT(PCSUPGLOBALINFOPAGE)  g_pSUPGlobalInfoPage;
@@ -251 +251 @@
  *
  * @returns error code specific to uFunction.
- * @param   pVM         Pointer to the Host Context mapping of the VM structure.
+ * @param   pVMR0       Pointer to the Ring-0 (Host Context) mapping of the VM structure.
  * @param   uOperation  Operation to execute.
  * @param   pvArg       Argument.
  */
-SUPR3DECL(int) SUPCallVMMR0(PVM pVM, unsigned uOperation, void *pvArg);
+SUPR3DECL(int) SUPCallVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg);
 
 /**
@@ -265 +265 @@
  *
  * @returns error code specific to uFunction.
- * @param   pVM         Pointer to the Host Context mapping of the VM structure.
+ * @param   pVMR0       Pointer to the Ring-0 (Host Context) mapping of the VM structure.
  * @param   uOperation  Operation to execute.
  * @param   pvArg       Pointer to argument structure or if cbArg is 0 just an value.
@@ -272 +272 @@
  *                      being invalidated while we're executing the call.
  */
-SUPR3DECL(int) SUPCallVMMR0Ex(PVM pVM, unsigned uOperation, void *pvArg, unsigned cbArg);
+SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned uOperation, void *pvArg, unsigned cbArg);
 
 /**
@@ -349 +349 @@
  * @returns NULL on failure.
  * @param   cb          Number of bytes to allocate.
- * @param   ppvR0       Where to store the ring-0 mapping of the allocation. (optional)
+ * @param   pR0Ptr      Where to store the ring-0 mapping of the allocation. (optional)
  * @param   pHCPhys     Where to store the physical address of the memory block.
  *
@@ -356 +356 @@
  *          the world switchers.
  */
-SUPR3DECL(void *) SUPContAlloc2(unsigned cb, void **ppvR0, PRTHCPHYS pHCPhys);
+SUPR3DECL(void *) SUPContAlloc2(unsigned cb, PRTR0PTR pR0Ptr, PRTHCPHYS pHCPhys);
 
 /**
@@ -486 +486 @@
 SUPR0DECL(int) SUPR0LockMem(PSUPDRVSESSION pSession, void *pvR3, unsigned cb, PSUPPAGE paPages);
 SUPR0DECL(int) SUPR0UnlockMem(PSUPDRVSESSION pSession, void *pvR3);
-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);
 SUPR0DECL(int) SUPR0ContFree(PSUPDRVSESSION pSession, void *pv);
 SUPR0DECL(int) SUPR0LowAlloc(PSUPDRVSESSION pSession, unsigned cPages, void **ppvR3, PSUPPAGE paPages);