Changeset 46942 in vbox for trunk/include/VBox

Timestamp:

Jul 3, 2013 2:53:47 PM (12 years ago)

Author:

vboxsync

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

86947

Message:

VMM: Fix LDTR restoration to be done dynamically. This is required for 64-bit Darwin hosts.

Location:

trunk/include/VBox/vmm

Files:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -45 +45 @@
 #define VMX_RESTORE_HOST_SEL_FS               RT_BIT(2)
 #define VMX_RESTORE_HOST_SEL_GS               RT_BIT(3)
-#define VMX_RESTORE_HOST_SEL_LDTR             RT_BIT(4)
-#define VMX_RESTORE_HOST_SEL_TR               RT_BIT(5)
-#define VMX_RESTORE_HOST_GDTR                 RT_BIT(6)
-#define VMX_RESTORE_HOST_IDTR                 RT_BIT(7)
+#define VMX_RESTORE_HOST_SEL_TR               RT_BIT(4)
+#define VMX_RESTORE_HOST_GDTR                 RT_BIT(5)
+#define VMX_RESTORE_HOST_IDTR                 RT_BIT(6)
 /** @} */
 
@@ -63 +62 @@
     RTSEL       uHostSelFS;     /* 0x04 */
     RTSEL       uHostSelGS;     /* 0x06 */
-    RTSEL       uHostSelLDTR;   /* 0x08 */
-    RTSEL       uHostSelTR;     /* 0x0a */
-    uint32_t    u32Padding;     /* 0x0c */
-    uint64_t    uHostFSBase;    /* 0x10 */
-    uint64_t    uHostGSBase;    /* 0x18 */
-    X86XDTR64   HostGdtr;       /* 0x20 */
-    X86XDTR64   HostIdtr;       /* 0x2a */
+    RTSEL       uHostSelTR;     /* 0x08 */
+    uint16_t    u16Padding;     /* 0x0a */
+    uint64_t    uHostFSBase;    /* 0x0c */
+    uint64_t    uHostGSBase;    /* 0x14 */
+    X86XDTR64   HostGdtr;       /* 0x1c */
+    X86XDTR64   HostIdtr;       /* 0x26 */
 } VMXRESTOREHOST;
 #pragma pack()
@@ -79 +77 @@
 AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelFS,    4);
 AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelGS,    6);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelLDTR,  8);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelTR,   10);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,  16);
-AssertCompileMemberOffset(VMXRESTOREHOST, uHostGSBase,  24);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     32);
-AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     42);
-AssertCompileSize(VMXRESTOREHOST, 52);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostSelTR,    8);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostFSBase,  12);
+AssertCompileMemberOffset(VMXRESTOREHOST, uHostGSBase,  20);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostGdtr,     28);
+AssertCompileMemberOffset(VMXRESTOREHOST, HostIdtr,     38);
+AssertCompileSize(VMXRESTOREHOST, 48);
 
 /** @name VMX VMCS-Read cache indices.

trunk/include/VBox/vmm/hm_vmx.mac

@@ -156 +156 @@
 %define VMX_RESTORE_HOST_SEL_FS                                 4h    ;RT_BIT(2)
 %define VMX_RESTORE_HOST_SEL_GS                                 8h    ;RT_BIT(3)
-%define VMX_RESTORE_HOST_SEL_LDTR                               10h   ;RT_BIT(4)
-%define VMX_RESTORE_HOST_SEL_TR                                 20h   ;RT_BIT(5)
-%define VMX_RESTORE_HOST_GDTR                                   40h   ;RT_BIT(6)
-%define VMX_RESTORE_HOST_IDTR                                   80h   ;RT_BIT(7)
+%define VMX_RESTORE_HOST_SEL_TR                                 10h   ;RT_BIT(4)
+%define VMX_RESTORE_HOST_GDTR                                   20h   ;RT_BIT(5)
+%define VMX_RESTORE_HOST_IDTR                                   40h   ;RT_BIT(6)
 
 struc VMXRESTOREHOST
@@ -166 +165 @@
     .uHostSelFS         resw    1
     .uHostSelGS         resw    1
-    .uHostSelLDTR       resw    1
     .uHostSelTR         resw    1
-    .u32Padding         resd    1
+    .u16Padding         resw    1
     .uHostFSBase        resq    1
     .uHostGSBase        resq    1