Changeset 72403 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 31, 2018 1:28:21 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

122866

Message:

NEM/win: Working on merging the two sets of register access functions. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -1034 +1034 @@
     /* MSRs */
     // HvX64RegisterTsc - don't touch
-    /** @todo does HvX64RegisterTsc include TSC_AUX?  Is it TSC_AUX? */
     if (fWhat & CPUMCTX_EXTRN_EFER)
     {
@@ -1174 +1173 @@
     }
 
-    /* event injection (always clear it). */
+    /* event injection (clear it). */
     if (fWhat & CPUMCTX_EXTRN_NEM_WIN_EVENT_INJECT)
     {
@@ -1767 +1766 @@
         Assert(pInput->Names[iReg] == HvX64RegisterDr7);
         if (pCtx->dr[7] != paValues[iReg].Reg64)
-            CPUMSetGuestDR6(pVCpu, paValues[iReg].Reg64);
+            CPUMSetGuestDR7(pVCpu, paValues[iReg].Reg64);
         iReg++;
     }
@@ -2097 +2096 @@
             pVCpu->nem.s.fLastInterruptShadow = paValues[iReg].InterruptState.InterruptShadow;
             if (paValues[iReg].InterruptState.InterruptShadow)
-            {
                 EMSetInhibitInterruptsPC(pVCpu, paValues[iReg + 1].Reg64);
-                VMCPU_FF_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
-            }
             else
                 VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);