Changeset 8868 in vbox

Timestamp:

May 16, 2008 7:43:10 AM (17 years ago)

Author:

vboxsync

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

30897

Message:

Base & extended model corrections.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (1 diff)
• HWACCM.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -1135 +1135 @@
                         "Brand ID:                        %#04x\n",
                         (uEAX >> 8) & 0xf, (uEAX >> 20) & 0x7f, ((uEAX >> 8) & 0xf) + (((uEAX >> 8) & 0xf) == 0xf ? (uEAX >> 20) & 0x7f : 0),
-                        (uEAX >> 4) & 0xf, (uEAX >> 16) & 0x0f, ((uEAX >> 4) & 0xf) | ((((uEAX >> 4) & 0xf) == 0xf ? (uEAX >> 16) & 0x0f : 0) << 4),
+                        (uEAX >> 4) & 0xf, (uEAX >> 16) & 0x0f, ((uEAX >> 4) & 0xf) | ((((uEAX >> 8) & 0xf) == 0xf ? (uEAX >> 16) & 0x0f : 0) << 4),
                         (uEAX >> 0) & 0xf,
                         (Guest.ebx >> 24) & 0xff,

trunk/src/VBox/VMM/HWACCM.cpp

@@ -449 +449 @@
              */
             uint32_t u32Dummy;
-            uint32_t u32Version, u32Family, u32Model, u32Stepping;
+            uint32_t u32Version, u32Family, u32Model, u32Stepping, u32BaseFamily;
             ASMCpuId(1, &u32Version, &u32Dummy, &u32Dummy, &u32Dummy);
-            u32Family    = ((u32Version >> 8) & 0xf) + (((u32Version >> 8) & 0xf) == 0xf ? (u32Version >> 20) & 0x7f : 0);
+            u32BaseFamily= (u32Version >> 8) & 0xf;
+            u32Family    = u32BaseFamily + (u32BaseFamily == 0xf ? ((u32Version >> 20) & 0x7f) : 0);
             u32Model     = ((u32Version >> 4) & 0xf);
-            u32Model     = u32Model | ((u32Model == 0xf ? (u32Version >> 16) & 0x0f : 0) << 4);
+            u32Model     = u32Model | ((u32BaseFamily == 0xf ? (u32Version >> 16) & 0x0f : 0) << 4);
             u32Stepping  = u32Version & 0xf;
             if (    u32Family == 0xf

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

@@ -159 +159 @@
      */
     uint32_t u32Dummy;
-    uint32_t u32Version, u32Family, u32Model, u32Stepping;
+    uint32_t u32Version, u32Family, u32Model, u32Stepping, u32BaseFamily;
     ASMCpuId(1, &u32Version, &u32Dummy, &u32Dummy, &u32Dummy);
-    u32Family    = ((u32Version >> 8) & 0xf) + (((u32Version >> 8) & 0xf) == 0xf ? (u32Version >> 20) & 0x7f : 0);
+    u32BaseFamily= (u32Version >> 8) & 0xf;
+    u32Family    = u32BaseFamily + (u32BaseFamily == 0xf ? ((u32Version >> 20) & 0x7f) : 0);
     u32Model     = ((u32Version >> 4) & 0xf);
-    u32Model     = u32Model | ((u32Model == 0xf ? (u32Version >> 16) & 0x0f : 0) << 4);
+    u32Model     = u32Model | ((u32BaseFamily == 0xf ? (u32Version >> 16) & 0x0f : 0) << 4);
     u32Stepping  = u32Version & 0xf;
     if (    u32Family == 0xf