Changeset 2270 in vbox for trunk/src/VBox/VMM/VMMAll/IOMAll.cpp

Timestamp:

Apr 20, 2007 12:58:15 PM (18 years ago)

Author:

vboxsync

Message:

Stricter pointer typechecking. (R0 vs R3)

File:

• trunk/src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (5 diffs)

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

@@ -435 +435 @@
         pRange->pfnWriteCallback= pfnWriteCallback;
         pRange->pfnFillCallback = pfnFillCallback;
-        #ifdef IN_GC
+#ifdef IN_GC
         pRange->pDevIns         = pDevIns;
         pRange->pszDesc         = MMHyperGC2HC(pVM, (void *)pszDesc);
-        #else
+#else
         pRange->pDevIns         = MMHyperHC2GC(pVM, pDevIns);
         pRange->pszDesc         = pszDesc;
-        #endif
+#endif
 
         /*
@@ -478 +478 @@
  * @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)
 {
@@ -548 +548 @@
         pRange->pfnInStrCallback = pfnInStrCallback;
 #ifdef IN_GC
-        pRange->pDevIns         = MMHyperGC2HC(pVM, pDevIns);
-        pRange->pszDesc         = MMHyperGC2HC(pVM, (void *)pszDesc);
+        pRange->pDevIns         = MMHyperGCToR0(pVM, pDevIns);
+        pRange->pszDesc         = MMHyperGCToR3(pVM, (void *)pszDesc);
+#elif defined(IN_RING3)
+        pRange->pDevIns         = MMHyperR3ToR0(pVM, pDevIns);
+        pRange->pszDesc         = pszDesc;
 #else
         pRange->pDevIns         = pDevIns;
-        pRange->pszDesc         = pszDesc;
+        pRange->pszDesc         = MMHyperR0ToR3(pVM, (RTR0PTR)pszDesc);
 #endif
 
@@ -590 +593 @@
  * @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)
 {
     LogFlow(("IOMMMIORegisterR0: pDevIns=%p GCPhysStart=%#x cbRange=%#x pvUser=%VHv pfnWriteCallback=%#x pfnReadCallback=%#x pfnFillCallback=%#x pszDesc=%s\n",
@@ -658 +661 @@
         pRange->pfnFillCallback = pfnFillCallback;
 #ifdef IN_GC
-        pRange->pDevIns         = MMHyperGC2HC(pVM, pDevIns);
-        pRange->pszDesc         = MMHyperGC2HC(pVM, (void *)pszDesc);
+        pRange->pDevIns         = MMHyperGCToR0(pVM, pDevIns);
+        pRange->pszDesc         = MMHyperGCToR3(pVM, (void *)pszDesc);
+#elif defined(IN_RING3)
+        pRange->pDevIns         = MMHyperR3ToR0(pVM, pDevIns);
+        pRange->pszDesc         = pszDesc;
 #else
         pRange->pDevIns         = pDevIns;
-        pRange->pszDesc         = pszDesc;
+        pRange->pszDesc         = MMHyperR0ToR3(pVM, (RTR0PTR)pszDesc);
 #endif