Changeset 44172 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 19, 2012 6:09:21 PM (12 years ago)

Author:

vboxsync

Message:

cpumR0MapLocalApicWorker: Use ASMIsXyzCpuEx and friends.

File:

• trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

@@ -737 +737 @@
     AssertReturnVoid(iCpu >= 0 && (unsigned)iCpu < RT_ELEMENTS(g_aLApics));
 
-    uint32_t u32MaxIdx, u32EBX, u32ECX, u32EDX;
-    ASMCpuId(0, &u32MaxIdx, &u32EBX, &u32ECX, &u32EDX);
-    if (   (   (   u32EBX == X86_CPUID_VENDOR_INTEL_EBX
-                && u32ECX == X86_CPUID_VENDOR_INTEL_ECX
-                && u32EDX == X86_CPUID_VENDOR_INTEL_EDX)
-           ||  (   u32EBX == X86_CPUID_VENDOR_AMD_EBX
-                && u32ECX == X86_CPUID_VENDOR_AMD_ECX
-                && u32EDX == X86_CPUID_VENDOR_AMD_EDX)
-           ||  (   u32EBX == X86_CPUID_VENDOR_VIA_EBX
-                && u32ECX == X86_CPUID_VENDOR_VIA_ECX
-                && u32EDX == X86_CPUID_VENDOR_VIA_EDX))
-        && u32MaxIdx >= 1)
+    uint32_t uMaxLeaf, u32EBX, u32ECX, u32EDX;
+    ASMCpuId(0, &uMaxLeaf, &u32EBX, &u32ECX, &u32EDX);
+    if (   (   ASMIsIntelCpuEx(u32EBX, u32ECX, u32EDX)
+            || ASMIsAmdCpuEx(u32EBX, u32ECX, u32EDX)
+            || ASMIsViaCentaurCpuEx(u32EBX, u32ECX, u32EDX))
+        && ASMIsValidStdRange(uMaxLeaf))
     {
         ASMCpuId(1, &u32MaxIdx, &u32EBX, &u32ECX, &u32EDX);
@@ -758 +752 @@
 
             /* see Intel Manual: Local APIC Status and Location: MAXPHYADDR default is bit 36 */
-            uint32_t u32MaxExtIdx;
-            ASMCpuId(0x80000000, &u32MaxExtIdx, &u32EBX, &u32ECX, &u32EDX);
-            if (   u32MaxExtIdx >= UINT32_C(0x80000008)
-                && u32MaxExtIdx <  UINT32_C(0x8000ffff))
+            uint32_t uMaxExtLeaf;
+            ASMCpuId(0x80000000, &uMaxExtLeaf, &u32EBX, &u32ECX, &u32EDX);
+            if (   uMaxExtLeaf >= UINT32_C(0x80000008)
+                && ASMIsValidExtRange(uMaxExtLeaf))
             {
                 uint32_t u32PhysBits;