dev

git-svn-id: svn+ssh://svn.crossrain.com/svn/rpase/trunk/rtk@125 b0bb84a5-424d-4f98-af44-3ef3f117eb03

diff --git a/arch/linux/x86_64/rtypes.h b/arch/linux/x86_64/rtypes.h
index a9bdce4..a74b072 100644 (file)
--- a/arch/linux/x86_64/rtypes.h
+++ b/arch/linux/x86_64/rtypes.h
@@ -32,15 +32,33 @@ typedef unsigned int ruint32;
 typedef signed long rint64;
 typedef unsigned long ruint64;
 typedef unsigned long rword;
+typedef unsigned int ratomic;
 
 /*
  * Atomic operations (Architecture Dependent)
  */
-#define R_COMPARE_AND_EXCHANGE(ptr, oldval, newval, res) \
+#define R_ATOMIC_CMPXCHG(ptr, oldval, newval, resptr) \
                do { __asm__ __volatile__ ("lock; cmpxchgl %2, %1" \
-                       : "=a" (res), "=m" (*ptr) \
+                       : "=a" (*(resptr)), "=m" (*ptr) \
                        : "r" (newval), "m" (*ptr), "0" (oldval)); } while (0)
 
+#define R_ATOMIC_XCHG(ptr, val) \
+               do { __asm__ __volatile__("xchgl %0,%1" \
+                       :"=r" ((ruint32) val) \
+                       :"m" (*(volatile ruint32 *)ptr), "0" (val) \
+                       :"memory"); } while (0)
+
+#define R_ATOMIC_ADD(ptr, val) \
+               do { __asm__ __volatile__ ("addl %1,%0" \
+                       : "=m" (*ptr) \
+                       : "ir" (val), "m" (*ptr)); } while (0)
+
+#define R_ATOMIC_SUB(ptr, val) \
+               do { __asm__ __volatile__ ("subl %1,%0" \
+                       : "=m" (*ptr) \
+                       : "ir" (val), "m" (*ptr)); } while (0)
+
+
 
 #ifndef NULL
 #ifdef __cplusplus

diff --git a/rlib/build/linux/x86_64/Makefile b/rlib/build/linux/x86_64/Makefile
index b2c8b7a..9ad5379 100644 (file)
--- a/rlib/build/linux/x86_64/Makefile
+++ b/rlib/build/linux/x86_64/Makefile
@@ -18,6 +18,8 @@ ifeq ($(CCBLD), yes)
 CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
+CFLAGS += -DRPA_DEBUG_MEM
+
 CFLAGS += $(MACH) $(INCLUDE)
 LDFLAGS := $(MACH)
 

diff --git a/rlib/ratomic.c b/rlib/ratomic.c
index 45903ff..3392de9 100644 (file)
--- a/rlib/ratomic.c
+++ b/rlib/ratomic.c
@@ -1,10 +1,29 @@
 #include "rtypes.h"
 
 
-rboolean r_atomic_compare_and_exchange(volatile rint *ptr, rint oldval, rint newval)
+rboolean r_atomic_compare_and_exchange(volatile ratomic *ptr, ratomic oldval, ratomic newval)
 {
-       rint result;
+       ratomic result;
 
-       R_COMPARE_AND_EXCHANGE(ptr, oldval, newval, result);
+       R_ATOMIC_CMPXCHG(ptr, oldval, newval, &result);
        return (result == oldval);
 }
+
+
+ratomic r_atomic_exchange(volatile ratomic *ptr, ratomic val)
+{
+       R_ATOMIC_XCHG(ptr, val);
+       return val;
+}
+
+
+void r_atomic_add(volatile ratomic *ptr, ratomic val)
+{
+       R_ATOMIC_ADD(ptr, val);
+}
+
+
+void r_atomic_sub(volatile ratomic *ptr, ratomic val)
+{
+       R_ATOMIC_SUB(ptr, val);
+}

diff --git a/rlib/ratomic.h b/rlib/ratomic.h
index d533658..17c7d1b 100644 (file)
--- a/rlib/ratomic.h
+++ b/rlib/ratomic.h
@@ -6,8 +6,10 @@ extern "C" {
 #endif
 
 
-rboolean r_atomic_compare_and_exchange(volatile rint *ptr, rint oldval, rint newval);
-
+rboolean r_atomic_compare_and_exchange(volatile ratomic *ptr, ratomic oldval, ratomic newval);
+ratomic r_atomic_exchange(volatile ratomic *ptr, ratomic val);
+ratomic r_atomic_add(volatile ratomic *ptr, ratomic val);
+ratomic r_atomic_sub(volatile ratomic *ptr, ratomic val);
 
 #ifdef __cplusplus
 }

diff --git a/rlib/rmem.c b/rlib/rmem.c
index 39efca3..1e63f5d 100644 (file)
--- a/rlib/rmem.c
+++ b/rlib/rmem.c
@@ -82,3 +82,15 @@ void *r_memcpy(void *dest, const void *src, unsigned long n)
 {
        return memcpy(dest, src, (size_t)n);
 }
+
+
+rboolean r_atomic_int_compare_and_exchange (volatile rint *atomic, rint oldval, rint newval)
+{
+  rint result;
+
+  __asm__ __volatile__ ("lock; cmpxchgl %2, %1"
+            : "=a" (result), "=m" (*atomic)
+            : "r" (newval), "m" (*atomic), "0" (oldval));
+
+  return result == oldval;
+}