Changeset 925a21e in mainline for uspace/lib/c/arch/ia32/include/atomic.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/ia32/include/atomic.h (modified) (5 diffs)

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

@@ -42 +42 @@
 static inline void atomic_inc(atomic_t *val)
 {
+#ifdef __PCC__
+        asm volatile (
+                "lock incl %0\n"
+                : "+m" (val->count)
+        );
+#else
         asm volatile (
                 "lock incl %[count]\n"
                 : [count] "+m" (val->count)
         );
+#endif
 }
 
 static inline void atomic_dec(atomic_t *val)
 {
+#ifdef __PCC__
+        asm volatile (
+                "lock decl %0\n"
+                : "+m" (val->count)
+        );
+#else
         asm volatile (
                 "lock decl %[count]\n"
                 : [count] "+m" (val->count)
         );
+#endif
 }
 
@@ -60 +74 @@
         atomic_count_t r = 1;
         
+#ifdef __PCC__
+        asm volatile (
+                "lock xaddl %1, %0\n"
+                : "+m" (val->count),
+                  "+r" (r)
+        );
+#else
         asm volatile (
                 "lock xaddl %[r], %[count]\n"
@@ -65 +86 @@
                   [r] "+r" (r)
         );
+#endif
         
         return r;
@@ -73 +95 @@
         atomic_count_t r = -1;
         
+#ifdef __PCC__
+        asm volatile (
+                "lock xaddl %1, %0\n"
+                : "+m" (val->count),
+                  "+r" (r)
+        );
+#else
         asm volatile (
                 "lock xaddl %[r], %[count]\n"
@@ -78 +107 @@
                   [r] "+r" (r)
         );
+#endif
         
         return r;