Changeset 46142 in vbox for trunk/src/VBox

Timestamp:

May 17, 2013 1:06:57 PM (12 years ago)

Author:

vboxsync

Message:

VMM/CPUM: show all CPUID leaves in the log, not only the leaves we privode to the guest

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -3287 +3287 @@
     unsigned    cStdMax = pVM->cpum.s.aGuestCpuIdStd[0].eax;
 
+    uint32_t    cStdHstMax;
+    uint32_t    dummy;
+    ASMCpuId_Idx_ECX(0, 0, &cStdHstMax, &dummy, &dummy, &dummy);
+
+    unsigned    cStdLstMax = RT_MAX(RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd), cStdHstMax);
+
     pHlp->pfnPrintf(pHlp,
                     "         RAW Standard CPUIDs\n"
                     "     Function  eax      ebx      ecx      edx\n");
-    for (unsigned i = 0; i < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
-    {
-        Guest = pVM->cpum.s.aGuestCpuIdStd[i];
-        ASMCpuId_Idx_ECX(i, 0, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
-
-        pHlp->pfnPrintf(pHlp,
-                        "Gst: %08x  %08x %08x %08x %08x%s\n"
-                        "Hst:           %08x %08x %08x %08x\n",
-                        i, Guest.eax, Guest.ebx, Guest.ecx, Guest.edx,
-                        i <= cStdMax ? "" : "*",
-                        Host.eax, Host.ebx, Host.ecx, Host.edx);
+    for (unsigned i = 0; i <= cStdLstMax ; i++)
+    {
+        if (i < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd))
+        {
+            Guest = pVM->cpum.s.aGuestCpuIdStd[i];
+            ASMCpuId_Idx_ECX(i, 0, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
+
+            pHlp->pfnPrintf(pHlp,
+                            "Gst: %08x  %08x %08x %08x %08x%s\n"
+                            "Hst:           %08x %08x %08x %08x\n",
+                            i, Guest.eax, Guest.ebx, Guest.ecx, Guest.edx,
+                            i <= cStdMax ? "" : "*",
+                            Host.eax, Host.ebx, Host.ecx, Host.edx);
+        }
+        else
+        {
+            ASMCpuId_Idx_ECX(i, 0, &Host.eax, &Host.ebx, &Host.ecx, &Host.edx);
+
+            pHlp->pfnPrintf(pHlp,
+                            "Hst: %08x  %08x %08x %08x %08x\n",
+                            i, Host.eax, Host.ebx, Host.ecx, Host.edx);
+        }
     }