Changeset 74786 in vbox

Timestamp:

Oct 12, 2018 10:20:59 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

125730

Message:

vm.h,VMM: Made VMCPU_FF_CLEAR work on a single flag, introducing VMCPU_FF_CLEAR_MASK for the two cases we clear more than one. bugref:9180

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/EMR3Nem.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/VM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -658 +658 @@
 
 /** @def VMCPU_FF_CLEAR
- * Clears a force action flag for the given VCPU.
+ * Clears a single force action flag for the given VCPU.
  *
  * @param   pVCpu   The cross context virtual CPU structure.
  * @param   fFlag   The flag to clear.
  */
-#define VMCPU_FF_CLEAR(pVCpu, fFlag)        ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag))
+#if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
+# define VMCPU_FF_CLEAR(pVCpu, fFlag)       ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlag))
+#else
+# define VMCPU_FF_CLEAR(pVCpu, fFlag) \
+                   ([](PVMCPU a_pVCpu) -> void \
+                   { \
+                       AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+                       ASMAtomicAndU32(&a_pVCpu->fLocalForcedActions, ~(fFlag)); \
+                   }(pVCpu))
+#endif
+
+/** @def VMCPU_FF_CLEAR_MASK
+ * Clears two or more force action flags for the given VCPU.
+ *
+ * @param   pVCpu   The cross context virtual CPU structure.
+ * @param   fFlags  The flags to clear.
+ */
+#define VMCPU_FF_CLEAR_MASK(pVCpu, fFlags)  ASMAtomicAndU32(&(pVCpu)->fLocalForcedActions, ~(fFlags))
 
 /** @def VM_FF_IS_SET

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

@@ -310 +310 @@
     {
         Log(("NEM: TODO: Make VMCPU_FF_PGM_SYNC_CR3 / VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL quiet! (%#x)\n", pVCpu->fLocalForcedActions));
-        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
+        VMCPU_FF_CLEAR_MASK(pVCpu, VMCPU_FF_PGM_SYNC_CR3 | VMCPU_FF_PGM_SYNC_CR3_NON_GLOBAL);
     }
 

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

@@ -2873 +2873 @@
 
     /* Clear all pending forced actions. */
-    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_ALL_MASK & ~VMCPU_FF_REQUEST);
+    VMCPU_FF_CLEAR_MASK(pVCpu, VMCPU_FF_ALL_MASK & ~VMCPU_FF_REQUEST);
 
     /*