Changeset 30145 in vbox for trunk/src

Timestamp:

Jun 10, 2010 11:52:14 AM (15 years ago)

Author:

vboxsync

Message:

Preparations for fixing the NXE assumption in the 32/64 switcher.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMSwitcher.cpp (modified) (1 diff)
• VMMSwitcher/LegacyandAMD64.mac (modified) (1 diff)
• VMMSwitcher/VMMSwitcher.h (modified) (2 diffs)
• VMMSwitcher/VMMSwitcher.mac (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1422 +1422 @@
         }
 
+        case CPUMCPUIDFEATURE_NXE:
+        {
+            if (pVM->cpum.s.aGuestCpuIdExt[0].eax >= 0x80000001)
+                return !!(pVM->cpum.s.aGuestCpuIdExt[1].edx & X86_CPUID_AMD_FEATURE_EDX_NX);
+        }
+
         case CPUMCPUIDFEATURE_RDTSCP:
         {

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -527 +527 @@
             }
 
-
-            ///@todo case FIX_CR4_MASK:
-            ///@todo case FIX_CR4_OSFSXR:
+            /*
+             * Store the EFER or mask for the 32->64 bit switcher.
+             */
+            case FIX_EFER_OR_MASK:
+            {
+                uint32_t u32OrMask = MSR_K6_EFER_LME | MSR_K6_EFER_SCE;
+                if (CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NXE))
+                    u32OrMask |= MSR_K6_EFER_NXE;
+
+                *uSrc.pu32 = u32OrMask;
+                break;
+            }
 
             /*

trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac

@@ -228 +228 @@
     rdmsr
     or      eax, MSR_K6_EFER_LME | MSR_K6_EFER_SCE | MSR_K6_EFER_NXE
+;    FIXUP FIX_EFER_OR_MASK
+;    or      eax, 0
+    or      eax, 0
+    and     eax, ~(MSR_K6_EFER_FFXSR) ; turn off fast fxsave/fxrstor (skipping xmm regs)
     wrmsr
     mov     edx, ebp

trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h

@@ -43 +43 @@
 #define FIX_HYPER_TSS           20
 #define FIX_GC_TSS_GDTE_DW2     21
-#define FIX_CR4_MASK            22
-#define FIX_CR4_OSFSXR          23
 #define FIX_NO_FXSAVE_JMP       24
 #define FIX_NO_SYSENTER_JMP     25
@@ -59 +57 @@
 #define FIX_GC_64_BIT_CPUM_OFF  36
 #define FIX_GC_CPUMCPU_OFF      37
+#define FIX_EFER_OR_MASK        38
 #define FIX_THE_END             255
 /** @} */

trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac

@@ -87 +87 @@
 %define FIX_HYPER_TSS           20
 %define FIX_GC_TSS_GDTE_DW2     21
-%define FIX_CR4_MASK            22
-%define FIX_CR4_OSFSXR          23
 %define FIX_NO_FXSAVE_JMP       24
 %define FIX_NO_SYSENTER_JMP     25
@@ -103 +101 @@
 %define FIX_GC_64_BIT_CPUM_OFF  36
 %define FIX_GC_CPUMCPU_OFF      37
+%define FIX_EFER_OR_MASK        38
 %define FIX_THE_END             255
 ;/** @} */