Changeset 47706 in vbox for trunk/src/VBox

Timestamp:

Aug 13, 2013 7:08:07 PM (11 years ago)

Author:

vboxsync

Message:

Must be careful in ring-3 too.

File:

• trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (5 diffs)

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

@@ -2259 +2259 @@
     {
         Assert(!CPUMIsGuestDebugStateActive(pVCpu));
+#ifdef IN_RC
+        bool const fHmEnabled = false;
+#elif defined(IN_RING3)
+        bool const fHmEnabled = HMIsEnabled(pVM);
+#endif
 
         /*
@@ -2277 +2282 @@
         {
             uNewDr0 = CPUMGetGuestDR0(pVCpu);
-#ifdef IN_RC
-            if (MMHyperIsInsideArea(pVM, uNewDr0))
+#ifndef IN_RING0
+            if (fHmEnabled && MMHyperIsInsideArea(pVM, uNewDr0))
                 uNewDr0 = 0;
             else
@@ -2297 +2302 @@
         {
             uNewDr1 = CPUMGetGuestDR1(pVCpu);
-#ifdef IN_RC
-            if (MMHyperIsInsideArea(pVM, uNewDr1))
+#ifndef IN_RING0
+            if (fHmEnabled && MMHyperIsInsideArea(pVM, uNewDr1))
                 uNewDr1 = 0;
             else
@@ -2317 +2322 @@
         {
             uNewDr2 = CPUMGetGuestDR2(pVCpu);
-#ifdef IN_RC
-            if (MMHyperIsInsideArea(pVM, uNewDr2))
+#ifndef IN_RING0
+            if (fHmEnabled && MMHyperIsInsideArea(pVM, uNewDr2))
                 uNewDr2 = 0;
             else
@@ -2337 +2342 @@
         {
             uNewDr3 = CPUMGetGuestDR3(pVCpu);
-#ifdef IN_RC
-            if (MMHyperIsInsideArea(pVM, uNewDr3))
+#ifndef IN_RING0
+            if (fHmEnabled && MMHyperIsInsideArea(pVM, uNewDr3))
                 uNewDr3 = 0;
             else