Changeset 74453 in vbox for trunk

Timestamp:

Sep 25, 2018 11:15:13 AM (6 years ago)

Author:

vboxsync

Message:

DrvChar,asm.h: Added ASMAtomicXchgZ to get rid of 32-bit VCC warnings/errors.

Location:

trunk

Files:

• include/iprt/asm.h (modified) (1 diff)
• src/VBox/Devices/Serial/DrvChar.cpp (modified) (2 diffs)

trunk/include/iprt/asm.h

@@ -527 +527 @@
 
 /**
+ * Atomically Exchange a size_t value, ordered.
+ *
+ * @returns Current *ppv value
+ * @param   ppv    Pointer to the pointer variable to update.
+ * @param   pv     The pointer value to assign to *ppv.
+ */
+DECLINLINE(size_t) ASMAtomicXchgZ(size_t volatile RT_FAR *puValue, const size_t uValue)
+{
+#if ARCH_BITS == 16
+    AssertCompile(sizeof(size_t) == 2);
+    return ASMAtomicXchgU16((volatile uint16_t RT_FAR *)puValue, uValue);
+#elif ARCH_BITS == 32
+    return ASMAtomicXchgU32((volatile uint32_t RT_FAR *)puValue, uValue);
+#elif ARCH_BITS == 64
+    return ASMAtomicXchgU64((volatile uint64_t RT_FAR *)puValue, uValue);
+#else
+# error "ARCH_BITS is bogus"
+#endif
+}
+
+
+/**
  * Atomically Exchange a pointer value, ordered.
  *

trunk/src/VBox/Devices/Serial/DrvChar.cpp

@@ -212 +212 @@
     {        
         size_t cbOld = 0;
-        ASMAtomicXchgSizeCorrect(&pThis->cbRemaining, 0, &cbOld);
+        cbOld = ASMAtomicXchgZ(&pThis->cbRemaining, 0);
         if (cbOld) /* Kick the I/O thread to fetch new data. */
             rc = pThis->pDrvStream->pfnPollInterrupt(pThis->pDrvStream);
@@ -218 +218 @@
 
     LogFlowFunc(("-> %Rrc\n", rc));
-    return VINF_SUCCESS;
+    return VINF_SUCCESS; /** @todo r=bird: return rc? */
 }