small changes

[c11tester.git] / impatomic.cc

diff --git a/impatomic.cc b/impatomic.cc
index df11202d8ade74f9e677bd8ebb46b2fc1bf062cd..391ce2aa159cea4b6e103d074c6cb5eb53032dfd 100644 (file)
--- a/impatomic.cc
+++ b/impatomic.cc
@@ -1,14 +1,15 @@
 #include "impatomic.h"
 #include "common.h"
 #include "model.h"
+#include "threads-model.h"
+#include "action.h"
 
 namespace std {
 
 bool atomic_flag_test_and_set_explicit ( volatile atomic_flag * __a__, memory_order __x__ ) {
        volatile bool * __p__ = &((__a__)->__f__);
-       model->switch_to_master(new ModelAction(ATOMIC_RMWR, __x__, (void *) __p__));
-       bool result = (bool) thread_current()->get_return_value();
-       model->switch_to_master(new ModelAction(ATOMIC_RMW, __x__, (void *) __p__, true));
+       bool result = (bool) model->switch_thread(new ModelAction(ATOMIC_RMWR, __x__, (void *) __p__));
+       model->switch_thread(new ModelAction(ATOMIC_RMW, __x__, (void *) __p__, true));
        return result;
 }
 
@@ -16,25 +17,24 @@ bool atomic_flag_test_and_set( volatile atomic_flag* __a__ )
 { return atomic_flag_test_and_set_explicit( __a__, memory_order_seq_cst ); }
 
 void atomic_flag_clear_explicit
-( volatile atomic_flag* __a__, memory_order __x__ )
+       ( volatile atomic_flag* __a__, memory_order __x__ )
 {
        volatile bool * __p__ = &((__a__)->__f__);
-       model->switch_to_master(new ModelAction(ATOMIC_WRITE, __x__, (void *) __p__, false));
+       model->switch_thread(new ModelAction(ATOMIC_WRITE, __x__, (void *) __p__, false));
 }
 
 void atomic_flag_clear( volatile atomic_flag* __a__ )
 { atomic_flag_clear_explicit( __a__, memory_order_seq_cst ); }
 
-void atomic_flag_fence( const volatile atomic_flag* __a__, memory_order __x__ )
-{
-       ASSERT(0);
+void __atomic_flag_wait__( volatile atomic_flag* __a__ ) {
+       while ( atomic_flag_test_and_set( __a__ ) )
+               ;
 }
 
-void __atomic_flag_wait__( volatile atomic_flag* __a__ )
-{ while ( atomic_flag_test_and_set( __a__ ) ); }
-
 void __atomic_flag_wait_explicit__( volatile atomic_flag* __a__,
-                                    memory_order __x__ )
-{ while ( atomic_flag_test_and_set_explicit( __a__, __x__ ) ); }
+                                                                                                                                               memory_order __x__ ) {
+       while ( atomic_flag_test_and_set_explicit( __a__, __x__ ))
+               ;
+}
 
 }