Changeset 04803bf in mainline for uspace/lib/c/arch/amd64/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/amd64/include/atomic.h (moved) (moved from uspace/lib/libc/arch/amd64/include/atomic.h ) (2 diffs)

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

@@ -38 +38 @@
 #define LIBC_amd64_ATOMIC_H_
 
-static inline void atomic_inc(atomic_t *val) {
-        asm volatile ("lock incq %0\n" : "+m" (val->count));
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
+
+static inline void atomic_inc(atomic_t *val)
+{
+        asm volatile (
+                "lock incq %[count]\n"
+                : [count] "+m" (val->count)
+        );
 }
 
-static inline void atomic_dec(atomic_t *val) {
-        asm volatile ("lock decq %0\n" : "+m" (val->count));
+static inline void atomic_dec(atomic_t *val)
+{
+        asm volatile (
+                "lock decq %[count]\n"
+                : [count] "+m" (val->count)
+        );
 }
 
-static inline long atomic_postinc(atomic_t *val) 
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
-        long r;
-
-        asm volatile (
-                "movq $1, %0\n"
-                "lock xaddq %0, %1\n"
-                : "=r" (r), "+m" (val->count)
-        );
-
-        return r;
-}
-
-static inline long atomic_postdec(atomic_t *val) 
-{
-        long r;
+        atomic_count_t r = 1;
         
         asm volatile (
-                "movq $-1, %0\n"
-                "lock xaddq %0, %1\n"
-                : "=r" (r), "+m" (val->count)
+                "lock xaddq %[r], %[count]\n"
+                : [count] "+m" (val->count),
+                  [r] "+r" (r)
         );
         
@@ -72 +71 @@
 }
 
-#define atomic_preinc(val) (atomic_postinc(val) + 1)
-#define atomic_predec(val) (atomic_postdec(val) - 1)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
+{
+        atomic_count_t r = -1;
+        
+        asm volatile (
+                "lock xaddq %[r], %[count]\n"
+                : [count] "+m" (val->count),
+                  [r] "+r" (r)
+        );
+        
+        return r;
+}
+
+#define atomic_preinc(val)  (atomic_postinc(val) + 1)
+#define atomic_predec(val)  (atomic_postdec(val) - 1)
 
 #endif