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

Timestamp:

Feb 11, 2008 11:02:51 PM (17 years ago)

Author:

vboxsync

Message:

Separated the PGMVIRTHANDLERTYPE_HYPERVISOR kind of handlers from the others since to simplify the code a bit.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (4 diffs)
• PGMAllGst.h (modified) (1 diff)
• PGMAllHandler.cpp (modified) (1 diff)

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

@@ -197 +197 @@
                  * Check if the fault address is in a virtual page access handler range.
                  */
-                PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrRangeGet(&CTXSUFF(pVM->pgm.s.pTrees)->VirtHandlers, pvFault);
+                PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrRangeGet(&CTXSUFF(pVM->pgm.s.pTrees)->HyperVirtHandlers, pvFault);
                 if (    pCur
                     &&  (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
-                    &&  (    uErr & X86_TRAP_PF_RW
-                         ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
-                              && pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR) ) ) /** r=bird: <- this is probably wrong. */
+                    &&  uErr & X86_TRAP_PF_RW)
                 {
 #  ifdef IN_GC
@@ -384 +382 @@
                             if (    (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
                                 &&  (    uErr & X86_TRAP_PF_RW
-                                     ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
-                                          && pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR) ) ) /** @todo r=bird: _HYPERVISOR is impossible here because of mapping check. */
+                                     ||  pCur->enmType != PGMVIRTHANDLERTYPE_WRITE ) )
                             {
 #  ifdef IN_GC
@@ -411 +408 @@
                             if (    pCur
                                 &&  (   uErr & X86_TRAP_PF_RW
-                                    ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
-                                        &&  pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR) ) )
+                                     || pCur->enmType != PGMVIRTHANDLERTYPE_WRITE ) )
                             {
                                 Assert((pCur->aPhysToVirt[iPage].Core.Key & X86_PTE_PAE_PG_MASK) == GCPhys);
@@ -494 +490 @@
                         if (    (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
                             &&  (    uErr & X86_TRAP_PF_RW
-                                 ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
-                                      && pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR) ) ) /** @todo r=bird: _HYPERVISOR is impossible here because of mapping check. */
+                                 ||  pCur->enmType != PGMVIRTHANDLERTYPE_WRITE ) )
                         {
 #  ifdef IN_GC

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

@@ -644 +644 @@
     PPGMVIRTHANDLER pCur  = (PPGMVIRTHANDLER)pNode;
     PPGMHVUSTATE    pState = (PPGMHVUSTATE)pvUser;
+    Assert(pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR);
 
 #if PGM_GST_TYPE == PGM_TYPE_32BIT

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

@@ -1100 +1100 @@
      * Calc flags.
      */
+    Assert(pCur->enmType != PGMVIRTHANDLERTYPE_HYPERVISOR);
     unsigned        fFlags;
     switch (pCur->enmType)