Changeset 81870 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 15, 2019 12:52:16 PM (5 years ago)

Author:

vboxsync

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

134664

Message:

DevATA: Use RT_SAFE_SUBSCRIPT. bugref:9218

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (16 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -4042 +4042 @@
     PATADEVSTATER3  pIfR3 = RT_FROM_MEMBER(pInterface, ATADEVSTATER3, IMountNotify);
     PATASTATE       pThis = PDMDEVINS_2_DATA(pIfR3->pDevIns, PATASTATE);
-    PATADEVSTATE    pIf   = &pThis->aCts[pIfR3->iCtl % RT_ELEMENTS(pThis->aCts)].aIfs[pIfR3->iDev % RT_ELEMENTS(pThis->aCts[0].aIfs)];
+    PATADEVSTATE    pIf   = &RT_SAFE_SUBSCRIPT(RT_SAFE_SUBSCRIPT(pThis->aCts, pIfR3->iCtl).aIfs, pIfR3->iDev);
     Log(("%s: changing LUN#%d\n", __FUNCTION__, pIfR3->iLUN));
 
@@ -4075 +4075 @@
     PATADEVSTATER3  pIfR3 = RT_FROM_MEMBER(pInterface, ATADEVSTATER3, IMountNotify);
     PATASTATE       pThis = PDMDEVINS_2_DATA(pIfR3->pDevIns, PATASTATE);
-    PATADEVSTATE    pIf   = &pThis->aCts[pIfR3->iCtl % RT_ELEMENTS(pThis->aCts)].aIfs[pIfR3->iDev % RT_ELEMENTS(pThis->aCts[0].aIfs)];
+    PATADEVSTATE    pIf   = &RT_SAFE_SUBSCRIPT(RT_SAFE_SUBSCRIPT(pThis->aCts, pIfR3->iCtl).aIfs, pIfR3->iDev);
     Log(("%s:\n", __FUNCTION__));
     pIf->cTotalSectors = 0;
@@ -4824 +4824 @@
 # ifndef RT_OS_WINDOWS /* We've got this API on windows, but it doesn't necessarily interrupt I/O. */
                         PATASTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PATASTATER3);
-                        PATACONTROLLERR3 pCtlR3 = &pThisCC->aCts[pCtl->iCtl % RT_ELEMENTS(pThisCC->aCts)];
+                        PATACONTROLLERR3 pCtlR3 = &RT_SAFE_SUBSCRIPT(pThisCC->aCts, pCtl->iCtl);
                         RTThreadPoke(pCtlR3->hAsyncIOThread);
 # endif
@@ -5024 +5024 @@
             uint8_t        status  = s->uATARegStatus;
             PATASTATER3    pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PATASTATER3);
-            PATADEVSTATER3 pDevR3  = &pThisCC->aCts[pCtl->iCtl % RT_ELEMENTS(pThisCC->aCts)].aIfs[s->iDev % RT_ELEMENTS(pThisCC->aCts[0].aIfs)];
+            PATADEVSTATER3 pDevR3  = &RT_SAFE_SUBSCRIPT(RT_SAFE_SUBSCRIPT(pThisCC->aCts, pCtl->iCtl).aIfs, s->iDev);
 
             ataSetStatusValue(pCtl, s, ATA_STAT_BUSY);
@@ -5206 +5206 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     RT_NOREF(offPort);
 
@@ -5277 +5277 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     RT_NOREF(offPort);
 
@@ -5365 +5365 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     RT_NOREF(offPort);
 
@@ -5456 +5456 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     RT_NOREF(offPort);
 
@@ -5762 +5762 @@
     PATASTATER3 const       pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PATASTATER3);
     uintptr_t const         iCtl    = pCtlR3 - &pThisCC->aCts[0];
-    PATACONTROLLER const    pCtl    = &pThis->aCts[iCtl % RT_ELEMENTS(pThisCC->aCts)];
+    PATACONTROLLER const    pCtl    = &RT_SAFE_SUBSCRIPT(pThis->aCts, iCtl);
     int                     rc      = VINF_SUCCESS;
     uint64_t                u64TS   = 0; /* shut up gcc */
@@ -6387 +6387 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(offPort >> BM_DMA_CTL_IOPORTS_SHIFT) % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (offPort >> BM_DMA_CTL_IOPORTS_SHIFT));
     RT_NOREF(pvUser);
 
@@ -6422 +6422 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(offPort >> BM_DMA_CTL_IOPORTS_SHIFT) % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (offPort >> BM_DMA_CTL_IOPORTS_SHIFT));
     RT_NOREF(pvUser);
 
@@ -6555 +6555 @@
 #ifdef VBOX_STRICT
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl  = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl  = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     Assert((uintptr_t)pvUser < 2);
     Assert(!pCtl->aIfs[0].fPresent && !pCtl->aIfs[1].fPresent);
@@ -6578 +6578 @@
 #ifdef VBOX_STRICT
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     Assert((uintptr_t)pvUser < 2);
     Assert(cb <= 4);
@@ -6642 +6642 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
 
     Assert((uintptr_t)pvUser < 2);
@@ -6680 +6680 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     int rc;
 
@@ -6712 +6712 @@
 {
     PATASTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PATASTATE);
-    PATACONTROLLER pCtl = &pThis->aCts[(uintptr_t)pvUser % RT_ELEMENTS(pThis->aCts)];
+    PATACONTROLLER pCtl = &RT_SAFE_SUBSCRIPT(pThis->aCts, (uintptr_t)pvUser);
     int            rc;