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

Timestamp:

Feb 11, 2008 11:35:37 PM (17 years ago)

Author:

vboxsync

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

28066

Message:

Pass mapping sizes in uint32_t instead of size_t to avoid warnings. (PGMR3MapPT, PGMR3MappingsSize and PGMR3MappingsFix.)

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMMap.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -3885 +3885 @@
     pVM->pgm.s.fDisableMappings = !fEnable;
 
-    size_t cb;
+    uint32_t cb;
     int rc = PGMR3MappingsSize(pVM, &cb);
     AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/PGMMap.cpp

@@ -54 +54 @@
  * @param   pszDesc         Pointer to description string. This must not be freed.
  */
-PGMR3DECL(int) PGMR3MapPT(PVM pVM, RTGCPTR GCPtr, size_t cb, PFNPGMRELOCATE pfnRelocate, void *pvUser, const char *pszDesc)
+PGMR3DECL(int) PGMR3MapPT(PVM pVM, RTGCPTR GCPtr, uint32_t cb, PFNPGMRELOCATE pfnRelocate, void *pvUser, const char *pszDesc)
 {
     LogFlow(("PGMR3MapPT: GCPtr=%#x cb=%d pfnRelocate=%p pvUser=%p pszDesc=%s\n", GCPtr, cb, pfnRelocate, pvUser, pszDesc));
@@ -67 +67 @@
         return VERR_INVALID_PARAMETER;
     }
-    cb = RT_ALIGN_Z(cb, _4M);
+    cb = RT_ALIGN_32(cb, _4M);
     RTGCPTR GCPtrLast = GCPtr + cb - 1;
     if (GCPtrLast < GCPtr)
@@ -275 +275 @@
  * @param   pcb     Where to store the size.
  */
-PGMR3DECL(int) PGMR3MappingsSize(PVM pVM, size_t *pcb)
-{
-    size_t cb = 0;
+PGMR3DECL(int) PGMR3MappingsSize(PVM pVM, uint32_t *pcb)
+{
+    RTGCUINTPTR cb = 0;
     for (PPGMMAPPING pCur = pVM->pgm.s.pMappingsR3; pCur; pCur = pCur->pNextR3)
         cb += pCur->cb;
 
     *pcb = cb;
+    AssertReturn(*pcb != cb, VERR_NUMBER_TOO_BIG);
     Log(("PGMR3MappingsSize: return %d (%#x) bytes\n", cb, cb));
     return VINF_SUCCESS;
@@ -295 +296 @@
  * @param   cb          The size of the range starting at GCPtrBase.
  */
-PGMR3DECL(int) PGMR3MappingsFix(PVM pVM, RTGCPTR GCPtrBase, size_t cb)
+PGMR3DECL(int) PGMR3MappingsFix(PVM pVM, RTGCPTR GCPtrBase, uint32_t cb)
 {
     Log(("PGMR3MappingsFix: GCPtrBase=%#x cb=%#x\n", GCPtrBase, cb));