Changeset 94901 in vbox

Timestamp:

May 6, 2022 6:59:14 PM (3 years ago)

Author:

vboxsync

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

151307

Message:

VMM/CPUM: On non-x86 hosts, just use the MXCSR MASK from the CPU DB as-is. bugref:9898

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMR3/CPUMR3CpuId.cpp (modified) (2 diffs)
• include/CPUMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -2022 +2022 @@
         return VERR_UNSUPPORTED_CPU;
     }
+
+    pVM->cpum.s.fHostMxCsrMask = CPUMR3DeterminHostMxCsrMask();
 #endif
-
-    pVM->cpum.s.fHostMxCsrMask = CPUMR3DeterminHostMxCsrMask();
 
     CPUMMSRS HostMsrs;

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -4583 +4583 @@
              : rc;
 
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     if (pCpum->GuestInfo.fMxCsrMask & ~pVM->cpum.s.fHostMxCsrMask)
     {
@@ -4590 +4591 @@
     }
     LogRel(("CPUM: MXCSR_MASK=%#x (host: %#x)\n", pCpum->GuestInfo.fMxCsrMask, pVM->cpum.s.fHostMxCsrMask));
+#else
+    LogRel(("CPUM: MXCSR_MASK=%#x\n", pCpum->GuestInfo.fMxCsrMask));
+#endif
 
     /** @cfgm{/CPUM/MSRs/[Name]/[First|Last|Type|Value|...],}

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -366 +366 @@
     uint64_t                fXStateHostMask;
 
+#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
     /** The host MXCSR mask (determined at init). */
     uint32_t                fHostMxCsrMask;
+#else
+    uint32_t                u32UnusedOnNonX86;
+#endif
     /** Nested VMX: Whether to expose VMX-preemption timer to the guest. */
     bool                    fNestedVmxPreemptTimer;