Changeset 1161 in vbox for trunk

Timestamp:

Mar 2, 2007 2:40:01 PM (18 years ago)

Author:

vboxsync

Message:

Some more v86 corrections.

File:

• trunk/src/VBox/VMM/VMMGC/DBGFGC.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMGC/DBGFGC.cpp

@@ -46 +46 @@
 DBGFGCDECL(int) DBGFGCTrap01Handler(PVM pVM, PCPUMCTXCORE pRegFrame, RTUINTREG uDr6)
 {
-    const bool fInHyper = !(pRegFrame->ss & X86_SEL_RPL);
+    const bool fInHyper = !(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM;
 
     /*
@@ -128 +128 @@
                          pVM->dbgf.s.aBreakpoints[iBp].iBp, pPc, pRegFrame->cs, pRegFrame->eip,
                          pVM->dbgf.s.aBreakpoints[iBp].cHits));
-                return !(pRegFrame->ss & X86_SEL_RPL)
+                return (!(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM)
                     ? VINF_EM_DBG_HYPER_BREAKPOINT
                     : VINF_EM_DBG_BREAKPOINT;
@@ -135 +135 @@
     }
 
-    return !(pRegFrame->ss & X86_SEL_RPL)
+    return (!(pRegFrame->ss & X86_SEL_RPL) && !pRegFrame->eflags.Bits.u1VM)
         ? VINF_EM_DBG_HYPER_ASSERTION
         : VINF_EM_RAW_GUEST_TRAP;