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

Timestamp:

Oct 31, 2011 3:36:29 PM (13 years ago)

Author:

vboxsync

Message:

IOM: Added flags for dropping into the vbox debugger on complicated MMIO accesses. DBGF: some namespace cleanups.

File:

• trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp (modified) (10 diffs)

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

@@ -85 +85 @@
  *          VINF_IOM_HC_MMIO_READ may be returned.
  *
+ * @param   pVM                 The VM handle.
  * @param   pRange              The range to write to.
  * @param   GCPhys              The physical address to start writing.
@@ -90 +91 @@
  * @param   cbValue             The size of the value to write.
  */
-static VBOXSTRICTRC iomMMIODoComplicatedWrite(PIOMMMIORANGE pRange, RTGCPHYS GCPhys, void const *pvValue, unsigned cbValue)
+static VBOXSTRICTRC iomMMIODoComplicatedWrite(PVM pVM, PIOMMMIORANGE pRange, RTGCPHYS GCPhys, void const *pvValue, unsigned cbValue)
 {
     AssertReturn(   (pRange->fFlags & IOMMMIO_FLAGS_WRITE_MODE) != IOMMMIO_FLAGS_WRITE_PASSTHRU
@@ -100 +101 @@
 
     /*
+     * Do debug stop if requested.
+     */
+    int rc = VINF_SUCCESS; NOREF(pVM);
+#ifdef VBOX_STRICT
+    if (pRange->fFlags & IOMMMIO_FLAGS_DBGSTOP_ON_COMPLICATED_WRITE)
+# ifdef IN_RING3
+        rc = DBGFR3EventSrc(pVM, DBGFEVENT_DEV_STOP, RT_SRC_POS,
+                            "Complicated write %#x byte at %RGp to %s\n", cbValue, GCPhys, R3STRING(pRange->pszDesc));
+# else
+        return VINF_IOM_HC_MMIO_WRITE;
+# endif
+#endif
+
+
+    /*
      * Split and conquer.
      */
-    int rc = VINF_SUCCESS;
     for (;;)
     {
@@ -251 +266 @@
                                                     GCPhysFault, (void *)pvData, cb); /** @todo fix const!! */
         else
-            rc = iomMMIODoComplicatedWrite(pRange, GCPhysFault, pvData, cb);
+            rc = iomMMIODoComplicatedWrite(pVM, pRange, GCPhysFault, pvData, cb);
     }
     else
@@ -271 +286 @@
  *          VINF_IOM_HC_MMIO_WRITE may be returned.
  *
+ * @param   pVM                 The VM handle.
  * @param   pRange              The range to read from.
  * @param   GCPhys              The physical address to start reading.
@@ -276 +292 @@
  * @param   cbValue             The size of the value to read.
  */
-static VBOXSTRICTRC iomMMIODoComplicatedRead(PIOMMMIORANGE pRange, RTGCPHYS GCPhys, void *pvValue, unsigned cbValue)
+static VBOXSTRICTRC iomMMIODoComplicatedRead(PVM pVM, PIOMMMIORANGE pRange, RTGCPHYS GCPhys, void *pvValue, unsigned cbValue)
 {
     AssertReturn(   (pRange->fFlags & IOMMMIO_FLAGS_READ_MODE) == IOMMMIO_FLAGS_READ_DWORD
@@ -285 +301 @@
 
     /*
+     * Do debug stop if requested.
+     */
+    int rc = VINF_SUCCESS; NOREF(pVM);
+#ifdef VBOX_STRICT
+    if (pRange->fFlags & IOMMMIO_FLAGS_DBGSTOP_ON_COMPLICATED_WRITE)
+# ifdef IN_RING3
+        rc = DBGFR3EventSrc(pVM, DBGFEVENT_DEV_STOP, RT_SRC_POS,
+                            "Complicated read %#x byte at %RGp to %s\n", cbValue, GCPhys, R3STRING(pRange->pszDesc));
+# else
+        return VINF_IOM_HC_MMIO_READ;
+# endif
+#endif
+
+    /*
      * Split and conquer.
      */
-    int rc = VINF_SUCCESS;
     for (;;)
     {
@@ -439 +468 @@
             rc = pRange->CTX_SUFF(pfnReadCallback)(pRange->CTX_SUFF(pDevIns), pRange->CTX_SUFF(pvUser), GCPhys, pvValue, cbValue);
         else
-            rc = iomMMIODoComplicatedRead(pRange, GCPhys, pvValue, cbValue);
+            rc = iomMMIODoComplicatedRead(pVM, pRange, GCPhys, pvValue, cbValue);
     }
     else
@@ -1804 +1833 @@
                                                    pu32Value, (unsigned)cbValue);
         else
-            rc = iomMMIODoComplicatedRead(pRange, GCPhys, pu32Value, (unsigned)cbValue);
+            rc = iomMMIODoComplicatedRead(pVM, pRange, GCPhys, pu32Value, (unsigned)cbValue);
         STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfRead), a);
         switch (VBOXSTRICTRC_VAL(rc))
@@ -1933 +1962 @@
                                                     GCPhys, &u32Value, (unsigned)cbValue);
         else
-            rc = iomMMIODoComplicatedWrite(pRange, GCPhys, &u32Value, (unsigned)cbValue);
+            rc = iomMMIODoComplicatedWrite(pVM, pRange, GCPhys, &u32Value, (unsigned)cbValue);
         STAM_PROFILE_STOP(&pStats->CTX_SUFF_Z(ProfWrite), a);
 #ifndef IN_RING3