Changeset 21327 in vbox

Timestamp:

Jul 7, 2009 12:48:59 PM (15 years ago)

Author:

vboxsync

Message:

cpumR3Load: ignore some advanced capability bits, that we don't expose to the guest

Location:

trunk

Files:

• include/VBox/x86.h (modified) (3 diffs)
• src/VBox/VMM/CPUM.cpp (modified) (1 diff)

trunk/include/VBox/x86.h

@@ -355 +355 @@
 /** ECX Bit 0 - SSE3 - Supports SSE3 or not. */
 #define X86_CPUID_FEATURE_ECX_SSE3      RT_BIT(0)
+/** ECX Bit 2 - DTES64 - DS Area 64-bit Layout. */
+#define X86_CPUID_FEATURE_ECX_DTES64    RT_BIT(2)
 /** ECX Bit 3 - MONITOR - Supports MONITOR/MWAIT. */
 #define X86_CPUID_FEATURE_ECX_MONITOR   RT_BIT(3)
@@ -361 +363 @@
 /** ECX Bit 5 - VMX - Virtual Machine Technology. */
 #define X86_CPUID_FEATURE_ECX_VMX       RT_BIT(5)
+/** ECX Bit 6 - SMX - Safer Mode Extensions. */
+#define X86_CPUID_FEATURE_ECX_SMX       RT_BIT(6)
 /** ECX Bit 7 - EST - Enh. SpeedStep Tech. */
 #define X86_CPUID_FEATURE_ECX_EST       RT_BIT(7)
@@ -373 +377 @@
 /** ECX Bit 14 - xTPR Update Control. Processor supports changing IA32_MISC_ENABLES[bit 23]. */
 #define X86_CPUID_FEATURE_ECX_TPRUPDATE RT_BIT(14)
+/** ECX Bit 15 - PDCM - Perf/Debug Capability MSR. */
+#define X86_CPUID_FEATURE_ECX_PDCM      RT_BIT(15)
+/** ECX Bit 18 - DCA - Direct Cache Access. */
+#define X86_CPUID_FEATURE_ECX_DCA       RT_BIT(18)
+/** ECX Bit 19 - SSE4_1 - Supports SSE4_1 or not. */
+#define X86_CPUID_FEATURE_ECX_SSE4_1    RT_BIT(19)
+/** ECX Bit 20 - SSE4_2 - Supports SSE4_2 or not. */
+#define X86_CPUID_FEATURE_ECX_SSE4_2    RT_BIT(20)
 /** ECX Bit 21 - x2APIC support. */
 #define X86_CPUID_FEATURE_ECX_X2APIC    RT_BIT(21)
+/** ECX Bit 22 - MOVBE instruction. */
+#define X86_CPUID_FEATURE_ECX_MOVBE     RT_BIT(22)
 /** ECX Bit 23 - POPCOUNT instruction. */
 #define X86_CPUID_FEATURE_ECX_POPCOUNT  RT_BIT(23)
+/** ECX Bit 26 - XSAVE instruction. */
+#define X86_CPUID_FEATURE_ECX_XSAVE     RT_BIT(26)
+/** ECX Bit 27 - OSXSAVE instruction. */
+#define X86_CPUID_FEATURE_ECX_OSXSAVE   RT_BIT(27)
 
 

trunk/src/VBox/VMM/CPUM.cpp

@@ -1105 +1105 @@
         au32CpuIdSaved[5] &= ~0x00ff0000;
 
+        /* Ignore some advanced capability bits, that we don't expose to the guest. */
+        au32CpuId[6]      &= ~(   X86_CPUID_FEATURE_ECX_DTES64
+                               |  X86_CPUID_FEATURE_ECX_VMX
+                               |  X86_CPUID_FEATURE_ECX_SMX
+                               |  X86_CPUID_FEATURE_ECX_EST
+                               |  X86_CPUID_FEATURE_ECX_TM2
+                               |  X86_CPUID_FEATURE_ECX_CNTXID
+                               |  X86_CPUID_FEATURE_ECX_TPRUPDATE
+                               |  X86_CPUID_FEATURE_ECX_PDCM
+                               |  X86_CPUID_FEATURE_ECX_DCA
+                               |  X86_CPUID_FEATURE_ECX_X2APIC
+                               |  X86_CPUID_FEATURE_ECX_POPCOUNT
+                               |  X86_CPUID_FEATURE_ECX_MOVBE
+                               |  X86_CPUID_FEATURE_ECX_XSAVE
+                               |  X86_CPUID_FEATURE_ECX_OSXSAVE
+                              );
+        au32CpuIdSaved[6] &= ~(   X86_CPUID_FEATURE_ECX_DTES64
+                               |  X86_CPUID_FEATURE_ECX_VMX
+                               |  X86_CPUID_FEATURE_ECX_SMX
+                               |  X86_CPUID_FEATURE_ECX_EST
+                               |  X86_CPUID_FEATURE_ECX_TM2
+                               |  X86_CPUID_FEATURE_ECX_CNTXID
+                               |  X86_CPUID_FEATURE_ECX_TPRUPDATE
+                               |  X86_CPUID_FEATURE_ECX_PDCM
+                               |  X86_CPUID_FEATURE_ECX_DCA
+                               |  X86_CPUID_FEATURE_ECX_X2APIC
+                               |  X86_CPUID_FEATURE_ECX_POPCOUNT
+                               |  X86_CPUID_FEATURE_ECX_MOVBE
+                               |  X86_CPUID_FEATURE_ECX_XSAVE
+                               |  X86_CPUID_FEATURE_ECX_OSXSAVE
+                              );
+
+        /* Make sure we don't forget to update the masks when enabling 
+         * features in the future. 
+         */
+        AssertRelease(!(pVM->cpum.s.aGuestCpuIdStd[1].ecx & 
+                              (   X86_CPUID_FEATURE_ECX_DTES64
+                               |  X86_CPUID_FEATURE_ECX_VMX
+                               |  X86_CPUID_FEATURE_ECX_SMX
+                               |  X86_CPUID_FEATURE_ECX_EST
+                               |  X86_CPUID_FEATURE_ECX_TM2
+                               |  X86_CPUID_FEATURE_ECX_CNTXID
+                               |  X86_CPUID_FEATURE_ECX_TPRUPDATE
+                               |  X86_CPUID_FEATURE_ECX_PDCM
+                               |  X86_CPUID_FEATURE_ECX_DCA
+                               |  X86_CPUID_FEATURE_ECX_X2APIC
+                               |  X86_CPUID_FEATURE_ECX_POPCOUNT
+                               |  X86_CPUID_FEATURE_ECX_MOVBE
+                               |  X86_CPUID_FEATURE_ECX_XSAVE
+                               |  X86_CPUID_FEATURE_ECX_OSXSAVE
+                              )));
         /* do the compare */
         if (memcmp(au32CpuIdSaved, au32CpuId, sizeof(au32CpuIdSaved)))