Changeset 17106 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 25, 2009 12:35:15 AM (16 years ago)

Author:

vboxsync

Message:

VMM,REM: Removed the single page limitation on the TSS monitoring and going over the interrupt redirection bitmap monitoring.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllRegs.cpp (modified) (1 diff)
• EMAll.cpp (modified) (3 diffs)

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

@@ -640 +640 @@
     PCPUMCPU pCpumCpu = cpumGetCpumCpu(pVM);
 
-    if (    (cr4                   & (X86_CR4_PGE | X86_CR4_PAE | X86_CR4_PSE))
+    if (    (cr4                 & (X86_CR4_PGE | X86_CR4_PAE | X86_CR4_PSE))
         !=  (pCpumCpu->Guest.cr4 & (X86_CR4_PGE | X86_CR4_PAE | X86_CR4_PSE)))
         pCpumCpu->fChanged |= CPUM_CHANGED_GLOBAL_TLB_FLUSH;

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

@@ -2094 +2094 @@
         oldval = CPUMGetGuestCR4(pVM);
         rc = CPUMSetGuestCR4(pVM, val); AssertRC(rc);
-        val   = CPUMGetGuestCR4(pVM);
-
+        val = CPUMGetGuestCR4(pVM);
+
+        /* Illegal to disable PAE when long mode is active. (AMD Arch. Programmer's Manual Volume 2: Table 14-5) */
         msrEFER = CPUMGetGuestEFER(pVM);
-        /* Illegal to disable PAE when long mode is active. (AMD Arch. Programmer's Manual Volume 2: Table 14-5) */
         if (    (msrEFER & MSR_K6_EFER_LMA)
             &&  (oldval & X86_CR4_PAE)
             &&  !(val & X86_CR4_PAE))
         {
-            return VERR_EM_INTERPRETER; /* @todo generate #GP(0) */
+            return VERR_EM_INTERPRETER; /** @todo generate #GP(0) */
         }
 
@@ -2112 +2112 @@
             AssertRCReturn(rc, rc);
         }
+
+        /* Feeling extremely lazy. */
 # ifdef IN_RC
-        /* Feeling extremely lazy. */
         if (    (oldval & (X86_CR4_OSFSXR|X86_CR4_OSXMMEEXCPT|X86_CR4_PCE|X86_CR4_MCE|X86_CR4_PAE|X86_CR4_DE|X86_CR4_TSD|X86_CR4_PVI|X86_CR4_VME))
             !=  (val    & (X86_CR4_OSFSXR|X86_CR4_OSXMMEEXCPT|X86_CR4_PCE|X86_CR4_MCE|X86_CR4_PAE|X86_CR4_DE|X86_CR4_TSD|X86_CR4_PVI|X86_CR4_VME)))
@@ -2121 +2122 @@
         }
 # endif
+        if ((val ^ oldval) & X86_CR4_VME)
+            VM_FF_SET(pVM, VM_FF_SELM_SYNC_TSS);
+
         return PGMChangeMode(pVM, CPUMGetGuestCR0(pVM), CPUMGetGuestCR4(pVM), CPUMGetGuestEFER(pVM));