Changeset 10538 in vbox

Timestamp:

Jul 11, 2008 5:53:49 PM (17 years ago)

Author:

vboxsync

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

33226

Message:

Fixed ring 3 mmio handling (unused previously).

Location:

trunk/src/VBox/VMM

Files:

• IOM.cpp (modified) (1 diff)
• IOMInternal.h (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (1 diff)

trunk/src/VBox/VMM/IOM.cpp

@@ -1459 +1459 @@
          */
         rc = PGMR3PhysMMIORegister(pVM, GCPhysStart, cbRange,
-                                   /*IOMR3MMIOHandler*/ NULL, pRange,
+                                   IOMR3MMIOHandler, pRange,
                                    pVM->iom.s.pfnMMIOHandlerR0, MMHyperR3ToR0(pVM, pRange),
                                    pVM->iom.s.pfnMMIOHandlerGC, MMHyperR3ToGC(pVM, pRange), pszDesc);

trunk/src/VBox/VMM/IOMInternal.h

@@ -438 +438 @@
 IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 
+#ifdef IN_RING3
+/**
+ * \#PF Handler callback for MMIO ranges.
+ *
+ * @returns VINF_SUCCESS if the handler have carried out the operation.
+ * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation.
+ * @param   pVM             VM Handle.
+ * @param   GCPhys          The physical address the guest is writing to.
+ * @param   pvPhys          The HC mapping of that address.
+ * @param   pvBuf           What the guest is reading/writing.
+ * @param   cbBuf           How much it's reading/writing.
+ * @param   enmAccessType   The access type.
+ * @param   pvUser      Pointer to the MMIO range entry.
+ */
+DECLCALLBACK(int) IOMR3MMIOHandler(PVM pVM, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser);
+#endif
+
 /**
  * Gets the I/O port range for the specified I/O port in the current context.

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

@@ -1202 +1202 @@
 
 
+#ifdef IN_RING3
+/**
+ * \#PF Handler callback for MMIO ranges.
+ *
+ * @returns VINF_SUCCESS if the handler have carried out the operation.
+ * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation.
+ * @param   pVM             VM Handle.
+ * @param   GCPhys          The physical address the guest is writing to.
+ * @param   pvPhys          The HC mapping of that address.
+ * @param   pvBuf           What the guest is reading/writing.
+ * @param   cbBuf           How much it's reading/writing.
+ * @param   enmAccessType   The access type.
+ * @param   pvUser          Pointer to the MMIO range entry.
+ */
+DECLCALLBACK(int) IOMR3MMIOHandler(PVM pVM, RTGCPHYS GCPhysFault, void *pvPhys, void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType, void *pvUser)
+{
+    int           rc;
+    PIOMMMIORANGE pRange = (PIOMMMIORANGE)pvUser;
+
+    Assert(pRange);
+    Assert(pRange == iomMMIOGetRange(&pVM->iom.s, GCPhysFault));
+
+    if (enmAccessType == PGMACCESSTYPE_READ)
+        rc = iomMMIODoRead(pVM, pRange, GCPhysFault, pvBuf, cbBuf);
+    else
+        rc = iomMMIODoWrite(pVM, pRange, GCPhysFault, pvBuf, cbBuf);
+
+    AssertRC(rc);
+    return rc;
+}
+#endif /* IN_RING3 */
+
+
 /**
  * Reads a MMIO register.