Changeset 20079 in vbox for trunk

Timestamp:

May 27, 2009 12:35:00 PM (16 years ago)

Author:

vboxsync

Message:

Deal with locking later

File:

• trunk/src/recompiler/VBoxRecompiler.c (modified) (12 diffs)

trunk/src/recompiler/VBoxRecompiler.c

@@ -2839 +2839 @@
     Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb);
     AssertMsg(fFlags == REM_NOTIFY_PHYS_RAM_FLAGS_RAM || fFlags == REM_NOTIFY_PHYS_RAM_FLAGS_MMIO2, ("#x\n", fFlags));
+#ifdef VBOX_WITH_REM_LOCKING
     Assert(!PGMIsLockOwner(pVM));
-
+    EMR3RemLock(pVM);
+#endif
     /*
      * Base ram? Update GCPhysLastRam.
@@ -2862 +2864 @@
     Assert(pVM->rem.s.fIgnoreAll);
     pVM->rem.s.fIgnoreAll = false;
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemUnlock(pVM);
+#endif
 }
 
@@ -2889 +2893 @@
     Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb);
 
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemLock(pVM);
+#endif
     /*
      * Register the rom.
@@ -2900 +2906 @@
     Assert(pVM->rem.s.fIgnoreAll);
     pVM->rem.s.fIgnoreAll = false;
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemUnlock(pVM);
+#endif
 }
 
@@ -2923 +2931 @@
     Assert(RT_ALIGN_Z(cb, PAGE_SIZE) == cb);
 
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemLock(pVM);
-
+#endif
     /*
      * Unassigning the memory.
@@ -2935 +2944 @@
     Assert(pVM->rem.s.fIgnoreAll);
     pVM->rem.s.fIgnoreAll = false;
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemUnlock(pVM);
+#endif
 }
 
@@ -2959 +2970 @@
     Assert(RT_ALIGN_T(cb, PAGE_SIZE, RTGCPHYS) == cb);
 
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemLock(pVM);
+#endif
     if (pVM->rem.s.cHandlerNotifications)
         REMR3ReplayHandlerNotifications(pVM);
@@ -2973 +2986 @@
     Assert(pVM->rem.s.fIgnoreAll);
     pVM->rem.s.fIgnoreAll = false;
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemUnlock(pVM);
+#endif
 }
 
@@ -2993 +3008 @@
     VM_ASSERT_EMT(pVM);
 
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemLock(pVM);
-
+#endif
     if (pVM->rem.s.cHandlerNotifications)
         REMR3ReplayHandlerNotifications(pVM);
@@ -3021 +3037 @@
     Assert(pVM->rem.s.fIgnoreAll);
     pVM->rem.s.fIgnoreAll = false;
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemUnlock(pVM);
+#endif
 }
 
@@ -3043 +3061 @@
     AssertReleaseMsg(enmType != PGMPHYSHANDLERTYPE_MMIO, ("enmType=%d\n", enmType));
 
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemLock(pVM);
-
+#endif
     if (pVM->rem.s.cHandlerNotifications)
         REMR3ReplayHandlerNotifications(pVM);
@@ -3076 +3095 @@
         pVM->rem.s.fIgnoreAll = false;
     }
+#ifdef VBOX_WITH_REM_LOCKING
     EMR3RemUnlock(pVM);
+#endif
 }