X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=include%2Fimpatomic.h;h=b4273eee4a5984ce47c3b0ae922700fcad1f9e11;hp=1b9ce6be97f9efdb23debaaa87c820406a65ccf2;hb=7c510878f9679da10de79c289df402356b092396;hpb=daa5636072c8e6211e33701ae3d399c04e847946

diff --git a/include/impatomic.h b/include/impatomic.h
index 1b9ce6b..b4273ee 100644
--- a/include/impatomic.h
+++ b/include/impatomic.h
@@ -2330,23 +2330,28 @@ inline bool atomic_compare_exchange_strong
 inline void* atomic_fetch_add_explicit
 ( volatile atomic_address* __a__, ptrdiff_t __m__, memory_order __x__ )
 {
-	void* volatile* __p__ = &((__a__)->__f__);
-	void* __r__ = (void *) model_rmwr_action((void *)__p__, __x__);
-	model_rmw_action((void *)__p__, __x__, (uint64_t) ((char*)(*__p__) + __m__));
-  return __r__; }
+	volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);
+	__typeof__((__a__)->__f__) __old__=(__typeof__((__a__)->__f__)) model_rmwr_action((void *)__p__, __x__);
+	__typeof__((__a__)->__f__) __copy__= __old__;
+	__copy__ = (void *) (((char *)__copy__) + __m__);
+	model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__);
+	return __old__;
+}
 
-inline void* atomic_fetch_add
+ inline void* atomic_fetch_add
 ( volatile atomic_address* __a__, ptrdiff_t __m__ )
 { return atomic_fetch_add_explicit( __a__, __m__, memory_order_seq_cst ); }
 
 
 inline void* atomic_fetch_sub_explicit
 ( volatile atomic_address* __a__, ptrdiff_t __m__, memory_order __x__ )
-{
-	void* volatile* __p__ = &((__a__)->__f__);
-	void* __r__ = (void *) model_rmwr_action((void *)__p__, __x__);
-	model_rmw_action((void *)__p__, __x__, (uint64_t)((char*)(*__p__) - __m__));
-  return __r__; }
+{	volatile __typeof__((__a__)->__f__)* __p__ = & ((__a__)->__f__);
+	__typeof__((__a__)->__f__) __old__=(__typeof__((__a__)->__f__)) model_rmwr_action((void *)__p__, __x__);
+	__typeof__((__a__)->__f__) __copy__= __old__;
+	__copy__ = (void *) (((char *)__copy__) - __m__);
+	model_rmw_action((void *)__p__, __x__, (uint64_t) __copy__);
+	return __old__;
+}
 
 inline void* atomic_fetch_sub
 ( volatile atomic_address* __a__, ptrdiff_t __m__ )