Changeset 7695 in vbox for trunk/include

Timestamp:

Apr 2, 2008 12:17:19 PM (17 years ago)

Author:

vboxsync

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

29222

Message:

Added system MSRs to the CPUMCTX structure.
Sync them in REM as well.

Location:

trunk/include/VBox

Files:

• cpum.h (modified) (2 diffs)
• cpum.mac (modified) (2 diffs)
• vm.h (modified) (1 diff)
• vm.mac (modified) (1 diff)
• x86.h (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -306 +306 @@
     CPUMSYSENTER    SysEnter;
 
+    /** System MSRs.
+     * @{ */
+    uint64_t        msrEFER;
+    uint64_t        msrSTAR;
+    uint64_t        msrPAT;
+    uint64_t        msrLSTAR;
+    uint64_t        msrCSTAR;
+    uint64_t        msrSFMASK;
+    uint64_t        msrFSBASE;
+    uint64_t        msrGSBASE;
+    uint64_t        msrKERNELGSBASE;
+    /** @} */
+
     /** Hidden selector registers.
      * @{ */
@@ -313 +326 @@
 
     /* padding to get 32byte aligned size */
-    uint32_t        padding[4];
+    uint32_t        padding[2];
 } CPUMCTX;
 #pragma pack()

trunk/include/VBox/cpum.mac

@@ -185 +185 @@
     .SysEnter.esp       resb    8
 
+    .msrEFER            resb    8
+    .msrSTAR            resb    8
+    .msrPAT             resb    8
+    .msrLSTAR           resb    8
+    .msrCSTAR           resb    8
+    .msrSFMASK          resb    8
+    .msrFSBASE          resb    8
+    .msrGSBASE          resb    8
+    .msrKERNELGSBASE    resb    8
+
     .ldtrHid.u32Base    resd    1
     .ldtrHid.u32Limit   resd    1
@@ -194 +204 @@
 
     ; padding
-    .padding            resd    4
+    .padding            resd    2
 endstruc
 

trunk/include/VBox/vm.h

@@ -392 +392 @@
         struct CPUM s;
 #endif
-        char        padding[4128];      /* multiple of 32 */
+        char        padding[4384];      /* multiple of 32 */
     } cpum;
 

trunk/include/VBox/vm.mac

@@ -88 +88 @@
 
     alignb 32
-    .cpum                 resb 4128
+    .cpum                 resb 4384
     .vmm                  resb 1024
 

trunk/include/VBox/x86.h

@@ -713 +713 @@
 #endif
 
+/* Page Attribute Table. */
+#define IA32_CR_PAT                         0x277
+
 /** Basic VMX information. */
 #define MSR_IA32_VMX_BASIC_INFO             0x480