Changeset 38326 in vbox for trunk

Timestamp:

Aug 5, 2011 2:35:08 PM (13 years ago)

Author:

vboxsync

Message:

EM,REM: Make the EM execution scheduling policies apply to HM as well.

Location:

trunk

Files:

• include/VBox/vmm/em.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (2 diffs)
• src/recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/include/VBox/vmm/em.h

@@ -129 +129 @@
 #define EMIsRawRing0Enabled(pVM) (!(pVM)->fRecompileSupervisor)
 
+/**
+ * Checks if execution with hardware assisted virtualization is enabled.
+ *
+ * @returns true if enabled.
+ * @returns false if disabled.
+ * @param   pVM         The VM to operate on.
+ */
+#define EMIsHwVirtExecutionEnabled(pVM) (!(pVM)->fRecompileSupervisor && !(pVM)->fRecompileSupervisor)
+
 VMMDECL(void)           EMSetInhibitInterruptsPC(PVMCPU pVCpu, RTGCUINTPTR PC);
 VMMDECL(RTGCUINTPTR)    EMGetInhibitInterruptsPC(PVMCPU pVCpu);

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -608 +608 @@
         {
             case EMEXECPOLICY_RECOMPILE_RING0:
-                pVM->fRecompileSupervisor = !pArgs->fEnforce;
+                pVM->fRecompileSupervisor = pArgs->fEnforce;
                 break;
             case EMEXECPOLICY_RECOMPILE_RING3:
@@ -1152 +1152 @@
     if (HWACCMIsEnabled(pVM))
     {
-        /* Hardware accelerated raw-mode:
+        /*
+         * Hardware accelerated raw-mode:
          *
-         * Typically only 32-bits protected mode, with paging enabled, code is allowed here.
-         */
-        if (HWACCMR3CanExecuteGuest(pVM, pCtx) == true)
+         * Typically only 32-bits protected mode, with paging enabled, code is
+         * allowed here.
+         */
+        if (   EMIsHwVirtExecutionEnabled(pVM)
+            && HWACCMR3CanExecuteGuest(pVM, pCtx))
             return EMSTATE_HWACC;
 
-        /* Note: Raw mode and hw accelerated mode are incompatible. The latter turns
-         * off monitoring features essential for raw mode! */
+        /*
+         * Note! Raw mode and hw accelerated mode are incompatible. The latter
+         *       turns off monitoring features essential for raw mode!
+         */
         return EMSTATE_REM;
     }

trunk/src/recompiler/VBoxRecompiler.c

@@ -1430 +1430 @@
 
         env->state |= CPU_RAW_HWACC;
+
+        /*
+         * The simple check first...
+         */
+        if (!EMIsHwVirtExecutionEnabled(env->pVM))
+            return false;
 
         /*