Changeset 41388 in vbox for trunk/src/VBox/VMM

Timestamp:

May 22, 2012 12:36:00 PM (13 years ago)

Author:

vboxsync

Message:

PGM: I believe trapping all access to shadowed ROM pages is going too far, see PGMROMPROT_IS_ROM and PGMR3PhysRomProtect.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPhys.cpp (modified) (1 diff)
• VMMR3/PGMPhys.cpp (modified) (2 diffs)

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

@@ -90 +90 @@
     PVMCPU          pVCpu = VMMGetCpu(pVM);
     NOREF(uErrorCode); NOREF(pvFault);
+
+    Assert(!(uErrorCode & X86_TRAP_PF_RW)); /* This shall not be used for write access! */
 
     Assert(iPage < (pRom->cb >> PAGE_SHIFT));

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -3198 +3198 @@
                 REMR3NotifyPhysRomRegister(pVM, GCPhys, cb, NULL, true /* fShadowed */);
 #endif
-                rc = PGMR3HandlerPhysicalRegister(pVM,
-                                                  fFlags & PGMPHYS_ROM_FLAGS_SHADOWED
-                                                  ? PGMPHYSHANDLERTYPE_PHYSICAL_ALL
-                                                  : PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
-                                                  GCPhys, GCPhysLast,
+                rc = PGMR3HandlerPhysicalRegister(pVM, PGMPHYSHANDLERTYPE_PHYSICAL_WRITE, GCPhys, GCPhysLast,
                                                   pgmR3PhysRomWriteHandler, pRomNew,
                                                   NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),
@@ -3209 +3205 @@
             else
             {
-                rc = PGMR3HandlerPhysicalRegister(pVM,
-                                                  fFlags & PGMPHYS_ROM_FLAGS_SHADOWED
-                                                  ? PGMPHYSHANDLERTYPE_PHYSICAL_ALL
-                                                  : PGMPHYSHANDLERTYPE_PHYSICAL_WRITE,
-                                                  GCPhys, GCPhysLast,
+                rc = PGMR3HandlerPhysicalRegister(pVM, PGMPHYSHANDLERTYPE_PHYSICAL_WRITE, GCPhys, GCPhysLast,
                                                   pgmR3PhysRomWriteHandler, pRomNew,
                                                   NULL, "pgmPhysRomWriteHandler", MMHyperCCToR0(pVM, pRomNew),