Changeset 47699 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 13, 2013 3:04:08 PM (11 years ago)

Author:

vboxsync

Message:

I/O breakpoints for raw-mode and non-string instructions in IEM.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)
• VMMRC/TRPMRCHandlers.cpp (modified) (2 diffs)
• VMMRZ/DBGFRZ.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -4690 +4690 @@
         if (rcStrict != VINF_SUCCESS)
             rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
+        Assert(rcStrict == VINF_SUCCESS); /* assumed below */
+
+        /*
+         * Check for I/O breakpoints.
+         */
+        uint32_t const uDr7 = pCtx->dr[7];
+        if (RT_UNLIKELY(   (   (uDr7 & X86_DR7_ENABLED_MASK)
+                            && X86_DR7_ANY_RW_IO(uDr7)
+                            && (pCtx->cr4 & X86_CR4_DE))
+                        || DBGFBpIsHwIoArmed(IEMCPU_TO_VM(pIemCpu))))
+        {
+            rcStrict = DBGFBpCheckIo(IEMCPU_TO_VM(pIemCpu), IEMCPU_TO_VMCPU(pIemCpu), pCtx, u16Port, cbReg);
+            if (rcStrict == VINF_EM_RAW_GUEST_TRAP)
+                rcStrict = iemRaiseDebugException(pIemCpu);
+        }
     }
 
@@ -4745 +4760 @@
         if (rcStrict != VINF_SUCCESS)
             rcStrict = iemSetPassUpStatus(pIemCpu, rcStrict);
+        Assert(rcStrict == VINF_SUCCESS); /* assumed below */
+
+        /*
+         * Check for I/O breakpoints.
+         */
+        uint32_t const uDr7 = pCtx->dr[7];
+        if (RT_UNLIKELY(   (   (uDr7 & X86_DR7_ENABLED_MASK)
+                            && X86_DR7_ANY_RW_IO(uDr7)
+                            && (pCtx->cr4 & X86_CR4_DE))
+                        || DBGFBpIsHwIoArmed(IEMCPU_TO_VM(pIemCpu))))
+        {
+            rcStrict = DBGFBpCheckIo(IEMCPU_TO_VM(pIemCpu), IEMCPU_TO_VMCPU(pIemCpu), pCtx, u16Port, cbReg);
+            if (rcStrict == VINF_EM_RAW_GUEST_TRAP)
+                rcStrict = iemRaiseDebugException(pIemCpu);
+        }
     }
     return rcStrict;

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -323 +323 @@
     int rc = DBGFRZTrap01Handler(pVM, pVCpu, pRegFrame, uDr6, false /*fAltStepping*/);
     if (rc == VINF_EM_RAW_GUEST_TRAP)
-        CPUMSetGuestDR6(pVCpu, CPUMGetGuestDR6(pVCpu) | uDr6);
+    {
+        CPUMSetGuestDR6(pVCpu, (CPUMGetGuestDR6(pVCpu) & ~X86_DR6_B_MASK) | uDr6);
+        if (CPUMGetGuestDR7(pVCpu) & X86_DR7_GD)
+            CPUMSetGuestDR7(pVCpu, CPUMGetGuestDR7(pVCpu) & ~X86_DR7_GD);
+    }
     else if (rc == VINF_EM_DBG_STEPPED)
         pRegFrame->eflags.Bits.u1TF = 0;
@@ -1070 +1074 @@
         VBOXSTRICTRC rcStrict = IOMRCIOPortHandler(pVM, pVCpu, pRegFrame, &Cpu);
         if (IOM_SUCCESS(rcStrict))
+        {
             pRegFrame->rip += cbOp;
+
+            /*
+             * Check for I/O breakpoints.  A bit clumsy, but should be short lived (moved to IEM).
+             */
+            uint32_t const uDr7 = CPUMGetGuestDR7(pVCpu);
+            if (RT_UNLIKELY(   (   (uDr7 & X86_DR7_ENABLED_MASK)
+                                && X86_DR7_ANY_RW_IO(uDr7)
+                                && (CPUMGetGuestCR4(pVCpu) & X86_CR4_DE))
+                            || DBGFBpIsHwIoArmed(pVM)))
+            {
+                uint64_t    uPort = pRegFrame->dx;
+                unsigned    cbValue;
+                if (   Cpu.pCurInstr->uOpcode == OP_IN
+                    || Cpu.pCurInstr->uOpcode == OP_INSB
+                    || Cpu.pCurInstr->uOpcode == OP_INSWD)
+                {
+                    cbValue = DISGetParamSize(&Cpu, &Cpu.Param1);
+                    if (Cpu.Param2.fUse & DISUSE_IMMEDIATE)
+                        uPort = Cpu.Param2.uValue;
+                }
+                else
+                {
+                    cbValue = DISGetParamSize(&Cpu, &Cpu.Param2);
+                    if (Cpu.Param1.fUse & DISUSE_IMMEDIATE)
+                        uPort = Cpu.Param1.uValue;
+                }
+
+                VBOXSTRICTRC rcStrict2 = DBGFBpCheckIo(pVM, pVCpu, CPUMCTX_FROM_CORE(pRegFrame), uPort, cbValue);
+                if (rcStrict2 == VINF_EM_RAW_GUEST_TRAP)
+                {
+                    /* Raise #DB. */
+                    TRPMResetTrap(pVCpu);
+                    TRPMAssertTrap(pVCpu, X86_XCPT_DE, TRPM_TRAP);
+                    if (rcStrict)
+                        LogRel(("trpmGCTrap0dHandler: Overriding %Rrc with #DB on I/O port access.\n", VBOXSTRICTRC_VAL(rcStrict)));
+                    rcStrict = VINF_EM_RAW_GUEST_TRAP;
+                }
+                /* rcStrict is VINF_SUCCESS or in [VINF_EM_FIRST..VINF_EM_LAST]. */
+                else if (   rcStrict2 != VINF_SUCCESS
+                         && (rcStrict == VINF_SUCCESS || rcStrict2 < rcStrict))
+                    rcStrict = rcStrict2;
+            }
+        }
         rc = VBOXSTRICTRC_TODO(rcStrict);
         TRPM_EXIT_DBG_HOOK(0xd);

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

@@ -96 +96 @@
     }
 
-    LogFlow(("DBGFRZTrap01Handler: guest debug event %RTreg at %04x:%RGv!\n", uDr6, pRegFrame->cs.Sel, pRegFrame->rip));
+    LogFlow(("DBGFRZTrap01Handler: guest debug event %#x at %04x:%RGv!\n", (uint32_t)uDr6, pRegFrame->cs.Sel, pRegFrame->rip));
     return VINF_EM_RAW_GUEST_TRAP;
 }