Changeset 49975 in vbox

Timestamp:

Dec 18, 2013 2:04:47 PM (11 years ago)

Author:

vboxsync

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

91402

Message:

EM: Make sure the RA1 and RAZ bits of DR6 and DR7 are enforced. Fixes netware debug assertion in HM.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1821 +1821 @@
 {
     Assert(pRegFrame == CPUMGetGuestCtxCore(pVCpu));
-    uint64_t val;
+    uint64_t uNewDrX;
     int      rc;
     NOREF(pVM);
 
     if (CPUMIsGuestIn64BitCode(pVCpu))
-        rc = DISFetchReg64(pRegFrame, SrcRegGen, &val);
+        rc = DISFetchReg64(pRegFrame, SrcRegGen, &uNewDrX);
     else
     {
         uint32_t val32;
         rc = DISFetchReg32(pRegFrame, SrcRegGen, &val32);
-        val = val32;
+        uNewDrX = val32;
     }
 
     if (RT_SUCCESS(rc))
     {
+        if (DestRegDrx == 6)
+        {
+            uNewDrX |= X86_DR6_RA1_MASK;
+            uNewDrX &= ~X86_DR6_RAZ_MASK;
+        }
+        else if (DestRegDrx == 7)
+        {
+            uNewDrX |= X86_DR7_RA1_MASK;
+            uNewDrX &= ~X86_DR7_RAZ_MASK;
+        }
+
         /** @todo we don't fail if illegal bits are set/cleared for e.g. dr7 */
-        rc = CPUMSetGuestDRx(pVCpu, DestRegDrx, val);
+        rc = CPUMSetGuestDRx(pVCpu, DestRegDrx, uNewDrX);
         if (RT_SUCCESS(rc))
             return rc;