Changeset 26526 in vbox

Timestamp:

Feb 15, 2010 3:36:01 AM (15 years ago)

Author:

vboxsync

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

57697

Message:

VMM,asm.h,Config.kmk: win.amd64 warnings; fixed the ASMAtomicSubU32 signature.

Location:

trunk

Files:

• Config.kmk (modified) (5 diffs)
• include/iprt/asm.h (modified) (1 diff)
• src/VBox/Devices/Audio/coreaudio.c (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/PDMAsyncCompletionFile.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMAsyncCompletionFileCache.cpp (modified) (2 diffs)
• src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp (modified) (1 diff)
• src/VBox/VMM/SSM.cpp (modified) (7 diffs)

trunk/Config.kmk ¶

@@ -1859 +1859 @@
   VBOX_GCC_WERR ?= -Werror
   VBOX_VCC_WERR ?= -WX
+  VBOX_VCC_LD_WERR ?= ## @todo later also: -WX
  endif
 endif
@@ -2164 +2165 @@
   endif
   TEMPLATE_VBoxRc_CFLAGS             = $(TEMPLATE_VBoxRc_CXXFLAGS)
-  TEMPLATE_VBoxRc_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Lines -MapInfo:Exports -NoD $(VBOX_VCC_WERR)
+  TEMPLATE_VBoxRc_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Lines -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR)
   ifndef VBOX_NOINC_MISC
    include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
@@ -2287 +2288 @@
  endif
 TEMPLATE_VBoxR0_CFLAGS              = $(TEMPLATE_VBoxR0_CXXFLAGS)
-TEMPLATE_VBoxR0_LDFLAGS             = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_WERR)
+TEMPLATE_VBoxR0_LDFLAGS             = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR)
 TEMPLATE_VBoxR0_LIBS                = \
         $(PATH_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
@@ -2725 +2726 @@
  TEMPLATE_VBoxR3Dll_CFLAGS            += $(VBOX_VCC_WERR)
  TEMPLATE_VBoxR3Dll_CXXFLAGS          += $(VBOX_VCC_WERR)
- TEMPLATE_VBoxR3Dll_LDFLAGS           += $(VBOX_VCC_WERR)
+ TEMPLATE_VBoxR3Dll_LDFLAGS           += $(VBOX_VCC_LD_WERR)
 else
  TEMPLATE_VBoxR3Dll_CFLAGS            += $(VBOX_GCC_WERR)
@@ -2766 +2767 @@
  TEMPLATE_VBoxR3Static_CFLAGS      += $(VBOX_VCC_WERR)
  TEMPLATE_VBoxR3Static_CXXFLAGS    += $(VBOX_VCC_WERR)
- TEMPLATE_VBoxR3Static_LDFLAGS     += $(VBOX_VCC_WERR)
+ TEMPLATE_VBoxR3Static_LDFLAGS     += $(VBOX_VCC_LD_WERR)
 else
  TEMPLATE_VBoxR3Static_CFLAGS      += $(VBOX_GCC_WERR)

trunk/include/iprt/asm.h ¶

@@ -3704 +3704 @@
  *
  * @returns The old value.
- * @param   pi32        Pointer to the value.
- * @param   i32         Number to subtract.
- */
-DECLINLINE(uint32_t) ASMAtomicSubU32(int32_t volatile *pi32, uint32_t i32)
-{
-    return ASMAtomicAddU32((uint32_t volatile *)pi32, (uint32_t)-(int32_t)i32);
+ * @param   pu32        Pointer to the value.
+ * @param   u32         Number to subtract.
+ */
+DECLINLINE(uint32_t) ASMAtomicSubU32(uint32_t volatile *pu32, uint32_t u32)
+{
+    return ASMAtomicAddU32(pu32, (uint32_t)-(int32_t)u32);
 }
 

trunk/src/VBox/Devices/Audio/coreaudio.c ¶

@@ -168 +168 @@
     pBuffer->uReadPos = (pBuffer->uReadPos + cSize) % pBuffer->cBufSize;
 
-    ASMAtomicSubU32((int32_t*)&pBuffer->cBufferUsed, cSize);
+    ASMAtomicSubU32(&pBuffer->cBufferUsed, cSize);
 }
 

trunk/src/VBox/VMM/Makefile.kmk ¶

@@ -181 +181 @@
         PDMAsyncCompletionFileCache.cpp
 endif
+if defined(VBOX_WITH_WARNINGS_AS_ERRORS) && "$(KBUILD_TARGET)" == "win"
+PDMAsyncCompletionFileCache.cpp_CXXFLAGS = -WX-
+endif
 
 ifdef VBOX_WITH_RAW_MODE

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp ¶

@@ -326 +326 @@
     else
     {
-        uint32_t uOld = ASMAtomicSubU32(&pTaskFile->cbTransferLeft, pTask->DataSeg.cbSeg);
+        Assert((uint32_t)pTask->DataSeg.cbSeg == pTask->DataSeg.cbSeg && (int32_t)pTask->DataSeg.cbSeg >= 0);
+        uint32_t uOld = ASMAtomicSubS32(&pTaskFile->cbTransferLeft, (int32_t)pTask->DataSeg.cbSeg);
 
         if (!(uOld - pTask->DataSeg.cbSeg)
@@ -347 +348 @@
            || (enmTransfer == PDMACTASKFILETRANSFER_WRITE));
 
-    ASMAtomicWriteS32(&pTaskFile->cbTransferLeft, cbTransfer);
+    Assert((uint32_t)cbTransfer == cbTransfer && (uint32_t)cbTransfer >= 0);
+    ASMAtomicWriteS32(&pTaskFile->cbTransferLeft, (int32_t)cbTransfer);
     ASMAtomicWriteBool(&pTaskFile->fCompleted, false);
 

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp ¶

@@ -605 +605 @@
     PPDMACFILETASKSEG pNext = pTaskSeg->pNext;
 
-    uint32_t uOld = ASMAtomicSubU32(&pTaskSeg->pTask->cbTransferLeft, pTaskSeg->cbTransfer);
+    uint32_t uOld = ASMAtomicSubS32(&pTaskSeg->pTask->cbTransferLeft, pTaskSeg->cbTransfer);
     AssertMsg(uOld >= pTaskSeg->cbTransfer, ("New value would overflow\n"));
     if (!(uOld - pTaskSeg->cbTransfer)
@@ -1771 +1771 @@
                 LogFlow(("Evicted enough bytes (%u requested). Creating new cache entry\n", cbToWrite));
 
-                uint8_t *pbBuf;
                 PPDMACFILECACHEENTRY pEntryNew;
 

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp ¶

@@ -374 +374 @@
 static int pdmacFileAioMgrNormalReqsEnqueue(PPDMACEPFILEMGR pAioMgr,
                                             PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint,
-                                            PRTFILEAIOREQ pahReqs, size_t cReqs)
+                                            PRTFILEAIOREQ pahReqs, unsigned cReqs)
 {
     int rc;

trunk/src/VBox/VMM/SSM.cpp ¶

@@ -559 +559 @@
              * @{ */
             /** The size of the file header. */
-            size_t          cbFileHdr;
+            uint32_t        cbFileHdr;
             /** The major version number. */
             uint16_t        u16VerMajor;
@@ -2346 +2346 @@
     Assert(pStrm->pCur);
     Assert(pStrm->off + cb <= RT_SIZEOFMEMB(SSMSTRMBUF, abData));
-    pStrm->off += cb;
+    pStrm->off += (uint32_t)cb;
     return VINF_SUCCESS;
 }
@@ -3408 +3408 @@
     while (cbToFill > 0)
     {
-        size_t cb = RT_MIN(sizeof(g_abZero), cbToFill);
+        uint32_t cb = RT_MIN(sizeof(g_abZero), cbToFill);
         int rc = ssmR3DataWrite(pSSM, g_abZero, cb);
         if (RT_FAILURE(rc))
@@ -5798 +5798 @@
                     /* Spill the remainer into the data buffer. */
                     memset(&pSSM->u.Read.abDataBuffer[0], 0, cbToRead - cbBuf);
-                    pSSM->u.Read.cbDataBuffer  = cbToRead - cbBuf;
+                    pSSM->u.Read.cbDataBuffer  = cbToRead - (uint32_t)cbBuf;
                     pSSM->u.Read.offDataBuffer = 0;
                     cbToRead = (uint32_t)cbBuf;
@@ -6902 +6902 @@
                 while (pSSM->u.Read.cbRecLeft)
                 {
-                    uint8_t abBuf[8192];
-                    size_t  cbToRead = RT_MIN(pSSM->u.Read.cbRecLeft, sizeof(abBuf));
+                    uint8_t  abBuf[8192];
+                    uint32_t cbToRead = RT_MIN(pSSM->u.Read.cbRecLeft, sizeof(abBuf));
                     int rc = ssmR3DataReadV2Raw(pSSM, abBuf, cbToRead);
                     if (RT_FAILURE(rc))
@@ -7142 +7142 @@
     {
         char        szMagic[sizeof(SSMFILEHDR_MAGIC_V2_0)];
-        size_t      cbHdr;
+        uint32_t    cbHdr;
         unsigned    uFmtVerMajor;
         unsigned    uFmtVerMinor;
@@ -8465 +8465 @@
     int rc = ssmR3StrmPeekAt(&pSSM->Strm, offDir, pDir, cbDir, NULL);
     AssertLogRelRCReturn(rc, rc);
-    rc = ssmR3ValidateDirectory(pDir, cbDir, offDir, cDirEntries, pSSM->u.Read.cbFileHdr, pSSM->u.Read.u32SvnRev);
+    rc = ssmR3ValidateDirectory(pDir, (uint32_t)cbDir, offDir, cDirEntries, pSSM->u.Read.cbFileHdr, pSSM->u.Read.u32SvnRev);
     if (RT_FAILURE(rc))
         return rc;