Changeset 7996 in vbox

Timestamp:

Apr 15, 2008 2:15:58 PM (17 years ago)

Author:

vboxsync

Message:

Relax tests for PAE (rem vs raw)

Location:

trunk/src

Files:

• VBox/VMM/EM.cpp (modified) (2 diffs)
• VBox/VMM/PGM.cpp (modified) (1 diff)
• recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -2416 +2416 @@
 #ifdef VBOX_STRICT
         Assert(REMR3QueryPendingInterrupt(pVM) == REM_NO_PENDING_IRQ);
-        Assert(!(pCtx->cr4 & X86_CR4_PAE));
         Assert(pCtx->eflags.Bits.u1VM || (pCtx->ss & X86_SEL_RPL) == 3 || (pCtx->ss & X86_SEL_RPL) == 0);
         AssertMsg(   (pCtx->eflags.u32 & X86_EFL_IF)
@@ -2778 +2777 @@
     if (pCtx->cr4 & X86_CR4_PAE)
     {
-        //Log2(("raw mode refused: PAE\n"));
-        return EMSTATE_REM;
+        uint32_t u32Dummy, u32Features;
+
+        CPUMGetGuestCpuId(pVM, 1, &u32Dummy, &u32Dummy, &u32Dummy, &u32Features);
+        if (!(u32Features & X86_CPUID_FEATURE_EDX_PAE))
+            return EMSTATE_REM;
     }
 

trunk/src/VBox/VMM/PGM.cpp

@@ -2912 +2912 @@
         case PGMMODE_PAE:
         {
-            uint32_t u32Dummy, u32ExtFeatures;
-
-            CPUMGetGuestCpuId(pVM, 1, &u32Dummy, &u32Dummy, &u32Dummy, &u32ExtFeatures);
-            if (!(u32ExtFeatures & X86_CPUID_FEATURE_EDX_PAE))
+            uint32_t u32Dummy, u32Features;
+
+            CPUMGetGuestCpuId(pVM, 1, &u32Dummy, &u32Dummy, &u32Dummy, &u32Features);
+            if (!(u32Features & X86_CPUID_FEATURE_EDX_PAE))
             {
                 /* Pause first, then inform Main. */

trunk/src/recompiler/VBoxRecompiler.c

@@ -1204 +1204 @@
     if (env->cr[4] & CR4_PAE_MASK)
     {
-        STAM_COUNTER_INC(&gStatRefusePAE);
-        //Log2(("raw mode refused: PAE\n"));
-        return false;
+        if (!(env->cpuid_features & X86_CPUID_FEATURE_EDX_PAE))
+        {
+            STAM_COUNTER_INC(&gStatRefusePAE);
+            return false;
+        }
     }