Changeset 9282 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2008 8:36:10 AM (17 years ago)

Author:

vboxsync

Message:

Type and cast corrections

Location:

trunk/src/VBox/VMM

Files:

• IOMInternal.h (modified) (1 diff)
• VMMAll/IOMAllMMIO.cpp (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMGC/MMRamGC.cpp (modified) (1 diff)
• VMMGC/SELMGC.cpp (modified) (4 diffs)
• VMMGC/TRPMGC.cpp (modified) (1 diff)
• VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)

trunk/src/VBox/VMM/IOMInternal.h

@@ -428 +428 @@
  * @param   pvUser      Pointer to the MMIO range entry.
  */
-IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser);
+IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
 
 /**

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

@@ -942 +942 @@
  * @param   pvUser      Pointer to the MMIO ring-3 range entry.
  */
-IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, void *pvFault, RTGCPHYS GCPhysFault, void *pvUser)
+IOMDECL(int) IOMMMIOHandler(PVM pVM, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore, RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser)
 {
     STAM_PROFILE_START(&pVM->iom.s.StatGCMMIOHandler, a);
-    Log3(("IOMMMIOHandler: GCPhys=%RGp uErr=%#x pvFault=%p eip=%RGv\n",
-          GCPhysFault, uErrorCode, pvFault, pCtxCore->eip));
+    Log3(("IOMMMIOHandler: GCPhys=%RGp uErr=%#x pvFault=%VGv eip=%RGv\n",
+          GCPhysFault, (uint32_t)uErrorCode, pvFault, pCtxCore->eip));
 
     PIOMMMIORANGE pRange = (PIOMMMIORANGE)pvUser;

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

@@ -299 +299 @@
 PGMDECL(int)     PGMTrap0eHandler(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
 {
-    LogFlow(("PGMTrap0eHandler: uErr=%#x pvFault=%VGv eip=%VGv\n", uErr, pvFault, pRegFrame->eip));
+    LogFlow(("PGMTrap0eHandler: uErr=%#x pvFault=%VGv eip=%VGv\n", (uint32_t)uErr, pvFault, pRegFrame->eip));
     STAM_PROFILE_START(&pVM->pgm.s.StatGCTrap0e, a);
     STAM_STATS({ pVM->pgm.s.CTXSUFF(pStatTrap0eAttribution) = NULL; } );

trunk/src/VBox/VMM/VMMGC/MMRamGC.cpp

@@ -138 +138 @@
      * And mark the relevant guest page as accessed and dirty.
      */
-    PGMGstModifyPage(pVM, (RTGCPTR)pDst, cb, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D));
+    PGMGstModifyPage(pVM, (RTGCPTR)(RTRCUINTPTR)pDst, cb, X86_PTE_A | X86_PTE_D, ~(uint64_t)(X86_PTE_A | X86_PTE_D));
 
     return rc;

trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

@@ -205 +205 @@
         /** @todo should check if any affected selectors are loaded. */
         uint32_t cb;
-        rc = EMInterpretInstruction(pVM, pRegFrame, (RTGCPTR)pvFault, &cb);
+        rc = EMInterpretInstruction(pVM, pRegFrame, (RTGCPTR)(RTRCUINTPTR)pvFault, &cb);
         if (VBOX_SUCCESS(rc) && cb)
         {
@@ -291 +291 @@
      */
     uint32_t cb;
-    int rc = EMInterpretInstruction(pVM, pRegFrame, (RTGCPTR)pvFault, &cb);
+    int rc = EMInterpretInstruction(pVM, pRegFrame, (RTGCPTR)(RTRCUINTPTR)pvFault, &cb);
     if (VBOX_SUCCESS(rc) && cb)
     {
@@ -321 +321 @@
                     {
                         /* Shadow page table might be out of sync */
-                        rc = PGMPrefetchPage(pVM, (RTGCPTR)((uint8_t *)pGuestTSS + offIntRedirBitmap + i*8));
+                        rc = PGMPrefetchPage(pVM, (RTGCPTR)(RTRCUINTPTR)((uint8_t *)pGuestTSS + offIntRedirBitmap + i*8));
                         if (VBOX_FAILURE(rc))
                         {
@@ -440 +440 @@
                 /** @todo might cross page boundary */
                 fTriedAlready = true;
-                rc = PGMPrefetchPage(pVM, (RTGCPTR)GCPtrTss);
+                rc = PGMPrefetchPage(pVM, (RTGCPTR)(RTRCUINTPTR)GCPtrTss);
                 if (rc != VINF_SUCCESS)
                     return rc;

trunk/src/VBox/VMM/VMMGC/TRPMGC.cpp

@@ -115 +115 @@
 
     AssertMsg(offRange < (uint32_t)cbIDT+1, ("pvFault=%VGv GCPtrIDT=%VGv-%VGv pvRange=%VGv\n", pvFault, GCPtrIDT, GCPtrIDTEnd, pvRange));
-    Assert((RTGCPTR)pvRange == GCPtrIDT);
+    Assert((RTGCPTR)(RTRCUINTPTR)pvRange == GCPtrIDT);
 
 #if 0

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -467 +467 @@
      * accessing user code. need to handle it somehow in future!
      */
-    uint8_t *pu8Code;
-    if (SELMValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, (PRTGCPTR)&pu8Code) == VINF_SUCCESS)
-    {
+    RTGCPTR GCPtr;
+    if (SELMValidateAndConvertCSAddr(pVM, pRegFrame->eflags, pRegFrame->ss, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip, &GCPtr) == VINF_SUCCESS)
+    {
+        uint8_t *pu8Code = (uint8_t *)GCPtr;
         /*
          * First skip possible instruction prefixes, such as: