Changeset 2268 in vbox

Timestamp:

Apr 20, 2007 12:57:49 PM (18 years ago)

Author:

vboxsync

Message:

Stricter pointer typechecking. (R0 vs R3)

Location:

trunk/include/VBox

Files:

• iom.h (modified) (2 diffs)
• mm.h (modified) (1 diff)
• pdm.h (modified) (8 diffs)
• pgm.h (modified) (3 diffs)

trunk/include/VBox/iom.h

@@ -230 +230 @@
  * @param   pszDesc             Pointer to description string. This must not be freed.
  */
-IOMDECL(int)  IOMIOPortRegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTHCPTR pvUser,
-                                  HCPTRTYPE(PFNIOMIOPORTOUT) pfnOutCallback, HCPTRTYPE(PFNIOMIOPORTIN) pfnInCallback,
-                                  HCPTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStrCallback, HCPTRTYPE(PFNIOMIOPORTINSTRING) pfnInStrCallback,
+IOMDECL(int)  IOMIOPortRegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTIOPORT PortStart, RTUINT cPorts, RTR0PTR pvUser,
+                                  R0PTRTYPE(PFNIOMIOPORTOUT) pfnOutCallback, R0PTRTYPE(PFNIOMIOPORTIN) pfnInCallback,
+                                  R0PTRTYPE(PFNIOMIOPORTOUTSTRING) pfnOutStrCallback, R0PTRTYPE(PFNIOMIOPORTINSTRING) pfnInStrCallback,
                                   const char *pszDesc);
 
@@ -254 +254 @@
  * @param   pszDesc             Pointer to description string. This must not be freed.
  */
-IOMDECL(int)  IOMMMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
-                                HCPTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, HCPTRTYPE(PFNIOMMMIOREAD) pfnReadCallback,
-                                HCPTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc);
+IOMDECL(int)  IOMMMIORegisterR0(PVM pVM, PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
+                                R0PTRTYPE(PFNIOMMMIOWRITE) pfnWriteCallback, R0PTRTYPE(PFNIOMMMIOREAD) pfnReadCallback,
+                                R0PTRTYPE(PFNIOMMMIOFILL) pfnFillCallback, const char *pszDesc);
 
 

trunk/include/VBox/mm.h

@@ -419 +419 @@
 #endif
 
-
 /**
  * Converts a HC address in the Hypervisor memory region to a GC address.

trunk/include/VBox/pdm.h

@@ -4501 +4501 @@
      * @param   pszDesc             Pointer to description string. This must not be freed.
      */
-    DECLR3CALLBACKMEMBER(int, pfnIOPortRegisterR0,(PPDMDEVINS pDevIns, RTIOPORT Port, RTUINT cPorts, RTHCPTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnIOPortRegisterR0,(PPDMDEVINS pDevIns, RTIOPORT Port, RTUINT cPorts, RTR0PTR pvUser,
                                                    const char *pszOut, const char *pszIn,
                                                    const char *pszOutStr, const char *pszInStr, const char *pszDesc));
@@ -4576 +4576 @@
      * @param   pszDesc             Pointer to description string. This must not be freed.
      */
-    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
+    DECLR3CALLBACKMEMBER(int, pfnMMIORegisterR0,(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
                                                  const char *pszWrite, const char *pszRead, const char *pszFill,
                                                  const char *pszDesc));
@@ -5499 +5499 @@
 
     /** Pointer the HC PDM Device API. */
-    HCPTRTYPE(PCPDMDEVHLP)      pDevHlp;
+    R3PTRTYPE(PCPDMDEVHLP)      pDevHlp;
     /** Pointer the R0 PDM Device API. */
     R0PTRTYPE(PCPDMDEVHLPR0)    pDevHlpR0;
     /** Pointer to device registration structure.  */
-    HCPTRTYPE(PCPDMDEVREG)      pDevReg;
+    R3PTRTYPE(PCPDMDEVREG)      pDevReg;
     /** Configuration handle. */
-    HCPTRTYPE(PCFGMNODE)        pCfgHandle;
+    R3PTRTYPE(PCFGMNODE)        pCfgHandle;
     /** Pointer to device instance data. */
-    HCPTRTYPE(void *)           pvInstanceDataHC;
+    R3PTRTYPE(void *)           pvInstanceDataR3;
+    /** Pointer to device instance data. */
+    R0PTRTYPE(void *)           pvInstanceDataR0;
     /** Pointer the GC PDM Device API. */
     GCPTRTYPE(PCPDMDEVHLPGC)    pDevHlpGC;
@@ -5514 +5516 @@
 #if HC_ARCH_BITS == 32
     /* padding to make achInstanceData aligned at 16 byte boundrary. */
-    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 2 : 0];
+    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 1 : 0];
 #endif
     /** Device instance data. The size of this area is defined
@@ -5572 +5574 @@
 #define PDMINS2DATA_GCPTR(pIns)     ( (pIns)->pvInstanceDataGC )
 
-/** @def PDMINS2DATA_HCPTR
+/** @def PDMINS2DATA_R3PTR
  * Converts a PDM Device or Driver instance pointer to a HC pointer to the instance data.
  */
-#define PDMINS2DATA_HCPTR(pIns)     ( (pIns)->pvInstanceDataHC )
+#define PDMINS2DATA_R3PTR(pIns)     ( (pIns)->pvInstanceDataR3 )
+
+ /** @def PDMINS2DATA_R0PTR
+ * Converts a PDM Device or Driver instance pointer to a R0 pointer to the instance data.
+ */
+#define PDMINS2DATA_R0PTR(pIns)     ( (pIns)->pvInstanceDataR0 )
 
 /** @def PDMDEVINS_2_GCPTR
@@ -5582 +5589 @@
 #define PDMDEVINS_2_GCPTR(pDevIns)  ( (GCPTRTYPE(PPDMDEVINS))((RTGCUINTPTR)(pDevIns)->pvInstanceDataGC - RT_OFFSETOF(PDMDEVINS, achInstanceData)) )
 
-/** @def PDMDEVINS_2_HCPTR
+/** @def PDMDEVINS_2_R3PTR
  * Converts a PDM Device instance pointer a HC PDM Device instance pointer.
  */
-#define PDMDEVINS_2_HCPTR(pDevIns)  ( (HCPTRTYPE(PPDMDEVINS))((RTHCUINTPTR)(pDevIns)->pvInstanceDataHC - RT_OFFSETOF(PDMDEVINS, achInstanceData)) )
+#define PDMDEVINS_2_R3PTR(pDevIns)  ( (HCPTRTYPE(PPDMDEVINS))((RTHCUINTPTR)(pDevIns)->pvInstanceDataR3 - RT_OFFSETOF(PDMDEVINS, achInstanceData)) )
+
+/** @def PDMDEVINS_2_R0PTR
+ * Converts a PDM Device instance pointer a R0 PDM Device instance pointer.
+ */
+#define PDMDEVINS_2_R0PTR(pDevIns)  ( (R0PTRTYPE(PPDMDEVINS))((RTR0UINTPTR)(pDevIns)->pvInstanceDataR0 - RT_OFFSETOF(PDMDEVINS, achInstanceData)) )
 
 
@@ -5640 +5652 @@
  * @copydoc PDMDEVHLP::pfnIOPortRegisterR0
  */
-DECLINLINE(int) PDMDevHlpIOPortRegisterR0(PPDMDEVINS pDevIns, RTIOPORT Port, RTUINT cPorts, RTHCPTR pvUser,
+DECLINLINE(int) PDMDevHlpIOPortRegisterR0(PPDMDEVINS pDevIns, RTIOPORT Port, RTUINT cPorts, RTR0PTR pvUser,
                                           const char *pszOut, const char *pszIn, const char *pszOutStr,
                                           const char *pszInStr, const char *pszDesc)
@@ -5669 +5681 @@
  * @copydoc PDMDEVHLP::pfnMMIORegisterR0
  */
-DECLINLINE(int) PDMDevHlpMMIORegisterR0(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTHCPTR pvUser,
+DECLINLINE(int) PDMDevHlpMMIORegisterR0(PPDMDEVINS pDevIns, RTGCPHYS GCPhysStart, RTUINT cbRange, RTR0PTR pvUser,
                                         const char *pszWrite, const char *pszRead, const char *pszFill, const char *pszDesc)
 {

trunk/include/VBox/pgm.h

@@ -619 +619 @@
  */
 PGMDECL(int) PGMHandlerPhysicalRegisterEx(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,
-                                          HCPTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTHCPTR pvUserR3,
-                                          R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTHCPTR pvUserR0,
+                                          R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
+                                          R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
                                           GCPTRTYPE(PFNPGMGCPHYSHANDLER) pfnHandlerGC, RTGCPTR pvUserGC,
-                                          HCPTRTYPE(const char *) pszDesc);
+                                          R3PTRTYPE(const char *) pszDesc);
 
 /**
@@ -664 +664 @@
  */
 PGMDECL(int) PGMHandlerPhysicalChangeCallbacks(PVM pVM, RTGCPHYS GCPhys,
-                                               HCPTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTHCPTR pvUserR3,
-                                               R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTHCPTR pvUserR0,
+                                               R3PTRTYPE(PFNPGMR3PHYSHANDLER) pfnHandlerR3, RTR3PTR pvUserR3,
+                                               R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0, RTR0PTR pvUserR0,
                                                GCPTRTYPE(PFNPGMGCPHYSHANDLER) pfnHandlerGC, RTGCPTR pvUserGC,
-                                               HCPTRTYPE(const char *) pszDesc);
+                                               R3PTRTYPE(const char *) pszDesc);
 
 /**
@@ -1447 +1447 @@
 PGMR3DECL(int) PGMR3HandlerPhysicalRegister(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhys, RTGCPHYS GCPhysLast,
                                             PFNPGMR3PHYSHANDLER pfnHandlerR3, void *pvUserR3,
-                                            const char *pszModR0, const char *pszHandlerR0, RTHCPTR pvUserR0,
+                                            const char *pszModR0, const char *pszHandlerR0, RTR0PTR pvUserR0,
                                             const char *pszModGC, const char *pszHandlerGC, RTGCPTR pvUserGC, const char *pszDesc);