Changeset 15609 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2008 10:00:21 PM (16 years ago)

Author:

vboxsync

Message:

HWACCM/EM: Sketeched out some scheduling notification from EM to let HWACCM know when to resync the guest state - disabled for the time being.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (7 diffs)
• HWACCM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -78 +78 @@
 #include <VBox/param.h>
 #include <VBox/err.h>
+
+
+/*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+#if 0 /* Disabled till after 2.1.0 when we've time to test it. */
+#define EM_NOTIFY_HWACCM
+#endif
 
 
@@ -1312 +1320 @@
             {
                 pCtx->rip += Cpu.opsize;
+#ifdef EM_NOTIFY_HWACCM
+                if (pVM->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC)
+                    HWACCMR3NotifyEmulated(VMMGetCpu(pVM));
+#endif
                 STAM_PROFILE_STOP(&pVM->em.s.StatMiscEmu, a);
                 return rc;
@@ -1326 +1338 @@
     STAM_PROFILE_STOP(&pVM->em.s.StatREMEmu, a);
 
+#ifdef EM_NOTIFY_HWACCM
+    if (pVM->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC)
+        HWACCMR3NotifyEmulated(VMMGetCpu(pVM));
+#endif
     return rc;
 }
@@ -1563 +1579 @@
                 {
                     pCtx->rip += cpu.opsize;
+#ifdef EM_NOTIFY_HWACCM
+                    if (pVM->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC)
+                        HWACCMR3NotifyEmulated(VMMGetCpu(pVM));
+#endif
                     return rc;
                 }
@@ -2057 +2077 @@
                     {
                         pCtx->rip += Cpu.opsize;
+#ifdef EM_NOTIFY_HWACCM
+                        if (pVM->em.s.enmState == EMSTATE_DEBUG_GUEST_HWACC)
+                            HWACCMR3NotifyEmulated(VMMGetCpu(pVM));
+#endif
                         STAM_PROFILE_STOP(&pVM->em.s.StatPrivEmu, a);
 
@@ -2783 +2807 @@
     STAM_COUNTER_INC(&pVM->em.s.StatHwAccExecuteEntry);
 
+#ifdef EM_NOTIFY_HWACCM
+    HWACCMR3NotifyScheduled(&pVM->aCpus[idCpu]);
+#endif
+
     /*
      * Spin till we get a forced action which returns anything but VINF_SUCCESS.
@@ -2865 +2893 @@
         }
     }
+
     /*
      * Return to outer loop.

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1333 +1333 @@
 
 /**
+ * Notifcation from EM about a rescheduling into hardware assisted execution
+ * mode.
+ *
+ * @param   pVCpu       Pointer to the current virtual cpu structure.
+ */
+VMMR3DECL(void) HWACCMR3NotifyScheduled(PVMCPU pVCpu)
+{
+    pVCpu->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_ALL_GUEST;
+}
+
+/**
+ * Notifcation from EM about returning from instruction emulation (REM / EM).
+ *
+ * @param   pVCpu       Pointer to the current virtual cpu structure.
+ */
+VMMR3DECL(void) HWACCMR3NotifyEmulated(PVMCPU pVCpu)
+{
+    pVCpu->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_ALL_GUEST;
+}
+
+/**
  * Checks if we are currently using hardware accelerated raw mode.
  *