Changeset 81955 in vbox

Timestamp:

Nov 18, 2019 5:23:13 PM (5 years ago)

Author:

vboxsync

Message:

DevHPET: Eliminated unnecessary pointers in the state structures. bugref:9218

File:

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

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

@@ -208 +208 @@
     TMTIMERHANDLE               hTimer;
 
-    /** Pointer to the instance data - R3 Ptr. */
-    R3PTRTYPE(struct HPET *)    pHpetR3;
-    /** Pointer to the instance data - R0 Ptr. */
-    R0PTRTYPE(struct HPET *)    pHpetR0;
-    /** Pointer to the instance data - RC Ptr. */
-    RCPTRTYPE(struct HPET *)    pHpetRC;
-
     /** Timer index. */
     uint8_t                     idxTimer;
@@ -220 +213 @@
     uint8_t                     u8Wrap;
     /** Explicit padding. */
-    uint8_t                     abPadding[2];
+    uint8_t                     abPadding[6];
 
     /** @name Memory-mapped, software visible timer registers.
@@ -250 +243 @@
 typedef struct HPET
 {
-    /** Pointer to the device instance. - R3 ptr. */
-    PPDMDEVINSR3                pDevInsR3;
     /** The HPET helpers - R3 Ptr. */
     PCPDMHPETHLPR3              pHpetHlpR3;
-
-    /** Pointer to the device instance. - R0 ptr. */
-    PPDMDEVINSR0                pDevInsR0;
     /** The HPET helpers - R0 Ptr. */
     PCPDMHPETHLPR0              pHpetHlpR0;
-
-    /** Pointer to the device instance. - RC ptr. */
-    PPDMDEVINSRC                pDevInsRC;
     /** The HPET helpers - RC Ptr. */
     PCPDMHPETHLPRC              pHpetHlpRC;
+    uint32_t                    u32Padding;
 
     /** Timer structures. */
@@ -410 +396 @@
     pHpetTimer->u8Wrap = 0;
 
-    uint64_t u64Ticks = hpetGetTicks(pDevIns, pHpetTimer->CTX_SUFF(pHpet));
+    uint64_t u64Ticks = hpetGetTicks(pDevIns, pThis);
     hpetAdjustComparator(pHpetTimer, u64Ticks);
 
@@ -443 +429 @@
     if (u64Diff <= u64TickLimit)
     {
-        Log4(("HPET: next IRQ in %lld ticks (%lld ns)\n", u64Diff, hpetTicksToNs(pHpetTimer->CTX_SUFF(pHpet), u64Diff)));
-        PDMDevHlpTimerSetNano(pDevIns, pHpetTimer->hTimer, hpetTicksToNs(pHpetTimer->CTX_SUFF(pHpet), u64Diff));
+        Log4(("HPET: next IRQ in %lld ticks (%lld ns)\n", u64Diff, hpetTicksToNs(pThis, u64Diff)));
+        PDMDevHlpTimerSetNano(pDevIns, pHpetTimer->hTimer, hpetTicksToNs(pThis, u64Diff));
     }
     else
@@ -770 +756 @@
             {
 #ifdef IN_RING3
-                rc = pThis->pHpetHlpR3->pfnSetLegacyMode(pThis->pDevInsR3, RT_BOOL(u32NewValue & HPET_CFG_LEGACY));
+                rc = pThis->pHpetHlpR3->pfnSetLegacyMode(pDevIns, RT_BOOL(u32NewValue & HPET_CFG_LEGACY));
                 if (rc != VINF_SUCCESS)
 #else
@@ -1010 +996 @@
  *
  * @returns IRQ number.
+ * @param   pThis               The shared HPET state.
  * @param   pHpetTimer          The HPET timer.
  */
-static uint32_t hpetR3TimerGetIrq(PCHPETTIMER pHpetTimer)
+static uint32_t hpetR3TimerGetIrq(PHPET pThis, PCHPETTIMER pHpetTimer)
 {
     /*
@@ -1023 +1010 @@
      */
     if (   (pHpetTimer->idxTimer <= 1)
-        && (pHpetTimer->CTX_SUFF(pHpet)->u64HpetConfig & HPET_CFG_LEGACY))
+        && (pThis->u64HpetConfig & HPET_CFG_LEGACY))
         return (pHpetTimer->idxTimer == 0) ? 0 : 8;
 
@@ -1033 +1020 @@
  * Used by hpetR3Timer to update the IRQ status.
  *
- * @param   pThis               The HPET device state.
+ * @param   pDevIns             The device instance.
+ * @param   pThis               The shared HPET state.
  * @param   pHpetTimer          The HPET timer.
  */
-static void hpetR3TimerUpdateIrq(PHPET pThis, PHPETTIMER pHpetTimer)
+static void hpetR3TimerUpdateIrq(PPDMDEVINS pDevIns, PHPET pThis, PHPETTIMER pHpetTimer)
 {
     /** @todo is it correct? */
@@ -1042 +1030 @@
         && !!(pThis->u64HpetConfig & HPET_CFG_ENABLE))
     {
-        uint32_t irq = hpetR3TimerGetIrq(pHpetTimer);
+        uint32_t irq = hpetR3TimerGetIrq(pThis, pHpetTimer);
         Log4(("HPET: raising IRQ %d\n", irq));
 
@@ -1052 +1040 @@
            level-triggered mode yet. */
         if ((pHpetTimer->u64Config & HPET_TN_INT_TYPE) == HPET_TIMER_TYPE_EDGE)
-            pThis->pHpetHlpR3->pfnSetIrq(pThis->CTX_SUFF(pDevIns), irq, PDM_IRQ_LEVEL_FLIP_FLOP);
+            pThis->pHpetHlpR3->pfnSetIrq(pDevIns, irq, PDM_IRQ_LEVEL_FLIP_FLOP);
         else
             AssertFailed();
@@ -1107 +1095 @@
 
     /* Should it really be under lock, does it really matter? */
-    hpetR3TimerUpdateIrq(pThis, pHpetTimer);
+    hpetR3TimerUpdateIrq(pDevIns, pThis, pHpetTimer);
 }
 
@@ -1283 +1271 @@
     NOREF(offDelta);
 
-    pThis->pDevInsRC    = PDMDEVINS_2_RCPTR(pDevIns);
     pThis->pHpetHlpRC   = pThis->pHpetHlpR3->pfnGetRCHelpers(pDevIns);
-
-    for (unsigned i = 0; i < RT_ELEMENTS(pThis->aTimers); i++)
-    {
-        PHPETTIMER pTm = &pThis->aTimers[i];
-        pTm->pHpetRC = PDMINS_2_DATA_RCPTR(pDevIns);
-    }
 }
 
@@ -1373 +1354 @@
      * Initialize the device state.
      */
-    pThis->pDevInsR3 = pDevIns;
-    pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
-    pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
 
     /* Init the HPET timers (init all regardless of how many we expose). */
@@ -1381 +1359 @@
     {
         PHPETTIMER pHpetTimer = &pThis->aTimers[i];
-
         pHpetTimer->idxTimer = i;
-        pHpetTimer->pHpetR3  = pThis;
-        pHpetTimer->pHpetR0  = PDMINS_2_DATA_R0PTR(pDevIns);
-        pHpetTimer->pHpetRC  = PDMINS_2_DATA_RCPTR(pDevIns);
+        pHpetTimer->hTimer   = NIL_TMTIMERHANDLE;
     }