Changeset 81162 in vbox for trunk/include/VBox

Timestamp:

Oct 8, 2019 4:45:46 PM (5 years ago)

Author:

vboxsync

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

133796

Message:

IOM: New MMIO management code - work in progress. bugref:9218

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (3 diffs)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -210 +210 @@
         struct IOMR0PERVM   s;
 #endif
-        uint8_t             padding[256];
+        uint8_t             padding[512];
     } iomr0;
 
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[4096 - 64 - 256 - 512 - 256 - 64 - 1792 - 256 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abPadding2[4096 - 64 - 256 - 512       - 64 - 1792 - 256 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096 - 64 - 256 - 512 - 256 - 64 - 1792 - 512 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abPadding2[4096 - 64 - 256 - 512       - 64 - 1792 - 512 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif
 
@@ -226 +226 @@
     GVMCPU          aCpus[1];
 } GVM;
+#if 0
 #if RT_GNUC_PREREQ(4, 6) && defined(__cplusplus)
 # pragma GCC diagnostic push
@@ -245 +246 @@
 # pragma GCC diagnostic pop
 #endif
+#endif
 
 /** The GVM::u32Magic value (Wayne Shorter). */

trunk/include/VBox/vmm/vm.h

@@ -1320 +1320 @@
         struct IOM s;
 #endif
-        uint8_t     padding[960];       /* multiple of 64 */
+        uint8_t     padding[1152];      /* multiple of 64 */
     } iom;
 
@@ -1432 +1432 @@
 
     /** Padding for aligning the structure size on a page boundrary. */
-    uint8_t         abAlignment2[2968 + 256 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
+    uint8_t         abAlignment2[2776 + 256 - sizeof(PVMCPUR3) * VMM_MAX_CPU_COUNT];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -127 +127 @@
     .mm                     resb 192
     .pdm                    resb 1920
-    .iom                    resb 960
+    .iom                    resb 1152
     .em                     resb 256
     .nem                    resb 128
@@ -138 +138 @@
     .cfgm                   resb 8
 
-    .abAlignment2           resb 2968 + 256 - RTR0PTR_CB * VMM_MAX_CPU_COUNT
+    .abAlignment2           resb 2776 + 256 - RTR0PTR_CB * VMM_MAX_CPU_COUNT
 
     alignb RTR0PTR_CB * VMM_MAX_CPU_COUNT ; ASSUMES VMM_MAX_CPU_COUNT is a power of two.