Changeset 10210 in vbox

Timestamp:

Jul 4, 2008 9:53:45 AM (17 years ago)

Author:

vboxsync

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

32795

Message:

Support MSR_K6_EFER_FFXSR if X86_CPUID_AMD_FEATURE_EDX_FFXSR is set.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)

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

@@ -2405 +2405 @@
         if (u32Features & X86_CPUID_AMD_FEATURE_EDX_SEP)
             uMask |= MSR_K6_EFER_SCE;
+        if (u32Features & X86_CPUID_AMD_FEATURE_EDX_FFXSR)
+            uMask |= MSR_K6_EFER_FFXSR;
 
         /* Check for illegal MSR_K6_EFER_LME transitions: not allowed to change LME if paging is enabled. (AMD Arch. Programmer's Manual Volume 2: Table 14-5) */
@@ -2414 +2416 @@
         }
 
-        /* There are a few more: e.g. MSR_K6_EFER_FFXSR, MSR_K6_EFER_LMSLE */
-        AssertMsg(!(val & ~(MSR_K6_EFER_NXE|MSR_K6_EFER_LME|MSR_K6_EFER_LMA /* ignored anyway */ |MSR_K6_EFER_SCE)), ("Unexpected value %RX64\n", val));
+        /* There are a few more: e.g. MSR_K6_EFER_LMSLE */
+        AssertMsg(!(val & ~(MSR_K6_EFER_NXE|MSR_K6_EFER_LME|MSR_K6_EFER_LMA /* ignored anyway */ |MSR_K6_EFER_SCE|MSR_K6_EFER_FFXSR)), ("Unexpected value %RX64\n", val));
         pCtx->msrEFER = (pCtx->msrEFER & ~uMask) | (val & uMask);