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

Timestamp:

Sep 2, 2016 9:22:00 AM (9 years ago)

Author:

vboxsync

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

110440

Message:

PDM,IOM: MMIO range length is now a RTGCPHYS instead of uint32_t.

File:

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

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

@@ -52 +52 @@
     RTGCPHYS                    GCPhys;
     /** Size of the range. */
-    uint32_t                    cb;
+    RTGCPHYS                    cb;
     /** The reference counter. */
     uint32_t volatile           cRefs;
+    /** Flags, see IOMMMIO_FLAGS_XXX. */
+    uint32_t                    fFlags;
 
     /** Pointer to user argument - R0. */
@@ -67 +69 @@
     R0PTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackR0;
 
-    /** Flags, see IOMMMIO_FLAGS_XXX. */ /* (Placed here for alignment reasons.) */
-    uint32_t                    fFlags;
+    /** Pointer to user argument - R3. */
+    RTR3PTR                     pvUserR3;
+    /** Pointer to device instance - R3. */
+    PPDMDEVINSR3                pDevInsR3;
+    /** Pointer to write callback function - R3. */
+    R3PTRTYPE(PFNIOMMMIOWRITE)  pfnWriteCallbackR3;
+    /** Pointer to read callback function - R3. */
+    R3PTRTYPE(PFNIOMMMIOREAD)   pfnReadCallbackR3;
+    /** Pointer to fill (memset) callback function - R3. */
+    R3PTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackR3;
+
+    /** Description / Name. For easing debugging. */
+    R3PTRTYPE(const char *)     pszDesc;
 
     /** Pointer to user argument - RC. */
@@ -80 +93 @@
     /** Pointer to fill (memset) callback function - RC. */
     RCPTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackRC;
-
-    /** Pointer to user argument - R3. */
-    RTR3PTR                     pvUserR3;
-    /** Pointer to device instance - R3. */
-    PPDMDEVINSR3                pDevInsR3;
-    /** Pointer to write callback function - R3. */
-    R3PTRTYPE(PFNIOMMMIOWRITE)  pfnWriteCallbackR3;
-    /** Pointer to read callback function - R3. */
-    R3PTRTYPE(PFNIOMMMIOREAD)   pfnReadCallbackR3;
-    /** Pointer to fill (memset) callback function - R3. */
-    R3PTRTYPE(PFNIOMMMIOFILL)   pfnFillCallbackR3;
-
-    /** Description / Name. For easing debugging. */
-    R3PTRTYPE(const char *)     pszDesc;
+#if HC_ARCH_BITS == 64
+    /** Padding structure length to multiple of 8 bytes. */
+    RTRCPTR                     RCPtrPadding;
+#endif
 } IOMMMIORANGE;
 /** Pointer to a MMIO range descriptor, R3 version. */