Changeset 8889

Timestamp:

05/16/08 14:36:58 (4 months ago)

Author:

vboxsync

Message:

Added ASMGetCpuModuleIntel/Amd and ASMIsIntelCpu and ASMIsIntelCpuEx because intel idffers sligtly in the way they calulate the module number.

Files:

• trunk/include/iprt/asm.h (modified) (2 diffs)
• trunk/src/VBox/Runtime/testcase/tstInlineAsm.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/CPUM.cpp (modified) (5 diffs)

trunk/include/iprt/asm.h

@@ -944 +944 @@
-
-/**
+ * Tests if it an genuin Intel CPU based on the ASMCpuId(0) output.
+ *
+ * @returns true/false.
+ * @param   uEBX    EBX return from ASMCpuId(0)
+ * @param   uECX    ECX return from ASMCpuId(0)
+ * @param   uEDX    EDX return from ASMCpuId(0)
+ */
+DECLINLINE(bool) ASMIsIntelCpuEx(uint32_t uEBX, uint32_t uECX, uint32_t uEDX)
+{
+    return uEBX == 0x756e6547
+        || uECX == 0x6c65746e
+        || uEDX == 0x49656e69;
+}
+
+
+/**
+ * Tests if this is an genuin Intel CPU.
+ *
+ * @returns true/false.
+ */
+DECLINLINE(bool) ASMIsIntelCpu(void)
+{
+    uint32_t uEAX, uEBX, uECX, uEDX;
+    ASMCpuId(1, &uEAX, &uEBX, &uECX, &uEDX);
+    return ASMIsIntelCpuEx(uEBX, uECX, uEDX);
+}
+
+
+/**
- * Extracts the CPU family from ASMCpuId(1) or ASMCpuId(0x80000001)
- *
@@ -958 +987 @@
-
-/**
-
+, Intel variant.
- *
- * @returns Model.
- * @param   uEAX    EAX from ASMCpuId(1) or ASMCpuId(0x80000001).
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         ? ((uEAX >> 4) & 0xf) | ((uEAX >> 12) & 0xf0)
-         : ((uEAX >> 4) & 0xf);

trunk/src/VBox/Runtime/testcase/tstInlineAsm.cpp

@@ -175 +175 @@
-             "Support:                         0-%u\n",
-             &s.uEBX, &s.uEDX, &s.uECX, s.uEAX);
+    bool const fIntel = ASMIsIntelCpuEx(s.uEBX, s.uECX, s.uEDX);
-
-    /*
@@ -190 +191 @@
-                 "Brand ID:                        %#04x\n",
-                 (s.uEAX >> 8) & 0xf, (s.uEAX >> 20) & 0x7f, ASMGetCpuFamily(s.uEAX),
-
+, fIntel
-                 ASMGetCpuStepping(s.uEAX),
-                 (s.uEBX >> 24) & 0xff,
@@ -285 +286 @@
-                 "Brand ID:                        %#05x\n",
-                 (s.uEAX >> 8) & 0xf, (s.uEAX >> 20) & 0x7f, ASMGetCpuFamily(s.uEAX),
-
+, fIntel
-                 ASMGetCpuStepping(s.uEAX),
-                 s.uEBX & 0xfff);

trunk/src/VBox/VMM/CPUM.cpp

@@ -1045 +1045 @@
-        case 4:  return "4 way ";
-        case 5:  return "res5  ";
-
-
+
-        case 8:  return "16 way";
-        case 9:  return "res9  ";
@@ -1093 +1092 @@
-                    "         RAW Standard CPUIDs\n"
-                    "     Function  eax      ebx      ecx      edx\n");
-
+RT_
-    {
-        Guest = pVM->cpum.s.aGuestCpuIdStd[i];
@@ -1121 +1120 @@
-     * Get Features.
-     */
+    bool const fIntel = ASMIsIntelCpuEx(pVM->cpum.s.aGuestCpuIdStd[0].ebx,
+                                        pVM->cpum.s.aGuestCpuIdStd[0].ecx,
+                                        pVM->cpum.s.aGuestCpuIdStd[0].edx);
-    if (cStdMax >= 1 && iVerbosity)
-    {
@@ -1135 +1137 @@
-                        "Brand ID:                        %#04x\n",
-                        (uEAX >> 8) & 0xf, (uEAX >> 20) & 0x7f, ASMGetCpuFamily(uEAX),
-
+, fIntel
-                        ASMGetCpuStepping(uEAX),
-                        (Guest.ebx >> 24) & 0xff,
@@ -1309 +1311 @@
-                        "Brand ID:                        %#05x\n",
-                        (uEAX >> 8) & 0xf, (uEAX >> 20) & 0x7f, ASMGetCpuFamily(uEAX),
-
+, fIntel
-                        ASMGetCpuStepping(uEAX),
-                        Guest.ebx & 0xfff);