Changeset 3781092 in mainline for uspace/lib/c/arch/amd64/include/atomic.h

Timestamp:

2011-09-09T18:22:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (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

File:

• uspace/lib/c/arch/amd64/include/atomic.h (modified) (5 diffs)

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

@@ -44 +44 @@
 static inline void atomic_inc(atomic_t *val)
 {
+#ifdef __PCC__
+        asm volatile (
+                "lock incq %0\n"
+                : "+m" (val->count)
+        );
+#else
         asm volatile (
                 "lock incq %[count]\n"
                 : [count] "+m" (val->count)
         );
+#endif
 }
 
 static inline void atomic_dec(atomic_t *val)
 {
+#ifdef __PCC__
+        asm volatile (
+                "lock decq %0\n"
+                : "+m" (val->count)
+        );
+#else
         asm volatile (
                 "lock decq %[count]\n"
                 : [count] "+m" (val->count)
         );
+#endif
 }
 
@@ -62 +76 @@
         atomic_count_t r = 1;
         
+#ifdef __PCC__
+        asm volatile (
+                "lock xaddq %1, %0\n"
+                : "+m" (val->count),
+                  "+r" (r)
+        );
+#else
         asm volatile (
                 "lock xaddq %[r], %[count]\n"
@@ -67 +88 @@
                   [r] "+r" (r)
         );
+#endif
         
         return r;
@@ -75 +97 @@
         atomic_count_t r = -1;
         
+#ifdef __PCC__
+        asm volatile (
+                "lock xaddq %1, %0\n"
+                : "+m" (val->count),
+                  "+r" (r)
+        );
+#else
         asm volatile (
                 "lock xaddq %[r], %[count]\n"
@@ -80 +109 @@
                   [r] "+r" (r)
         );
+#endif
         
         return r;