Changeset 28330 in vbox

Timestamp:

Apr 14, 2010 9:47:47 PM (15 years ago)

Author:

vboxsync

Message:

PDMR3LdrGetInterfaceSymbols related fixes.

Location:

trunk/src/VBox/VMM

Files:

• PDMDevHlp.cpp (modified) (2 diffs)
• PDMDriver.cpp (modified) (2 diffs)
• PDMLdr.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -1799 +1799 @@
         if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_RC)
             rc = PDMR3LdrGetInterfaceSymbols(pDevIns->Internal.s.pVMR3, pvInterface, cbInterface,
-                                             pDevIns->pReg->szName, pszSymPrefix, pszSymList,
+                                             pDevIns->pReg->szRCMod, pszSymPrefix, pszSymList,
                                              false /*fRing0OrRC*/);
         else
@@ -1835 +1835 @@
         if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_R0)
             rc = PDMR3LdrGetInterfaceSymbols(pDevIns->Internal.s.pVMR3, pvInterface, cbInterface,
-                                             pDevIns->pReg->szName, pszSymPrefix, pszSymList,
+                                             pDevIns->pReg->szR0Mod, pszSymPrefix, pszSymList,
                                              true /*fRing0OrRC*/);
         else

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -1230 +1230 @@
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_RC)
             rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3, pvInterface, cbInterface,
-                                             pDrvIns->pReg->szName, pszSymPrefix, pszSymList,
+                                             pDrvIns->pReg->szRCMod, pszSymPrefix, pszSymList,
                                              false /*fRing0OrRC*/);
         else
@@ -1266 +1266 @@
         if (pDrvIns->pReg->fFlags & PDM_DRVREG_FLAGS_R0)
             rc = PDMR3LdrGetInterfaceSymbols(pDrvIns->Internal.s.pVMR3, pvInterface, cbInterface,
-                                             pDrvIns->pReg->szName, pszSymPrefix, pszSymList,
+                                             pDrvIns->pReg->szR0Mod, pszSymPrefix, pszSymList,
                                              true /*fRing0OrRC*/);
         else

trunk/src/VBox/VMM/PDMLdr.cpp

@@ -1304 +1304 @@
  *                              - GCPHYS:whatever,
  *                              - HCPHYS:whatever.
- * @param   fRing0OrRC      Set if it's a ring-0 context interface, clear if
+ * @param   fRing0          Set if it's a ring-0 context interface, clear if
  *                          it's raw-mode context interface.
  */
 VMMR3DECL(int) PDMR3LdrGetInterfaceSymbols(PVM pVM, void *pvInterface, size_t cbInterface,
                                            const char *pszModule, const char *pszSymPrefix,
-                                           const char *pszSymList, bool fRing0OrRC)
+                                           const char *pszSymList, bool fRing0)
 {
     /*
@@ -1316 +1316 @@
     int     rc      = VINF_SUCCESS;
     PPDMMOD pModule = pdmR3LdrFindModule(pVM->pUVM,
-                                         pszModule ? pszModule : fRing0OrRC ? "VMMR0.r0" : "VMMGC.gc",
-                                         fRing0OrRC ? PDMMOD_TYPE_R0 : PDMMOD_TYPE_RC,
+                                         pszModule ? pszModule : fRing0 ? "VMMR0.r0" : "VMMGC.gc",
+                                         fRing0 ? PDMMOD_TYPE_R0 : PDMMOD_TYPE_RC,
                                          true /*fLazy*/);
     if (pModule)
@@ -1324 +1324 @@
         char            szSymbol[256];
         size_t const    cchSymPrefix = strlen(pszSymPrefix);
-        AssertReturn(cchSymPrefix + 5 >= sizeof(szSymbol), VERR_SYMBOL_NOT_FOUND);
+        AssertReturn(cchSymPrefix + 5 < sizeof(szSymbol), VERR_SYMBOL_NOT_FOUND);
         memcpy(szSymbol, pszSymPrefix, cchSymPrefix);
 
@@ -1394 +1394 @@
                  */
                 AssertReturn(cchSymPrefix + cchSym < sizeof(szSymbol), VERR_SYMBOL_NOT_FOUND);
-                memcmp(&szSymbol[cchSymPrefix], pszCur, cchSym);
+                memcpy(&szSymbol[cchSymPrefix], pszCur, cchSym);
                 szSymbol[cchSymPrefix + cchSym] = '\0';
 
-                RTUINTPTR Value;
-                rc = RTLdrGetSymbolEx(pModule->hLdrMod, pModule->pvBits, pModule->ImageBase, szSymbol, &Value);
-                AssertMsgRCBreak(rc, ("Couldn't find symbol '%s' in module '%s'\n", szSymbol, pModule->szName));
-
-                if (fRing0OrRC)
+                if (fRing0)
                 {
+                    void *pvValue;
+                    rc = SUPR3GetSymbolR0((void *)(RTR0PTR)pModule->ImageBase, szSymbol, &pvValue);
+                    AssertMsgRCBreak(rc, ("Couldn't find symbol '%s' in module '%s'\n", szSymbol, pModule->szName));
+
                     PRTR0PTR pValue = (PRTR0PTR)((uintptr_t)pvInterface + offInterface);
                     AssertMsgBreakStmt(offInterface + sizeof(*pValue) <= cbInterface,
                                        ("off=%#x cb=%#x sym=%s\n", offInterface, cbInterface, szSymbol),
                                        rc = VERR_BUFFER_OVERFLOW);
-                    *pValue = (RTR0PTR)Value;
-                    Assert(*pValue == Value);
+                    *pValue = (RTR0PTR)pvValue;
+                    Assert((void *)*pValue == pvValue);
                     offInterface += sizeof(*pValue);
                 }
                 else
                 {
+                    RTUINTPTR Value;
+                    rc = RTLdrGetSymbolEx(pModule->hLdrMod, pModule->pvBits, pModule->ImageBase, szSymbol, &Value);
+                    AssertMsgRCBreak(rc, ("Couldn't find symbol '%s' in module '%s'\n", szSymbol, pModule->szName));
+
                     PRTRCPTR pValue = (PRTRCPTR)((uintptr_t)pvInterface + offInterface);
                     AssertMsgBreakStmt(offInterface + sizeof(*pValue) <= cbInterface,