Changeset 81961 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 18, 2019 7:06:25 PM (5 years ago)

Author:

vboxsync

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

134758

Message:

DevHPET,PDM: Split structures and refactored registration. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevHPET.cpp (modified) (12 diffs)

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -239 +239 @@
 
 /**
- * The shared HPET state.
+ * The shared HPET device state.
  */
 typedef struct HPET
 {
-    /** The HPET helpers - R3 Ptr. */
-    PCPDMHPETHLPR3              pHpetHlpR3;
-    /** The HPET helpers - R0 Ptr. */
-    PCPDMHPETHLPR0              pHpetHlpR0;
-    /** The HPET helpers - RC Ptr. */
-    PCPDMHPETHLPRC              pHpetHlpRC;
-    uint32_t                    u32Padding;
-
     /** Timer structures. */
     HPETTIMER                   aTimers[RT_MAX(HPET_NUM_TIMERS_PIIX, HPET_NUM_TIMERS_ICH9)];
@@ -288 +280 @@
 
 
+/**
+ * The ring-3 specific HPET device state.
+ */
+typedef struct HPETR3
+{
+    /** The HPET helpers. */
+    PCPDMHPETHLPR3              pHpetHlp;
+} HPETR3;
+/** Pointer to the ring-3 specific HPET device state. */
+typedef HPETR3 *PHPETR3;
+
+
+/**
+ * The ring-0 specific HPET device state.
+ */
+typedef struct HPETR0
+{
+    /** The HPET helpers. */
+    PCPDMHPETHLPR0              pHpetHlp;
+} HPETR0;
+/** Pointer to the ring-0 specific HPET device state. */
+typedef HPETR0 *PHPETR0;
+
+
+/**
+ * The raw-mode specific HPET device state.
+ */
+typedef struct HPETRC
+{
+    /** The HPET helpers. */
+    PCPDMHPETHLPRC              pHpetHlp;
+} HPETRC;
+/** Pointer to the raw-mode specific HPET device state. */
+typedef HPETRC *PHPETRC;
+
+
+/** The HPET device state specific to the current context. */
+typedef CTX_SUFF(HPET) HPETCC;
+/** Pointer to the HPET device state specific to the current context. */
+typedef CTX_SUFF(PHPET) PHPETCC;
+
+
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
 
@@ -754 +788 @@
              * may request retry in R3 - so we must keep state intact.
              */
-            if (   ((iOldValue ^ u32NewValue) & HPET_CFG_LEGACY)
-                && pThis->pHpetHlpR3 != NIL_RTR3PTR)
+            if ((iOldValue ^ u32NewValue) & HPET_CFG_LEGACY)
             {
 #ifdef IN_RING3
-                rc = pThis->pHpetHlpR3->pfnSetLegacyMode(pDevIns, RT_BOOL(u32NewValue & HPET_CFG_LEGACY));
-                if (rc != VINF_SUCCESS)
+                PHPETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHPETCC);
+                if (pThisCC->pHpetHlp != NULL)
+                {
+                    rc = pThisCC->pHpetHlp->pfnSetLegacyMode(pDevIns, RT_BOOL(u32NewValue & HPET_CFG_LEGACY));
+                    if (rc != VINF_SUCCESS)
+                    {
+                        DEVHPET_UNLOCK_BOTH(pDevIns, pThis);
+                        break;
+                    }
+                }
 #else
                 rc = VINF_IOM_R3_MMIO_WRITE;
+                DEVHPET_UNLOCK_BOTH(pDevIns, pThis);
+                break;
 #endif
-                {
-                    DEVHPET_UNLOCK_BOTH(pDevIns, pThis);
-                    break;
-                }
             }
 
@@ -1041 +1080 @@
            level-triggered mode yet. */
         if ((pHpetTimer->u64Config & HPET_TN_INT_TYPE) == HPET_TIMER_TYPE_EDGE)
-            pThis->pHpetHlpR3->pfnSetIrq(pDevIns, irq, PDM_IRQ_LEVEL_FLIP_FLOP);
+        {
+            PHPETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHPETCC);
+            AssertReturnVoid(pThisCC);
+            pThisCC->pHpetHlp->pfnSetIrq(pDevIns, irq, PDM_IRQ_LEVEL_FLIP_FLOP);
+        }
         else
             AssertFailed();
@@ -1268 +1311 @@
 static DECLCALLBACK(void) hpetR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    PHPET pThis = PDMDEVINS_2_DATA(pDevIns, PHPET);
+    PHPETRC pThisRC = PDMINS_2_DATA_RC(pDevIns, PHPETRC);
     LogFlow(("hpetR3Relocate:\n"));
-    NOREF(offDelta);
-
-    pThis->pHpetHlpRC   = pThis->pHpetHlpR3->pfnGetRCHelpers(pDevIns);
+
+    pThisRC->pHpetHlp += offDelta;
 }
 
@@ -1281 +1323 @@
 static DECLCALLBACK(void) hpetR3Reset(PPDMDEVINS pDevIns)
 {
-    PHPET pThis = PDMDEVINS_2_DATA(pDevIns, PHPET);
+    PHPET   pThis   = PDMDEVINS_2_DATA(pDevIns, PHPET);
+    PHPETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHPETCC);
     LogFlow(("hpetR3Reset:\n"));
 
@@ -1335 +1378 @@
      * Notify the PIT/RTC devices.
      */
-    if (pThis->pHpetHlpR3)
-        pThis->pHpetHlpR3->pfnSetLegacyMode(pDevIns, false /*fActive*/);
+    if (pThisCC->pHpetHlp)
+        pThisCC->pHpetHlp->pfnSetLegacyMode(pDevIns, false /*fActive*/);
 }
 
@@ -1347 +1390 @@
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PHPET           pThis   = PDMDEVINS_2_DATA(pDevIns, PHPET);
+    PHPETCC         pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHPETCC);
     PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
 
@@ -1409 +1453 @@
     PDMHPETREG HpetReg;
     HpetReg.u32Version = PDM_HPETREG_VERSION;
-    rc = PDMDevHlpHPETRegister(pDevIns, &HpetReg, &pThis->pHpetHlpR3);
+    rc = PDMDevHlpHpetRegister(pDevIns, &HpetReg, &pThisCC->pHpetHlp);
     AssertRCReturn(rc, rc);
 
@@ -1421 +1465 @@
     AssertRCReturn(rc, rc);
 
-    if (pDevIns->fRCEnabled)
-    {
-        pThis->pHpetHlpRC = pThis->pHpetHlpR3->pfnGetRCHelpers(pDevIns);
-    }
-
-    if (pDevIns->fR0Enabled)
-    {
-        pThis->pHpetHlpR0 = pThis->pHpetHlpR3->pfnGetR0Helpers(pDevIns);
-        AssertReturn(pThis->pHpetHlpR0 != NIL_RTR0PTR, VERR_INTERNAL_ERROR);
-    }
-
     /*
      * Register SSM state and info item.
@@ -1452 +1485 @@
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
     PHPET   pThis   = PDMDEVINS_2_DATA(pDevIns, PHPET);
-    //PHPETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHPETCC);
+    PHPETCC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PHPETCC);
 
     int rc = PDMDevHlpSetDeviceCritSect(pDevIns, PDMDevHlpCritSectGetNop(pDevIns));
+    AssertRCReturn(rc, rc);
+
+    PDMHPETREG HpetReg;
+    HpetReg.u32Version = PDM_HPETREG_VERSION;
+    rc = PDMDevHlpHpetSetUpContext(pDevIns, &HpetReg, &pThisCC->pHpetHlp);
     AssertRCReturn(rc, rc);
 
@@ -1473 +1511 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "hpet",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_RZ | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_PIT,
     /* .cMaxInstances = */          1,
     /* .uSharedVersion = */         42,
     /* .cbInstanceShared = */       sizeof(HPET),
-    /* .cbInstanceCC = */           0,
-    /* .cbInstanceRC = */           0,
+    /* .cbInstanceCC = */           sizeof(HPETCC),
+    /* .cbInstanceRC = */           sizeof(HPETRC),
     /* .cMaxPciDevices = */         0,
     /* .cMaxMsixVectors = */        0,