add support for function calls 'atomic_init' and 'atomic_compare_exchange()'

diff --git a/cmodelint.cc b/cmodelint.cc
index cdd8b442616be68ce17d882f97987cd3b959e3d3..454c4a06773159429bbffeac10e0bf6998ce7bc4 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -33,15 +33,6 @@ uint64_t model_rmwr_action(void *obj, memory_order ord) {
        return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
 }
 
        return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
 }
 

-/**
- * Performs the read part of a RMW CAS action. The next action must
- * either be the write part of the RMW action or an explicit close out
- * of the RMW action w/o a write.
- */
-uint64_t model_rmwrcas_action(void *obj, memory_order ord, uint64_t oldval, int size) {
-       return model->switch_to_master(new ModelAction(ATOMIC_RMWRCAS, ord, obj, oldval, size));
-}
-

 /** Performs the write part of a RMW action. */
 void model_rmw_action(void *obj, memory_order ord, uint64_t val) {
        model->switch_to_master(new ModelAction(ATOMIC_RMW, ord, obj, val));
 /** Performs the write part of a RMW action. */
 void model_rmw_action(void *obj, memory_order ord, uint64_t val) {
        model->switch_to_master(new ModelAction(ATOMIC_RMW, ord, obj, val));


@@ -74,8 +65,23 @@ void model_fence_action_helper(int atomic_index) {
        model->switch_to_master(new ModelAction(ATOMIC_FENCE, orders[atomic_index], FENCE_LOCATION));
 }
 
        model->switch_to_master(new ModelAction(ATOMIC_FENCE, orders[atomic_index], FENCE_LOCATION));
 }
 

+// cds atomic inits
+void cds_atomic_init8(void * obj, uint8_t val) {
+       model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, (uint64_t) val));
+}
+void cds_atomic_init16(void * obj, uint16_t val) {
+       model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, (uint64_t) val));
+}
+void cds_atomic_init32(void * obj, uint32_t val) {
+       model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, (uint64_t) val));
+}
+void cds_atomic_init64(void * obj, uint64_t val) {
+       model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, val));
+}
+
+

 // cds atomic loads
 // cds atomic loads

-uint8_t cds_atomic_load8(void * obj, int atomic_index) {
+uint8_t cds_atomic_load8(void * obj, int atomic_index) {       

        return (uint8_t) ( model->switch_to_master(new ModelAction(ATOMIC_READ, orders[atomic_index], obj)) );
 }
 uint16_t cds_atomic_load16(void * obj, int atomic_index) {
        return (uint8_t) ( model->switch_to_master(new ModelAction(ATOMIC_READ, orders[atomic_index], obj)) );
 }
 uint16_t cds_atomic_load16(void * obj, int atomic_index) {


@@ -89,158 +95,189 @@ uint64_t cds_atomic_load64(void * obj, int atomic_index) {
 }
 
 // cds atomic stores
 }
 
 // cds atomic stores

-void cds_atomic_store8(void * obj, int atomic_index, uint8_t val) {
+void cds_atomic_store8(void * obj, uint8_t val, int atomic_index) {

        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, (uint64_t) val));
 }
        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, (uint64_t) val));
 }

-void cds_atomic_store16(void * obj, int atomic_index, uint16_t val) {
+void cds_atomic_store16(void * obj, uint16_t val, int atomic_index) {

        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, (uint64_t) val));
 }
        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, (uint64_t) val));
 }

-void cds_atomic_store32(void * obj, int atomic_index, uint32_t val) {
+void cds_atomic_store32(void * obj, uint32_t val, int atomic_index) {

        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, (uint64_t) val));
 }
        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, (uint64_t) val));
 }

-void cds_atomic_store64(void * obj, int atomic_index, uint64_t val) {
+void cds_atomic_store64(void * obj, uint64_t val, int atomic_index) {

        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, val));
 }
 
 /*
        model->switch_to_master(new ModelAction(ATOMIC_WRITE, orders[atomic_index], obj, val));
 }
 
 /*

- #define _ATOMIC_RMW_(__op__, size, addr, atomic_index, val )            \
-   ({                                                                      \
-   uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index);   \
-   uint##size##_t _copy = _old;                                          \
-   _copy __op__ ( uint##size##_t ) _val;                                 \
-   model_rmw_action_helper(addr, atomic_index, (uint64_t) _copy);        \
-   return _old;                                                          \
-   })*/
+#define _ATOMIC_RMW_(__op__, size, addr, atomic_index, val )            \
+({                                                                      \
+  uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index);   \
+  uint##size##_t _copy = _old;                                          \
+  _copy __op__ ( uint##size##_t ) _val;                                 \
+  model_rmw_action_helper(addr, atomic_index, (uint64_t) _copy);        \
+  return _old;                                                          \
+})*/

 
 #define _ATOMIC_RMW_(__op__, size, addr, atomic_index, val )            \
 
 #define _ATOMIC_RMW_(__op__, size, addr, atomic_index, val )            \

-       ({                                                                      \
-               uint ## size ## _t _old = model_rmwr_action_helper(addr, atomic_index);   \
-               uint ## size ## _t _copy = _old;                                          \
-               uint ## size ## _t _val = val;                                            \
-               _copy __op__ _val;                                                    \
-               model_rmw_action_helper(addr, atomic_index, (uint64_t) _copy);        \
-               return _old;                                                          \
-       })
+({                                                                      \
+  uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index);   \
+  uint##size##_t _copy = _old;                                          \
+  uint##size##_t _val = val;                                            \
+  _copy __op__ _val;                                                    \
+  model_rmw_action_helper(addr, atomic_index, (uint64_t) _copy);        \
+  return _old;                                                          \
+})

 
 // cds atomic exchange
 
 // cds atomic exchange

-uint8_t cds_atomic_exchange8(void* addr, int atomic_index, uint8_t val) {
-       _ATOMIC_RMW_( =, 8, addr, atomic_index, val);
+uint8_t cds_atomic_exchange8(void* addr, uint8_t val, int atomic_index) {
+       _ATOMIC_RMW_( = , 8, addr, atomic_index, val);

 }
 }

-uint16_t cds_atomic_exchange16(void* addr, int atomic_index, uint16_t val) {
-       _ATOMIC_RMW_( =, 16, addr, atomic_index, val);
+uint16_t cds_atomic_exchange16(void* addr, uint16_t val, int atomic_index) {
+       _ATOMIC_RMW_( = , 16, addr, atomic_index, val);

 }
 }

-uint32_t cds_atomic_exchange32(void* addr, int atomic_index, uint32_t val) {
-       _ATOMIC_RMW_( =, 32, addr, atomic_index, val);
+uint32_t cds_atomic_exchange32(void* addr, uint32_t val, int atomic_index) {
+       _ATOMIC_RMW_( = , 32, addr, atomic_index, val);

 }
 }

-uint64_t cds_atomic_exchange64(void* addr, int atomic_index, uint64_t val) {
-       _ATOMIC_RMW_( =, 64, addr, atomic_index, val);
+uint64_t cds_atomic_exchange64(void* addr, uint64_t val, int atomic_index) {
+       _ATOMIC_RMW_( = , 64, addr, atomic_index, val);

 }
 
 // cds atomic fetch add
 }
 
 // cds atomic fetch add

-uint8_t cds_atomic_fetch_add8(void* addr, int atomic_index, uint8_t val) {
-       _ATOMIC_RMW_( +=, 8, addr, atomic_index, val);
+uint8_t cds_atomic_fetch_add8(void* addr, uint8_t val, int atomic_index) {
+       _ATOMIC_RMW_( += , 8, addr, atomic_index, val);

 }
 }

-uint16_t cds_atomic_fetch_add16(void* addr, int atomic_index, uint16_t val) {
-       _ATOMIC_RMW_( +=, 16, addr, atomic_index, val);
+uint16_t cds_atomic_fetch_add16(void* addr, uint16_t val, int atomic_index) {
+       _ATOMIC_RMW_( += , 16, addr, atomic_index, val);

 }
 }

-uint32_t cds_atomic_fetch_add32(void* addr, int atomic_index, uint32_t val) {
-       _ATOMIC_RMW_( +=, 32, addr, atomic_index, val);
+uint32_t cds_atomic_fetch_add32(void* addr, uint32_t val, int atomic_index) {
+       _ATOMIC_RMW_( += , 32, addr, atomic_index, val);

 }
 }

-uint64_t cds_atomic_fetch_add64(void* addr, int atomic_index, uint64_t val) {
-       _ATOMIC_RMW_( +=, 64, addr, atomic_index, val);
+uint64_t cds_atomic_fetch_add64(void* addr, uint64_t val, int atomic_index) {
+       _ATOMIC_RMW_( += , 64, addr, atomic_index, val);

 }
 
 // cds atomic fetch sub
 }
 
 // cds atomic fetch sub

-uint8_t cds_atomic_fetch_sub8(void* addr, int atomic_index, uint8_t val) {
-       _ATOMIC_RMW_( -=, 8, addr, atomic_index, val);
+uint8_t cds_atomic_fetch_sub8(void* addr, uint8_t val, int atomic_index) {
+       _ATOMIC_RMW_( -= , 8, addr, atomic_index, val);

 }
 }

-uint16_t cds_atomic_fetch_sub16(void* addr, int atomic_index, uint16_t val) {
-       _ATOMIC_RMW_( -=, 16, addr, atomic_index, val);
+uint16_t cds_atomic_fetch_sub16(void* addr, uint16_t val, int atomic_index) {
+       _ATOMIC_RMW_( -= , 16, addr, atomic_index, val);

 }
 }

-uint32_t cds_atomic_fetch_sub32(void* addr, int atomic_index, uint32_t val) {
-       _ATOMIC_RMW_( -=, 32, addr, atomic_index, val);
+uint32_t cds_atomic_fetch_sub32(void* addr, uint32_t val, int atomic_index) {
+       _ATOMIC_RMW_( -= , 32, addr, atomic_index, val);

 }
 }

-uint64_t cds_atomic_fetch_sub64(void* addr, int atomic_index, uint64_t val) {
-       _ATOMIC_RMW_( -=, 64, addr, atomic_index, val);
+uint64_t cds_atomic_fetch_sub64(void* addr, uint64_t val, int atomic_index) {
+       _ATOMIC_RMW_( -= , 64, addr, atomic_index, val);

 }
 
 // cds atomic fetch and
 }
 
 // cds atomic fetch and

-uint8_t cds_atomic_fetch_and8(void* addr, int atomic_index, uint8_t val) {
-       _ATOMIC_RMW_( &=, 8, addr, atomic_index, val);
+uint8_t cds_atomic_fetch_and8(void* addr, uint8_t val, int atomic_index) {
+       _ATOMIC_RMW_( &= , 8, addr, atomic_index, val);

 }
 }

-uint16_t cds_atomic_fetch_and16(void* addr, int atomic_index, uint16_t val) {
-       _ATOMIC_RMW_( &=, 16, addr, atomic_index, val);
+uint16_t cds_atomic_fetch_and16(void* addr, uint16_t val, int atomic_index) {
+       _ATOMIC_RMW_( &= , 16, addr, atomic_index, val);

 }
 }

-uint32_t cds_atomic_fetch_and32(void* addr, int atomic_index, uint32_t val) {
-       _ATOMIC_RMW_( &=, 32, addr, atomic_index, val);
+uint32_t cds_atomic_fetch_and32(void* addr, uint32_t val, int atomic_index) {
+       _ATOMIC_RMW_( &= , 32, addr, atomic_index, val);

 }
 }

-uint64_t cds_atomic_fetch_and64(void* addr, int atomic_index, uint64_t val) {
-       _ATOMIC_RMW_( &=, 64, addr, atomic_index, val);
+uint64_t cds_atomic_fetch_and64(void* addr, uint64_t val, int atomic_index) {
+       _ATOMIC_RMW_( &= , 64, addr, atomic_index, val);

 }
 
 // cds atomic fetch or
 }
 
 // cds atomic fetch or

-uint8_t cds_atomic_fetch_or8(void* addr, int atomic_index, uint8_t val) {
-       _ATOMIC_RMW_( |=, 8, addr, atomic_index, val);
+uint8_t cds_atomic_fetch_or8(void* addr, uint8_t val, int atomic_index) {
+       _ATOMIC_RMW_( |= , 8, addr, atomic_index, val);

 }
 }

-uint16_t cds_atomic_fetch_or16(void* addr, int atomic_index, uint16_t val) {
-       _ATOMIC_RMW_( |=, 16, addr, atomic_index, val);
+uint16_t cds_atomic_fetch_or16(void* addr, uint16_t val, int atomic_index) {
+       _ATOMIC_RMW_( |= , 16, addr, atomic_index, val);

 }
 }

-uint32_t cds_atomic_fetch_or32(void* addr, int atomic_index, uint32_t val) {
-       _ATOMIC_RMW_( |=, 32, addr, atomic_index, val);
+uint32_t cds_atomic_fetch_or32(void* addr, uint32_t val, int atomic_index) {
+       _ATOMIC_RMW_( |= , 32, addr, atomic_index, val);

 }
 }

-uint64_t cds_atomic_fetch_or64(void* addr, int atomic_index, uint64_t val) {
-       _ATOMIC_RMW_( |=, 64, addr, atomic_index, val);
+uint64_t cds_atomic_fetch_or64(void* addr, uint64_t val, int atomic_index) {
+       _ATOMIC_RMW_( |= , 64, addr, atomic_index, val);

 }
 
 // cds atomic fetch xor
 }
 
 // cds atomic fetch xor

-uint8_t cds_atomic_fetch_xor8(void* addr, int atomic_index, uint8_t val) {
-       _ATOMIC_RMW_( ^=, 8, addr, atomic_index, val);
+uint8_t cds_atomic_fetch_xor8(void* addr, uint8_t val, int atomic_index) {
+       _ATOMIC_RMW_( ^= , 8, addr, atomic_index, val);

 }
 }

-uint16_t cds_atomic_fetch_xor16(void* addr, int atomic_index, uint16_t val) {
-       _ATOMIC_RMW_( ^=, 16, addr, atomic_index, val);
+uint16_t cds_atomic_fetch_xor16(void* addr, uint16_t val, int atomic_index) {
+       _ATOMIC_RMW_( ^= , 16, addr, atomic_index, val);

 }
 }

-uint32_t cds_atomic_fetch_xor32(void* addr, int atomic_index, uint32_t val) {
-       _ATOMIC_RMW_( ^=, 32, addr, atomic_index, val);
+uint32_t cds_atomic_fetch_xor32(void* addr, uint32_t val, int atomic_index) {
+       _ATOMIC_RMW_( ^= , 32, addr, atomic_index, val);

 }
 }

-uint64_t cds_atomic_fetch_xor64(void* addr, int atomic_index, uint64_t val) {
-       _ATOMIC_RMW_( ^=, 64, addr, atomic_index, val);
+uint64_t cds_atomic_fetch_xor64(void* addr, uint64_t val, int atomic_index) {
+       _ATOMIC_RMW_( ^= , 64, addr, atomic_index, val);

 }
 
 // cds atomic compare and exchange
 }
 
 // cds atomic compare and exchange

-// In order to accomodate the LLVM PASS, the return values are not true or false.
+// In order to accomodate the LLVM PASS, the return values are not true or false. 

 
 #define _ATOMIC_CMPSWP_WEAK_ _ATOMIC_CMPSWP_
 #define _ATOMIC_CMPSWP_(size, addr, expected, desired, atomic_index)                            \
 
 #define _ATOMIC_CMPSWP_WEAK_ _ATOMIC_CMPSWP_
 #define _ATOMIC_CMPSWP_(size, addr, expected, desired, atomic_index)                            \

-       ({                                                                                              \
-               uint ## size ## _t _desired = desired;                                                            \
-               uint ## size ## _t _expected = expected;                                                          \
-               uint ## size ## _t _old = model_rmwr_action_helper(addr, atomic_index);                           \
-               if (_old == _expected  ) {                                                                    \
-                       model_rmw_action_helper(addr, atomic_index, (uint64_t) _desired ); return _expected; }      \
-               else {                                                                                        \
-                       model_rmwc_action_helper(addr, atomic_index); _expected = _old; return _old; }              \
-       })
-
-// expected is supposed to be a pointer to an address, but the CmpOperand
-// extracted from LLVM IR is an integer type.
-
-uint8_t cds_atomic_compare_exchange8(void* addr, uint8_t expected,
-                                                                                                                                                uint8_t desired, int atomic_index_succ, int atomic_index_fail ) {
+({                                                                                              \
+  uint##size##_t _desired = desired;                                                            \
+  uint##size##_t _expected = expected;                                                          \
+  uint##size##_t _old = model_rmwr_action_helper(addr, atomic_index);                           \
+  if (_old == _expected  ) {                                                                    \
+    model_rmw_action_helper(addr, atomic_index, (uint64_t) _desired ); return _expected; }      \
+  else {                                                                                        \
+    model_rmwc_action_helper(addr, atomic_index); _expected = _old; return _old; }              \
+})
+
+// atomic_compare_exchange version 1: the CmpOperand (corresponds to expected)
+// extracted from LLVM IR is an integer type. 
+
+uint8_t cds_atomic_compare_exchange8_v1(void* addr, uint8_t expected, 
+                uint8_t desired, int atomic_index_succ, int atomic_index_fail ) {

        _ATOMIC_CMPSWP_(8, addr, expected, desired, atomic_index_succ );
 }
        _ATOMIC_CMPSWP_(8, addr, expected, desired, atomic_index_succ );
 }

-uint16_t cds_atomic_compare_exchange16(void* addr, uint16_t expected,
-                                                                                                                                                        uint16_t desired, int atomic_index_succ, int atomic_index_fail ) {
+uint16_t cds_atomic_compare_exchange16_v1(void* addr, uint16_t expected,
+                uint16_t desired, int atomic_index_succ, int atomic_index_fail ) {

        _ATOMIC_CMPSWP_(16, addr, expected, desired, atomic_index_succ );
 }
        _ATOMIC_CMPSWP_(16, addr, expected, desired, atomic_index_succ );
 }

-uint32_t cds_atomic_compare_exchange32(void* addr, uint32_t expected,
-                                                                                                                                                        uint32_t desired, int atomic_index_succ, int atomic_index_fail ) {
+uint32_t cds_atomic_compare_exchange32_v1(void* addr, uint32_t expected, 
+                uint32_t desired, int atomic_index_succ, int atomic_index_fail ) {

        _ATOMIC_CMPSWP_(32, addr, expected, desired, atomic_index_succ );
 }
        _ATOMIC_CMPSWP_(32, addr, expected, desired, atomic_index_succ );
 }

-uint64_t cds_atomic_compare_exchange64(void* addr, uint64_t expected,
-                                                                                                                                                        uint64_t desired, int atomic_index_succ, int atomic_index_fail ) {
+uint64_t cds_atomic_compare_exchange64_v1(void* addr, uint64_t expected, 
+                uint64_t desired, int atomic_index_succ, int atomic_index_fail ) {

        _ATOMIC_CMPSWP_(64, addr, expected, desired, atomic_index_succ );
 }
 
        _ATOMIC_CMPSWP_(64, addr, expected, desired, atomic_index_succ );
 }
 

+// atomic_compare_exchange version 2
+bool cds_atomic_compare_exchange8_v2(void* addr, uint8_t* expected, 
+                uint8_t desired, int atomic_index_succ, int atomic_index_fail ) {
+       uint8_t ret = cds_atomic_compare_exchange8_v1(addr, *expected,
+                               desired, atomic_index_succ, atomic_index_fail );
+       if (ret == *expected) return true;
+       else return false; 
+}
+bool cds_atomic_compare_exchange16_v2(void* addr, uint16_t* expected,
+                uint16_t desired, int atomic_index_succ, int atomic_index_fail ) {
+       uint16_t ret = cds_atomic_compare_exchange16_v1(addr, *expected,
+                               desired, atomic_index_succ, atomic_index_fail );
+       if (ret == *expected) return true;
+       else return false; 
+}
+bool cds_atomic_compare_exchange32_v2(void* addr, uint32_t* expected, 
+                uint32_t desired, int atomic_index_succ, int atomic_index_fail ) {
+       uint32_t ret = cds_atomic_compare_exchange32_v1(addr, *expected,
+                               desired, atomic_index_succ, atomic_index_fail );
+       if (ret == *expected) return true;
+       else return false; 
+}
+bool cds_atomic_compare_exchange64_v2(void* addr, uint64_t* expected, 
+                uint64_t desired, int atomic_index_succ, int atomic_index_fail ) {
+       uint64_t ret = cds_atomic_compare_exchange64_v1(addr, *expected,
+                               desired, atomic_index_succ, atomic_index_fail );
+       if (ret == *expected) return true;
+       else return false; 
+}
+
+

 // cds atomic thread fence
 
 void cds_atomic_thread_fence(int atomic_index) {
 // cds atomic thread fence
 
 void cds_atomic_thread_fence(int atomic_index) {


@@ -248,7 +285,7 @@ void cds_atomic_thread_fence(int atomic_index) {
 }
 
 /*
 }
 
 /*

- #define _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ )                         \
+#define _ATOMIC_CMPSWP_( __a__, __e__, __m__, __x__ )                         \

         ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);   \
                 __typeof__(__e__) __q__ = (__e__);                            \
                 __typeof__(__m__) __v__ = (__m__);                            \
         ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);   \
                 __typeof__(__e__) __q__ = (__e__);                            \
                 __typeof__(__m__) __v__ = (__m__);                            \


@@ -259,13 +296,13 @@ void cds_atomic_thread_fence(int atomic_index) {
                 else {  model_rmwc_action((void *)__p__, __x__); *__q__ = __t__;  __r__ = false;} \
                 __r__; })
 
                 else {  model_rmwc_action((void *)__p__, __x__); *__q__ = __t__;  __r__ = false;} \
                 __r__; })
 

- #define _ATOMIC_FENCE_( __x__ ) \
+#define _ATOMIC_FENCE_( __x__ ) \

         ({ model_fence_action(__x__);})
         ({ model_fence_action(__x__);})

- */
+*/

 
 /*
 
 
 /*
 

- #define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ )                         \
+#define _ATOMIC_MODIFY_( __a__, __o__, __m__, __x__ )                         \

         ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);   \
         __typeof__((__a__)->__f__) __old__=(__typeof__((__a__)->__f__)) model_rmwr_action((void *)__p__, __x__); \
         __typeof__(__m__) __v__ = (__m__);                                    \
         ({ volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);   \
         __typeof__((__a__)->__f__) __old__=(__typeof__((__a__)->__f__)) model_rmwr_action((void *)__p__, __x__); \
         __typeof__(__m__) __v__ = (__m__);                                    \


@@ -273,5 +310,5 @@ void cds_atomic_thread_fence(int atomic_index) {
         __copy__ __o__ __v__;                                                 \
         model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__);          \
         __old__ = __old__;  Silence clang (-Wunused-value)                    \
         __copy__ __o__ __v__;                                                 \
         model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__);          \
         __old__ = __old__;  Silence clang (-Wunused-value)                    \

-         })
- */
+         })                           
+*/

diff --git a/include/cmodelint.h b/include/cmodelint.h
index d5a04867a6d83d16b0108eddf9e4d31f29f68410..4288607c4a5b235527e7c876ef56446639b0d274 100644 (file)
--- a/include/cmodelint.h
+++ b/include/cmodelint.h
@@ -16,7 +16,6 @@ uint64_t model_read_action(void * obj, memory_order ord);
 void model_write_action(void * obj, memory_order ord, uint64_t val);
 void model_init_action(void * obj, uint64_t val);
 uint64_t model_rmwr_action(void *obj, memory_order ord);
 void model_write_action(void * obj, memory_order ord, uint64_t val);
 void model_init_action(void * obj, uint64_t val);
 uint64_t model_rmwr_action(void *obj, memory_order ord);

-uint64_t model_rmwrcas_action(void *obj, memory_order ord, uint64_t oval, int size);

 void model_rmw_action(void *obj, memory_order ord, uint64_t val);
 void model_rmwc_action(void *obj, memory_order ord);
 void model_fence_action(memory_order ord);
 void model_rmw_action(void *obj, memory_order ord, uint64_t val);
 void model_rmwc_action(void *obj, memory_order ord);
 void model_fence_action(memory_order ord);


@@ -27,60 +26,74 @@ void model_rmw_action_helper(void *obj, int atomic_index, uint64_t val);
 void model_rmwc_action_helper(void *obj, int atomic_index);
 void model_fence_action_helper(int atomic_index);
 
 void model_rmwc_action_helper(void *obj, int atomic_index);
 void model_fence_action_helper(int atomic_index);
 

-// WL
+/* the following functions are used by llvm pass */
+
+void cds_atomic_init8(void * obj, uint8_t val);
+void cds_atomic_init16(void * obj, uint16_t val);
+void cds_atomic_init32(void * obj, uint32_t val);
+void cds_atomic_init64(void * obj, uint64_t val);
+

 uint8_t  cds_atomic_load8(void * obj, int atomic_index);
 uint16_t cds_atomic_load16(void * obj, int atomic_index);
 uint32_t cds_atomic_load32(void * obj, int atomic_index);
 uint64_t cds_atomic_load64(void * obj, int atomic_index);
 
 uint8_t  cds_atomic_load8(void * obj, int atomic_index);
 uint16_t cds_atomic_load16(void * obj, int atomic_index);
 uint32_t cds_atomic_load32(void * obj, int atomic_index);
 uint64_t cds_atomic_load64(void * obj, int atomic_index);
 

-void cds_atomic_store8(void * obj, int atomic_index, uint8_t val);
-void cds_atomic_store16(void * obj, int atomic_index, uint16_t val);
-void cds_atomic_store32(void * obj, int atomic_index, uint32_t val);
-void cds_atomic_store64(void * obj, int atomic_index, uint64_t val);
+void cds_atomic_store8(void * obj, uint8_t val, int atomic_index);
+void cds_atomic_store16(void * obj, uint16_t val, int atomic_index);
+void cds_atomic_store32(void * obj, uint32_t val, int atomic_index);
+void cds_atomic_store64(void * obj, uint64_t val, int atomic_index);

 
 
 // cds atomic exchange
 
 
 // cds atomic exchange

-uint8_t cds_atomic_exchange8(void* addr, int atomic_index, uint8_t val);
-uint16_t cds_atomic_exchange16(void* addr, int atomic_index, uint16_t val);
-uint32_t cds_atomic_exchange32(void* addr, int atomic_index, uint32_t val);
-uint64_t cds_atomic_exchange64(void* addr, int atomic_index, uint64_t val);
+uint8_t cds_atomic_exchange8(void* addr, uint8_t val, int atomic_index);
+uint16_t cds_atomic_exchange16(void* addr, uint16_t val, int atomic_index);
+uint32_t cds_atomic_exchange32(void* addr, uint32_t val, int atomic_index);
+uint64_t cds_atomic_exchange64(void* addr, uint64_t val, int atomic_index);

 // cds atomic fetch add
 // cds atomic fetch add

-uint8_t  cds_atomic_fetch_add8(void* addr, int atomic_index, uint8_t val);
-uint16_t cds_atomic_fetch_add16(void* addr, int atomic_index, uint16_t val);
-uint32_t cds_atomic_fetch_add32(void* addr, int atomic_index, uint32_t val);
-uint64_t cds_atomic_fetch_add64(void* addr, int atomic_index, uint64_t val);
+uint8_t  cds_atomic_fetch_add8(void* addr, uint8_t val, int atomic_index);
+uint16_t cds_atomic_fetch_add16(void* addr, uint16_t val, int atomic_index);
+uint32_t cds_atomic_fetch_add32(void* addr, uint32_t val, int atomic_index);
+uint64_t cds_atomic_fetch_add64(void* addr, uint64_t val, int atomic_index);

 // cds atomic fetch sub
 // cds atomic fetch sub

-uint8_t  cds_atomic_fetch_sub8(void* addr, int atomic_index, uint8_t val);
-uint16_t cds_atomic_fetch_sub16(void* addr, int atomic_index, uint16_t val);
-uint32_t cds_atomic_fetch_sub32(void* addr, int atomic_index, uint32_t val);
-uint64_t cds_atomic_fetch_sub64(void* addr, int atomic_index, uint64_t val);
+uint8_t  cds_atomic_fetch_sub8(void* addr, uint8_t val, int atomic_index);
+uint16_t cds_atomic_fetch_sub16(void* addr, uint16_t val, int atomic_index);
+uint32_t cds_atomic_fetch_sub32(void* addr, uint32_t val, int atomic_index);
+uint64_t cds_atomic_fetch_sub64(void* addr, uint64_t val, int atomic_index);

 // cds atomic fetch and
 // cds atomic fetch and

-uint8_t cds_atomic_fetch_and8(void* addr, int atomic_index, uint8_t val);
-uint16_t cds_atomic_fetch_and16(void* addr, int atomic_index, uint16_t val);
-uint32_t cds_atomic_fetch_and32(void* addr, int atomic_index, uint32_t val);
-uint64_t cds_atomic_fetch_and64(void* addr, int atomic_index, uint64_t val);
+uint8_t cds_atomic_fetch_and8(void* addr, uint8_t val, int atomic_index);
+uint16_t cds_atomic_fetch_and16(void* addr, uint16_t val, int atomic_index);
+uint32_t cds_atomic_fetch_and32(void* addr, uint32_t val, int atomic_index);
+uint64_t cds_atomic_fetch_and64(void* addr, uint64_t val, int atomic_index);

 // cds atomic fetch or
 // cds atomic fetch or

-uint8_t cds_atomic_fetch_or8(void* addr, int atomic_index, uint8_t val);
-uint16_t cds_atomic_fetch_or16(void* addr, int atomic_index, uint16_t val);
-uint32_t cds_atomic_fetch_or32(void* addr, int atomic_index, uint32_t val);
-uint64_t cds_atomic_fetch_or64(void* addr, int atomic_index, uint64_t val);
+uint8_t cds_atomic_fetch_or8(void* addr, uint8_t val, int atomic_index);
+uint16_t cds_atomic_fetch_or16(void* addr, uint16_t val, int atomic_index);
+uint32_t cds_atomic_fetch_or32(void* addr, uint32_t val, int atomic_index);
+uint64_t cds_atomic_fetch_or64(void* addr, uint64_t val, int atomic_index);

 // cds atomic fetch xor
 // cds atomic fetch xor

-uint8_t cds_atomic_fetch_xor8(void* addr, int atomic_index, uint8_t val);
-uint16_t cds_atomic_fetch_xor16(void* addr, int atomic_index, uint16_t val);
-uint32_t cds_atomic_fetch_xor32(void* addr, int atomic_index, uint32_t val);
-uint64_t cds_atomic_fetch_xor64(void* addr, int atomic_index, uint64_t val);
+uint8_t cds_atomic_fetch_xor8(void* addr, uint8_t val, int atomic_index);
+uint16_t cds_atomic_fetch_xor16(void* addr, uint16_t val, int atomic_index);
+uint32_t cds_atomic_fetch_xor32(void* addr, uint32_t val, int atomic_index);
+uint64_t cds_atomic_fetch_xor64(void* addr, uint64_t val, int atomic_index);

 
 // cds atomic compare and exchange (strong)
 
 // cds atomic compare and exchange (strong)

-
-uint8_t cds_atomic_compare_exchange8(void* addr, uint8_t expected, 
+uint8_t cds_atomic_compare_exchange8_v1(void* addr, uint8_t expected, 

                   uint8_t desire, int atomic_index_succ, int atomic_index_fail );
                   uint8_t desire, int atomic_index_succ, int atomic_index_fail );

-uint16_t cds_atomic_compare_exchange16(void* addr, uint16_t expected,
+uint16_t cds_atomic_compare_exchange16_v1(void* addr, uint16_t expected,

                   uint16_t desire, int atomic_index_succ, int atomic_index_fail );
                   uint16_t desire, int atomic_index_succ, int atomic_index_fail );

-uint32_t cds_atomic_compare_exchange32(void* addr, uint32_t expected, 
+uint32_t cds_atomic_compare_exchange32_v1(void* addr, uint32_t expected, 

                   uint32_t desire, int atomic_index_succ, int atomic_index_fail );
                   uint32_t desire, int atomic_index_succ, int atomic_index_fail );

-uint64_t cds_atomic_compare_exchange64(void* addr, uint64_t expected, 
+uint64_t cds_atomic_compare_exchange64_v1(void* addr, uint64_t expected, 

                   uint64_t desire, int atomic_index_succ, int atomic_index_fail );
 
                   uint64_t desire, int atomic_index_succ, int atomic_index_fail );
 

+bool cds_atomic_compare_exchange8_v2(void* addr, uint8_t* expected, 
+                uint8_t desired, int atomic_index_succ, int atomic_index_fail );
+bool cds_atomic_compare_exchange16_v2(void* addr, uint16_t* expected,
+                uint16_t desired, int atomic_index_succ, int atomic_index_fail );
+bool cds_atomic_compare_exchange32_v2(void* addr, uint32_t* expected, 
+                uint32_t desired, int atomic_index_succ, int atomic_index_fail );
+bool cds_atomic_compare_exchange64_v2(void* addr, uint64_t* expected, 
+                uint64_t desired, int atomic_index_succ, int atomic_index_fail );
+

 // cds atomic thread fence
 void cds_atomic_thread_fence(int atomic_index);
 
 // cds atomic thread fence
 void cds_atomic_thread_fence(int atomic_index);