|
@@ -84,16 +84,43 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
|
|
|
return retval; \
|
|
|
}
|
|
|
|
|
|
-#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
|
|
|
+#define ATOMIC_FETCH_OP(op) \
|
|
|
+static inline int atomic_fetch_##op(int i, atomic_t *v) \
|
|
|
+{ \
|
|
|
+ int retval, status; \
|
|
|
+ \
|
|
|
+ asm volatile( \
|
|
|
+ "1: mov %4,(_AAR,%3) \n" \
|
|
|
+ " mov (_ADR,%3),%1 \n" \
|
|
|
+ " mov %1,%0 \n" \
|
|
|
+ " " #op " %5,%0 \n" \
|
|
|
+ " mov %0,(_ADR,%3) \n" \
|
|
|
+ " mov (_ADR,%3),%0 \n" /* flush */ \
|
|
|
+ " mov (_ASR,%3),%0 \n" \
|
|
|
+ " or %0,%0 \n" \
|
|
|
+ " bne 1b \n" \
|
|
|
+ : "=&r"(status), "=&r"(retval), "=m"(v->counter) \
|
|
|
+ : "a"(ATOMIC_OPS_BASE_ADDR), "r"(&v->counter), "r"(i) \
|
|
|
+ : "memory", "cc"); \
|
|
|
+ return retval; \
|
|
|
+}
|
|
|
+
|
|
|
+#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op) ATOMIC_FETCH_OP(op)
|
|
|
|
|
|
ATOMIC_OPS(add)
|
|
|
ATOMIC_OPS(sub)
|
|
|
|
|
|
-ATOMIC_OP(and)
|
|
|
-ATOMIC_OP(or)
|
|
|
-ATOMIC_OP(xor)
|
|
|
+#undef ATOMIC_OPS
|
|
|
+#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op)
|
|
|
+
|
|
|
+#define atomic_fetch_or atomic_fetch_or
|
|
|
+
|
|
|
+ATOMIC_OPS(and)
|
|
|
+ATOMIC_OPS(or)
|
|
|
+ATOMIC_OPS(xor)
|
|
|
|
|
|
#undef ATOMIC_OPS
|
|
|
+#undef ATOMIC_FETCH_OP
|
|
|
#undef ATOMIC_OP_RETURN
|
|
|
#undef ATOMIC_OP
|
|
|
|