Changeset 9649 in vbox

Timestamp:

Jun 12, 2008 9:48:30 AM (17 years ago)

Author:

vboxsync

Message:

Added CPUMIsGuestInLongMode.

Location:

trunk

Files:

• include/VBox/cpum.h (modified) (1 diff)
• 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) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllPhys.cpp (modified) (1 diff)

trunk/include/VBox/cpum.h

@@ -518 +518 @@
 
 /**
+ * Tests if the guest is running in long mode or not.
+ *
+ * @returns true if in long mode, otherwise false.
+ * @param   pVM     The VM handle.
+ */
+DECLINLINE(bool) CPUMIsGuestInLongMode(PVM pVM)
+{
+    return (CPUMGetGuestEFER(pVM) & MSR_K6_EFER_LMA) == MSR_K6_EFER_LMA;
+}
+
+/**
  * Tests if the guest is running in paged protected or not.
  *

trunk/src/VBox/VMM/CPUM.cpp

@@ -790 +790 @@
     {
         case CPUMDUMPTYPE_TERSE:
-            if (CPUMGetGuestMode(pVM) == CPUMMODE_LONG)
+            if (CPUMIsGuestInLongMode(pVM))
             {
                 pHlp->pfnPrintf(pHlp,
@@ -818 +818 @@
 
         case CPUMDUMPTYPE_DEFAULT:
-            if (CPUMGetGuestMode(pVM) == CPUMMODE_LONG)
+            if (CPUMIsGuestInLongMode(pVM))
             {
                 pHlp->pfnPrintf(pHlp,
@@ -854 +854 @@
 
         case CPUMDUMPTYPE_VERBOSE:
-            if (CPUMGetGuestMode(pVM) == CPUMMODE_LONG)
+            if (CPUMIsGuestInLongMode(pVM))
             {
                 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? */
-    bool fPSE;
-
-    if (CPUMGetGuestMode(pVM) == CPUMMODE_LONG)
-        fPSE = true;
-    else
-        fPSE = !!(CPUMGetGuestCR4(pVM) & X86_CR4_PSE);
+    const bool fPSE = CPUMIsGuestInLongMode(pVM) || !!(CPUMGetGuestCR4(pVM) & X86_CR4_PSE);
 
     /* Global pages supported? */
@@ -3262 +3257 @@
         return VERR_INVALID_PARAMETER;
     }
-    bool fBigPagesSupported;
-
-    if (CPUMGetGuestMode(pVM) == CPUMMODE_LONG)
-        fBigPagesSupported = true;
-    else
-        fBigPagesSupported = !!(cr4 & X86_CR4_PSE);
+    const bool fBigPagesSupported = CPUMIsGuestInLongMode(pVM) || !!(cr4 & X86_CR4_PSE);
 
     int rc = VINF_SUCCESS;

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

@@ -397 +397 @@
 
     /* Mask away invalid parts of the cpu context. */
-    if (CPUMGetGuestMode(pVM) != CPUMMODE_LONG)
+    if (!CPUMIsGuestInLongMode(pVM))
     {
         uint64_t u64Mask = UINT64_C(0xffffffff);

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

@@ -1865 +1865 @@
 EMDECL(int) EMInterpretDRxWrite(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t DestRegDrx, uint32_t SrcRegGen)
 {
-    uint32_t val32;
-
-    int rc = DISFetchReg32(pRegFrame, SrcRegGen, &val32);
+    uint64_t val;
+    int      rc;
+
+    if (CPUMIsGuestInLongMode(pVM))
+    {
+        rc = DISFetchReg64(pRegFrame, SrcRegGen, &val);
+    }
+    else 
+    {
+        uint32_t val32;
+        rc = DISFetchReg32(pRegFrame, SrcRegGen, &val32);
+        val = val32;
+    }
+
     if (VBOX_SUCCESS(rc))
     {
-        rc = CPUMSetGuestDRx(pVM, DestRegDrx, val32);
+        rc = CPUMSetGuestDRx(pVM, DestRegDrx, val);
         if (VBOX_SUCCESS(rc))
             return rc;

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

@@ -988 +988 @@
      * PAE or 32-bit?
      */
-    Assert(CPUMGetGuestMode(pVM) != CPUMMODE_LONG);
+    Assert(!CPUMIsGuestInLongMode(pVM));
 
     int rc;