Changeset 70918 in vbox for trunk/include/VBox/vmm

Timestamp:

Feb 8, 2018 4:11:47 PM (7 years ago)

Author:

vboxsync

Message:

VMM: NEM kick off.

Location:

trunk/include/VBox/vmm

Files:

• nem.h (added)
• vm.h (modified) (4 diffs)
• vm.mac (modified) (2 diffs)

trunk/include/VBox/vmm/vm.h

@@ -168 +168 @@
     } em;
 
+    /** NEM part. */
+    union VMCPUUNIONNEM
+    {
+#ifdef ___NEMInternal_h
+        struct NEMCPU       s;
+#endif
+        uint8_t             padding[128];       /* multiple of 64 */
+    } nem;
+
     /** TRPM part. */
     union VMCPUUNIONTRPM
@@ -254 +263 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[2104];
+    uint8_t                 abAlignment2[1976];
 
     /** PGM part. */
@@ -1186 +1195 @@
     } em;
 
+    /** NEM part. */
+    union
+    {
+#ifdef ___NEMInternal_h
+        struct NEM  s;
+#endif
+        uint8_t     padding[128];       /* multiple of 64 */
+    } nem;
+
     /** TM part. */
     union
@@ -1318 +1336 @@
     /** Padding for aligning the cpu array on a page boundary. */
 #if defined(VBOX_WITH_REM) && defined(VBOX_WITH_RAW_MODE)
-    uint8_t         abAlignment2[3870];
+    uint8_t         abAlignment2[3742];
 #elif defined(VBOX_WITH_REM) && !defined(VBOX_WITH_RAW_MODE)
-    uint8_t         abAlignment2[1630];
+    uint8_t         abAlignment2[1502];
 #elif !defined(VBOX_WITH_REM) && defined(VBOX_WITH_RAW_MODE)
-    uint8_t         abAlignment2[30];
-#else
-    uint8_t         abAlignment2[1886];
+    uint8_t         abAlignment2[3998];
+#else
+    uint8_t         abAlignment2[1758];
 #endif
 

trunk/include/VBox/vmm/vm.mac

@@ -64 +64 @@
     .hm                     resb 5824
     .em                     resb 1408
+    .nem                    resb 128
     .trpm                   resb 128
     .tm                     resb 384
@@ -161 +162 @@
     .iom                    resb 896
     .em                     resb 256
+    .nem                    resb 128
     .tm                     resb 2496
     .dbgf                   resb 2368