Changeset 92542 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 22, 2021 10:25:24 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM-linux: nicer main loop w/o continue. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-linux.cpp

@@ -2527 +2527 @@
                 if (   !VM_FF_IS_ANY_SET(   pVM,   !fSingleStepping ? VM_FF_HP_R0_PRE_HM_MASK    : VM_FF_HP_R0_PRE_HM_STEP_MASK)
                     && !VMCPU_FF_IS_ANY_SET(pVCpu, !fSingleStepping ? VMCPU_FF_HP_R0_PRE_HM_MASK : VMCPU_FF_HP_R0_PRE_HM_STEP_MASK) )
-                    continue;
-
-                /** @todo Try handle pending flags, not just return to EM loops.  Take care
-                 *        not to set important RCs here unless we've handled an exit. */
-                LogFlow(("NEM/%u: breaking: pending FF (%#x / %#RX64)\n",
-                         pVCpu->idCpu, pVM->fGlobalForcedActions, (uint64_t)pVCpu->fLocalForcedActions));
-                STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnFFPost);
+                { /* likely */ }
+                else
+                {
+
+                    /** @todo Try handle pending flags, not just return to EM loops.  Take care
+                     *        not to set important RCs here unless we've handled an exit. */
+                    LogFlow(("NEM/%u: breaking: pending FF (%#x / %#RX64)\n",
+                             pVCpu->idCpu, pVM->fGlobalForcedActions, (uint64_t)pVCpu->fLocalForcedActions));
+                    STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnFFPost);
+                    break;
+                }
             }
             else
@@ -2539 +2543 @@
                 LogFlow(("NEM/%u: breaking: canceled %d (pre exec)\n", pVCpu->idCpu, VMCPU_GET_STATE(pVCpu) ));
                 STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnCancel);
+                break;
             }
         }
@@ -2545 +2550 @@
             LogFlow(("NEM/%u: breaking: pending FF (pre exec)\n", pVCpu->idCpu));
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnFFPre);
-        }
-        break;
+            break;
+        }
     } /* the run loop */