Changeset 36315 in vbox

Timestamp:

Mar 18, 2011 3:49:23 PM (14 years ago)

Author:

vboxsync

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

70637

Message:

VMM: more correct MSR_IA32_MISC_ENABLE emulation

Location:

trunk

Files:

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

trunk/include/VBox/x86.h

@@ -888 +888 @@
 
 /** Enable misc. processor features (R/W). */
-#define MSR_IA32_MISC_ENABLE                0x1A0
+#define MSR_IA32_MISC_ENABLE                   0x1A0
+/* Enable fast-strings feature (for REP MOVS and REP STORS). */
+#define MSR_IA32_MISC_ENABLE_FAST_STRINGS      RT_BIT(0)
+/* Automatic Thermal Control Circuit Enable (R/W). */
+#define MSR_IA32_MISC_ENABLE_TCC               RT_BIT(3)
+/* Performance Monitoring Available (R). */
+#define MSR_IA32_MISC_ENABLE_PERF_MON          RT_BIT(7)
+/* Branch Trace Storage Unavailable (R/O). */
+#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL       RT_BIT(11)
+/* Precise Event Based Sampling (PEBS) Unavailable (R/O). */
+#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL      RT_BIT(12)
+/* Enhanced Intel SpeedStep Technology Enable (R/W). */
+#define MSR_IA32_MISC_ENABLE_SST_ENABLE        RT_BIT(16)
+/* If MONITOR/MWAIT is supported (R/W). */
+#define MSR_IA32_MISC_ENABLE_MONITOR           RT_BIT(18)
+/* Limit CPUID Maxval to 3 leafs (R/W). */
+#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID       RT_BIT(22)
+/* When set to 1, xTPR messages are disabled (R/W). */
+#define MSR_IA32_MISC_ENABLE_XTPR_MSG_DISABLE  RT_BIT(23)
+/* When set to 1, the Execute Disable Bit feature (XD Bit) is disabled (R/W). */
+#define MSR_IA32_MISC_ENABLE_XD_DISABLE        RT_BIT(34)
 
 /** MTRR Default Range. */

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

@@ -866 +866 @@
             *puValue = pVCpu->cpum.s.GuestMsr.msr.miscEnable;
 #else
-            *puValue = 0;
+            /* Currenty we don't allow guests to modify enable MSRs. */
+            *puValue = MSR_IA32_MISC_ENABLE_FAST_STRINGS  /* by default */;
+
+            if ((pVCpu->CTX_SUFF(pVM)->cpum.s.aGuestCpuIdStd[1].ecx & X86_CPUID_FEATURE_ECX_MONITOR) != 0)
+                
+                *puValue |= MSR_IA32_MISC_ENABLE_MONITOR /* if mwait/monitor available */;
+            /** @todo: add more cpuid-controlled features this way. */
 #endif
             break;

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

@@ -2666 +2666 @@
         return "MSR_IA32_TSC";
     case MSR_IA32_MISC_ENABLE:
-        return "Unsupported MSR_IA32_MISC_ENABLE";
+        return "MSR_IA32_MISC_ENABLE";
     case MSR_IA32_MTRR_CAP:
         return "Unsupported MSR_IA32_MTRR_CAP";