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

Timestamp:

Feb 1, 2021 2:38:38 PM (4 years ago)

Author:

vboxsync

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

142527

Message:

VMM/HMSVM: Moving more stuff to HMR0PERVCPU. bugref:9217

Location:

trunk/src/VBox/VMM/include

Files:

• HMInternal.h (modified) (2 diffs)
• HMInternal.mac (modified) (2 diffs)

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

@@ -1018 +1018 @@
     struct HMCPUSVM
     {
-        /** Physical address of the host VMCB which holds additional host-state. */
-        RTHCPHYS                    HCPhysVmcbHost;
-        /** R0 memory object for the host VMCB which holds additional host-state. */
-        RTR0MEMOBJ                  hMemObjVmcbHost;
-        /** Padding.
-         * @todo remove, pointless now  */
-        R0PTRTYPE(void *)           pvPadding;
-
-        /** Physical address of the guest VMCB. */
-        RTHCPHYS                    HCPhysVmcb;
-        /** R0 memory object for the guest VMCB. */
-        RTR0MEMOBJ                  hMemObjVmcb;
-        /** Pointer to the guest VMCB. */
-        R0PTRTYPE(PSVMVMCB)         pVmcb;
-
-        /** Physical address of the MSR bitmap (8 KB). */
-        RTHCPHYS                    HCPhysMsrBitmap;
-        /** R0 memory object for the MSR bitmap (8 KB). */
-        RTR0MEMOBJ                  hMemObjMsrBitmap;
-        /** Pointer to the MSR bitmap. */
-        R0PTRTYPE(void *)           pvMsrBitmap;
-
         /** Whether VTPR with V_INTR_MASKING set is in effect, indicating
          *  we should check if the VTPR changed on every VM-exit. */
@@ -1320 +1298 @@
         PFNHMSVMVMRUN               pfnVMRun;
 
+        /** Physical address of the host VMCB which holds additional host-state. */
+        RTHCPHYS                    HCPhysVmcbHost;
+        /** R0 memory object for the host VMCB which holds additional host-state. */
+        RTR0MEMOBJ                  hMemObjVmcbHost;
+
+        /** Physical address of the guest VMCB. */
+        RTHCPHYS                    HCPhysVmcb;
+        /** R0 memory object for the guest VMCB. */
+        RTR0MEMOBJ                  hMemObjVmcb;
+        /** Pointer to the guest VMCB. */
+        R0PTRTYPE(PSVMVMCB)         pVmcb;
+
+        /** Physical address of the MSR bitmap (8 KB). */
+        RTHCPHYS                    HCPhysMsrBitmap;
+        /** R0 memory object for the MSR bitmap (8 KB). */
+        RTR0MEMOBJ                  hMemObjMsrBitmap;
+        /** Pointer to the MSR bitmap. */
+        R0PTRTYPE(void *)           pvMsrBitmap;
+
         /** For saving stack space, the disassembler state is allocated here
          * instead of on the stack. */

trunk/src/VBox/VMM/include/HMInternal.mac

@@ -137 +137 @@
 
 struc HMCPUSVM
-    .HCPhysVmcbHost                 RTHCPHYS_RES 1
-
-    .hMemObjVmcbHost                RTR0PTR_RES  1
-    .pvPadding                      RTR0PTR_RES  1 ; pointless padding
-
-    .HCPhysVmcb                     RTHCPHYS_RES 1
-    .hMemObjVmcb                    RTR0PTR_RES  1
-    .pVmcb                          RTR0PTR_RES  1
-
-    .HCPhysMsrBitmap                RTHCPHYS_RES 1
-    .hMemObjMsrBitmap               RTR0PTR_RES  1
-    .pvMsrBitmap                    RTR0PTR_RES  1
-
     .fSyncVTpr                      resb    1
     .fEmulateLongModeSysEnterExit   resb    1
@@ -219 +206 @@
     .pfnVMRun                       RTR0PTR_RES  1
 
+    alignb 8
+    .HCPhysVmcbHost                 RTHCPHYS_RES 1
+
+    alignb 8
+    .hMemObjVmcbHost                RTR0PTR_RES  1
+
+    alignb 8
+    .HCPhysVmcb                     RTHCPHYS_RES 1
+    .hMemObjVmcb                    RTR0PTR_RES  1
+    .pVmcb                          RTR0PTR_RES  1
+
+    alignb 8
+    .HCPhysMsrBitmap                RTHCPHYS_RES 1
+    .hMemObjMsrBitmap               RTR0PTR_RES  1
+    .pvMsrBitmap                    RTR0PTR_RES  1
+
     .DisState                       resb    0d8h
 endstruc