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

Timestamp:

Jan 22, 2021 11:32:07 PM (4 years ago)

Author:

vboxsync

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

142377

Message:

VMM/HMVMX: Saved 8 bytes in VMXRESTOREHOST.

Location:

trunk/src/VBox/VMM/include

Files:

• HMInternal.h (modified) (1 diff)
• HMInternal.mac (modified) (1 diff)

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

@@ -907 +907 @@
 typedef struct VMXRESTOREHOST
 {
-    RTSEL       uHostSelDS;     /* 0x00 */
-    RTSEL       uHostSelES;     /* 0x02 */
-    RTSEL       uHostSelFS;     /* 0x04 */
-    RTSEL       uHostSelGS;     /* 0x06 */
-    RTSEL       uHostSelTR;     /* 0x08 */
-    uint8_t     abPadding0[4];
-    X86XDTR64   HostGdtr;       /**< 0x0e - should be aligned by its 64-bit member. */
-    uint8_t     abPadding1[6];
-    X86XDTR64   HostGdtrRw;     /**< 0x1e - should be aligned by its 64-bit member. */
-    uint8_t     abPadding2[6];
-    X86XDTR64   HostIdtr;       /**< 0x2e - should be aligned by its 64-bit member. */
-    uint64_t    uHostFSBase;    /* 0x38 */
-    uint64_t    uHostGSBase;    /* 0x40 */
+    RTSEL       uHostSelDS;     /**< 0x00 */
+    RTSEL       uHostSelES;     /**< 0x02 */
+    RTSEL       uHostSelFS;     /**< 0x04 */
+    X86XDTR64   HostGdtr;       /**< 0x06 - should be aligned by its 64-bit member. */
+    RTSEL       uHostSelGS;     /**< 0x10 */
+    RTSEL       uHostSelTR;     /**< 0x12 */
+    uint8_t     abPadding0[2];  /**< 0x14 */
+    X86XDTR64   HostGdtrRw;     /**< 0x16 - should be aligned by its 64-bit member. */
+    uint8_t     abPadding1[6];  /**< 0x20 */
+    X86XDTR64   HostIdtr;       /**< 0x26 - should be aligned by its 64-bit member. */
+    uint64_t    uHostFSBase;    /**< 0x30 */
+    uint64_t    uHostGSBase;    /**< 0x38 */
 } VMXRESTOREHOST;
 /** Pointer to VMXRESTOREHOST. */
 typedef VMXRESTOREHOST *PVMXRESTOREHOST;
 AssertCompileSize(X86XDTR64, 10);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr.uAddr,   16);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtrRw.uAddr, 32);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr.uAddr,   48);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,      56);
-AssertCompileSize(VMXRESTOREHOST, 72);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr.uAddr,   0x08);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtrRw.uAddr, 0x18);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr.uAddr,   0x28);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,      0x30);
+AssertCompileSize(VMXRESTOREHOST, 64);
 AssertCompileSizeAlignment(VMXRESTOREHOST, 8);
 

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

@@ -98 +98 @@
     .uHostSelES                     resw    1
     .uHostSelFS                     resw    1
+    .HostGdtr                       resb    10
     .uHostSelGS                     resw    1
     .uHostSelTR                     resw    1
-    .abPadding0                     resb    4
-    .HostGdtr                       resb    10
+    .abPadding0                     resb    2
+    .HostGdtrRw                     resb    10
     .abPadding1                     resb    6
-    .HostGdtrRw                     resb    10
-    .abPadding2                     resb    6
     .HostIdtr                       resb    10
+    alignb 8
     .uHostFSBase                    resq    1
     .uHostGSBase                    resq    1
 endstruc
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     16-2)
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtrRw,   32-2)
-AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     48-2)
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,    56)
-AssertCompileSize(VMXRESTOREHOST, 72)
 
 struc HMCPUVMX