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

Timestamp:

Nov 13, 2024 3:01:58 PM (2 months ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-win-armv8.cpp: Some cleanups, bugref:10392

File:

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

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

@@ -1860 +1860 @@
                         );
         char szInstr[256]; RT_ZERO(szInstr);
-#if 0
         DBGFR3DisasInstrEx(pVM->pUVM, pVCpu->idCpu, 0, 0,
                            DBGF_DISAS_FLAGS_CURRENT_GUEST | DBGF_DISAS_FLAGS_DEFAULT_MODE,
                            szInstr, sizeof(szInstr), NULL);
-#endif
         Log3(("%s%s\n", szRegs, szInstr));
     }
@@ -2359 +2357 @@
         nemR3WinSetGReg(pVCpu, ARMV8_AARCH64_REG_X0, false /*f64BitReg*/, false /*fSignExtend*/, (uint64_t)ARM_PSCI_STS_NOT_SUPPORTED);
 
+    /** @todo What to do if immediate is != 0? */
+
+    if (   rcStrict == VINF_SUCCESS
+        && fAdvancePc)
+        pVCpu->cpum.GstCtx.Pc.u64 += sizeof(uint32_t);
 
     return rcStrict;
@@ -2470 +2473 @@
 #endif
 
-    if (RT_UNLIKELY(!pVCpu->nem.s.fIdRegsSynced))
-    {
-        /*
-         * Sync the guest ID registers which are per VM once (they are readonly and stay constant during VM lifetime).
-         * Need to do it here and not during the init because loading a saved state might change the ID registers from what
-         * done in the call to CPUMR3PopulateFeaturesByIdRegisters().
-         */
-        PCCPUMIDREGS pIdRegsGst = NULL;
-        int rc = CPUMR3QueryGuestIdRegs(pVM, &pIdRegsGst);
-        AssertRCReturn(rc, rc);
-
-        WHV_REGISTER_NAME  aenmNames[12];
-        WHV_REGISTER_VALUE aValues[12];
-
-        uint32_t iReg = 0;
-#define ADD_REG64(a_enmName, a_uValue) do { \
-            aenmNames[iReg]      = (a_enmName); \
-            aValues[iReg].Reg128.High64 = 0; \
-            aValues[iReg].Reg64  = (a_uValue); \
-            iReg++; \
-        } while (0)
-
-
-        ADD_REG64(WHvArm64RegisterIdAa64Mmfr0El1, pIdRegsGst->u64RegIdAa64Mmfr0El1);
-#undef ADD_REG64
-
-        //HRESULT hrc = WHvSetVirtualProcessorRegisters(pVM->nem.s.hPartition, pVCpu->idCpu, aenmNames, iReg, aValues);
-        //AssertReturn(SUCCEEDED(hrc), VERR_NEM_IPE_9);
-
-        pVCpu->nem.s.fIdRegsSynced = true;
-    }
-
     /*
      * Try switch to NEM runloop state.
@@ -2521 +2492 @@
      */
     const bool      fSingleStepping     = DBGFIsStepping(pVCpu);
-//    const uint32_t  fCheckVmFFs         = !fSingleStepping ? VM_FF_HP_R0_PRE_HM_MASK
-//                                                           : VM_FF_HP_R0_PRE_HM_STEP_MASK;
-//    const uint32_t  fCheckCpuFFs        = !fSingleStepping ? VMCPU_FF_HP_R0_PRE_HM_MASK : VMCPU_FF_HP_R0_PRE_HM_STEP_MASK;
     VBOXSTRICTRC    rcStrict            = VINF_SUCCESS;
     for (unsigned iLoop = 0;; iLoop++)
     {
-        /*
-         * Pending interrupts or such?  Need to check and deal with this prior
-         * to the state syncing.
-         */
-#if 0
-        if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_FIQ | VMCPU_FF_UPDATE_IRQ))
-        {
-            /* Try inject interrupt. */
-            rcStrict = nemHCWinHandleInterruptFF(pVM, pVCpu, &pVCpu->nem.s.fDesiredInterruptWindows);
-            if (rcStrict == VINF_SUCCESS)
-            { /* likely */ }
-            else
-            {
-                LogFlow(("NEM/%u: breaking: nemHCWinHandleInterruptFF -> %Rrc\n", pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict) ));
-                STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnStatus);
-                break;
-            }
-        }
-#endif
-
         /* Ensure that Hyper-V has the whole state. */
         int rc2 = nemHCWinCopyStateToHyperV(pVM, pVCpu);
@@ -2567 +2515 @@
             if (VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC_NEM_WAIT, VMCPUSTATE_STARTED_EXEC_NEM))
             {
-#if 0 //def LOG_ENABLED
+#ifdef LOG_ENABLED
                 if (LogIsFlowEnabled())
                 {
-                    static const WHV_REGISTER_NAME s_aNames[6] = { WHvX64RegisterCs, WHvX64RegisterRip, WHvX64RegisterRflags,
-                                                                   WHvX64RegisterSs, WHvX64RegisterRsp, WHvX64RegisterCr0 };
-                    WHV_REGISTER_VALUE aRegs[RT_ELEMENTS(s_aNames)] = { {{0, 0} } };
+                    static const WHV_REGISTER_NAME s_aNames[2] = { WHvArm64RegisterPc, WHvArm64RegisterPstate };
+                    WHV_REGISTER_VALUE aRegs[RT_ELEMENTS(s_aNames)] = { { { {0, 0} } } };
                     WHvGetVirtualProcessorRegisters(pVM->nem.s.hPartition, pVCpu->idCpu, s_aNames, RT_ELEMENTS(s_aNames), aRegs);
-                    LogFlow(("NEM/%u: Entry @ %04x:%08RX64 IF=%d EFL=%#RX64 SS:RSP=%04x:%08RX64 cr0=%RX64\n",
-                             pVCpu->idCpu, aRegs[0].Segment.Selector, aRegs[1].Reg64, RT_BOOL(aRegs[2].Reg64 & X86_EFL_IF),
-                             aRegs[2].Reg64, aRegs[3].Segment.Selector, aRegs[4].Reg64, aRegs[5].Reg64));
+                    LogFlow(("NEM/%u: Entry @ %08RX64 pstate=%#RX64\n", pVCpu->idCpu, aRegs[0].Reg64, aRegs[1].Reg64));
                 }
 #endif
+
                 MY_WHV_RUN_VP_EXIT_CONTEXT ExitReason = {0};
                 TMNotifyStartOfExecution(pVM, pVCpu);
@@ -2587 +2533 @@
                 TMNotifyEndOfExecution(pVM, pVCpu, ASMReadTSC());
 #ifdef LOG_ENABLED
-                LogFlow(("NEM/%u: Exit  @ @todo Reason=%#x\n", pVCpu->idCpu, ExitReason.ExitReason));
+                if (LogIsFlowEnabled())
+                {
+                    static const WHV_REGISTER_NAME s_aNames[2] = { WHvArm64RegisterPc, WHvArm64RegisterPstate };
+                    WHV_REGISTER_VALUE aRegs[RT_ELEMENTS(s_aNames)] = { { { {0, 0} } } };
+                    WHvGetVirtualProcessorRegisters(pVM->nem.s.hPartition, pVCpu->idCpu, s_aNames, RT_ELEMENTS(s_aNames), aRegs);
+                    LogFlow(("NEM/%u: Exit @ %08RX64 pstate=%#RX64 Reason=%#x\n",
+                             pVCpu->idCpu, aRegs[0].Reg64, aRegs[1].Reg64, ExitReason.ExitReason));
+                }
 #endif
                 if (SUCCEEDED(hrc))
@@ -2599 +2552 @@
                     else
                     {
-                        LogFlow(("NEM/%u: breaking: nemHCWinHandleMessage -> %Rrc\n", pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict) ));
+                        LogFlow(("NEM/%u: breaking: nemR3WinHandleExit -> %Rrc\n", pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict) ));
                         STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatBreakOnStatus);
                         break;
@@ -2701 +2654 @@
 #endif
 
-#if 0
-    LogFlow(("NEM/%u: %04x:%08RX64 efl=%#08RX64 => %Rrc\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel,
-             pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.rflags.u, VBOXSTRICTRC_VAL(rcStrict) ));
-#endif
+    LogFlow(("NEM/%u: %08RX64 pstate=%#08RX64 => %Rrc\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64,
+             pVCpu->cpum.GstCtx.fPState, VBOXSTRICTRC_VAL(rcStrict) ));
     return rcStrict;
 }