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

Timestamp:

Jul 1, 2009 12:37:04 PM (15 years ago)

Author:

vboxsync

Message:

Moved CR0.WP=0 handling up a bit

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -794 +794 @@
                             return VINF_EM_NO_MEMORY;
                     }
+
+                    /* Check to see if we need to emulate the instruction as X86_CR0_WP has been cleared. */
+                    if (    CPUMGetGuestCPL(pVCpu, pRegFrame) == 0
+                        &&  ((CPUMGetGuestCR0(pVCpu) & (X86_CR0_WP | X86_CR0_PG)) == X86_CR0_PG)
+                        &&  (uErr & (X86_TRAP_PF_RW | X86_TRAP_PF_P)) == (X86_TRAP_PF_RW | X86_TRAP_PF_P))
+                    {
+                        uint64_t fPageGst;
+                        rc = PGMGstGetPage(pVCpu, pvFault, &fPageGst, NULL);
+                        if (    RT_SUCCESS(rc)
+                            && !(fPageGst & X86_PTE_RW))
+                        {
+                            rc = PGMInterpretInstruction(pVM, pVCpu, pRegFrame, pvFault);
+                            if (RT_SUCCESS(rc))
+                                STAM_COUNTER_INC(&pVCpu->pgm.s.StatRZTrap0eWPEmulInRZ);
+                            else
+                                STAM_COUNTER_INC(&pVCpu->pgm.s.StatRZTrap0eWPEmulToR3);
+                            return rc;
+                        }
+                        AssertMsgFailed(("Unexpected r/w page %RGv flag=%x rc=%Rrc\n", pvFault, (uint32_t)fPageGst, rc));
+                    }
+
                     /// @todo count the above case; else
                     if (uErr & X86_TRAP_PF_US)
@@ -826 +847 @@
                         STAM_STATS({ pVCpu->pgm.s.CTX_SUFF(pStatTrap0eAttribution) = &pVCpu->pgm.s.StatRZTrap0eTime2OutOfSyncHndObs; });
                         return VINF_SUCCESS;
-                    }
-
-                    /* Check to see if we need to emulate the instruction as X86_CR0_WP has been cleared. */
-                    if (    CPUMGetGuestCPL(pVCpu, pRegFrame) == 0
-                        &&  ((CPUMGetGuestCR0(pVCpu) & (X86_CR0_WP | X86_CR0_PG)) == X86_CR0_PG)
-                        &&  (uErr & (X86_TRAP_PF_RW | X86_TRAP_PF_P)) == (X86_TRAP_PF_RW | X86_TRAP_PF_P))
-                    {
-                        uint64_t fPageGst;
-                        rc = PGMGstGetPage(pVCpu, pvFault, &fPageGst, NULL);
-                        if (    RT_SUCCESS(rc)
-                            && !(fPageGst & X86_PTE_RW))
-                        {
-                            rc = PGMInterpretInstruction(pVM, pVCpu, pRegFrame, pvFault);
-                            if (RT_SUCCESS(rc))
-                                STAM_COUNTER_INC(&pVCpu->pgm.s.StatRZTrap0eWPEmulInRZ);
-                            else
-                                STAM_COUNTER_INC(&pVCpu->pgm.s.StatRZTrap0eWPEmulToR3);
-                            return rc;
-                        }
-                        AssertMsgFailed(("Unexpected r/w page %RGv flag=%x rc=%Rrc\n", pvFault, (uint32_t)fPageGst, rc));
                     }
                 }