X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fuatomic_arch_s390.h;h=2a4fa03e66cedb8d32488ae9e659ef886e76d88f;hp=c4ca056fe078b5e3a57bcae3db93e3bee6bc3d44;hb=1b9119f8d4c3f40a61d4ee5403f0e7e5967c33d8;hpb=0cdbb97c1452c0413c99db75b9841fe3b6243618

diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic_arch_s390.h
index c4ca056..2a4fa03 100644
--- a/urcu/uatomic_arch_s390.h
+++ b/urcu/uatomic_arch_s390.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2009 Novell, Inc.
  * Author: Jan Blunck <jblunck@suse.de>
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -32,17 +32,9 @@
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 
-#ifndef __SIZEOF_LONG__
-#ifdef __s390x__
-#define __SIZEOF_LONG__ 8
-#else
-#define __SIZEOF_LONG__ 4
-#endif
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2)
 #define COMPILER_HAVE_SHORT_MEM_OPERAND
@@ -58,19 +50,21 @@
 #ifdef COMPILER_HAVE_SHORT_MEM_OPERAND
 
 #define MEMOP_OUT(addr)	"=Q" (*(addr))
-#define MEMOP_IN	"Q" (*(addr))
+#define MEMOP_IN(addr)	"Q" (*(addr))
 #define MEMOP_REF(op)	#op		/* op refer to MEMOP_IN operand */
 
 #else /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 
 #define MEMOP_OUT(addr)	"=m" (*(addr))
-#define MEMOP_IN	"a" (addr), "m" (*(addr))
+#define MEMOP_IN(addr)	"a" (addr), "m" (*(addr))
 #define MEMOP_REF(op)	"0(" #op ")"	/* op refer to MEMOP_IN operand */
 
 #endif /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 
-#define uatomic_set(addr, v)	STORE_SHARED(*(addr), (v))
-#define uatomic_read(addr)	LOAD_SHARED(*(addr))
+struct __uatomic_dummy {
+	unsigned long v[10];
+};
+#define __hp(x)	((struct __uatomic_dummy *)(x))
 
 /* xchg */
 
@@ -85,12 +79,12 @@ unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 		__asm__ __volatile__(
 			"0:	cs %0,%2," MEMOP_REF(%3) "\n"
 			"	brc 4,0b\n"
-			: "=&r" (old_val), MEMOP_OUT (addr)
-			: "r" (val), MEMOP_IN (addr)
+			: "=&r" (old_val), MEMOP_OUT (__hp(addr))
+			: "r" (val), MEMOP_IN (__hp(addr))
 			: "memory", "cc");
 		return old_val;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long old_val;
@@ -98,8 +92,8 @@ unsigned long _uatomic_exchange(volatile void *addr, unsigned long val, int len)
 		__asm__ __volatile__(
 			"0:	csg %0,%2," MEMOP_REF(%3) "\n"
 			"	brc 4,0b\n"
-			: "=&r" (old_val), MEMOP_OUT (addr)
-			: "r" (val), MEMOP_IN (addr)
+			: "=&r" (old_val), MEMOP_OUT (__hp(addr))
+			: "r" (val), MEMOP_IN (__hp(addr))
 			: "memory", "cc");
 		return old_val;
 	}
@@ -128,18 +122,18 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 
 		__asm__ __volatile__(
 			"	cs %0,%2," MEMOP_REF(%3) "\n"
-			: "+r" (old_val), MEMOP_OUT (addr)
-			: "r" (_new), MEMOP_IN (addr)
+			: "+r" (old_val), MEMOP_OUT (__hp(addr))
+			: "r" (_new), MEMOP_IN (__hp(addr))
 			: "memory", "cc");
 		return old_val;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
 			"	csg %0,%2," MEMOP_REF(%3) "\n"
-			: "+r" (old), MEMOP_OUT (addr)
-			: "r" (_new), MEMOP_IN (addr)
+			: "+r" (old), MEMOP_OUT (__hp(addr))
+			: "r" (_new), MEMOP_IN (__hp(addr))
 			: "memory", "cc");
 		return old;
 	}
@@ -157,58 +151,10 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 					       (unsigned long)(_new),	\
 					       sizeof(*(addr)))
 
-/* uatomic_add_return */
-
-static inline __attribute__((always_inline))
-unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
-{
-	switch (len) {
-	case 4:
-	{
-		unsigned int old, oldt;
-
-		oldt = uatomic_read((unsigned int *)addr);
-		do {
-			old = oldt;
-			oldt = _uatomic_cmpxchg(addr, old, old + val, 4);
-		} while (oldt != old);
-
-		return old + val;
-	}
-#if (BITS_PER_LONG == 64)
-	case 8:
-	{
-		unsigned long old, oldt;
-
-		oldt = uatomic_read((unsigned long *)addr);
-		do {
-			old = oldt;
-			oldt = _uatomic_cmpxchg(addr, old, old + val, 8);
-		} while (oldt != old);
-
-		return old + val;
-	}
-#endif
-	}
-	__builtin_trap();
-	return 0;
+#ifdef __cplusplus 
 }
+#endif
 
-#define uatomic_add_return(addr, v)					\
-	((__typeof__(*(addr))) _uatomic_add_return((addr),		\
-						  (unsigned long)(v),	\
-						  sizeof(*(addr))))
-
-/* uatomic_sub_return, uatomic_add, uatomic_sub, uatomic_inc, uatomic_dec */
-
-#define uatomic_sub_return(addr, v)	uatomic_add_return((addr), -(v))
-
-#define uatomic_add(addr, v)		(void)uatomic_add_return((addr), (v))
-#define uatomic_sub(addr, v)		(void)uatomic_sub_return((addr), (v))
-
-#define uatomic_inc(addr)		uatomic_add((addr), 1)
-#define uatomic_dec(addr)		uatomic_add((addr), -1)
-
-#define compat_uatomic_cmpxchg(ptr, old, _new)	uatomic_cmpxchg(ptr, old, _new)
+#include <urcu/uatomic_generic.h>
 
 #endif /* _URCU_UATOMIC_ARCH_S390_H */