Changeset 47671 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 12, 2013 11:16:55 AM (11 years ago)

Author:

vboxsync

Message:

VMM: More debugging related stuff.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• DBGFAll.cpp (modified) (1 diff)
• IEMAll.cpp (modified) (4 diffs)

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

@@ -115 +115 @@
 
 /**
+ * Checks if any of the hardware breakpoints are armed.
+ *
+ * @returns true if armed, false if not.
+ * @param   pVM         The cross context VM structure.
+ */
+VMM_INT_DECL(bool) DBGFBpIsHwArmed(PVM pVM)
+{
+    Assert(RT_ELEMENTS(pVM->dbgf.s.aHwBreakpoints) == 4);
+    return (pVM->dbgf.s.aHwBreakpoints[0].fEnabled && pVM->dbgf.s.aHwBreakpoints[0].enmType == DBGFBPTYPE_REG)
+        || (pVM->dbgf.s.aHwBreakpoints[1].fEnabled && pVM->dbgf.s.aHwBreakpoints[1].enmType == DBGFBPTYPE_REG)
+        || (pVM->dbgf.s.aHwBreakpoints[2].fEnabled && pVM->dbgf.s.aHwBreakpoints[2].enmType == DBGFBPTYPE_REG)
+        || (pVM->dbgf.s.aHwBreakpoints[3].fEnabled && pVM->dbgf.s.aHwBreakpoints[3].enmType == DBGFBPTYPE_REG);
+}
+
+
+/**
  * Returns the single stepping state for a virtual CPU.
  *

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

@@ -8926 +8926 @@
      */
     PVM pVM = IEMCPU_TO_VM(pIemCpu);
-    EMRemLock(pVM);
-    int rc = REMR3EmulateInstruction(pVM, IEMCPU_TO_VMCPU(pIemCpu));
-    AssertRC(rc);
-    EMRemUnlock(pVM);
+    VBOXSTRICTRC rc = VERR_EM_CANNOT_EXEC_GUEST;
+#if 1
+    if (   HMIsEnabled(pVM)
+        && pIemCpu->cIOReads == 0
+        && pIemCpu->cIOWrites == 0)
+        do
+            rc = EMR3HmSingleInstruction(pVM, IEMCPU_TO_VMCPU(pIemCpu), EM_ONE_INS_FLAGS_RIP_CHANGE);
+        while (rc == VINF_SUCCESS);
+#endif
+    if (   rc == VERR_EM_CANNOT_EXEC_GUEST
+        || rc == VINF_IOM_R3_IOPORT_READ
+        || rc == VINF_IOM_R3_IOPORT_WRITE
+        || rc == VINF_IOM_R3_MMIO_READ
+        || rc == VINF_IOM_R3_MMIO_READ_WRITE
+        || rc == VINF_IOM_R3_MMIO_WRITE
+        )
+    {
+        EMRemLock(pVM);
+        rc = REMR3EmulateInstruction(pVM, IEMCPU_TO_VMCPU(pIemCpu));
+        AssertRC(rc);
+        EMRemUnlock(pVM);
+    }
 
     /*
@@ -9550 +9568 @@
      * See if there is an interrupt pending in TRPM and inject it if we can.
      */
-#ifdef IEM_VERIFICATION_MODE_FULL
+#if !defined(IEM_VERIFICATION_MODE_FULL) || !defined(IN_RING3)
+# ifdef IEM_VERIFICATION_MODE_FULL
     pIemCpu->uInjectCpl = UINT8_MAX;
-#endif
+# endif
     if (   pCtx->eflags.Bits.u1IF
         && TRPMHasTrap(pVCpu)
@@ -9566 +9585 @@
             TRPMResetTrap(pVCpu);
     }
+#else
+    iemExecVerificationModeSetup(pIemCpu);
+#endif
 
     /*
@@ -9609 +9631 @@
     if (rcStrict == VINF_SUCCESS)
         rcStrict = iemExecOneInner(pVCpu, pIemCpu, true);
+
+#if defined(IEM_VERIFICATION_MODE_FULL) && defined(IN_RING3)
+    /*
+     * Assert some sanity.
+     */
+    iemExecVerificationModeCheck(pIemCpu);
+#endif
 
     /*