Changeset 47437 in vbox for trunk/include/VBox

Timestamp:

Jul 27, 2013 7:24:42 PM (11 years ago)

Author:

vboxsync

Message:

VMXRESTOREHOST: drop the #pragma pack(1) and correctly align the members instead. It appears (the #AC test) that X86XDTR64 should be aligned by it's 64-bit member and not by the start of the structure, not unexpected.

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -69 +69 @@
 /**
  * Host-state restoration structure.
- * This holds host-state fields that require manual restoration. The layout is
- * critical as it's used from assembly code.
- */
-#pragma pack(1)
+ * This holds host-state fields that require manual restoration.
+ * Assembly version found in hm_vmx.mac (should be automatically verified).
+ */
 typedef struct VMXRESTOREHOST
 {
@@ -80 +79 @@
     RTSEL       uHostSelGS;     /* 0x06 */
     RTSEL       uHostSelTR;     /* 0x08 */
-    uint16_t    u16Padding;     /* 0x0a */
-    uint64_t    uHostFSBase;    /* 0x0c */
-    uint64_t    uHostGSBase;    /* 0x14 */
-    X86XDTR64   HostGdtr;       /* 0x1c */
-    X86XDTR64   HostIdtr;       /* 0x26 */
+    uint8_t     abPadding0[4];
+    X86XDTR64   HostGdtr;       /**< 0x0e - should be aligned by it's 64-bit member.  */
+    uint8_t     abPadding1[6];
+    X86XDTR64   HostIdtr;       /**< 0x1e - should be aligned by it's 64-bit member. */
+    uint64_t    uHostFSBase;    /* 0x28 */
+    uint64_t    uHostGSBase;    /* 0x30 */
 } VMXRESTOREHOST;
-#pragma pack()
 /** Pointer to VMXRESTOREHOST. */
 typedef VMXRESTOREHOST *PVMXRESTOREHOST;
 AssertCompileSize(X86XDTR64, 10);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelDS,    0);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelES,    2);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelFS,    4);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelGS,    6);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelTR,    8);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,  12);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostGSBase,  20);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     28);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     38);
-AssertCompileSize(VMXRESTOREHOST, 48);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr.uAddr, 16);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr.uAddr, 32);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,    40);
+AssertCompileSize(VMXRESTOREHOST, 56);
 
 /** @name VMX VMCS-Read cache indices.

trunk/include/VBox/vmm/hm_vmx.mac

@@ -160 +160 @@
 %define VMX_RESTORE_HOST_IDTR                                   40h   ;RT_BIT(6)
 
+;; C version hm_vmx.h
 struc VMXRESTOREHOST
     .uHostSelDS         resw    1
@@ -166 +167 @@
     .uHostSelGS         resw    1
     .uHostSelTR         resw    1
-    .u16Padding         resw    1
+    .abPadding0         resb    4
+    .HostGdtr           resb    10
+    .abPadding1         resb    6
+    .HostIdtr           resb    10
     .uHostFSBase        resq    1
     .uHostGSBase        resq    1
-    .HostGdtr           resb    10
-    .HostIdtr           resb    10
 endstruc
+AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     16-2)
+AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     32-2)
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,    40)
+AssertCompileSize(VMXRESTOREHOST, 56)