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

Timestamp:

Nov 25, 2008 8:41:40 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

39897

Message:

Added R0 address to MMR3HyperMapHCPhys and made the MMHyperXToR0 use pvR0 for HCPhys and Locked more strickly.

File:

• trunk/src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)

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

@@ -219 +219 @@
             if (pLookup->u.Locked.pvR0)
                 return (RTR0PTR)((RTR0UINTPTR)pLookup->u.Locked.pvR0 + off);
-            /** @todo #1865: accessing ring-3 memory (LOCKED)! */
+#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE /** @todo make NIL_RTR0PTR default! */
+            return NIL_RTR0PTR;
+#else
             return (RTR0PTR)((RTR3UINTPTR)pLookup->u.Locked.pvR3 + off);
+#endif
+
         case MMLOOKUPHYPERTYPE_HCPHYS:
-            /** @todo #1865: accessing ring-3 memory (HCPHYS)! */
-            return (RTR0PTR)((RTR3UINTPTR)pLookup->u.HCPhys.pvR3 + off);
+            if (pLookup->u.HCPhys.pvR0)
+                return (RTR0PTR)((RTR0UINTPTR)pLookup->u.HCPhys.pvR0 + off);
+            return NIL_RTR0PTR;
         default:
             AssertMsgFailed(("enmType=%d\n", pLookup->enmType));