Changeset 107220 in vbox for trunk/src/VBox/VMM

Timestamp:

Dec 3, 2024 9:46:18 AM (3 months ago)

Author:

vboxsync

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

166224

Message:

VMM/CPUM,TM: Removed obsolete raw-mode CR4 masks. jiraref:VBP-1466

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CPUM.cpp (modified) (3 diffs)
• VMMR3/TM.cpp (modified) (1 diff)
• include/CPUMInternal.h (modified) (2 diffs)
• include/CPUMInternal.mac (modified) (1 diff)
• testcase/tstVMStruct.h (modified) (1 diff)

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

@@ -2307 +2307 @@
         return VMSetError(pVM, VERR_UNSUPPORTED_CPU, RT_SRC_POS, "Host CPU does not support RDTSC.");
 #endif
-
-    /*
-     * Setup the CR4 AND and OR masks used in the raw-mode switcher.
-     */
-    pVM->cpum.s.CR4.AndMask = X86_CR4_OSXMMEEXCPT | X86_CR4_PVI | X86_CR4_VME;
-    pVM->cpum.s.CR4.OrMask  = X86_CR4_OSFXSR;
 
     /*
@@ -5051 +5045 @@
                     pVCpu->cpum.s.Hyper.dr[0], pVCpu->cpum.s.Hyper.dr[1], pVCpu->cpum.s.Hyper.dr[2], pVCpu->cpum.s.Hyper.dr[3],
                     pVCpu->cpum.s.Hyper.dr[4], pVCpu->cpum.s.Hyper.dr[5], pVCpu->cpum.s.Hyper.dr[6], pVCpu->cpum.s.Hyper.dr[7]);
-    pHlp->pfnPrintf(pHlp, "CR4OrMask=%#x CR4AndMask=%#x\n", pVM->cpum.s.CR4.OrMask, pVM->cpum.s.CR4.AndMask);
 }
 
@@ -5306 +5299 @@
 
 
-
-/**
- * API for controlling a few of the CPU features found in CR4.
- *
- * Currently only X86_CR4_TSD is accepted as input.
- *
- * @returns VBox status code.
- *
- * @param   pVM     The cross context VM structure.
- * @param   fOr     The CR4 OR mask.
- * @param   fAnd    The CR4 AND mask.
- */
-VMMR3DECL(int) CPUMR3SetCR4Feature(PVM pVM, RTHCUINTREG fOr, RTHCUINTREG fAnd)
-{
-    AssertMsgReturn(!(fOr & ~(X86_CR4_TSD)), ("%#x\n", fOr), VERR_INVALID_PARAMETER);
-    AssertMsgReturn((fAnd & ~(X86_CR4_TSD)) == ~(X86_CR4_TSD), ("%#x\n", fAnd), VERR_INVALID_PARAMETER);
-
-    pVM->cpum.s.CR4.OrMask &= fAnd;
-    pVM->cpum.s.CR4.OrMask |= fOr;
-
-    return VINF_SUCCESS;
-}
-
-
 /**
  * Called when the ring-3 init phase completes.

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

@@ -657 +657 @@
      */
     pVM->tm.s.enmOriginalTSCMode = pVM->tm.s.enmTSCMode;
-#if !defined(VBOX_VMM_TARGET_ARMV8)
-    CPUMR3SetCR4Feature(pVM, X86_CR4_TSD, ~X86_CR4_TSD);
-#endif
     LogRel(("TM:     cTSCTicksPerSecond=%'RU64 (%#RX64) enmTSCMode=%d (%s) TSCMultiplier=%u\n"
             "TM: cTSCTicksPerSecondHost=%'RU64 (%#RX64)\n"

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

@@ -355 +355 @@
     uint32_t                fHostUseFlags;
 
-    /** CR4 mask
-     * @todo obsolete? */
-    struct
-    {
-        uint32_t            AndMask; /**< @todo Move these to the per-CPU structure and fix the switchers. Saves a register! */
-        uint32_t            OrMask;
-    } CR4;
-
     /** The (more) portable CPUID level. */
     uint8_t                 u8PortableCpuIdLevel;
@@ -392 +384 @@
 
     /** Align to 64-byte boundary. */
-    uint8_t                 abPadding2[16];
+    uint8_t                 abPadding2[16+8];
 
     /** Host CPU feature information.

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

@@ -81 +81 @@
     .fHostUseFlags              resd    1
 
-    ; CR4 masks
-    .CR4.AndMask                resd    1
-    .CR4.OrMask                 resd    1
     .u8PortableCpuIdLevel       resb    1
     .fPendingRestore            resb    1

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -38 +38 @@
     GEN_CHECK_SIZE(CPUM);    // has .mac
     GEN_CHECK_OFF(CPUM, fHostUseFlags);
-    GEN_CHECK_OFF(CPUM, CR4);
 #ifndef VBOX_FOR_DTRACE_LIB
     GEN_CHECK_OFF(CPUM, u8PortableCpuIdLevel);