Changeset 2559 in vbox for trunk/src/VBox

Timestamp:

May 9, 2007 2:00:38 PM (18 years ago)

Author:

vboxsync

Message:

Allow ring-3 only access handlers (phys).

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMHandler.cpp (modified) (3 diffs)
• VMMAll/PGMAllBth.h (modified) (2 diffs)
• VMMAll/PGMAllHandler.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1205 +1205 @@
     PPGMPHYSHANDLER pHandler = (PPGMPHYSHANDLER)pNode;
     RTGCINTPTR      offDelta = *(PRTGCINTPTR)pvUser;
-    Assert(pHandler->pfnHandlerGC);
-    pHandler->pfnHandlerGC  += offDelta;
-    if (pHandler->pvUserGC)
-        pHandler->pvUserGC  += offDelta;
+    if (pHandler->pfnHandlerGC)
+        pHandler->pfnHandlerGC += offDelta;
+    if ((RTGCUINTPTR)pHandler->pvUserGC >= 0x10000)
+        pHandler->pvUserGC += offDelta;
     return 0;
 }
+
 
 /**

trunk/src/VBox/VMM/PGMHandler.cpp

@@ -101 +101 @@
         pszModR0 = VMMR0_MAIN_MODULE_NAME;
 
-    if (    !pszModGC || !*pszModGC || !pszHandlerGC || !*pszHandlerGC
-        ||  !pszModR0 || !*pszModR0 || !pszHandlerR0 || !*pszHandlerR0)
-    {
-        AssertMsgFailed(("pfnHandlerGC or/and pszModGC is missing\n"));
-        return VERR_INVALID_PARAMETER;
-    }
-
     /*
      * Resolve the R0 handler.
@@ -113 +106 @@
     R0PTRTYPE(PFNPGMR0PHYSHANDLER) pfnHandlerR0 = NIL_RTR0PTR;
     int rc = VINF_SUCCESS;
-    if (HWACCMR3IsAllowed(pVM))
+    if (pszHandlerR0 && HWACCMR3IsAllowed(pVM))
         rc = PDMR3GetSymbolR0Lazy(pVM, pszModR0, pszHandlerR0, &pfnHandlerR0);
     if (VBOX_SUCCESS(rc))
@@ -120 +113 @@
          * Resolve the GC handler.
          */
-        RTGCPTR pfnHandlerGC;
-        rc = PDMR3GetSymbolGCLazy(pVM, pszModGC, pszHandlerGC, &pfnHandlerGC);
+        RTGCPTR pfnHandlerGC = NIL_RTGCPTR;
+        if (pszHandlerGC)
+            rc = PDMR3GetSymbolGCLazy(pVM, pszModGC, pszHandlerGC, &pfnHandlerGC);
 
         if (VBOX_SUCCESS(rc))

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

@@ -351 +351 @@
                                       ("Unexpected trap for physical handler: %08X (phys=%08x) HCPhys=%X uErr=%X, enum=%d\n", pvFault, GCPhys, HCPhys, uErr, pCur->enmType));
 
-#ifdef IN_GC
-                            Assert(CTXSUFF(pCur->pfnHandler));
-                            STAM_PROFILE_START(&pCur->Stat, h);
-                            rc = pCur->CTXSUFF(pfnHandler)(pVM, uErr, pRegFrame, pvFault, GCPhysFault, CTXSUFF(pCur->pvUser));
-                            STAM_PROFILE_STOP(&pCur->Stat, h);
-#elif IN_RING0
+#if defined(IN_GC) || defined(ING_RING0)
                             if (CTXALLSUFF(pCur->pfnHandler))
                             {
@@ -364 +359 @@
                             }
                             else
+#endif
                                 rc = VINF_EM_RAW_EMULATE_INSTR;
-#else
-                            rc = VINF_EM_RAW_EMULATE_INSTR;
-#endif
                             STAM_COUNTER_INC(&pVM->pgm.s.StatHandlersPhysical);
                             STAM_PROFILE_STOP(&pVM->pgm.s.StatHandlers, b);

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

@@ -108 +108 @@
             return VERR_INVALID_PARAMETER;
     }
-    if (!pfnHandlerGC)
-    {
-        AssertMsgFailed(("!pfnHandlerGC\n"));
-        return VERR_INVALID_PARAMETER;
-    }
     if (    (RTGCUINTPTR)pvUserGC >= 0x10000
         &&  MMHyperHC2GC(pVM, MMHyperGC2HC(pVM, pvUserGC)) != pvUserGC)
@@ -119 +114 @@
         return VERR_INVALID_PARAMETER;
     }
+    AssertReturn(pfnHandlerR3 || pfnHandlerR0 || pfnHandlerGC, VERR_INVALID_PARAMETER);
 
     /*