Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/VMEmt.cpp

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (7 diffs)

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

@@ -568 +568 @@
     }
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    uint64_t cNsVTimerActivate = TMCpuGetVTimerActivationNano(pVCpu);
-    const bool fVTimerActive = cNsVTimerActivate != UINT64_MAX;
+#ifdef VBOX_VMM_TARGET_ARMV8
+    uint64_t   cNsVTimerActivate = TMCpuGetVTimerActivationNano(pVCpu);
+    const bool fVTimerActive     = cNsVTimerActivate != UINT64_MAX;
 #endif
 
@@ -590 +590 @@
         if (    VM_FF_IS_ANY_SET(pVM, VM_FF_EXTERNAL_HALTED_MASK)
             ||  VMCPU_FF_IS_ANY_SET(pVCpu, fMask)
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
             ||  cNsElapsedTimers >= cNsVTimerActivate
 #endif
             )
         {
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
             cNsVTimerActivate = 0;
 #endif
@@ -601 +601 @@
         }
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
         cNsVTimerActivate -= cNsElapsedTimers;
 #endif
@@ -614 +614 @@
             break;
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
         u64NanoTS = RT_MIN(cNsVTimerActivate, u64NanoTS);
 #endif
@@ -679 +679 @@
                 fBlockOnce = false;
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
             cNsVTimerActivate -= RT_MIN(cNsVTimerActivate, Elapsed);
             /* Did the vTimer expire? */
@@ -689 +689 @@
     //if (fSpinning) RTLogRelPrintf("spun for %RU64 ns %u loops; lag=%RU64 pct=%d\n", RTTimeNanoTS() - u64Now, cLoops, TMVirtualSyncGetLag(pVM), u32CatchUpPct);
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
     if (fVTimerActive)
     {
@@ -1157 +1157 @@
      * Check Relevant FFs.
      */
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    const uint64_t fMaskInterrupts = ((fFlags & VMWAITHALTED_F_IGNORE_IRQS) ? VMCPU_FF_INTERRUPT_IRQ : 0)
+#ifdef VBOX_VMM_TARGET_ARMV8
+    const uint64_t fMaskIrqs = ((fFlags & VMWAITHALTED_F_IGNORE_IRQS) ? VMCPU_FF_INTERRUPT_IRQ : 0)
                                    | ((fFlags & VMWAITHALTED_F_IGNORE_FIQS) ? VMCPU_FF_INTERRUPT_FIQ : 0);
-    const uint64_t fMask = VMCPU_FF_EXTERNAL_HALTED_MASK & ~fMaskInterrupts;
+    const uint64_t fMask     = VMCPU_FF_EXTERNAL_HALTED_MASK & ~fMaskIrqs;
 #else
-    const uint64_t fMask = !(fFlags & VMWAITHALTED_F_IGNORE_IRQS)
+    const uint64_t fMask     = !(fFlags & VMWAITHALTED_F_IGNORE_IRQS)
         ? VMCPU_FF_EXTERNAL_HALTED_MASK
         : VMCPU_FF_EXTERNAL_HALTED_MASK & ~(VMCPU_FF_UPDATE_APIC | VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC);