Changeset 33c4f72 in mainline for kernel/arch/abs32le/include/atomic.h

Timestamp:

2010-06-25T13:38:30Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

fc81981

Parents:

09a0bd4a

Message:

improve annotations
move to the newest VCC syntax
use VCC specifications as a separate vcc.h header

File:

• kernel/arch/abs32le/include/atomic.h (modified) (6 diffs)

kernel/arch/abs32le/include/atomic.h

@@ -42 +42 @@
 
 ATOMIC static inline void atomic_inc(atomic_t *val)
+    WRITES(&val->count)
+    REQUIRES_EXTENT_MUTABLE(val)
     REQUIRES(val->count < ATOMIC_COUNT_MAX)
 {
@@ -51 +53 @@
 
 ATOMIC static inline void atomic_dec(atomic_t *val)
+    WRITES(&val->count)
+    REQUIRES_EXTENT_MUTABLE(val)
     REQUIRES(val->count > ATOMIC_COUNT_MIN)
 {
@@ -60 +64 @@
 
 ATOMIC static inline atomic_count_t atomic_postinc(atomic_t *val)
+    WRITES(&val->count)
+    REQUIRES_EXTENT_MUTABLE(val)
     REQUIRES(val->count < ATOMIC_COUNT_MAX)
 {
@@ -73 +79 @@
 
 ATOMIC static inline atomic_count_t atomic_postdec(atomic_t *val)
+    WRITES(&val->count)
+    REQUIRES_EXTENT_MUTABLE(val)
     REQUIRES(val->count > ATOMIC_COUNT_MIN)
 {
@@ -89 +97 @@
 
 ATOMIC static inline atomic_count_t test_and_set(atomic_t *val)
+    WRITES(&val->count)
+    REQUIRES_EXTENT_MUTABLE(val)
 {
         /* On real hardware the retrieving of the original
@@ -99 +109 @@
 }
 
-ATOMIC static inline atomic_count_t arch_atomic_get(atomic_t *val)
-{
-        /* This function is not needed on real hardware, it just
-           duplicates the functionality of atomic_get(). It is
-           defined here because atomic_get() is an inline function
-           declared in a header file which we are included in. */
-        
-        return val->count;
-}
-
 static inline void atomic_lock_arch(atomic_t *val)
+    WRITES(&val->count)
+    REQUIRES_EXTENT_MUTABLE(val)
 {
         do {
-                while (arch_atomic_get(val));
+                while (val->count);
         } while (test_and_set(val));
 }