Changeset 97287 in vbox for trunk/include

Timestamp:

Oct 24, 2022 11:20:42 PM (2 years ago)

Author:

vboxsync

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

154278

Message:

VMM/cpum: Moved fExtrn up into the same cache line as rip, eflags, and crX.

Location:

trunk/include/VBox/vmm

Files:

• cpum.mac (modified) (2 diffs)
• cpumctx.h (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.mac

@@ -163 +163 @@
     .tr.u32Limit        resd    1
     .tr.Attr            resd    1
+    alignb 8
     .eip                resq    1
     .eflags             resq    1
-    .abPadding          resb    8
-    alignb 8
+    .fExtrn             resq    1
     .uRipInhibitInt     resq    1
     .cr0                resq    1
@@ -192 +192 @@
     .msrKERNELGSBASE    resb    8
 
-    alignb 8
-    .fExtrn             resq    1
-
     alignb 32
     .aPaePdpes          resq    4

trunk/include/VBox/vmm/cpumctx.h

@@ -417 +417 @@
     } CPUM_UNION_NM(rflags);
 
-    uint8_t             abPadding[8];
+    /** 0x150 - Externalized state tracker, CPUMCTX_EXTRN_XXX. */
+    uint64_t            fExtrn;
+
     /** The RIP value an interrupt shadow is/was valid for. */
     uint64_t            uRipInhibitInt;
@@ -464 +466 @@
     /** @} */
 
-    /** 0x230 - Externalized state tracker, CPUMCTX_EXTRN_XXX.
-     * @todo Move up after uRipInhibitInt after fInhibit moves into RFLAGS.
-     *       That will put this in the same cacheline as RIP, RFLAGS and CR0
-     *       which are typically always imported and exported again during an
-     *       VM exit. */
-    uint64_t            fExtrn;
-
-    uint64_t            u64Unused;
+    uint64_t            au64Unused[2];
 
     /** 0x240 - PAE PDPTEs. */
@@ -675 +670 @@
 AssertCompileMemberOffset(CPUMCTX,                                       rip, 0x0140);
 AssertCompileMemberOffset(CPUMCTX,                                    rflags, 0x0148);
+AssertCompileMemberOffset(CPUMCTX,                                    fExtrn, 0x0150);
 AssertCompileMemberOffset(CPUMCTX,                            uRipInhibitInt, 0x0158);
 AssertCompileMemberOffset(CPUMCTX,                                       cr0, 0x0160);