Changeset 74792 in vbox for trunk

Timestamp:

Oct 12, 2018 10:53:00 AM (6 years ago)

Author:

vboxsync

Message:

vm.h,VMM: Made VM_FF_SET and VMCPU_FF_SET both work on a single flag, with compile time assertions check this. Introduced VMCPU_FF_SET_MASK for the one place where a mask is used. bugref:9180

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (4 diffs)
• src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -620 +620 @@
 
 /** @def VM_FF_SET
- * Sets a force action flag.
+ * Sets a single force action flag.
  *
  * @param   pVM     The cross context VM structure.
@@ -626 +626 @@
  */
 #if 1
-# define VM_FF_SET(pVM, fFlag)              ASMAtomicOrU32(&(pVM)->fGlobalForcedActions, (fFlag))
+# if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
+#  define VM_FF_SET(pVM, fFlag)              ASMAtomicOrU32(&(pVM)->fGlobalForcedActions, (fFlag))
+# else
+#  define VM_FF_SET(pVM, fFlag) \
+    ([](PVM a_pVM) -> void \
+    { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        ASMAtomicOrU32(&a_pVM->fGlobalForcedActions, (fFlag)); \
+    }(pVM))
+# endif
 #else
 # define VM_FF_SET(pVM, fFlag) \
@@ -635 +644 @@
 
 /** @def VMCPU_FF_SET
- * Sets a force action flag for the given VCPU.
+ * Sets a single force action flag for the given VCPU.
  *
  * @param   pVCpu   The cross context virtual CPU structure.
  * @param   fFlag   The flag to set.
- */
-#define VMCPU_FF_SET(pVCpu, fFlag)          ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag))
+ * @sa      VMCPU_FF_SET_MASK
+ */
+#if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA)
+# define VMCPU_FF_SET(pVCpu, fFlag)          ASMAtomicOrU32(&(pVCpu)->fLocalForcedActions, (fFlag))
+#else
+# define VMCPU_FF_SET(pVCpu, fFlag) \
+    ([](PVMCPU a_pVCpu) -> void \
+    { \
+        AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \
+        ASMAtomicOrU32(&a_pVCpu->fLocalForcedActions, (fFlag)); \
+    }(pVCpu))
+#endif
+
+/** @def VMCPU_FF_SET
+ * Sets a two or more force action flag for the given VCPU.
+ *
+ * @param   pVCpu   The cross context virtual CPU structure.
+ * @param   fFlags  The flags to set.
+ * @sa      VMCPU_FF_SET
+ */
+#define VMCPU_FF_SET_MASK(a_pVCpu, fFlags)  ASMAtomicOrU32(&a_pVCpu->fLocalForcedActions, (fFlags))
 
 /** @def VM_FF_CLEAR
@@ -732 +760 @@
  * @param   pVM     The cross context VM structure.
  * @param   fFlags  The flags to check for.
+ * @sa      VM_FF_IS_SET
  */
 #define VM_FF_IS_ANY_SET(pVM, fFlags)       RT_BOOL((pVM)->fGlobalForcedActions & (fFlags))

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -294 +294 @@
         if (pVCpu->cpum.GstCtx.hwvirt.fLocalForcedActions)
         {
-            VMCPU_FF_SET(pVCpu, pVCpu->cpum.GstCtx.hwvirt.fLocalForcedActions);
+            VMCPU_FF_SET_MASK(pVCpu, pVCpu->cpum.GstCtx.hwvirt.fLocalForcedActions);
             pVCpu->cpum.GstCtx.hwvirt.fLocalForcedActions = 0;
         }