Changeset 9661 in vbox

Timestamp:

Jun 12, 2008 1:11:40 PM (17 years ago)

Author:

vboxsync

Message:

Implement and use CPUMIsGuestIn64BitCode where appropriate.

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (3 diffs)
• src/VBox/VMM/CPUM.cpp (modified) (3 diffs)
• src/VBox/VMM/PGM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)

trunk/include/VBox/cpum.h

@@ -535 +535 @@
 
 /**
- * Tests if the guest is running in paged protected or not.
+ * Tests if the guest is running in 16 bits paged protected or not.
  *
  * @returns true if in paged protected mode, otherwise false.
@@ -543 +543 @@
 
 /**
- * Tests if the guest is running in paged protected or not.
+ * Tests if the guest is running in 32 bits paged protected or not.
  *
  * @returns true if in paged protected mode, otherwise false.
@@ -551 +551 @@
 
 /**
- * Tests if the guest is running in paged protected or not.
- *
- * @returns true if in paged protected mode, otherwise false.
- * @param   pVM     The VM handle.
- */
-CPUMDECL(bool) CPUMIsGuestIn64BitCode(PVM pVM);
+ * Tests if the guest is running in 64 bits mode or not.
+ *
+ * @returns true if in 64 bits protected mode, otherwise false.
+ * @param   pVM     The VM handle.
+ * @param   pCtx    Current CPU context
+ */
+DECLINLINE(bool) CPUMIsGuestIn64BitCode(PVM pVM, PCCPUMCTXCORE pCtx)
+{
+    if (!CPUMIsGuestInLongMode(pVM))
+        return false;
+
+    return pCtx->csHid.Attr.n.u1Long;
+}
 
 /**

trunk/src/VBox/VMM/CPUM.cpp

@@ -790 +790 @@
     {
         case CPUMDUMPTYPE_TERSE:
-            if (CPUMIsGuestInLongMode(pVM))
+            if (CPUMIsGuestIn64BitCode(pVM, pCtxCore))
             {
                 pHlp->pfnPrintf(pHlp,
@@ -818 +818 @@
 
         case CPUMDUMPTYPE_DEFAULT:
-            if (CPUMIsGuestInLongMode(pVM))
+            if (CPUMIsGuestIn64BitCode(pVM, pCtxCore))
             {
                 pHlp->pfnPrintf(pHlp,
@@ -854 +854 @@
 
         case CPUMDUMPTYPE_VERBOSE:
-            if (CPUMIsGuestInLongMode(pVM))
+            if (CPUMIsGuestIn64BitCode(pVM, pCtxCore))
             {
                 pHlp->pfnPrintf(pHlp,

trunk/src/VBox/VMM/PGM.cpp

@@ -2383 +2383 @@
 /** @todo fix this! Convert the PGMR3DumpHierarchyHC functions to do guest stuff. */
     /* Big pages supported? */
-    const bool fPSE = CPUMIsGuestInLongMode(pVM) || !!(CPUMGetGuestCR4(pVM) & X86_CR4_PSE);
+    const bool fPSE  = !!(CPUMGetGuestCR4(pVM) & X86_CR4_PSE);
 
     /* Global pages supported? */
@@ -3257 +3257 @@
         return VERR_INVALID_PARAMETER;
     }
-    const bool fBigPagesSupported = CPUMIsGuestInLongMode(pVM) || !!(cr4 & X86_CR4_PSE);
+    const bool fBigPagesSupported = fLongMode || !!(cr4 & X86_CR4_PSE);
 
     int rc = VINF_SUCCESS;

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

@@ -1797 +1797 @@
     return enmMode;
 }
-

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

@@ -1868 +1868 @@
     int      rc;
 
-    if (CPUMIsGuestInLongMode(pVM))
+    if (CPUMIsGuestIn64BitCode(pVM, pRegFrame))
     {
         rc = DISFetchReg64(pRegFrame, SrcRegGen, &val);
@@ -1905 +1905 @@
     int rc = CPUMGetGuestDRx(pVM, SrcRegDrx, &val64);
     AssertMsgRCReturn(rc, ("CPUMGetGuestDRx %d failed\n", SrcRegDrx), VERR_EM_INTERPRETER);
-    if (CPUMIsGuestInLongMode(pVM))
+    if (CPUMIsGuestIn64BitCode(pVM, pRegFrame))
     {
         rc = DISWriteReg64(pRegFrame, DestRegGen, val64);