Changeset 76549 in vbox

Timestamp:

Dec 31, 2018 4:08:00 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Use the CR0, CR4 valid masks functions from r127850.

File:

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

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -5555 +5555 @@
 
             uint64_t const uOldCrX = pVCpu->cpum.GstCtx.cr0;
-            uint32_t const fValid  = X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS
-                                   | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM
-                                   | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG;
+            uint32_t const fValid  = CPUMGetGuestCR0ValidMask();
 
             /* ET is hardcoded on 486 and later. */
@@ -5799 +5797 @@
             uint64_t const uOldCrX = pVCpu->cpum.GstCtx.cr4;
 
-            /** @todo Shouldn't this look at the guest CPUID bits to determine
-             *        valid bits? e.g. if guest CPUID doesn't allow X86_CR4_OSXMMEEXCPT, we
-             *        should #GP(0). */
-            /* reserved bits */
-            uint32_t fValid = X86_CR4_VME | X86_CR4_PVI
-                            | X86_CR4_TSD | X86_CR4_DE
-                            | X86_CR4_PSE | X86_CR4_PAE
-                            | X86_CR4_MCE | X86_CR4_PGE
-                            | X86_CR4_PCE | X86_CR4_OSFXSR
-                            | X86_CR4_OSXMMEEXCPT;
-            if (IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmx)
-                fValid |= X86_CR4_VMXE;
-            if (IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fXSaveRstor)
-                fValid |= X86_CR4_OSXSAVE;
-            if (IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fPcid)
-                fValid |= X86_CR4_PCIDE;
-            if (IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fFsGsBase)
-                fValid |= X86_CR4_FSGSBASE;
+            /* Reserved bits. */
+            uint32_t const fValid = CPUMGetGuestCR4ValidMask(pVCpu->CTX_SUFF(pVM));
             if (uNewCrX & ~(uint64_t)fValid)
             {