Changeset 20399 in vbox

Timestamp:

Jun 8, 2009 1:01:44 PM (16 years ago)

Author:

vboxsync

Message:

Minor updates

Location:

trunk

Files:

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

trunk/include/VBox/em.h

@@ -185 +185 @@
 VMMR3DECL(void)     EMR3RemUnlock(PVM pVM);
 VMMR3DECL(void)     EMR3RemLock(PVM pVM);
+VMMR3DECL(bool)     EMR3RemIsLockOwner(PVM pVM);
 
 /**

trunk/include/VBox/vm.h

@@ -270 +270 @@
 #define VM_FF_PGM_NO_MEMORY                 RT_BIT_32(19)
 /** REM needs to be informed about handler changes. */
-#define VM_FF_REM_HANDLER_NOTIFY            RT_BIT_32(29)
+#define VM_FF_REM_HANDLER_NOTIFY_BIT        29
+#define VM_FF_REM_HANDLER_NOTIFY            RT_BIT_32(VM_FF_REM_HANDLER_NOTIFY_BIT)
 /** Suspend the VM - debug only. */
 #define VM_FF_DEBUG_SUSPEND                 RT_BIT_32(31)
@@ -360 +361 @@
 #define VM_FF_HWACCM_TO_R3_MASK                 (VM_FF_TM_VIRTUAL_SYNC | VM_FF_PGM_NEED_HANDY_PAGES | VM_FF_PGM_NO_MEMORY)
 /** VMCPU Flags that cause the HWACCM loops to go back to ring-3. */
-#define VMCPU_FF_HWACCM_TO_R3_MASK               (VMCPU_FF_TO_R3 | VMCPU_FF_TIMER)
+#define VMCPU_FF_HWACCM_TO_R3_MASK              (VMCPU_FF_TO_R3 | VMCPU_FF_TIMER)
 
 /** All the forced VM flags. */

trunk/src/VBox/VMM/EM.cpp

@@ -869 +869 @@
 VMMR3DECL(void) EMR3RemLock(PVM pVM)
 {
-#ifdef IN_RING3
     if (!PDMCritSectIsInitialized(&pVM->em.s.CritSectREM))
         return;     /* early init */
-#else
-    Assert(PDMCritSectIsInitialized(&pVM->em.s.CritSectREM));
-#endif
+
     int rc = PDMCritSectEnter(&pVM->em.s.CritSectREM, VERR_SEM_BUSY);
     AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));
@@ -886 +883 @@
 VMMR3DECL(void) EMR3RemUnlock(PVM pVM)
 {
-#ifdef IN_RING3
     if (!PDMCritSectIsInitialized(&pVM->em.s.CritSectREM))
         return;     /* early init */
-#else
-    Assert(PDMCritSectIsInitialized(&pVM->em.s.CritSectREM));
-#endif
+
     PDMCritSectLeave(&pVM->em.s.CritSectREM);
+}
+
+/**
+ * Check if this VCPU currently owns the REM lock.
+ *
+ * @returns bool owner/not owner
+ * @param   pVM         The VM to operate on.
+ */
+VMMR3DECL(bool) EMR3RemIsLockOwner(PVM pVM)
+{
+    return PDMCritSectIsOwner(&pVM->em.s.CritSectREM);
 }
 

trunk/src/recompiler/VBoxRecompiler.c

@@ -2728 +2728 @@
 REMR3DECL(void) REMR3ReplayHandlerNotifications(PVM pVM)
 {
+    Assert(EMR3RemIsLockOwner(pVM));
+
     /*
      * Replay the flushes.
      */
-    RTUINT i;
-    const RTUINT c = pVM->rem.s.cHandlerNotifications;
-
-    LogFlow(("REMR3ReplayInvalidatedPages:\n"));
+    LogFlow(("REMR3ReplayHandlerNotifications:\n"));
     VM_ASSERT_EMT(pVM);
 
-    pVM->rem.s.cHandlerNotifications = 0;
-    for (i = 0; i < c; i++)
-    {
-        PREMHANDLERNOTIFICATION pRec = &pVM->rem.s.aHandlerNotifications[i];
-        switch (pRec->enmKind)
+    if (VM_FF_TESTANDCLEAR(pVM, VM_FF_REM_HANDLER_NOTIFY_BIT))
+    {
+        RTUINT i;
+        const RTUINT c = pVM->rem.s.cHandlerNotifications;
+
+        pVM->rem.s.cHandlerNotifications = 0;
+        for (i = 0; i < c; i++)
         {
-            case REMHANDLERNOTIFICATIONKIND_PHYSICAL_REGISTER:
-                REMR3NotifyHandlerPhysicalRegister(pVM,
-                                                   pRec->u.PhysicalRegister.enmType,
-                                                   pRec->u.PhysicalRegister.GCPhys,
-                                                   pRec->u.PhysicalRegister.cb,
-                                                   pRec->u.PhysicalRegister.fHasHCHandler);
-                break;
-
-            case REMHANDLERNOTIFICATIONKIND_PHYSICAL_DEREGISTER:
-                REMR3NotifyHandlerPhysicalDeregister(pVM,
-                                                     pRec->u.PhysicalDeregister.enmType,
-                                                     pRec->u.PhysicalDeregister.GCPhys,
-                                                     pRec->u.PhysicalDeregister.cb,
-                                                     pRec->u.PhysicalDeregister.fHasHCHandler,
-                                                     pRec->u.PhysicalDeregister.fRestoreAsRAM);
-                break;
-
-            case REMHANDLERNOTIFICATIONKIND_PHYSICAL_MODIFY:
-                REMR3NotifyHandlerPhysicalModify(pVM,
-                                                 pRec->u.PhysicalModify.enmType,
-                                                 pRec->u.PhysicalModify.GCPhysOld,
-                                                 pRec->u.PhysicalModify.GCPhysNew,
-                                                 pRec->u.PhysicalModify.cb,
-                                                 pRec->u.PhysicalModify.fHasHCHandler,
-                                                 pRec->u.PhysicalModify.fRestoreAsRAM);
-                break;
-
-            default:
-                AssertReleaseMsgFailed(("enmKind=%d\n", pRec->enmKind));
-                break;
+            PREMHANDLERNOTIFICATION pRec = &pVM->rem.s.aHandlerNotifications[i];
+            switch (pRec->enmKind)
+            {
+                case REMHANDLERNOTIFICATIONKIND_PHYSICAL_REGISTER:
+                    REMR3NotifyHandlerPhysicalRegister(pVM,
+                                                    pRec->u.PhysicalRegister.enmType,
+                                                    pRec->u.PhysicalRegister.GCPhys,
+                                                    pRec->u.PhysicalRegister.cb,
+                                                    pRec->u.PhysicalRegister.fHasHCHandler);
+                    break;
+
+                case REMHANDLERNOTIFICATIONKIND_PHYSICAL_DEREGISTER:
+                    REMR3NotifyHandlerPhysicalDeregister(pVM,
+                                                        pRec->u.PhysicalDeregister.enmType,
+                                                        pRec->u.PhysicalDeregister.GCPhys,
+                                                        pRec->u.PhysicalDeregister.cb,
+                                                        pRec->u.PhysicalDeregister.fHasHCHandler,
+                                                        pRec->u.PhysicalDeregister.fRestoreAsRAM);
+                    break;
+
+                case REMHANDLERNOTIFICATIONKIND_PHYSICAL_MODIFY:
+                    REMR3NotifyHandlerPhysicalModify(pVM,
+                                                    pRec->u.PhysicalModify.enmType,
+                                                    pRec->u.PhysicalModify.GCPhysOld,
+                                                    pRec->u.PhysicalModify.GCPhysNew,
+                                                    pRec->u.PhysicalModify.cb,
+                                                    pRec->u.PhysicalModify.fHasHCHandler,
+                                                    pRec->u.PhysicalModify.fRestoreAsRAM);
+                    break;
+
+                default:
+                    AssertReleaseMsgFailed(("enmKind=%d\n", pRec->enmKind));
+                    break;
+            }
         }
     }
-    VM_FF_CLEAR(pVM, VM_FF_REM_HANDLER_NOTIFY);
 }