Changeset 1056 in vbox

Timestamp:

Feb 23, 2007 8:34:40 PM (18 years ago)

Author:

vboxsync

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

18932

Message:

CPUMR3SetCR4Feature

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• src/VBox/VMM/CPUM.cpp (modified) (3 diffs)

trunk/include/VBox/cpum.h

@@ -743 +743 @@
 #endif
 
+/**
+ * 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 VM handle.
+ * @param   fOr     The CR4 OR mask.
+ * @param   fAnd    The CR4 AND mask.
+ */
+CPUMR3DECL(int) CPUMR3SetCR4Feature(PVM pVM, RTHCUINTREG fOr, RTHCUINTREG fAnd);
+
 /** @} */
 #endif

trunk/src/VBox/VMM/CPUM.cpp

@@ -133 +133 @@
         pVM->cpum.s.CR4.OrMask  = X86_CR4_OSFSXR;
     }
-
-#ifdef CPUM_TRAP_RDTSC
-    pVM->cpum.s.CR4.OrMask |= X86_CR4_TSD;
-#endif
 
     if (!pVM->cpum.s.CPUFeatures.edx.u1MMX)
@@ -815 +811 @@
     pHlp->pfnPrintf(pHlp, "Hypervisor CPUM state: %s\n", pszComment);
     cpumR3InfoOne(&pVM->cpum.s.Hyper, pVM->cpum.s.pHyperCoreHC, pHlp, enmType, ".");
+    pHlp->pfnPrintf(pHlp, "CR4OrMask=%#x CR4AndMask=%#x\n", pVM->cpum.s.CR4.OrMask, pVM->cpum.s.CR4.AndMask);
 }
 
@@ -1674 +1671 @@
 }
 #endif
+
+
+/**
+ * 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 VM handle.
+ * @param   fOr     The CR4 OR mask.
+ * @param   fAnd    The CR4 AND mask.
+ */
+CPUMR3DECL(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;
+}
+