Changeset b03a666 in mainline

Timestamp:

2010-02-20T20:35:45Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7af8c0e, c2efbb4

Parents:

228666c

Message:

define atomic_count_t even for abs32le

Files:

• kernel/arch/abs32le/include/atomic.h (modified) (5 diffs)
• kernel/arch/abs32le/include/types.h (modified) (1 diff)
• uspace/lib/libc/arch/abs32le/include/atomic.h (modified) (5 diffs)
• uspace/lib/libc/arch/abs32le/include/types.h (modified) (1 diff)

kernel/arch/abs32le/include/atomic.h

@@ -54 +54 @@
 }
 
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         /* On real hardware both the storing of the previous
@@ -60 +60 @@
            atomic action. */
         
-        long prev = val->count;
+        atomic_count_t prev = val->count;
         
         val->count++;
@@ -66 +66 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         /* On real hardware both the storing of the previous
@@ -72 +72 @@
            atomic action. */
         
-        long prev = val->count;
+        atomic_count_t prev = val->count;
         
         val->count--;
@@ -81 +81 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-static inline uint32_t test_and_set(atomic_t *val)
+static inline atomic_count_t test_and_set(atomic_t *val)
 {
-        uint32_t prev = val->count;
+        atomic_count_t prev = val->count;
         val->count = 1;
         return prev;

kernel/arch/abs32le/include/types.h

@@ -55 +55 @@
 typedef uint32_t unative_t;
 typedef int32_t native_t;
+typedef uint32_t atomic_count_t;
 
 typedef struct {

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

@@ -43 +43 @@
 #include <atomicdflt.h>
 
-static inline bool cas(atomic_t *val, long ov, long nv)
+static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv)
 {
         if (val->count == ov) {
@@ -67 +67 @@
 }
 
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         /* On real hardware both the storing of the previous
@@ -73 +73 @@
            atomic action. */
         
-        long prev = val->count;
+        atomic_count_t prev = val->count;
         
         val->count++;
@@ -79 +79 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         /* On real hardware both the storing of the previous
@@ -85 +85 @@
            atomic action. */
         
-        long prev = val->count;
+        atomic_count_t prev = val->count;
         
         val->count--;

uspace/lib/libc/arch/abs32le/include/types.h

@@ -54 +54 @@
 
 typedef uint32_t uintptr_t;
+typedef uint32_t atomic_count_t;
+typedef int32_t atomic_signed_t;
 
 #endif