Changeset 2010 in vbox for trunk/src/VBox

Timestamp:

Apr 10, 2007 2:40:25 PM (18 years ago)

Author:

vboxsync

Message:

Check for monitor/mwait support in cpuid before emulating them.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)

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

@@ -1603 +1603 @@
 static int emInterpretMonitor(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
+    uint32_t u32Dummy, u32ExtFeatures, cpl;
+
     if (pRegFrame->ecx != 0)
         return VERR_EM_INTERPRETER; /* illegal value. */
 
     /* Get the current privilege level. */
-    uint32_t cpl = CPUMGetGuestCPL(pVM, pRegFrame);
+    cpl = CPUMGetGuestCPL(pVM, pRegFrame);
     if (cpl != 0)
         return VERR_EM_INTERPRETER; /* supervisor only */
 
+    CPUMGetGuestCpuId(pVM, 1, &u32Dummy, &u32Dummy, &u32ExtFeatures, &u32Dummy);
+    if (!(u32ExtFeatures & X86_CPUID_FEATURE_ECX_MONITOR))
+        return VERR_EM_INTERPRETER; /* not supported */
+
     return VINF_SUCCESS;
 }
@@ -1620 +1626 @@
 static int emInterpretMWait(PVM pVM, PDISCPUSTATE pCpu, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, uint32_t *pcbSize)
 {
+    uint32_t u32Dummy, u32ExtFeatures, cpl;
+
     if (pRegFrame->ecx != 0)
         return VERR_EM_INTERPRETER; /* illegal value. */
 
     /* Get the current privilege level. */
-    uint32_t cpl = CPUMGetGuestCPL(pVM, pRegFrame);
+    cpl = CPUMGetGuestCPL(pVM, pRegFrame);
     if (cpl != 0)
         return VERR_EM_INTERPRETER; /* supervisor only */
+
+    CPUMGetGuestCpuId(pVM, 1, &u32Dummy, &u32Dummy, &u32ExtFeatures, &u32Dummy);
+    if (!(u32ExtFeatures & X86_CPUID_FEATURE_ECX_MONITOR))
+        return VERR_EM_INTERPRETER; /* not supported */
 
     /** @todo not completely correct */