Changeset bf677f6 in mainline

Timestamp:

2013-11-11T21:17:25Z (10 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

9426f7c4

Parents:

679dc0c

Message:

Implement dummy atomics.

Location:

uspace/lib/c/arch/sparc32

Files:

• include/libarch/atomic.h (modified) (2 diffs)
• include/libarch/syscall.h (modified) (2 diffs)
• src/fibril.S (modified) (2 diffs)

uspace/lib/c/arch/sparc32/include/libarch/atomic.h

@@ -38 +38 @@
 #define LIBC_ARCH_ATOMIC_H_
 
+#define CAS
+
 #include <atomicdflt.h>
 #include <sys/types.h>
 
+static inline bool cas(atomic_t *val, atomic_count_t ov, atomic_count_t nv)
+{
+        if (val->count == ov) {
+                val->count = nv;
+                return true;
+        }
+        
+        return false;
+}
+
+static inline void atomic_inc(atomic_t *val) {
+        /* On real hardware the increment has to be done
+           as an atomic action. */
+        
+        val->count++;
+}
+
+static inline void atomic_dec(atomic_t *val) {
+        /* On real hardware the decrement has to be done
+           as an atomic action. */
+        
+        val->count++;
+}
+
+static inline atomic_count_t atomic_postinc(atomic_t *val)
+{
+        /* On real hardware both the storing of the previous
+           value and the increment have to be done as a single
+           atomic action. */
+        
+        atomic_count_t prev = val->count;
+        
+        val->count++;
+        return prev;
+}
+
+static inline atomic_count_t atomic_postdec(atomic_t *val)
+{
+        /* On real hardware both the storing of the previous
+           value and the decrement have to be done as a single
+           atomic action. */
+        
+        atomic_count_t prev = val->count;
+        
+        val->count--;
+        return prev;
+}
+
+#define atomic_preinc(val) (atomic_postinc(val) + 1)
+#define atomic_predec(val) (atomic_postdec(val) - 1)
+
+#if 0
 /** Atomic add operation.
  *
@@ -102 +156 @@
         (void) atomic_add(val, -1);
 }
+#endif
 
 #endif

uspace/lib/c/arch/sparc32/include/libarch/syscall.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcsparc64
+/** @addtogroup libcsparc32
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef LIBC_sparc64_SYSCALL_H_
-#define LIBC_sparc64_SYSCALL_H_
+#ifndef LIBC_sparc32_SYSCALL_H_
+#define LIBC_sparc32_SYSCALL_H_
 
 #include <sys/types.h>

uspace/lib/c/arch/sparc32/src/fibril.S

@@ -39 +39 @@
         # should a thread switch occur.
         #
-# XXX   CONTEXT_SAVE_ARCH_CORE %o0
+        CONTEXT_SAVE_ARCH_CORE %o0
         retl
         mov 1, %o0              ! context_save_arch returns 1
@@ -53 +53 @@
 #       flushw
         
-# XXX   CONTEXT_RESTORE_ARCH_CORE %o0
+        CONTEXT_RESTORE_ARCH_CORE %o0
         retl
         xor %o0, %o0, %o0       ! context_restore_arch returns 0