tabbing

diff --git a/cmodelint.cc b/cmodelint.cc
index cbf21320a52b6fd0792298bdfb15492d7464e83a..9b9055ae0cb8c4e004d02bc08e9d435deafbc98a 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -112,10 +112,10 @@ VOLATILELOAD(64)
                model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_relaxed, obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;            \
                thread_id_t tid = thread_current()->get_id();           \
                model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_relaxed, obj, (uint64_t) val)); \
                *((volatile uint ## size ## _t *)obj) = val;            \
                thread_id_t tid = thread_current()->get_id();           \

-               for(int i=0;i < size / 8;i++) {                         \
+               for(int i=0;i < size / 8;i++) {                         \

                        recordWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \
                        recordWrite(tid, (void *)(((char *)obj)+i));          \
                }                                                       \

-}
+       }

 
 VOLATILESTORE(8)
 VOLATILESTORE(16)
 
 VOLATILESTORE(8)
 VOLATILESTORE(16)

diff --git a/execution.cc b/execution.cc
index 4296895014c3eaa3c806067475a5a5cee6b3c16c..94be82acea20edd255f56fe6312702a89686df41 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -1105,7 +1105,7 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
                        int oldsize = (int) vec->size();
                        vec->resize(uninit_id + 1);
                        for(int i=oldsize;i<uninit_id+1;i++) {
                        int oldsize = (int) vec->size();
                        vec->resize(uninit_id + 1);
                        for(int i=oldsize;i<uninit_id+1;i++) {

-                         new(&(*vec)[i]) action_list_t();
+                               new(&(*vec)[i]) action_list_t();

                        }
                }
                (*vec)[uninit_id].push_front(uninit);
                        }
                }
                (*vec)[uninit_id].push_front(uninit);


@@ -1123,7 +1123,7 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
                uint oldsize =vec->size();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                uint oldsize =vec->size();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)

-                 new (&(*vec)[i]) action_list_t();
+                       new (&(*vec)[i]) action_list_t();

        }
        (*vec)[tid].push_back(act);
        if (uninit)
        }
        (*vec)[tid].push_back(act);
        if (uninit)


@@ -1152,7 +1152,7 @@ void ModelExecution::add_action_to_lists(ModelAction *act)
                        uint oldsize = vec->size();
                        vec->resize(priv->next_thread_id);
                        for(uint i=oldsize;i<priv->next_thread_id;i++)
                        uint oldsize = vec->size();
                        vec->resize(priv->next_thread_id);
                        for(uint i=oldsize;i<priv->next_thread_id;i++)

-                         new (&(*vec)[i]) action_list_t();
+                               new (&(*vec)[i]) action_list_t();

                }
                (*vec)[tid].push_back(act);
        }
                }
                (*vec)[tid].push_back(act);
        }


@@ -1214,7 +1214,7 @@ void ModelExecution::add_normal_write_to_lists(ModelAction *act)
                uint oldsize =vec->size();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                uint oldsize =vec->size();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)

-                 new (&(*vec)[i]) action_list_t();
+                       new (&(*vec)[i]) action_list_t();

        }
        insertIntoActionList(&(*vec)[tid],act);
 
        }
        insertIntoActionList(&(*vec)[tid],act);
 


@@ -1231,7 +1231,7 @@ void ModelExecution::add_write_to_lists(ModelAction *write) {
                uint oldsize =vec->size();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)
                uint oldsize =vec->size();
                vec->resize(priv->next_thread_id);
                for(uint i=oldsize;i<priv->next_thread_id;i++)

-                 new (&(*vec)[i]) action_list_t();
+                       new (&(*vec)[i]) action_list_t();

        }
        (*vec)[tid].push_back(write);
 }
        }
        (*vec)[tid].push_back(write);
 }

diff --git a/history.cc b/history.cc
index ea4ce20b6e27fec6c60f51f1232f8631d109538a..c48835340bbe5c574ffb48970d5f215e20daa78c 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -26,11 +26,11 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
                thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
 
        if ( thrd_func_list->size() <= id ) {
                thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
 
        if ( thrd_func_list->size() <= id ) {

-         uint oldsize = thrd_func_list->size();
-         thrd_func_list->resize( id + 1 );
-         for(uint i=oldsize; i<id+1; i++) {
-           new(&(*thrd_func_list)[i]) func_id_list_t();
-         }
+               uint oldsize = thrd_func_list->size();
+               thrd_func_list->resize( id + 1 );
+               for(uint i=oldsize;i<id+1;i++) {
+                       new(&(*thrd_func_list)[i]) func_id_list_t();
+               }

                thrd_func_inst_lists->resize( id + 1 );
        }
 
                thrd_func_inst_lists->resize( id + 1 );
        }
 

diff --git a/stl-model.h b/stl-model.h
index 70490965a2c70404eaf94a42ddc715777772f20d..cbcae7c04162f979cebb3d338cced3ad5d97e15e 100644 (file)
--- a/stl-model.h
+++ b/stl-model.h
@@ -60,9 +60,9 @@ public:
                mllnode<_Tp> *tmp = head;
                head = head->next;
                if (head == NULL)
                mllnode<_Tp> *tmp = head;
                head = head->next;
                if (head == NULL)

-                 tail = NULL;
+                       tail = NULL;

                else
                else

-                 head->prev = NULL;
+                       head->prev = NULL;

                delete tmp;
                _size--;
        }
                delete tmp;
                _size--;
        }


@@ -71,9 +71,9 @@ public:
                mllnode<_Tp> *tmp = tail;
                tail = tail->prev;
                if (tail == NULL)
                mllnode<_Tp> *tmp = tail;
                tail = tail->prev;
                if (tail == NULL)

-                 head = NULL;
+                       head = NULL;

                else
                else

-                 tail->next = NULL;
+                       tail->next = NULL;

                delete tmp;
                _size--;
        }
                delete tmp;
                _size--;
        }


@@ -218,9 +218,9 @@ public:
                sllnode<_Tp> *tmp = head;
                head = head->next;
                if (head == NULL)
                sllnode<_Tp> *tmp = head;
                head = head->next;
                if (head == NULL)

-                 tail = NULL;
+                       tail = NULL;

                else
                else

-                 head->prev = NULL;
+                       head->prev = NULL;

                delete tmp;
                _size--;
        }
                delete tmp;
                _size--;
        }


@@ -229,9 +229,9 @@ public:
                sllnode<_Tp> *tmp = tail;
                tail = tail->prev;
                if (tail == NULL)
                sllnode<_Tp> *tmp = tail;
                tail = tail->prev;
                if (tail == NULL)

-                 head = NULL;
+                       head = NULL;

                else
                else

-                   tail->next = NULL;
+                       tail->next = NULL;

                delete tmp;
                _size--;
        }
                delete tmp;
                _size--;
        }