Changeset 9661 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

Message:

Implement and use CPUMIsGuestIn64BitCode where appropriate.

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (3 diffs)
• PGM.cpp (modified) (2 diffs)
• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (2 diffs)

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);