Changeset 44170 in vbox

Timestamp:

Dec 19, 2012 5:57:32 PM (12 years ago)

Author:

vboxsync

Message:

cpumR3DetectVendor: Use ASMIsXyzCpuEx.

File:

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

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

@@ -667 +667 @@
 static CPUMCPUVENDOR cpumR3DetectVendor(uint32_t uEAX, uint32_t uEBX, uint32_t uECX, uint32_t uEDX)
 {
-    if (    uEAX >= 1
-        &&  uEBX == X86_CPUID_VENDOR_AMD_EBX
-        &&  uECX == X86_CPUID_VENDOR_AMD_ECX
-        &&  uEDX == X86_CPUID_VENDOR_AMD_EDX)
-        return CPUMCPUVENDOR_AMD;
-
-    if (    uEAX >= 1
-        &&  uEBX == X86_CPUID_VENDOR_INTEL_EBX
-        &&  uECX == X86_CPUID_VENDOR_INTEL_ECX
-        &&  uEDX == X86_CPUID_VENDOR_INTEL_EDX)
-        return CPUMCPUVENDOR_INTEL;
-
-    if (    uEAX >= 1
-        &&  uEBX == X86_CPUID_VENDOR_VIA_EBX
-        &&  uECX == X86_CPUID_VENDOR_VIA_ECX
-        &&  uEDX == X86_CPUID_VENDOR_VIA_EDX)
-        return CPUMCPUVENDOR_VIA;
-
-    /** @todo detect the other buggers... */
+    if (ASMIsValidStdRange(uEAX))
+    {
+        if (ASMIsAmdCpuEx(uEBX, uECX, uEDX))
+            return CPUMCPUVENDOR_AMD;
+
+        if (ASMIsIntelCpuEx(uEBX, uECX, uEDX))
+            return CPUMCPUVENDOR_INTEL;
+
+        if (ASMIsViaCentaurCpuEx(uEBX, uECX, uEDX))
+            return CPUMCPUVENDOR_VIA;
+
+        /** @todo detect the other buggers... */
+    }
+
     return CPUMCPUVENDOR_UNKNOWN;
 }