Add extern "C" to support linking userspace RCU library with C++ applications

[urcu.git] / urcu / uatomic_arch_s390.h

diff --git a/urcu/uatomic_arch_s390.h b/urcu/uatomic_arch_s390.h
index e5e1114391572e25c1d95fc8a53e96d132582ae4..813d9708a8efff783938a24c3e55987c64042436 100644 (file)
--- a/urcu/uatomic_arch_s390.h
+++ b/urcu/uatomic_arch_s390.h
@@ -32,6 +32,10 @@
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 
 #include <urcu/compiler.h>
 #include <urcu/system.h>
 

+#ifdef __cplusplus
+extern "C" {
+#endif 
+

 #ifndef __SIZEOF_LONG__
 #ifdef __s390x__
 #define __SIZEOF_LONG__ 8
 #ifndef __SIZEOF_LONG__
 #ifdef __s390x__
 #define __SIZEOF_LONG__ 8


@@ -59,7 +63,7 @@
 
 #define MEMOP_OUT(addr)        "=Q" (*(addr))
 #define MEMOP_IN       "Q" (*(addr))
 
 #define MEMOP_OUT(addr)        "=Q" (*(addr))
 #define MEMOP_IN       "Q" (*(addr))

-#define MEMOP_REF(op)  op              /* op refer to MEMOP_IN operand */
+#define MEMOP_REF(op)  #op             /* op refer to MEMOP_IN operand */

 
 #else /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 
 
 #else /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 


@@ -69,6 +73,11 @@
 
 #endif /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 
 
 #endif /* !COMPILER_HAVE_SHORT_MEM_OPERAND */
 

+struct __uatomic_dummy {
+       unsigned long v[10];
+};
+#define __hp(x)        ((struct __uatomic_dummy *)(x))
+

 #define uatomic_set(addr, v)   STORE_SHARED(*(addr), (v))
 #define uatomic_read(addr)     LOAD_SHARED(*(addr))
 
 #define uatomic_set(addr, v)   STORE_SHARED(*(addr), (v))
 #define uatomic_read(addr)     LOAD_SHARED(*(addr))
 


@@ -85,8 +94,8 @@ 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"
                __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;
        }
                        : "memory", "cc");
                return old_val;
        }


@@ -98,8 +107,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"
                __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;
        }
                        : "memory", "cc");
                return old_val;
        }


@@ -128,8 +137,8 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 
                __asm__ __volatile__(
                        "       cs %0,%2," MEMOP_REF(%3) "\n"
 
                __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;
        }
                        : "memory", "cc");
                return old_val;
        }


@@ -138,8 +147,8 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
        {
                __asm__ __volatile__(
                        "       csg %0,%2," MEMOP_REF(%3) "\n"
        {
                __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;
        }
                        : "memory", "cc");
                return old;
        }


@@ -211,4 +220,8 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val, int len)
 
 #define compat_uatomic_cmpxchg(ptr, old, _new) uatomic_cmpxchg(ptr, old, _new)
 
 
 #define compat_uatomic_cmpxchg(ptr, old, _new) uatomic_cmpxchg(ptr, old, _new)
 

+#ifdef __cplusplus 
+}
+#endif
+

 #endif /* _URCU_UATOMIC_ARCH_S390_H */
 #endif /* _URCU_UATOMIC_ARCH_S390_H */