Changeset 58909 in vbox for trunk/src/VBox/VMM/VMMRZ

Timestamp:

Nov 29, 2015 7:23:46 PM (9 years ago)

Author:

vboxsync

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

104409

Message:

DBGF: More groundwork for port I/O, MMIO, interrupt and generic event breakpoints.

File:

• trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp

@@ -57 +57 @@
      * A breakpoint?
      */
-    if (uDr6 & (X86_DR6_B0 | X86_DR6_B1 | X86_DR6_B2 | X86_DR6_B3))
+    AssertCompile(X86_DR6_B0 == 1 && X86_DR6_B1 == 2 && X86_DR6_B2 == 4 && X86_DR6_B3 == 8);
+    if (   (uDr6 & (X86_DR6_B0 | X86_DR6_B1 | X86_DR6_B2 | X86_DR6_B3))
+        && pVM->dbgf.s.cEnabledHwBreakpoints > 0)
     {
-        Assert(X86_DR6_B0 == 1 && X86_DR6_B1 == 2 && X86_DR6_B2 == 4 && X86_DR6_B3 == 8);
         for (unsigned iBp = 0; iBp < RT_ELEMENTS(pVM->dbgf.s.aHwBreakpoints); iBp++)
         {
@@ -125 +126 @@
      * Don't bother if we don't have any breakpoints.
      */
-    if (pVM->dbgf.s.cBreakpoints > 0)
+    unsigned cToSearch = pVM->dbgf.s.Int3.cToSearch;
+    if (cToSearch > 0)
     {
         RTGCPTR pPc;
@@ -137 +139 @@
         AssertRCReturn(rc, rc);
 
-        for (unsigned iBp = 0; iBp < RT_ELEMENTS(pVM->dbgf.s.aBreakpoints); iBp++)
+        unsigned iBp = pVM->dbgf.s.Int3.iStartSearch;
+        while (cToSearch-- > 0)
         {
-            if (    pVM->dbgf.s.aBreakpoints[iBp].u.GCPtr == (RTGCUINTPTR)pPc
-                &&  pVM->dbgf.s.aBreakpoints[iBp].enmType == DBGFBPTYPE_INT3)
+            if (   pVM->dbgf.s.aBreakpoints[iBp].u.GCPtr == (RTGCUINTPTR)pPc
+                && pVM->dbgf.s.aBreakpoints[iBp].enmType == DBGFBPTYPE_INT3)
             {
                 pVM->dbgf.s.aBreakpoints[iBp].cHits++;
@@ -152 +155 @@
                      : VINF_EM_DBG_BREAKPOINT;
             }
+            iBp++;
         }
     }