Changeset 91909 in vbox

Timestamp:

Oct 20, 2021 7:05:44 PM (3 years ago)

Author:

vboxsync

Message:

VMM,PDM: Eliminated PDMDevHlpCritSectGetNopR0 and PDMDevHlpCritSectGetNopRC as they are no longer used. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmcritsect.h (modified) (1 diff)
• include/VBox/vmm/pdmdev.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PDMCritSect.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmcritsect.h

@@ -89 +89 @@
 
 VMMR3DECL(PPDMCRITSECT)             PDMR3CritSectGetNop(PVM pVM);
-VMMR3DECL(R0PTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopR0(PVM pVM);
-VMMR3DECL(RCPTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopRC(PVM pVM);
 
 /* Strict build: Remap the two enter calls to the debug versions. */

trunk/include/VBox/vmm/pdmdev.h

@@ -2424 +2424 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 51, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 52, 0)
 
 /**
@@ -3818 +3818 @@
 
     /**
-     * Gets the NOP critical section.
-     *
-     * @returns The ring-0 address of the NOP critical section.
-     * @param   pDevIns             The device instance.
-     * @deprecated
-     */
-    DECLR3CALLBACKMEMBER(R0PTRTYPE(PPDMCRITSECT), pfnCritSectGetNopR0,(PPDMDEVINS pDevIns));
-
-    /**
-     * Gets the NOP critical section.
-     *
-     * @returns The raw-mode context address of the NOP critical section.
-     * @param   pDevIns             The device instance.
-     * @deprecated
-     */
-    DECLR3CALLBACKMEMBER(RCPTRTYPE(PPDMCRITSECT), pfnCritSectGetNopRC,(PPDMDEVINS pDevIns));
-
-    /**
      * Changes the device level critical section from the automatically created
      * default to one desired by the device constructor.
@@ -7841 +7823 @@
 }
 
-#ifdef IN_RING3
-
-/**
- * @copydoc PDMDEVHLPR3::pfnCritSectGetNopR0
- */
-DECLINLINE(R0PTRTYPE(PPDMCRITSECT)) PDMDevHlpCritSectGetNopR0(PPDMDEVINS pDevIns)
-{
-    return pDevIns->pHlpR3->pfnCritSectGetNopR0(pDevIns);
-}
-
-/**
- * @copydoc PDMDEVHLPR3::pfnCritSectGetNopRC
- */
-DECLINLINE(RCPTRTYPE(PPDMCRITSECT)) PDMDevHlpCritSectGetNopRC(PPDMDEVINS pDevIns)
-{
-    return pDevIns->pHlpR3->pfnCritSectGetNopRC(pDevIns);
-}
-
-#endif /* IN_RING3 */
-
 /**
  * @copydoc PDMDEVHLPR3::pfnSetDeviceCritSect

trunk/src/VBox/VMM/VMMR3/PDMCritSect.cpp

@@ -1088 +1088 @@
 
 /**
- * Gets the ring-0 address of the NOP critical section.
- *
- * @returns The ring-0 address of the NOP critical section.
- * @param   pVM                 The cross context VM structure.
- */
-VMMR3DECL(R0PTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopR0(PVM pVM)
-{
-    VM_ASSERT_VALID_EXT_RETURN(pVM, NIL_RTR0PTR);
-    return MMHyperR3ToR0(pVM, &pVM->pdm.s.NopCritSect);
-}
-
-
-/**
- * Gets the raw-mode context address of the NOP critical section.
- *
- * @returns The raw-mode context address of the NOP critical section.
- * @param   pVM                 The cross context VM structure.
- */
-VMMR3DECL(RCPTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopRC(PVM pVM)
-{
-    VM_ASSERT_VALID_EXT_RETURN(pVM, NIL_RTRCPTR);
-    return MMHyperR3ToRC(pVM, &pVM->pdm.s.NopCritSect);
-}
-
-
-/**
  * Display matching critical sections.
  */

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -2692 +2692 @@
     PPDMCRITSECT pCritSect = PDMR3CritSectGetNop(pVM);
     LogFlow(("pdmR3DevHlp_CritSectGetNop: caller='%s'/%d: return %p\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
-    return pCritSect;
-}
-
-
-/** @interface_method_impl{PDMDEVHLPR3,pfnCritSectGetNopR0} */
-static DECLCALLBACK(R0PTRTYPE(PPDMCRITSECT)) pdmR3DevHlp_CritSectGetNopR0(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    PVM pVM = pDevIns->Internal.s.pVMR3;
-    VM_ASSERT_EMT(pVM);
-
-    R0PTRTYPE(PPDMCRITSECT) pCritSect = PDMR3CritSectGetNopR0(pVM);
-    LogFlow(("pdmR3DevHlp_CritSectGetNopR0: caller='%s'/%d: return %RHv\n",
-             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
-    return pCritSect;
-}
-
-
-/** @interface_method_impl{PDMDEVHLPR3,pfnCritSectGetNopRC} */
-static DECLCALLBACK(RCPTRTYPE(PPDMCRITSECT)) pdmR3DevHlp_CritSectGetNopRC(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    PVM pVM = pDevIns->Internal.s.pVMR3;
-    VM_ASSERT_EMT(pVM);
-
-    RCPTRTYPE(PPDMCRITSECT) pCritSect = PDMR3CritSectGetNopRC(pVM);
-    LogFlow(("pdmR3DevHlp_CritSectGetNopRC: caller='%s'/%d: return %RRv\n",
              pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
     return pCritSect;
@@ -4563 +4535 @@
     pdmR3DevHlp_CritSectInit,
     pdmR3DevHlp_CritSectGetNop,
-    pdmR3DevHlp_CritSectGetNopR0,
-    pdmR3DevHlp_CritSectGetNopRC,
     pdmR3DevHlp_SetDeviceCritSect,
     pdmR3DevHlp_CritSectYield,
@@ -4928 +4898 @@
     pdmR3DevHlp_CritSectInit,
     pdmR3DevHlp_CritSectGetNop,
-    pdmR3DevHlp_CritSectGetNopR0,
-    pdmR3DevHlp_CritSectGetNopRC,
     pdmR3DevHlp_SetDeviceCritSect,
     pdmR3DevHlp_CritSectYield,
@@ -5450 +5418 @@
     pdmR3DevHlp_CritSectInit,
     pdmR3DevHlp_CritSectGetNop,
-    pdmR3DevHlp_CritSectGetNopR0,
-    pdmR3DevHlp_CritSectGetNopRC,
     pdmR3DevHlp_SetDeviceCritSect,
     pdmR3DevHlp_CritSectYield,