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

Timestamp:

Sep 25, 2024 6:43:43 AM (4 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin-armv8.cpp: Need to skip past the wfi instruction for an ARMV8_ESR_EL2_EC_TRAPPED_WFX exit, fixes sluggish behavior in the UEFI firmware boot menu, some logging fixes, bugref:10390

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin-armv8.cpp

@@ -1375 +1375 @@
                           "Setting MPIDR_EL1 failed on vCPU %u: %#x (%Rrc)", idCpu, hrc, nemR3DarwinHvSts2Rc(hrc));
 
+#if 0 /* Will triger an VM-exit if the guest hits a breakpoint, handy for debugging the MS bootloader. */
+    hrc != hv_vcpu_set_trap_debug_exceptions(pVCpu->nem.s.hVCpu, true);
+    if (hrc != HV_SUCCESS)
+        return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
+                          "Trapping debug exceptions on vCPU %u: %#x (%Rrc)", idCpu, hrc, nemR3DarwinHvSts2Rc(hrc));
+#endif
+
     return VINF_SUCCESS;
 }
@@ -1675 +1682 @@
         u64Val = nemR3DarwinGetGReg(pVCpu, uReg);
         rcStrict = PGMPhysWrite(pVM, GCPhysDataAbrt, &u64Val, cbAcc, PGMACCESSORIGIN_HM);
-        Log4(("MmioExit/%u: %08RX64: WRITE %#x LB %u, %.*Rhxs -> rcStrict=%Rrc\n",
+        Log4(("MmioExit/%u: %08RX64: WRITE %#RGp LB %u, %.*Rhxs -> rcStrict=%Rrc\n",
               pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64, GCPhysDataAbrt, cbAcc, cbAcc,
               &u64Val, VBOXSTRICTRC_VAL(rcStrict) ));
@@ -1682 +1689 @@
     {
         rcStrict = PGMPhysRead(pVM, GCPhysDataAbrt, &u64Val, cbAcc, PGMACCESSORIGIN_HM);
-        Log4(("MmioExit/%u: %08RX64: READ %#x LB %u -> %.*Rhxs rcStrict=%Rrc\n",
+        Log4(("MmioExit/%u: %08RX64: READ %#RGp LB %u -> %.*Rhxs rcStrict=%Rrc\n",
               pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64, GCPhysDataAbrt, cbAcc, cbAcc,
               &u64Val, VBOXSTRICTRC_VAL(rcStrict) ));
@@ -1898 +1905 @@
             /* No need to halt if there is an interrupt pending already. */
             if (VMCPU_FF_IS_ANY_SET(pVCpu, (VMCPU_FF_INTERRUPT_IRQ | VMCPU_FF_INTERRUPT_FIQ)))
+            {
+                LogFlowFunc(("IRQ | FIQ set => VINF_SUCCESS\n"));
+                pVCpu->cpum.GstCtx.Pc.u64 += fInsn32Bit ? sizeof(uint32_t) : sizeof(uint16_t);
                 return VINF_SUCCESS;
+            }
 
             /* Set the vTimer expiration in order to get out of the halt at the right point in time. */
@@ -1908 +1919 @@
                 /* Check whether it expired and start executing guest code. */
                 if (cTicksVTimer >= pVCpu->cpum.GstCtx.CntvCValEl0)
+                {
+                    LogFlowFunc(("Guest timer expired (cTicksVTimer=%RU64 CntvCValEl0=%RU64) => VINF_SUCCESS\n",
+                                 cTicksVTimer, pVCpu->cpum.GstCtx.CntvCValEl0));
+                    pVCpu->cpum.GstCtx.Pc.u64 += fInsn32Bit ? sizeof(uint32_t) : sizeof(uint16_t);
                     return VINF_SUCCESS;
+                }
 
                 uint64_t cTicksVTimerToExpire = pVCpu->cpum.GstCtx.CntvCValEl0 - cTicksVTimer;
@@ -1920 +1936 @@
                  */
                 if (cNanoSecsVTimerToExpire < 2 * RT_NS_1MS)
+                {
+                    LogFlowFunc(("Guest timer expiration < 2ms (cNanoSecsVTimerToExpire=%RU64) => VINF_SUCCESS\n",
+                                 cNanoSecsVTimerToExpire));
+                    pVCpu->cpum.GstCtx.Pc.u64 += fInsn32Bit ? sizeof(uint32_t) : sizeof(uint16_t);
                     return VINF_SUCCESS;
+                }
 
                 LogFlowFunc(("Set vTimer activation to cNanoSecsVTimerToExpire=%#RX64 (CntvCValEl0=%#RX64, u64VTimerOff=%#RX64 cTicksVTimer=%#RX64 u64CntFrqHz=%#RX64)\n",
@@ -1929 +1950 @@
                 TMCpuSetVTimerNextActivation(pVCpu, UINT64_MAX);
 
+            pVCpu->cpum.GstCtx.Pc.u64 += fInsn32Bit ? sizeof(uint32_t) : sizeof(uint16_t);
             return VINF_EM_HALT;
         }