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

Timestamp:

Mar 7, 2009 4:18:42 AM (16 years ago)

Author:

vboxsync

Message:

pgmPhysRomWriteHandler: corrected prototype (copy & past from obsolete code is not cool, removed dead pgmGCGuestPDWriteHandler prototype).

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (2 diffs)
• VMMAll/PGMAllPhys.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3027 +3027 @@
 void            pgmUnlock(PVM pVM);
 
-VMMRCDECL(int)  pgmGCGuestPDWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
-VMMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
-
 int             pgmR3SyncPTResolveConflict(PVM pVM, PPGMMAPPING pMapping, PX86PD pPDSrc, RTGCPTR GCPtrOldMapping);
 int             pgmR3SyncPTResolveConflictPAE(PVM pVM, PPGMMAPPING pMapping, RTGCPTR GCPtrOldMapping);
@@ -3056 +3053 @@
 int             pgmPhysGCPhys2CCPtrInternal(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, void **ppv);
 int             pgmPhysGCPhys2CCPtrInternalReadOnly(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, const void **ppv);
+VMMDECL(int)    pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 #ifdef IN_RING3
 int             pgmR3PhysChunkMap(PVM pVM, uint32_t idChunk, PPPGMCHUNKR3MAP ppChunk);

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

@@ -72 +72 @@
  * @param   pvUser      User argument. Pointer to the ROM range structure.
  */
-VMMDECL(int) pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser)
-{
-    int rc;
+VMMDECL(int) pgmPhysRomWriteHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser)
+{
+    int             rc;
 #ifdef VBOX_WITH_NEW_PHYS_CODE
-    PPGMROMRANGE pRom = (PPGMROMRANGE)pvUser;
-    uint32_t iPage = GCPhysFault - pRom->GCPhys;
+    PPGMROMRANGE    pRom = (PPGMROMRANGE)pvUser;
+    uint32_t        iPage = (GCPhysFault - pRom->GCPhys) >> PAGE_SHIFT;
     Assert(iPage < (pRom->cb >> PAGE_SHIFT));
     switch (pRom->aPages[iPage].enmProt)
@@ -1541 +1541 @@
                 break;
             }
-
             memset(pvBuf, 0xff, cb);
+
             cbRead -= cb;
             pvBuf   = (char *)pvBuf + cb;