Changeset 39111 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Oct 25, 2011 2:47:02 PM (14 years ago)

Author:

vboxsync

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

74544

Message:

IOM,PDM: Working on moving unaligned and non-dword MMIO access splitting and buffering up into IOM (from the device emulation).

File:

• trunk/src/VBox/VMM/include/IOMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -51 +51 @@
     uint32_t volatile           cRefs;
 
+    /** Pointer to user argument - R0. */
+    RTR0PTR                     pvUserR0;
+    /** Pointer to device instance - R0. */
+    PPDMDEVINSR0                pDevInsR0;
+    /** Pointer to write callback function - R0. */
+    R0PTRTYPE(PFNIOMMMIOWRITE)  pfnWriteCallbackR0;
+    /** Pointer to read callback function - R0. */
+    R0PTRTYPE(PFNIOMMMIOREAD)   pfnReadCallbackR0;
+    /** Pointer to fill (memset) callback function - R0. */
+    R0PTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackR0;
+
+    /** Flags, see IOMMMIO_FLAGS_XXX. */ /* (Placed here for alignment reasons.) */
+    uint32_t                    fFlags;
+
+    /** Pointer to user argument - RC. */
+    RTRCPTR                     pvUserRC;
+    /** Pointer to device instance - RC. */
+    PPDMDEVINSRC                pDevInsRC;
+    /** Pointer to write callback function - RC. */
+    RCPTRTYPE(PFNIOMMMIOWRITE)  pfnWriteCallbackRC;
+    /** Pointer to read callback function - RC. */
+    RCPTRTYPE(PFNIOMMMIOREAD)   pfnReadCallbackRC;
+    /** Pointer to fill (memset) callback function - RC. */
+    RCPTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackRC;
+
     /** Pointer to user argument - R3. */
     RTR3PTR                     pvUserR3;
@@ -61 +86 @@
     /** Pointer to fill (memset) callback function - R3. */
     R3PTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackR3;
-
-    /** Pointer to user argument - R0. */
-    RTR0PTR                     pvUserR0;
-    /** Pointer to device instance - R0. */
-    PPDMDEVINSR0                pDevInsR0;
-    /** Pointer to write callback function - R0. */
-    R0PTRTYPE(PFNIOMMMIOWRITE)  pfnWriteCallbackR0;
-    /** Pointer to read callback function - R0. */
-    R0PTRTYPE(PFNIOMMMIOREAD)   pfnReadCallbackR0;
-    /** Pointer to fill (memset) callback function - R0. */
-    R0PTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackR0;
-
-    /** Pointer to user argument - RC. */
-    RTRCPTR                     pvUserRC;
-    /** Pointer to device instance - RC. */
-    PPDMDEVINSRC                pDevInsRC;
-    /** Pointer to write callback function - RC. */
-    RCPTRTYPE(PFNIOMMMIOWRITE)  pfnWriteCallbackRC;
-    /** Pointer to read callback function - RC. */
-    RCPTRTYPE(PFNIOMMMIOREAD)   pfnReadCallbackRC;
-    /** Pointer to fill (memset) callback function - RC. */
-    RCPTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackRC;
-    /** Alignment padding. */
-    RTRCPTR                     RCPtrAlignment;
 
     /** Description / Name. For easing debugging. */