Index: /trunk/include/VBox/vmm/vm.h =================================================================== --- /trunk/include/VBox/vmm/vm.h (revision 74789) +++ /trunk/include/VBox/vmm/vm.h (revision 74790) @@ -692,14 +692,23 @@ /** @def VM_FF_IS_SET - * Checks if a force action flag is set. + * Checks if single a force action flag is set. * * @param pVM The cross context VM structure. * @param fFlag The flag to check. - */ -#define VM_FF_IS_SET(pVM, fFlag) (((pVM)->fGlobalForcedActions & (fFlag)) == (fFlag)) - + * @sa VM_FF_IS_ANY_SET + */ +#if !defined(VBOX_STRICT) || !defined(RT_COMPILER_SUPPORTS_LAMBDA) +# define VM_FF_IS_SET(pVM, fFlag) (((pVM)->fGlobalForcedActions & (fFlag)) == (fFlag)) +#else +# define VM_FF_IS_SET(pVM, fFlag) \ + ([](PVM a_pVM) -> bool \ + { \ + AssertCompile(RT_IS_POWER_OF_TWO(fFlag)); \ + return (a_pVM->fGlobalForcedActions & (fFlag)) == (fFlag); \ + }(pVM)) +#endif /** @def VMCPU_FF_IS_SET - * Checks if a force action flag is set for the given VCPU. + * Checks if a single force action flag is set for the given VCPU. * * @param pVCpu The cross context virtual CPU structure. Index: /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 74789) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (revision 74790) @@ -1080,5 +1080,5 @@ return rc; } - if (RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY))) + if (RT_UNLIKELY(VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY))) return VINF_EM_NO_MEMORY; } @@ -2162,5 +2162,5 @@ if ( cPages > 1 && !(uErr & X86_TRAP_PF_P) - && !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + && !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { /* @@ -2434,5 +2434,5 @@ if ( cPages > 1 && !(uErr & X86_TRAP_PF_P) - && !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + && !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { /* @@ -2462,5 +2462,5 @@ SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : "")); - if (RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY))) + if (RT_UNLIKELY(VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY))) break; } @@ -3116,5 +3116,5 @@ unsigned iPTDst = 0; while ( iPTDst < RT_ELEMENTS(pPTDst->a) - && !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + && !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { if (pRam && GCPhys >= pRam->GCPhys) @@ -3151,5 +3151,5 @@ rc = pgmPhysPageMakeWritable(pVM, pPage, GCPhys); AssertRCReturn(rc, rc); - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) break; } @@ -3426,5 +3426,5 @@ SHW_PTE_IS_TRACK_DIRTY(pPTDst->a[iPTDst]) ? " Track-Dirty" : "")); - if (RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY))) + if (RT_UNLIKELY(VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY))) break; } Index: /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (revision 74790) @@ -4243,5 +4243,5 @@ { STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchHmToR3FF); - int rc = RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) ? VINF_EM_NO_MEMORY : VINF_EM_RAW_TO_R3; + int rc = RT_LIKELY(!VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) ? VINF_EM_RAW_TO_R3 : VINF_EM_NO_MEMORY; Log4Func(("HM_TO_R3 forcing us back to ring-3. rc=%d\n", rc)); return rc; @@ -4257,5 +4257,5 @@ /* Pending PGM pool flushes. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_POOL_FLUSH_PENDING)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_POOL_FLUSH_PENDING)) { Log4Func(("PGM pool flush pending forcing us back to ring-3\n")); @@ -4264,5 +4264,5 @@ /* Pending DMA requests. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PDM_DMA)) + if (VM_FF_IS_SET(pVM, VM_FF_PDM_DMA)) { Log4Func(("Pending DMA request forcing us back to ring-3\n")); Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (revision 74790) @@ -6926,5 +6926,5 @@ { STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchHmToR3FF); - int rc2 = RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) ? VINF_EM_NO_MEMORY : VINF_EM_RAW_TO_R3; + int rc2 = RT_LIKELY(!VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) ? VINF_EM_RAW_TO_R3 : VINF_EM_NO_MEMORY; Log4Func(("HM_TO_R3 forcing us back to ring-3. rc=%d\n", rc2)); return rc2; @@ -6932,5 +6932,5 @@ /* Pending VM request packets, such as hardware interrupts. */ - if ( VM_FF_IS_PENDING(pVM, VM_FF_REQUEST) + if ( VM_FF_IS_SET(pVM, VM_FF_REQUEST) || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_REQUEST)) { @@ -6940,5 +6940,5 @@ /* Pending PGM pool flushes. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_POOL_FLUSH_PENDING)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_POOL_FLUSH_PENDING)) { Log4Func(("PGM pool flush pending forcing us back to ring-3\n")); @@ -6947,5 +6947,5 @@ /* Pending DMA requests. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PDM_DMA)) + if (VM_FF_IS_SET(pVM, VM_FF_PDM_DMA)) { Log4Func(("Pending DMA request forcing us back to ring-3\n")); Index: /trunk/src/VBox/VMM/VMMR3/DBGF.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/DBGF.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/DBGF.cpp (revision 74790) @@ -298,5 +298,5 @@ first. The request processing is a bit crazy, but unfortunately required by plugin unloading. */ - if ( VM_FF_IS_PENDING(pVM, VM_FF_REQUEST) + if ( VM_FF_IS_SET(pVM, VM_FF_REQUEST) || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_REQUEST)) { @@ -309,5 +309,5 @@ } /* Need to handle rendezvous too, for generic debug event management. */ - else if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + else if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { rc = VMMR3EmtRendezvousFF(pVM, pVCpu); @@ -391,5 +391,5 @@ /* Process priority stuff. */ - if ( VM_FF_IS_PENDING(pVM, VM_FF_REQUEST) + if ( VM_FF_IS_SET(pVM, VM_FF_REQUEST) || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_REQUEST)) { @@ -847,10 +847,10 @@ } - if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { rc = VMMR3EmtRendezvousFF(pVM, pVCpu); cPollHack = 1; } - else if ( VM_FF_IS_PENDING(pVM, VM_FF_REQUEST) + else if ( VM_FF_IS_SET(pVM, VM_FF_REQUEST) || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_REQUEST)) { Index: /trunk/src/VBox/VMM/VMMR3/EM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EM.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/EM.cpp (revision 74790) @@ -1700,5 +1700,5 @@ #endif - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { if ( rc > VINF_EM_NO_MEMORY @@ -1869,5 +1869,5 @@ * EMT Rendezvous (must be serviced before termination). */ - if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, ~CPUMCTX_EXTRN_KEEPER_MASK, rc); @@ -1890,5 +1890,5 @@ * State change request (cleared by vmR3SetStateLocked). */ - if (VM_FF_IS_PENDING(pVM, VM_FF_CHECK_VM_STATE)) + if (VM_FF_IS_SET(pVM, VM_FF_CHECK_VM_STATE)) { VMSTATE enmState = VMR3GetState(pVM); @@ -1952,5 +1952,5 @@ * Out of memory? Putting this after CSAM as it may in theory cause us to run out of memory. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { rc2 = PGMR3PhysAllocateHandyPages(pVM); @@ -1986,5 +1986,5 @@ * EMT Rendezvous (make sure they are handled before the requests). */ - if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, ~CPUMCTX_EXTRN_KEEPER_MASK, rc); @@ -2100,6 +2100,6 @@ * Timers before interrupts. */ - if ( VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_TIMER) - && !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if ( VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_TIMER) + && !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) TMR3TimerQueuesDo(pVM); @@ -2122,6 +2122,6 @@ * you might think. */ - if ( VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS) - && !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if ( VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS) + && !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { CPUM_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_RIP); @@ -2139,6 +2139,6 @@ */ bool fWakeupPending = false; - if ( !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY) - && (!rc || rc >= VINF_EM_RESCHEDULE_HM)) + if ( !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY) + && (!rc || rc >= VINF_EM_RESCHEDULE_HM)) { if ( !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS) @@ -2209,7 +2209,7 @@ * Debugger Facility request. */ - if ( ( VM_FF_IS_PENDING(pVM, VM_FF_DBGF) + if ( ( VM_FF_IS_SET(pVM, VM_FF_DBGF) || VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_DBGF) ) - && !VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY) ) + && !VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY) ) { CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, ~CPUMCTX_EXTRN_KEEPER_MASK, rc); @@ -2222,5 +2222,5 @@ */ if ( !fWakeupPending /* don't miss the wakeup from EMSTATE_HALTED! */ - && VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + && VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, ~CPUMCTX_EXTRN_KEEPER_MASK, rc); @@ -2243,5 +2243,5 @@ */ if ( !fWakeupPending /* don't miss the wakeup from EMSTATE_HALTED! */ - && VM_FF_IS_PENDING(pVM, VM_FF_CHECK_VM_STATE)) + && VM_FF_IS_SET(pVM, VM_FF_CHECK_VM_STATE)) { VMSTATE enmState = VMR3GetState(pVM); @@ -2272,5 +2272,5 @@ * than us since we can terminate without allocating more memory. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) { rc2 = PGMR3PhysAllocateHandyPages(pVM); @@ -2283,5 +2283,5 @@ * If the virtual sync clock is still stopped, make TM restart it. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_TM_VIRTUAL_SYNC)) + if (VM_FF_IS_SET(pVM, VM_FF_TM_VIRTUAL_SYNC)) TMR3VirtualSyncFF(pVM, pVCpu); @@ -2290,5 +2290,5 @@ * Debug, pause the VM. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_DEBUG_SUSPEND)) + if (VM_FF_IS_SET(pVM, VM_FF_DEBUG_SUSPEND)) { VM_FF_CLEAR(pVM, VM_FF_DEBUG_SUSPEND); Index: /trunk/src/VBox/VMM/VMMR3/EMHM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMHM.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/EMHM.cpp (revision 74790) @@ -354,5 +354,5 @@ * this check. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) return VINF_EM_NO_MEMORY; Index: /trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/EMR3Nem.cpp (revision 74790) @@ -330,5 +330,5 @@ * this check. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) return VINF_EM_NO_MEMORY; Index: /trunk/src/VBox/VMM/VMMR3/EMRaw.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/EMRaw.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/EMRaw.cpp (revision 74790) @@ -1255,5 +1255,5 @@ * this check. */ - if (VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY)) + if (VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY)) return VINF_EM_NO_MEMORY; Index: /trunk/src/VBox/VMM/VMMR3/FTM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/FTM.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/FTM.cpp (revision 74790) @@ -1338,5 +1338,5 @@ while ((rc = PDMCritSectTryEnter(&pVM->ftm.s.CritSect)) == VERR_SEM_BUSY) { - if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { rc = VMMR3EmtRendezvousFF(pVM, pVCpu); @@ -1344,5 +1344,5 @@ } - if (VM_FF_IS_PENDING(pVM, VM_FF_REQUEST)) + if (VM_FF_IS_SET(pVM, VM_FF_REQUEST)) { rc = VMR3ReqProcessU(pVM->pUVM, VMCPUID_ANY, true /*fPriorityOnly*/); Index: /trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp (revision 74790) @@ -663,5 +663,5 @@ /* We're done if there were no inserts while we were busy. */ if ( !ASMBitTest(&pVM->pdm.s.fQueueFlushing, PDM_QUEUE_FLUSH_FLAG_PENDING_BIT) - && !VM_FF_IS_PENDING(pVM, VM_FF_PDM_QUEUES)) + && !VM_FF_IS_SET(pVM, VM_FF_PDM_QUEUES)) break; VM_FF_CLEAR(pVM, VM_FF_PDM_QUEUES); Index: /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (revision 74790) @@ -165,5 +165,5 @@ } - if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { rc = VMMR3EmtRendezvousFF(pVM, &pVM->aCpus[idCpu]); Index: /trunk/src/VBox/VMM/VMMR3/VMM.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/VMM.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMR3/VMM.cpp (revision 74790) @@ -2361,5 +2361,5 @@ while (!ASMAtomicCmpXchgU32(&pVM->vmm.s.u32RendezvousLock, 0x77778888, 0)) { - if (VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)) + if (VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)) { rc = VMMR3EmtRendezvousFF(pVM, pVCpu); @@ -2375,5 +2375,5 @@ Log(("VMMR3EmtRendezvous: %#x EMT#%u\n", fFlags, pVCpu->idCpu)); - Assert(!VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS)); + Assert(!VM_FF_IS_SET(pVM, VM_FF_EMT_RENDEZVOUS)); Assert(!pVCpu->vmm.s.fInRendezvous); pVCpu->vmm.s.fInRendezvous = true; Index: /trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp (revision 74789) +++ /trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp (revision 74790) @@ -184,5 +184,5 @@ TMTimerPollVoid(pVM, pVCpu); Log2(("TMTimerPoll at %08RX32 - VM_FF_TM_VIRTUAL_SYNC=%d VM_FF_TM_VIRTUAL_SYNC=%d\n", pRegFrame->eip, - VM_FF_IS_PENDING(pVM, VM_FF_TM_VIRTUAL_SYNC), VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_TIMER))); + VM_FF_IS_SET(pVM, VM_FF_TM_VIRTUAL_SYNC), VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_TIMER))); } } @@ -223,5 +223,5 @@ { /* The out of memory condition naturally outranks the others. */ - if (RT_UNLIKELY(VM_FF_IS_PENDING(pVM, VM_FF_PGM_NO_MEMORY))) + if (RT_UNLIKELY(VM_FF_IS_SET(pVM, VM_FF_PGM_NO_MEMORY))) rc = VINF_EM_NO_MEMORY; else @@ -244,8 +244,8 @@ rc = VINF_EM_RAW_TIMER_PENDING; /* The Virtual Sync clock has stopped. */ - else if (VM_FF_IS_PENDING(pVM, VM_FF_TM_VIRTUAL_SYNC)) + else if (VM_FF_IS_SET(pVM, VM_FF_TM_VIRTUAL_SYNC)) rc = VINF_EM_RAW_TO_R3; /* DMA work pending? */ - else if (VM_FF_IS_PENDING(pVM, VM_FF_PDM_DMA)) + else if (VM_FF_IS_SET(pVM, VM_FF_PDM_DMA)) rc = VINF_EM_RAW_TO_R3; /* Pending request packets might contain actions that need immediate