Changeset 6911 in vbox

Timestamp:

Feb 11, 2008 10:00:13 PM (17 years ago)

Author:

vboxsync

Message:

Removed the EIP (PGMVIRTHANDLERTYPE_EIP) kind of virtual access handlers. This type have never been used, isn't working right, and is just messing up the code.

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/PGMHandler.cpp (modified) (2 diffs)
• src/VBox/VMM/PGMMap.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (6 diffs)
• src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (3 diffs)

trunk/include/VBox/pgm.h

@@ -184 +184 @@
     /** All access handled. */
     PGMVIRTHANDLERTYPE_ALL,
-    /** By eip - Natural traps only. */
-    PGMVIRTHANDLERTYPE_EIP,
     /** Hypervisor write access handled.
      * This is used to catch the guest trying to write to LDT, TSS and any other

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -285 +285 @@
         case PGMVIRTHANDLERTYPE_ALL:
         case PGMVIRTHANDLERTYPE_WRITE:
-        case PGMVIRTHANDLERTYPE_EIP:
             if (!pfnHandlerHC)
             {
@@ -573 +572 @@
         case PGMVIRTHANDLERTYPE_WRITE:  pszType = "Write  "; break;
         case PGMVIRTHANDLERTYPE_ALL:    pszType = "All    "; break;
-        case PGMVIRTHANDLERTYPE_EIP:    pszType = "EIP    "; break;
         case PGMVIRTHANDLERTYPE_HYPERVISOR: pszType = "WriteHyp "; break;
         default:                        pszType = "????"; break;

trunk/src/VBox/VMM/PGMMap.cpp

@@ -1090 +1090 @@
     switch (pCur->enmType)
     {
-        case PGMVIRTHANDLERTYPE_EIP:
-            RTLogPrintf("EIP      %RGv-%RGv size %RGv %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->cb, pCur->pszDesc);
-            break;
         case PGMVIRTHANDLERTYPE_NORMAL:
             RTLogPrintf("NORMAL   %RGv-%RGv size %RGv %s\n", pCur->GCPtr, pCur->GCPtrLast, pCur->cb, pCur->pszDesc);

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

@@ -199 +199 @@
                 PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrRangeGet(&CTXSUFF(pVM->pgm.s.pTrees)->VirtHandlers, pvFault);
                 if (    pCur
-                    &&  pCur->enmType != PGMVIRTHANDLERTYPE_EIP
                     &&  (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
                     &&  (    uErr & X86_TRAP_PF_RW
@@ -216 +215 @@
                     STAM_PROFILE_STOP(&pVM->pgm.s.StatMapping, a);
                     return rc;
-                }
-
-                /*
-                 * Check if the EIP is in a virtual page access handler range.
-                 */
-                if (cpl == 0)
-                {
-                    RTGCPTR pvEIP;
-                    rc = SELMValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, &pvEIP);
-                    if (VBOX_SUCCESS(rc))
-                    {
-                        PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrRangeGet(&CTXSUFF(pVM->pgm.s.pTrees)->VirtHandlers, pvEIP);
-                        if (    pCur
-                            &&  pCur->enmType == PGMVIRTHANDLERTYPE_EIP
-                            &&  (RTGCUINTPTR)pvEIP - (RTGCUINTPTR)pCur->GCPtr < pCur->cb)
-                        {
-#  ifdef IN_GC
-                            STAM_PROFILE_START(&pCur->Stat, h);
-                            rc = CTXSUFF(pCur->pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvEIP - (RTGCUINTPTR)pCur->GCPtr);
-                            STAM_PROFILE_STOP(&pCur->Stat, h);
-#  else
-                            AssertFailed();
-                            rc = VINF_EM_RAW_EMULATE_INSTR; /* can't happen with VMX */
-#  endif
-                            STAM_COUNTER_INC(&pVM->pgm.s.StatTrap0eMapHandler);
-                            STAM_PROFILE_STOP(&pVM->pgm.s.StatMapping, a);
-                            return rc;
-                        }
-                    }
                 }
 
@@ -412 +382 @@
                                       ("Unexpected trap for virtual handler: %VGv (phys=%VGp) HCPhys=%HGp uErr=%X, enum=%d\n", pvFault, GCPhys, pPage->HCPhys, uErr, pCur->enmType));
 
-                            if (    pCur->enmType != PGMVIRTHANDLERTYPE_EIP
-                                &&  (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
+                            if (    (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
                                 &&  (    uErr & X86_TRAP_PF_RW
                                      ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
@@ -441 +410 @@
                             Assert(VBOX_SUCCESS(rc) || !pCur);
                             if (    pCur
-                                &&  pCur->enmType != PGMVIRTHANDLERTYPE_EIP
                                 &&  (   uErr & X86_TRAP_PF_RW
                                     ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
@@ -524 +492 @@
                                   ("Unexpected trap for virtual handler: %08X (phys=%08x) HCPhys=%X uErr=%X, enum=%d\n", pvFault, GCPhys, pPage->HCPhys, uErr, pCur->enmType));
 
-                        if (    pCur->enmType != PGMVIRTHANDLERTYPE_EIP
-                            &&  (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
+                        if (    (RTGCUINTPTR)pvFault - (RTGCUINTPTR)pCur->GCPtr < pCur->cb
                             &&  (    uErr & X86_TRAP_PF_RW
                                  ||  (   pCur->enmType != PGMVIRTHANDLERTYPE_WRITE
@@ -759 +726 @@
 
 # if PGM_WITH_PAGING(PGM_GST_TYPE)
-    /*
-     * Check if it's in a EIP based virtual page access handler range.
-     * This is only used for supervisor pages in flat mode.
-     */
-    /** @todo this stuff is completely broken by the out-of-sync stuff. since we don't use this stuff, that's not really a problem yet. */
-    STAM_PROFILE_START(&pVM->pgm.s.StatEIPHandlers, d);
-    if (cpl == 0)
-    {
-        RTGCPTR pvEIP;
-        rc = SELMValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, &pvEIP);
-        if (    VBOX_SUCCESS(rc)
-            &&  pvEIP == (RTGCPTR)pRegFrame->eip)
-        {
-            PPGMVIRTHANDLER pCur = (PPGMVIRTHANDLER)RTAvlroGCPtrRangeGet(&CTXSUFF(pVM->pgm.s.pTrees)->VirtHandlers, pvEIP);
-            if (    pCur
-                &&  pCur->enmType == PGMVIRTHANDLERTYPE_EIP
-                &&  (RTGCUINTPTR)pvEIP - (RTGCUINTPTR)pCur->GCPtr < pCur->cb)
-            {
-                LogFlow(("EIP handler\n"));
-#  ifdef IN_GC
-                STAM_PROFILE_START(&pCur->Stat, h);
-                rc = CTXSUFF(pCur->pfnHandler)(pVM, uErr, pRegFrame, pvFault, pCur->GCPtr, (RTGCUINTPTR)pvEIP - (RTGCUINTPTR)pCur->GCPtr);
-                STAM_PROFILE_STOP(&pCur->Stat, h);
-#  else
-                rc = VINF_EM_RAW_EMULATE_INSTR; /** @todo for VMX */
-#  endif
-                STAM_PROFILE_STOP(&pVM->pgm.s.StatEIPHandlers, d);
-                return rc;
-            }
-        }
-    }
-    STAM_PROFILE_STOP(&pVM->pgm.s.StatEIPHandlers, d);
-
     /*
      * Conclusion, this is a guest trap.

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

@@ -659 +659 @@
     switch (pCur->enmType)
     {
-        case PGMVIRTHANDLERTYPE_EIP:
         case PGMVIRTHANDLERTYPE_NORMAL:     fFlags = MM_RAM_FLAGS_VIRTUAL_HANDLER; break;
         case PGMVIRTHANDLERTYPE_WRITE:      fFlags = MM_RAM_FLAGS_VIRTUAL_HANDLER | MM_RAM_FLAGS_VIRTUAL_WRITE; break;

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

@@ -1103 +1103 @@
     switch (pCur->enmType)
     {
-        case PGMVIRTHANDLERTYPE_EIP:
         case PGMVIRTHANDLERTYPE_NORMAL: fFlags = MM_RAM_FLAGS_VIRTUAL_HANDLER; break;
         case PGMVIRTHANDLERTYPE_WRITE:  fFlags = MM_RAM_FLAGS_VIRTUAL_HANDLER | MM_RAM_FLAGS_VIRTUAL_WRITE; break;
@@ -1232 +1231 @@
             switch (pCur->enmType)
             {
-                case PGMVIRTHANDLERTYPE_EIP:
                 case PGMVIRTHANDLERTYPE_NORMAL:     pState->fFlagsFound |= MM_RAM_FLAGS_VIRTUAL_HANDLER; break;
                 case PGMVIRTHANDLERTYPE_WRITE:      pState->fFlagsFound |= MM_RAM_FLAGS_VIRTUAL_HANDLER | MM_RAM_FLAGS_VIRTUAL_WRITE; break;
@@ -1276 +1274 @@
     switch (pVirt->enmType)
     {
-        case PGMVIRTHANDLERTYPE_EIP:
         case PGMVIRTHANDLERTYPE_NORMAL:     fFlags = MM_RAM_FLAGS_VIRTUAL_HANDLER; break;
         case PGMVIRTHANDLERTYPE_WRITE:      fFlags = MM_RAM_FLAGS_VIRTUAL_HANDLER | MM_RAM_FLAGS_VIRTUAL_WRITE; break;