From ab6eed5e7e56620a4104fc99291a00948bd6c3df Mon Sep 17 00:00:00 2001 From: root Date: Tue, 30 Jul 2019 22:40:15 -0700 Subject: [PATCH] tabbing --- cmodelint.cc | 4 ++-- execution.cc | 10 +++++----- history.cc | 10 +++++----- stl-model.h | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmodelint.cc b/cmodelint.cc index cbf21320..9b9055ae 100644 --- 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(); \ - for(int i=0;i < size / 8;i++) { \ + for(int i=0;i < size / 8;i++) { \ recordWrite(tid, (void *)(((char *)obj)+i)); \ } \ -} + } VOLATILESTORE(8) VOLATILESTORE(16) diff --git a/execution.cc b/execution.cc index 42968950..94be82ac 100644 --- 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;isize(); vec->resize(priv->next_thread_id); for(uint i=oldsize;inext_thread_id;i++) - new (&(*vec)[i]) action_list_t(); + new (&(*vec)[i]) action_list_t(); } (*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;inext_thread_id;i++) - new (&(*vec)[i]) action_list_t(); + new (&(*vec)[i]) action_list_t(); } (*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;inext_thread_id;i++) - new (&(*vec)[i]) action_list_t(); + new (&(*vec)[i]) action_list_t(); } 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;inext_thread_id;i++) - new (&(*vec)[i]) action_list_t(); + new (&(*vec)[i]) action_list_t(); } (*vec)[tid].push_back(write); } diff --git a/history.cc b/history.cc index ea4ce20b..c4883534 100644 --- 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 ) { - uint oldsize = thrd_func_list->size(); - thrd_func_list->resize( id + 1 ); - for(uint i=oldsize; isize(); + thrd_func_list->resize( id + 1 ); + for(uint i=oldsize;iresize( id + 1 ); } diff --git a/stl-model.h b/stl-model.h index 70490965..cbcae7c0 100644 --- a/stl-model.h +++ b/stl-model.h @@ -60,9 +60,9 @@ public: mllnode<_Tp> *tmp = head; head = head->next; if (head == NULL) - tail = NULL; + tail = NULL; else - head->prev = NULL; + head->prev = NULL; delete tmp; _size--; } @@ -71,9 +71,9 @@ public: mllnode<_Tp> *tmp = tail; tail = tail->prev; if (tail == NULL) - head = NULL; + head = NULL; else - tail->next = NULL; + tail->next = NULL; delete tmp; _size--; } @@ -218,9 +218,9 @@ public: sllnode<_Tp> *tmp = head; head = head->next; if (head == NULL) - tail = NULL; + tail = NULL; else - head->prev = NULL; + head->prev = NULL; delete tmp; _size--; } @@ -229,9 +229,9 @@ public: sllnode<_Tp> *tmp = tail; tail = tail->prev; if (tail == NULL) - head = NULL; + head = NULL; else - tail->next = NULL; + tail->next = NULL; delete tmp; _size--; } -- 2.34.1