Changeset 48066 in vbox

Timestamp:

Aug 26, 2013 3:05:20 PM (11 years ago)

Author:

vboxsync

Message:

CPUM: Fake MSR_IA32_MCG_STATUS reads. Corrected MSR names, IA32_MCP should be IA32_MCG according to latest intel docs.

Location:

trunk

Files:

• include/iprt/x86.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)

trunk/include/iprt/x86.h

@@ -978 +978 @@
 
 /** Machine Check Global Capabilities Register. */
-#define MSR_IA32_MCP_CAP                    0x179
+#define MSR_IA32_MCG_CAP                    0x179
 /** Machine Check Global Status Register. */
-#define MSR_IA32_MCP_STATUS                 0x17A
+#define MSR_IA32_MCG_STATUS                 0x17A
 /** Machine Check Global Control Register. */
-#define MSR_IA32_MCP_CTRL                   0x17B
+#define MSR_IA32_MCG_CTRL                   0x17B
 
 /** Trace/Profile Resource Control (R/W) */

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1102 +1102 @@
          */
         case MSR_IA32_BIOS_SIGN_ID:         /* fam/mod >= 6_01 */
-        case MSR_IA32_MCP_CAP:              /* fam/mod >= 6_01 */
-        /*case MSR_IA32_MCP_STATUS:     - indicated as not present in CAP */
-        /*case MSR_IA32_MCP_CTRL:       - indicated as not present in CAP */
+        case MSR_IA32_MCG_CAP:              /* fam/mod >= 6_01 */
+        case MSR_IA32_MCG_STATUS:           /* indicated as not present in CAP */
+        /*case MSR_IA32_MCG_CTRL:       - indicated as not present in CAP */
         case MSR_IA32_MC0_CTL:
         case MSR_IA32_MC0_STATUS:
@@ -1388 +1388 @@
         case MSR_IA32_BIOS_UPDT_TRIG:       /* fam/mod >= 6_01 */
         /*case MSR_IA32_MCP_CAP:     - read-only */
-        /*case MSR_IA32_MCP_STATUS:  - read-only */
-        /*case MSR_IA32_MCP_CTRL:    - indicated as not present in CAP */
+        /*case MSR_IA32_MCG_STATUS:  - read-only */
+        /*case MSR_IA32_MCG_CTRL:    - indicated as not present in CAP */
         /*case MSR_IA32_MC0_CTL:     - read-only? */
         /*case MSR_IA32_MC0_STATUS:  - read-only? */

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1658 +1658 @@
         case MSR_IA32_MISC_ENABLE:          return "MSR_IA32_MISC_ENABLE";
         case MSR_IA32_MTRR_CAP:             return "MSR_IA32_MTRR_CAP";
-        case MSR_IA32_MCP_CAP:              return "Unsupported MSR_IA32_MCP_CAP";
-        case MSR_IA32_MCP_STATUS:           return "Unsupported MSR_IA32_MCP_STATUS";
-        case MSR_IA32_MCP_CTRL:             return "Unsupported MSR_IA32_MCP_CTRL";
+        case MSR_IA32_MCG_CAP:              return "Unsupported MSR_IA32_MCG_CAP";
+        case MSR_IA32_MCG_STATUS:           return "Unsupported MSR_IA32_MCG_STATUS";
+        case MSR_IA32_MCG_CTRL:             return "Unsupported MSR_IA32_MCG_CTRL";
         case MSR_IA32_MTRR_DEF_TYPE:        return "MSR_IA32_MTRR_DEF_TYPE";
         case MSR_K7_EVNTSEL0:               return "Unsupported MSR_K7_EVNTSEL0";