Changeset 73323 in vbox

Timestamp:

Jul 23, 2018 2:06:19 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Deal with DRx state import assertions if DR7 isn't already imported (recalc hyper DRx). bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (4 diffs)
• VMMR0/NEMR0Native-win.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -591 +591 @@
 
     /* Debug registers. */
+    if (fWhat & CPUMCTX_EXTRN_DR7)
+        aenmNames[iReg++] = WHvX64RegisterDr7;
     if (fWhat & CPUMCTX_EXTRN_DR0_DR3)
     {
+        if (!(fWhat & CPUMCTX_EXTRN_DR7) && (pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_DR7))
+        {
+            fWhat |= CPUMCTX_EXTRN_DR7;
+            aenmNames[iReg++] = WHvX64RegisterDr7;
+        }
         aenmNames[iReg++] = WHvX64RegisterDr0;
         aenmNames[iReg++] = WHvX64RegisterDr1;
@@ -600 +607 @@
     if (fWhat & CPUMCTX_EXTRN_DR6)
         aenmNames[iReg++] = WHvX64RegisterDr6;
-    if (fWhat & CPUMCTX_EXTRN_DR7)
-        aenmNames[iReg++] = WHvX64RegisterDr7;
 
     /* Floating point state. */
@@ -889 +894 @@
 
     /* Debug registers. */
-    /** @todo fixme */
+    if (fWhat & CPUMCTX_EXTRN_DR7)
+    {
+        Assert(aenmNames[iReg] == WHvX64RegisterDr7);
+        if (pVCpu->cpum.GstCtx.dr[7] != aValues[iReg].Reg64)
+            CPUMSetGuestDR7(pVCpu, aValues[iReg].Reg64);
+        pVCpu->cpum.GstCtx.fExtrn &= ~CPUMCTX_EXTRN_DR7; /* Hack alert! Avoids asserting when processing CPUMCTX_EXTRN_DR0_DR3. */
+        iReg++;
+    }
     if (fWhat & CPUMCTX_EXTRN_DR0_DR3)
     {
@@ -912 +924 @@
         if (pVCpu->cpum.GstCtx.dr[6] != aValues[iReg].Reg64)
             CPUMSetGuestDR6(pVCpu, aValues[iReg].Reg64);
-        iReg++;
-    }
-    if (fWhat & CPUMCTX_EXTRN_DR7)
-    {
-        Assert(aenmNames[iReg] == WHvX64RegisterDr7);
-        if (pVCpu->cpum.GstCtx.dr[7] != aValues[iReg].Reg64)
-            CPUMSetGuestDR7(pVCpu, aValues[iReg].Reg64);
         iReg++;
     }

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

@@ -1419 +1419 @@
 
     /* Debug registers. */
+    if (fWhat & CPUMCTX_EXTRN_DR7)
+        pInput->Names[iReg++] = HvX64RegisterDr7;
     if (fWhat & CPUMCTX_EXTRN_DR0_DR3)
     {
+        if (!(fWhat & CPUMCTX_EXTRN_DR7) && (pCtx->fExtrn & CPUMCTX_EXTRN_DR7))
+        {
+            fWhat |= CPUMCTX_EXTRN_DR7;
+            pInput->Names[iReg++] = HvX64RegisterDr7;
+        }
         pInput->Names[iReg++] = HvX64RegisterDr0;
         pInput->Names[iReg++] = HvX64RegisterDr1;
@@ -1428 +1435 @@
     if (fWhat & CPUMCTX_EXTRN_DR6)
         pInput->Names[iReg++] = HvX64RegisterDr6;
-    if (fWhat & CPUMCTX_EXTRN_DR7)
-        pInput->Names[iReg++] = HvX64RegisterDr7;
 
     /* Floating point state. */
@@ -1765 +1770 @@
 
     /* Debug registers. */
-/** @todo fixme */
-/** @todo There are recalc issues here. Recalc will get register content and
- * that may assert since we doesn't clear CPUMCTX_EXTRN_ until the end. */
+    if (fWhat & CPUMCTX_EXTRN_DR7)
+    {
+        Assert(pInput->Names[iReg] == HvX64RegisterDr7);
+        if (pCtx->dr[7] != paValues[iReg].Reg64)
+            CPUMSetGuestDR7(pVCpu, paValues[iReg].Reg64);
+        pCtx->fExtrn &= ~CPUMCTX_EXTRN_DR7; /* Hack alert! Avoids asserting when processing CPUMCTX_EXTRN_DR0_DR3. */
+        iReg++;
+    }
     if (fWhat & CPUMCTX_EXTRN_DR0_DR3)
     {
@@ -1790 +1800 @@
         if (pCtx->dr[6] != paValues[iReg].Reg64)
             CPUMSetGuestDR6(pVCpu, paValues[iReg].Reg64);
-        iReg++;
-    }
-    if (fWhat & CPUMCTX_EXTRN_DR7)
-    {
-        Assert(pInput->Names[iReg] == HvX64RegisterDr7);
-        if (pCtx->dr[7] != paValues[iReg].Reg64)
-            CPUMSetGuestDR7(pVCpu, paValues[iReg].Reg64);
         iReg++;
     }