Changeset 8889 in vbox for trunk/src/VBox

Timestamp:

May 16, 2008 12:36:58 PM (17 years ago)

Author:

vboxsync

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

30924

Message:

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

Location:

trunk/src/VBox

Files:

• Runtime/testcase/tstInlineAsm.cpp (modified) (3 diffs)
• VMM/CPUM.cpp (modified) (5 diffs)

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),
-                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ASMGetCpuModel(s.uEAX),
+                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ASMGetCpuModel(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),
-                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ASMGetCpuModel(s.uEAX),
+                 (s.uEAX >> 4) & 0xf, (s.uEAX >> 16) & 0x0f, ASMGetCpuModel(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 6:  return "8 way ";
-        case 7:  return "res7  ";
+        case 6:  return "8 way ";                                    case 7:  return "res7  ";
         case 8:  return "16 way";
         case 9:  return "res9  ";
@@ -1093 +1092 @@
                     "         RAW Standard CPUIDs\n"
                     "     Function  eax      ebx      ecx      edx\n");
-    for (unsigned i = 0; i < ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
+    for (unsigned i = 0; i < RT_ELEMENTS(pVM->cpum.s.aGuestCpuIdStd); i++)
     {
         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),
-                        (uEAX >> 4) & 0xf, (uEAX >> 16) & 0x0f, ASMGetCpuModel(uEAX),
+                        (uEAX >> 4) & 0xf, (uEAX >> 16) & 0x0f, ASMGetCpuModel(uEAX, fIntel),
                         ASMGetCpuStepping(uEAX),
                         (Guest.ebx >> 24) & 0xff,
@@ -1309 +1311 @@
                         "Brand ID:                        %#05x\n",
                         (uEAX >> 8) & 0xf, (uEAX >> 20) & 0x7f, ASMGetCpuFamily(uEAX),
-                        (uEAX >> 4) & 0xf, (uEAX >> 16) & 0x0f, ASMGetCpuModel(uEAX),
+                        (uEAX >> 4) & 0xf, (uEAX >> 16) & 0x0f, ASMGetCpuModel(uEAX, fIntel),
                         ASMGetCpuStepping(uEAX),
                         Guest.ebx & 0xfff);