Changeset 82038 in vbox

Timestamp:

Nov 20, 2019 5:02:11 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134842

Message:

APIC: Removed a bunch of unused prototypes and associated APICBOTHCBDECL macro. Don't use VMM_INT_DECL on private methods like APICBOTHCBDECL, it's for cross components living inside the VMM. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/APICAll.cpp (modified) (3 diffs)
• include/APICInternal.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/APICAll.cpp ¶

@@ -3034 +3034 @@
  * @param   enmType         The IRQ type.
  */
-VMM_INT_DECL(void) apicClearInterruptFF(PVMCPUCC pVCpu, PDMAPICIRQ enmType)
+void apicClearInterruptFF(PVMCPUCC pVCpu, PDMAPICIRQ enmType)
 {
 #ifdef IN_RING3
@@ -3069 +3069 @@
  * @thread  Any.
  */
-VMM_INT_DECL(bool) apicPostInterrupt(PVMCPUCC pVCpu, uint8_t uVector, XAPICTRIGGERMODE enmTriggerMode, uint32_t uSrcTag)
+bool apicPostInterrupt(PVMCPUCC pVCpu, uint8_t uVector, XAPICTRIGGERMODE enmTriggerMode, uint32_t uSrcTag)
 {
     Assert(pVCpu);
@@ -3157 +3157 @@
  * @thread  Any.
  */
-VMM_INT_DECL(void) apicStartTimer(PVMCPUCC pVCpu, uint32_t uInitialCount)
+void apicStartTimer(PVMCPUCC pVCpu, uint32_t uInitialCount)
 {
     Assert(pVCpu);

trunk/src/VBox/VMM/include/APICInternal.h ¶

@@ -1393 +1393 @@
 }
 
-RT_C_DECLS_BEGIN
-
-
-/** @def APICBOTHCBDECL
- * Macro for declaring a callback which is static in HC and exported in GC.
- */
-#if defined(IN_RC) || defined(IN_RING0)
-# define APICBOTHCBDECL(type)    DECLEXPORT(type)
-#else
-# define APICBOTHCBDECL(type)    DECLCALLBACK(type)
-#endif
 
 const char                   *apicGetModeName(APICMODE enmMode);
@@ -1415 +1404 @@
 APICMODE                      apicGetMode(uint64_t uApicBaseMsr);
 
-APICBOTHCBDECL(uint64_t)      apicGetBaseMsr(PPDMDEVINS pDevIns, PVMCPU pVCpu);
-APICBOTHCBDECL(VBOXSTRICTRC)  apicSetBaseMsr(PPDMDEVINS pDevIns, PVMCPU pVCpu, uint64_t uBase);
-APICBOTHCBDECL(uint8_t)       apicGetTpr(PPDMDEVINS pDevIns, PVMCPU pVCpu, bool *pfPending, uint8_t *pu8PendingIntr);
-APICBOTHCBDECL(void)          apicSetTpr(PPDMDEVINS pDevIns, PVMCPU pVCpu, uint8_t u8Tpr);
-APICBOTHCBDECL(uint64_t)      apicGetTimerFreq(PPDMDEVINS pDevIns);
 DECLCALLBACK(VBOXSTRICTRC)    apicReadMmio(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, unsigned cb);
 DECLCALLBACK(VBOXSTRICTRC)    apicWriteMmio(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, unsigned cb);
-APICBOTHCBDECL(VBOXSTRICTRC)  apicReadMsr(PPDMDEVINS pDevIns,  PVMCPU pVCpu, uint32_t u32Reg, uint64_t *pu64Val);
-APICBOTHCBDECL(VBOXSTRICTRC)  apicWriteMsr(PPDMDEVINS pDevIns, PVMCPU pVCpu, uint32_t u32Reg, uint64_t u64Val);
-APICBOTHCBDECL(int)           apicGetInterrupt(PPDMDEVINS pDevIns,  PVMCPU pVCpu, uint8_t *puVector, uint32_t *puTagSrc);
-APICBOTHCBDECL(VBOXSTRICTRC)  apicLocalInterrupt(PPDMDEVINS pDevIns, PVMCPU pVCpu, uint8_t u8Pin, uint8_t u8Level, int rcRZ);
-APICBOTHCBDECL(int)           apicBusDeliver(PPDMDEVINS pDevIns, uint8_t uDest, uint8_t uDestMode, uint8_t uDeliveryMode,
-                                             uint8_t uVector, uint8_t uPolarity, uint8_t uTriggerMode, uint32_t uSrcTag);
-
-VMM_INT_DECL(bool)            apicPostInterrupt(PVMCPUCC pVCpu, uint8_t uVector, XAPICTRIGGERMODE enmTriggerMode, uint32_t uSrcTag);
-VMM_INT_DECL(void)            apicStartTimer(PVMCPUCC pVCpu, uint32_t uInitialCount);
-VMM_INT_DECL(void)            apicClearInterruptFF(PVMCPUCC pVCpu, PDMAPICIRQ enmType);
+
+bool                          apicPostInterrupt(PVMCPUCC pVCpu, uint8_t uVector, XAPICTRIGGERMODE enmTriggerMode, uint32_t uSrcTag);
+void                          apicStartTimer(PVMCPUCC pVCpu, uint32_t uInitialCount);
+void                          apicClearInterruptFF(PVMCPUCC pVCpu, PDMAPICIRQ enmType);
 void                          apicInitIpi(PVMCPUCC pVCpu);
 void                          apicResetCpu(PVMCPUCC pVCpu, bool fResetApicBaseMsr);
@@ -1441 +1419 @@
 DECLCALLBACK(int)             apicR3InitComplete(PPDMDEVINS pDevIns);
 
-RT_C_DECLS_END
-
 /** @} */