Changeset 48174 in vbox

Timestamp:

Aug 30, 2013 1:55:50 AM (11 years ago)

Author:

vboxsync

Message:

HM: Adjusted some CPUMIsXxxDebugStateActive() assertion for 64-on-32-bit conditions.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (3 diffs)
• HMVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -1370 +1370 @@
             CPUMR0LoadHyperDebugState(pVCpu, false /* include DR6 */);
         Assert(!CPUMIsGuestDebugStateActive(pVCpu));
-        Assert(CPUMIsHyperDebugStateActive(pVCpu));
+        Assert(CPUMIsHyperDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
 
         /* Update DR6 & DR7. (The other DRx values are handled by CPUM one way or the other.) */
@@ -1412 +1412 @@
             }
             Assert(!CPUMIsHyperDebugStateActive(pVCpu));
-            Assert(CPUMIsGuestDebugStateActive(pVCpu));
+            Assert(CPUMIsGuestDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
             Log5(("hm: Loaded guest DRx\n"));
         }
@@ -4170 +4170 @@
         /* Save the host & load the guest debug state, restart execution of the MOV DRx instruction. */
         CPUMR0LoadGuestDebugState(pVCpu, false /* include DR6 */);
-        Assert(CPUMIsGuestDebugStateActive(pVCpu));
+        Assert(CPUMIsGuestDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
 
         STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxContextSwitch);

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -3407 +3407 @@
             CPUMR0LoadHyperDebugState(pVCpu, true /* include DR6 */);
         Assert(!CPUMIsGuestDebugStateActive(pVCpu));
-        Assert(CPUMIsHyperDebugStateActive(pVCpu));
+        Assert(CPUMIsHyperDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
 
         /* Update DR7. (The other DRx values are handled by CPUM one way or the other.) */
@@ -3430 +3430 @@
             }
             Assert(!CPUMIsHyperDebugStateActive(pVCpu));
-            Assert(CPUMIsGuestDebugStateActive(pVCpu));
+            Assert(CPUMIsGuestDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
         }
         /*
@@ -9876 +9876 @@
         PVM pVM = pVCpu->CTX_SUFF(pVM);
         CPUMR0LoadGuestDebugState(pVCpu, true /* include DR6 */);
-        Assert(CPUMIsGuestDebugStateActive(pVCpu));
+        Assert(CPUMIsGuestDebugStateActive(pVCpu) || HC_ARCH_BITS == 32);
 
         HM_RESTORE_PREEMPT_IF_NEEDED();