Changeset 6927 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Feb 12, 2008 8:44:35 PM (17 years ago)

Author:

vboxsync

Message:

Converted MM_RAM_FLAGS_VIRTUAL_HANDLER, MM_RAM_FLAGS_VIRTUAL_WRITE
and MM_RAM_FLAGS_VIRTUAL_ALL into a two bit state variable in PGMPAGE.
I've checked this trice because, like last time, bugs may have odd
sideeffects and hide for a while before showing up. Hope I got this
right (unlike for phys).

Fixed a regression from the MM_RAM_FLAGS_PHYSICAL in the physical read/write code.

File:

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

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

@@ -93 +93 @@
 
 # if PGM_WITH_PAGING(PGM_GST_TYPE)
-    /* Determine current privilege level */
-    uint32_t cpl = CPUMGetGuestCPL(pVM, pRegFrame);
-
 #  ifdef PGM_SYNC_DIRTY_BIT
     /*
@@ -345 +342 @@
                          * In case of write access continue to the GC write handler.
                          */
-                        if (    (pPage->HCPhys & (MM_RAM_FLAGS_VIRTUAL_WRITE | MM_RAM_FLAGS_VIRTUAL_ALL)) == MM_RAM_FLAGS_VIRTUAL_WRITE /** @todo PAGE FLAGS */
+                        if (    PGM_PAGE_GET_HNDL_VIRT_STATE(pPage) < PGM_PAGE_HNDL_PHYS_STATE_ALL
                             && !(uErr & X86_TRAP_PF_P))
                         {
@@ -439 +436 @@
                     STAM_COUNTER_INC(&pVM->pgm.s.StatHandlersUnhandled);
 
-                    if (    !(pPage->HCPhys & (MM_RAM_FLAGS_VIRTUAL_ALL)) /** @todo PAGE FLAGS */
-                        &&  PGM_PAGE_GET_HNDL_PHYS_STATE(pPage) < PGM_PAGE_HNDL_PHYS_STATE_ALL
+                    if (    !PGM_PAGE_HAVE_ACTIVE_ALL_HANDLERS(pPage)
                         &&  !(uErr & X86_TRAP_PF_P))
                     {
@@ -539 +535 @@
 
 #  if PGM_WITH_PAGING(PGM_GST_TYPE) && !defined(IN_RING0)
-                if (cpl == 0)
+                if (CPUMGetGuestCPL(pVM, pRegFrame) == 0)
                 {
                     uint64_t fPageGst;
@@ -1128 +1124 @@
             const RTHCPHYS HCPhys = pPage->HCPhys; /** @todo FLAGS */
             SHWPTE PteDst;
-            if (    PGM_PAGE_GET_HNDL_PHYS_STATE(pPage) >= PGM_PAGE_HNDL_PHYS_STATE_WRITE
-                ||  (HCPhys & (MM_RAM_FLAGS_VIRTUAL_ALL | MM_RAM_FLAGS_VIRTUAL_WRITE)))
+            if (PGM_PAGE_HAVE_ACTIVE_HANDLERS(pPage))
             {
                 /** @todo r=bird: Are we actually handling dirty and access bits for pages with access handlers correctly? No. */
-                if (    PGM_PAGE_GET_HNDL_PHYS_STATE(pPage) <= PGM_PAGE_HNDL_PHYS_STATE_WRITE
-                    &&  !(HCPhys & MM_RAM_FLAGS_VIRTUAL_ALL))
+                if (!PGM_PAGE_HAVE_ACTIVE_ALL_HANDLERS(pPage))
                     PteDst.u = (PteSrc.u & ~(X86_PTE_PAE_PG_MASK | X86_PTE_AVL_MASK | X86_PTE_PAT | X86_PTE_PCD | X86_PTE_PWT | X86_PTE_RW))
                              | (HCPhys & X86_PTE_PAE_PG_MASK);