Changeset 04803bf in mainline for uspace/lib/c/arch/mips32/include/atomic.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/lib/c/arch/mips32/include/atomic.h (moved) (moved from uspace/lib/libc/arch/mips32/include/atomic.h ) (3 diffs)

uspace/lib/c/arch/mips32/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32      
+/** @addtogroup libcmips32
  * @{
  */
 /** @file
- * @ingroup libcmips32eb        
+ * @ingroup libcmips32eb
  */
 
@@ -37 +37 @@
 #define LIBC_mips32_ATOMIC_H_
 
-#define atomic_inc(x)   ((void) atomic_add(x, 1))
-#define atomic_dec(x)   ((void) atomic_add(x, -1))
+#define LIBC_ARCH_ATOMIC_H_
 
-#define atomic_postinc(x) (atomic_add(x, 1) - 1)
-#define atomic_postdec(x) (atomic_add(x, -1) + 1)
+#include <atomicdflt.h>
 
-#define atomic_preinc(x) atomic_add(x, 1)
-#define atomic_predec(x) atomic_add(x, -1)
+#define atomic_inc(x)  ((void) atomic_add(x, 1))
+#define atomic_dec(x)  ((void) atomic_add(x, -1))
+
+#define atomic_postinc(x)  (atomic_add(x, 1) - 1)
+#define atomic_postdec(x)  (atomic_add(x, -1) + 1)
+
+#define atomic_preinc(x)  atomic_add(x, 1)
+#define atomic_predec(x)  atomic_add(x, -1)
 
 /* Atomic addition of immediate value.
  *
  * @param val Memory location to which will be the immediate value added.
- * @param i Signed immediate that will be added to *val.
+ * @param i   Signed immediate that will be added to *val.
  *
  * @return Value after addition.
+ *
  */
-static inline long atomic_add(atomic_t *val, int i)
+static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i)
 {
-        long tmp, v;
-
+        atomic_count_t tmp;
+        atomic_count_t v;
+        
         asm volatile (
                 "1:\n"
@@ -66 +72 @@
                 /*      nop     */              /* nop is inserted automatically by compiler */
                 "       nop\n"
-                : "=&r" (tmp), "+m" (val->count), "=&r" (v)
-                : "r" (i), "i" (0)
-                );
-
+                : "=&r" (tmp),
+                  "+m" (val->count),
+                  "=&r" (v)
+                : "r" (i),
+                  "i" (0)
+        );
+        
         return v;
 }