Changeset 6176 in vbox

Timestamp:

Dec 21, 2007 9:35:32 PM (17 years ago)

Author:

vboxsync

Message:

use ASMCpuId_Idx_ECX, fixed some off-by-one bugs

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDRVShared.c (modified) (1 diff)
• VMM/CPUM.cpp (modified) (4 diffs)

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

@@ -4043 +4043 @@
     PSUPGIPCPU  pGipCpu;
 
-    if (RT_LIKELY(iCpu <= RT_ELEMENTS(pGip->aCPUs)))
+    if (RT_LIKELY(iCpu < RT_ELEMENTS(pGip->aCPUs)))
     {
         pGipCpu = &pGip->aCPUs[iCpu];

trunk/src/VBox/VMM/CPUM.cpp

@@ -195 +195 @@
      */
     for (i = 0; i < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
-        ASMCpuId(i,
+        ASMCpuId_Idx_ECX(i, 0,
                  &pCPUM->aGuestCpuIdStd[i].eax, &pCPUM->aGuestCpuIdStd[i].ebx,
                  &pCPUM->aGuestCpuIdStd[i].ecx, &pCPUM->aGuestCpuIdStd[i].edx);
@@ -1080 +1080 @@
                     "         RAW Standard CPUIDs\n"
                     "     Function  eax      ebx      ecx      edx\n");
-    for (unsigned i = 0; i <= ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
+    for (unsigned i = 0; i < ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
     {
         Guest = pVM->cpum.s.aGuestCpuIdStd[i];
-        ASMCpuId(i, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
+        ASMCpuId_Idx_ECX(i, 0, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
 
         pHlp->pfnPrintf(pHlp,
@@ -1261 +1261 @@
                     "         RAW Extended CPUIDs\n"
                     "     Function  eax      ebx      ecx      edx\n");
-    for (unsigned i = 0; i <= ELEMENTS(pVM->cpum.s.aGuestCpuIdExt); i++)
+    for (unsigned i = 0; i < ELEMENTS(pVM->cpum.s.aGuestCpuIdExt); i++)
     {
         Guest = pVM->cpum.s.aGuestCpuIdExt[i];
@@ -1548 +1548 @@
                     "         RAW Centaur CPUIDs\n"
                     "     Function  eax      ebx      ecx      edx\n");
-    for (unsigned i = 0; i <= RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur); i++)
+    for (unsigned i = 0; i < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdCentaur); i++)
     {
         Guest = pVM->cpum.s.aGuestCpuIdCentaur[i];