Changeset 94931 in vbox for trunk/src/VBox/VMM/tools

Timestamp:

May 9, 2022 8:24:47 AM (3 years ago)

Author:

vboxsync

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

151339

Message:

VMM/CPUM: Introduced a global variable g_CpumHostFeatures for keeping the host CPU features. This is safer than keeping this info in the shared part of the VM structure. bugref:10093

Location:

trunk/src/VBox/VMM/tools

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxCpuReport.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/tools/Makefile.kmk

@@ -62 +62 @@
         VBoxCpuReport.cpp \
         VBoxCpuReportMsrSup.cpp \
-        ../VMMR3/CPUMR3CpuId.cpp
+        ../VMMR3/CPUMR3CpuId.cpp \
+        ../VMMAll/CPUMAllCpuId.cpp
 VBoxCpuReport_SOURCES.linux = \
         VBoxCpuReportMsrLinux.cpp

trunk/src/VBox/VMM/tools/VBoxCpuReport.cpp

@@ -4460 +4460 @@
     if (!RTX86IsValidStdRange(uEax))
         return RTMsgErrorRc(VERR_NOT_SUPPORTED, "Invalid std CPUID range: %#x\n", uEax);
-    g_enmVendor = CPUMR3CpuIdDetectVendorEx(uEax, uEbx, uEcx, uEdx);
+    g_enmVendor = CPUMCpuIdDetectX86VendorEx(uEax, uEbx, uEcx, uEdx);
 
     ASMCpuIdExSlow(1, 0, 0, 0, &uEax, &uEbx, &uEcx, &uEdx);
-    g_enmMicroarch = CPUMR3CpuIdDetermineMicroarchEx(g_enmVendor,
-                                                     RTX86GetCpuFamily(uEax),
-                                                     RTX86GetCpuModel(uEax, g_enmVendor == CPUMCPUVENDOR_INTEL),
-                                                     RTX86GetCpuStepping(uEax));
+    g_enmMicroarch = CPUMCpuIdDetermineX86MicroarchEx(g_enmVendor,
+                                                      RTX86GetCpuFamily(uEax),
+                                                      RTX86GetCpuModel(uEax, g_enmVendor == CPUMCPUVENDOR_INTEL),
+                                                      RTX86GetCpuStepping(uEax));
     g_fIntelNetBurst = CPUMMICROARCH_IS_INTEL_NETBURST(g_enmMicroarch);
 
@@ -4522 +4522 @@
     PCPUMCPUIDLEAF  paLeaves;
     uint32_t        cLeaves;
-    int rc = CPUMR3CpuIdCollectLeaves(&paLeaves, &cLeaves);
+    int rc = CPUMCpuIdCollectLeavesX86(&paLeaves, &cLeaves);
     if (RT_FAILURE(rc))
         return RTMsgErrorRc(rc, "CPUMR3CollectCpuIdInfo failed: %Rrc\n", rc);
@@ -4640 +4640 @@
         return RTMsgErrorRc(VERR_NOT_SUPPORTED, "Invalid std CPUID range: %#x\n", uEax);
 
-    CPUMCPUVENDOR enmVendor = CPUMR3CpuIdDetectVendorEx(uEax, uEbx, uEcx, uEdx);
+    CPUMCPUVENDOR enmVendor = CPUMCpuIdDetectX86VendorEx(uEax, uEbx, uEcx, uEdx);
     if (enmVendor == CPUMCPUVENDOR_UNKNOWN)
         return RTMsgErrorRc(VERR_NOT_IMPLEMENTED, "Unknown CPU vendor: %.4s%.4s%.4s\n", &uEbx, &uEdx, &uEcx);
-    vbCpuRepDebug("CPU Vendor: %s - %.4s%.4s%.4s\n", CPUMR3CpuVendorName(enmVendor), &uEbx, &uEdx, &uEcx);
+    vbCpuRepDebug("CPU Vendor: %s - %.4s%.4s%.4s\n", CPUMCpuVendorName(enmVendor), &uEbx, &uEdx, &uEcx);
 
     /*
@@ -4649 +4649 @@
      */
     ASMCpuIdExSlow(1, 0, 0, 0, &uEax, &uEbx, &uEcx, &uEdx);
-    CPUMMICROARCH enmMicroarch = CPUMR3CpuIdDetermineMicroarchEx(enmVendor,
-                                                                 RTX86GetCpuFamily(uEax),
-                                                                 RTX86GetCpuModel(uEax, enmVendor == CPUMCPUVENDOR_INTEL),
-                                                                 RTX86GetCpuStepping(uEax));
+    CPUMMICROARCH enmMicroarch = CPUMCpuIdDetermineX86MicroarchEx(enmVendor,
+                                                                  RTX86GetCpuFamily(uEax),
+                                                                  RTX86GetCpuModel(uEax, enmVendor == CPUMCPUVENDOR_INTEL),
+                                                                  RTX86GetCpuStepping(uEax));
 
     /*
@@ -4794 +4794 @@
 
     CPUMUNKNOWNCPUID enmUnknownMethod;
-    CPUMCPUID       DefUnknown;
+    CPUMCPUID        DefUnknown;
     rc = CPUMR3CpuIdDetectUnknownLeafMethod(&enmUnknownMethod, &DefUnknown);
     if (RT_FAILURE(rc))
@@ -4842 +4842 @@
                    pszName,
                    pszCpuDesc,
-                   CPUMR3CpuVendorName(enmVendor),
+                   CPUMCpuVendorName(enmVendor),
                    RTX86GetCpuFamily(uEax),
                    RTX86GetCpuModel(uEax, enmVendor == CPUMCPUVENDOR_INTEL),
                    RTX86GetCpuStepping(uEax),
-                   CPUMR3MicroarchName(enmMicroarch),
+                   CPUMMicroarchName(enmMicroarch),
                    vbCpuRepGuessScalableBusFrequencyName(),
                    vbCpuRepGetPhysAddrWidth(),