Changeset c2efbb4 in mainline for uspace/lib/libc/arch/arm32/include/atomic.h

Timestamp:

2010-02-20T20:54:53Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

721d4e85, 95c4776

Parents:

f516bc2 (diff), b03a666 (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:

Synchronize with head.

File:

• uspace/lib/libc/arch/arm32/include/atomic.h (modified) (12 diffs)

uspace/lib/libc/arch/arm32/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcarm32       
+/** @addtogroup libcarm32
  * @{
  */
@@ -38 +38 @@
 
 #define LIBC_ARCH_ATOMIC_H_
-#define CAS 
+#define CAS
 
 #include <atomicdflt.h>
@@ -46 +46 @@
 extern uintptr_t *ras_page;
 
-static inline bool cas(atomic_t *val, long ov, long nv)
-{
-        long ret = 0;
-
+static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv)
+{
+        atomic_count_t ret = 0;
+        
         /*
          * The following instructions between labels 1 and 2 constitute a
@@ -75 +75 @@
                 : "memory"
         );
-
+        
         ras_page[0] = 0;
-        asm volatile ("" ::: "memory"); 
+        asm volatile (
+                "" ::: "memory"
+        );
         ras_page[1] = 0xffffffff;
-
+        
         return (bool) ret;
 }
@@ -89 +91 @@
  *
  * @return Value after addition.
- */
-static inline long atomic_add(atomic_t *val, int i)
-{
-        long ret = 0;
-
+ *
+ */
+static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i)
+{
+        atomic_count_t ret = 0;
+        
         /*
          * The following instructions between labels 1 and 2 constitute a
@@ -115 +118 @@
                 : [imm] "r" (i)
         );
-
+        
         ras_page[0] = 0;
-        asm volatile ("" ::: "memory"); 
+        asm volatile (
+                "" ::: "memory"
+        );
         ras_page[1] = 0xffffffff;
-
+        
         return ret;
 }
@@ -127 +132 @@
  *
  * @param val Variable to be incremented.
+ *
  */
 static inline void atomic_inc(atomic_t *val)
@@ -137 +143 @@
  *
  * @param val Variable to be decremented.
+ *
  */
 static inline void atomic_dec(atomic_t *val)
@@ -148 +155 @@
  * @param val Variable to be incremented.
  * @return    Value after incrementation.
- */
-static inline long atomic_preinc(atomic_t *val)
+ *
+ */
+static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
         return atomic_add(val, 1);
@@ -159 +167 @@
  * @param val Variable to be decremented.
  * @return    Value after decrementation.
- */
-static inline long atomic_predec(atomic_t *val)
+ *
+ */
+static inline atomic_count_t atomic_predec(atomic_t *val)
 {
         return atomic_add(val, -1);
@@ -170 +179 @@
  * @param val Variable to be incremented.
  * @return    Value before incrementation.
- */
-static inline long atomic_postinc(atomic_t *val)
+ *
+ */
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         return atomic_add(val, 1) - 1;
@@ -181 +191 @@
  * @param val Variable to be decremented.
  * @return    Value before decrementation.
- */
-static inline long atomic_postdec(atomic_t *val)
+ *
+ */
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         return atomic_add(val, -1) + 1;