Changeset 53213 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2014 6:34:23 PM (10 years ago)

Author:

vboxsync

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

96761

Message:

HostDrivers/Support: More accurate and reusable error code, more paranoia.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -6003 +6003 @@
             uint16_t iCpuBefore = pGip->aiCpuFromApicId[idApicBefore];
             uint16_t iCpuAfter  = pGip->aiCpuFromApicId[idApicAfter];
-            AssertMsgReturn(iCpuBefore < pGip->cCpus, ("iCpuBefore=%u cCpus=%u\n", iCpuBefore, pGip->cCpus), VERR_WRONG_ORDER);
-            AssertMsgReturn(iCpuAfter  < pGip->cCpus, ("iCpuAfter=%u cCpus=%u\n", iCpuAfter, pGip->cCpus), VERR_WRONG_ORDER);
+            AssertMsgReturn(iCpuBefore < pGip->cCpus, ("iCpuBefore=%u cCpus=%u\n", iCpuBefore, pGip->cCpus), VERR_INVALID_CPU_INDEX);
+            AssertMsgReturn(iCpuAfter  < pGip->cCpus, ("iCpuAfter=%u cCpus=%u\n", iCpuAfter, pGip->cCpus), VERR_INVALID_CPU_INDEX);
             pGipCpuBefore = &pGip->aCPUs[iCpuBefore];
             pGipCpuAfter  = &pGip->aCPUs[iCpuAfter];
@@ -6257 +6257 @@
         PSUPGIPCPU         pGipCpu;
         PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
-        unsigned           iCpu = pGip->aiCpuFromApicId[ASMGetApicId()];
+        uint8_t            idApic = ASMGetApicId();
+        AssertReturnVoid(idApic < RT_ELEMENTS(pGip->aiCpuFromApicId));
+        unsigned           iCpu = pGip->aiCpuFromApicId[idApic];
         AssertReturnVoid(iCpu < pGip->cCpus);
         pGipCpu = &pGip->aCPUs[iCpu];
@@ -7655 +7657 @@
 
             /* If we failed to have a delta, measurement the delta and retry. */
-            AssertReturn(idApic < RT_ELEMENTS(pGip->aiCpuFromApicId), VERR_INVALID_CPU_ID);
+            AssertMsgReturn(idApic < RT_ELEMENTS(pGip->aiCpuFromApicId),
+                            ("idApic=%u ArraySize=%u\n", idApic, RT_ELEMENTS(pGip->aiCpuFromApicId)), VERR_INVALID_CPU_INDEX);
             uint16_t iCpu = pGip->aiCpuFromApicId[idApic];
-            AssertMsgReturn(iCpu < pGip->cCpus, ("iCpu=%u cCpus=%u\n", iCpu, pGip->cCpus), VERR_WRONG_ORDER);
+            AssertMsgReturn(iCpu < pGip->cCpus, ("iCpu=%u cCpus=%u\n", iCpu, pGip->cCpus), VERR_INVALID_CPU_INDEX);
 
             rc2 = supdrvMeasureTscDeltaOne(pDevExt, iCpu);