Changeset 92473 in vbox

Timestamp:

Nov 17, 2021 10:16:04 AM (3 years ago)

Author:

vboxsync

Message:

VMM/NEMR3Native-darwin.cpp: Fix syncing DR3 and DR6 and notify TM when guest execution is started and stopped, bugref:9044

File:

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

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

@@ -989 +989 @@
         if (pVCpu->cpum.GstCtx.dr[1] != u64DrTmp)
             CPUMSetGuestDR1(pVCpu, u64DrTmp);
-        READ_GREG(HV_X86_DR3, u64DrTmp);
+        READ_GREG(HV_X86_DR2, u64DrTmp);
         if (pVCpu->cpum.GstCtx.dr[2] != u64DrTmp)
             CPUMSetGuestDR2(pVCpu, u64DrTmp);
@@ -999 +999 @@
     {
         uint64_t u64Dr6;
-        READ_GREG(HV_X86_DR7, u64Dr6);
+        READ_GREG(HV_X86_DR6, u64Dr6);
         if (pVCpu->cpum.GstCtx.dr[6] != u64Dr6)
             CPUMSetGuestDR6(pVCpu, u64Dr6);
@@ -2663 +2663 @@
                 pVCpu->nem.s.Event.fPending = false;
 
+                TMNotifyStartOfExecution(pVM, pVCpu);
+
                 Assert(!pVCpu->nem.s.fCtxChanged);
                 hv_return_t hrc;
@@ -2671 +2673 @@
 
                 VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_EXEC_NEM, VMCPUSTATE_STARTED_EXEC_NEM_WAIT);
+                TMNotifyEndOfExecution(pVM, pVCpu, ASMReadTSC());
+
                 if (hrc == HV_SUCCESS)
                 {