Changeset 47682 in vbox for trunk/src/VBox

Timestamp:

Aug 12, 2013 10:57:18 PM (11 years ago)

Author:

vboxsync

Message:

adjustments.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/DBGFAll.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)

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

@@ -177 +177 @@
 VMM_INT_DECL(VBOXSTRICTRC)  DBGFBpCheckIo(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTIOPORT uIoPort, uint8_t cbValue)
 {
-    static uint8_t const s_abInvAlign[4] = { 0, 1, 7, 3 };
     uint32_t const uIoPortFirst = uIoPort;
     uint32_t const uIoPortLast  = uIoPortFirst + cbValue - 1;

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

@@ -9155 +9155 @@
          * Note that the I/O breakpoint type is undefined if CR4.DE is 0.
          */
-        /** @todo We're not honoring I/O BPs if informational status code is returned.
-         *        We're also ignoring our own debugger's attempt at using I/O
-         *        breakpoints.  The whole host & guest debugger stuff needs to be
-         *        looked over at some point.  For now, it's just best effort. */
         int rc2 = hmR0VmxSaveGuestDR7(pVCpu, pMixedCtx);
         AssertRCReturn(rc2, rc2);
 
+        /** @todo Optimize away the DBGFBpIsHwIoArmed call by having DBGF tell the
+         *  execution engines about whether hyper BPs and such are pending. */
         uint32_t const uDr7 = pMixedCtx->dr[7];
-        if (   (   (uDr7 & X86_DR7_ENABLED_MASK)
-                && X86_DR7_ANY_RW_IO(uDr7)
-                && (pMixedCtx->cr4 & X86_CR4_DE))
-            || DBGFBpIsHwIoArmed(pVM))
+        if (RT_UNLIKELY(   (   (uDr7 & X86_DR7_ENABLED_MASK)
+                            && X86_DR7_ANY_RW_IO(uDr7)
+                            && (pMixedCtx->cr4 & X86_CR4_DE))
+                        || DBGFBpIsHwIoArmed(pVM)))
         {
             STAM_COUNTER_INC(&pVCpu->hm.s.StatDRxIoCheck);