Changeset 20567 in vbox for trunk/src/VBox

Timestamp:

Jun 14, 2009 8:31:54 PM (16 years ago)

Author:

vboxsync

Message:

DevATA,ATAController: Do not use MMGCRamReadNoTrapHandler nor MMGCRamWriteNoTrapHandler like that, they may both raise guru meditations. Changed the code to use the same PGMPhys*Read/Write APIs as in ring-3.

Location:

trunk/src/VBox

Files:

• Devices/Storage/DevATA.cpp (modified) (3 diffs)
• VMM/PGMInternal.h (modified) (2 diffs)
• VMM/VMMAll/PGMAll.cpp (modified) (2 diffs)
• VMM/VMMAll/PGMAllPhys.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -5400 +5400 @@
 }
 
-#ifndef IN_RING0
+#ifndef IN_RING0 /** @todo do this in ring-0 as well. */
 /**
  * Port I/O Handler for primary port range IN string operations.
@@ -5435 +5435 @@
         cbTransfer = cTransAvailable * cb;
 
-#ifdef IN_RC
-        for (uint32_t i = 0; i < cbTransfer; i += cb)
-            MMGCRamWriteNoTrapHandler((char *)GCDst + i, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, cb);
-#else /* !IN_RC */
         rc = PGMPhysSimpleDirtyWriteGCPtr(PDMDevHlpGetVMCPU(pDevIns), GCDst, s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
         Assert(rc == VINF_SUCCESS);
-#endif /* IN_RC */
 
         if (cbTransfer)
@@ -5492 +5487 @@
         cbTransfer = cTransAvailable * cb;
 
-#ifdef IN_RC
-        for (uint32_t i = 0; i < cbTransfer; i += cb)
-            MMGCRamReadNoTrapHandler(s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, (char *)GCSrc + i, cb);
-#else /* !IN_RC */
         rc = PGMPhysSimpleReadGCPtr(PDMDevHlpGetVMCPU(pDevIns), s->CTX_SUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
         Assert(rc == VINF_SUCCESS);
-#endif /* IN_RC */
 
         if (cbTransfer)

trunk/src/VBox/VMM/PGMInternal.h

@@ -449 +449 @@
         /** The HC virtual address of the two PAE page table. (i.e 1024 entries instead of 512) */
         R3PTRTYPE(PX86PTPAE)            paPaePTsR3;
-        /** The GC virtual address of the 32-bit page table. */
+        /** The RC virtual address of the 32-bit page table. */
         RCPTRTYPE(PX86PT)               pPTRC;
-        /** The GC virtual address of the two PAE page table. */
+        /** The RC virtual address of the two PAE page table. */
         RCPTRTYPE(PX86PTPAE)            paPaePTsRC;
-        /** The GC virtual address of the 32-bit page table. */
+        /** The R0 virtual address of the 32-bit page table. */
         R0PTRTYPE(PX86PT)               pPTR0;
-        /** The GC virtual address of the two PAE page table. */
+        /** The R0 virtual address of the two PAE page table. */
         R0PTRTYPE(PX86PTPAE)            paPaePTsR0;
     } aPTs[1];
@@ -484 +484 @@
     /** User argument for R0 handlers. */
     R0PTRTYPE(void *)                   pvUserR0;
-    /** Pointer to GC callback function. */
+    /** Pointer to RC callback function. */
     RCPTRTYPE(PFNPGMRCPHYSHANDLER)      pfnHandlerRC;
     /** User argument for RC handlers. */

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

@@ -2231 +2231 @@
                 return VINF_SUCCESS;
             }
-            else
-                LogFlow(("Out of sync entry %d\n", iPage));
+            LogFlow(("Out of sync entry %d\n", iPage));
         }
     }
@@ -2242 +2241 @@
      * Update the page tables.
      */
-    register unsigned iPage = pVM->pgm.s.iDynPageMapLast;
+    unsigned iPage = pVM->pgm.s.iDynPageMapLast;
     unsigned i;
-    for (i=0;i<(MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT);i++)
+    for (i = 0; i < (MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT); i++)
     {
         pVM->pgm.s.iDynPageMapLast = iPage = (iPage + 1) & ((MM_HYPER_DYNAMIC_SIZE >> PAGE_SHIFT) - 1);

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

@@ -2146 +2146 @@
 }
 
-#ifndef IN_RC /* Ring 0 & 3 only. (Just not needed in GC.) */
 
 /**
@@ -2618 +2617 @@
 }
 
-#endif /* !IN_RC */
 
 /**