bug fix

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index abf1182315b18410e2f3275e77f98218452515d8..deaab0be37bae9818dd053db4055bb0de5ba0bfd 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -13,7 +13,9 @@ ModelHistory::ModelHistory() :
        func_counter(1),        /* function id starts with 1 */
        func_map(),
        func_map_rev(),
-       func_nodes()
+       func_nodes(),
+       write_history(),
+       write_locations()
 {}
 
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
@@ -25,7 +27,13 @@ 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; i < id + 1; i++) {
+                       // push 0 as a dummy function id to a void seg fault
+                       (*thrd_func_list)[i].push_back(0);
+               }
+
                thrd_func_inst_lists->resize( id + 1 );
        }
 
@@ -55,7 +63,6 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
        uint32_t last_func_id = (*thrd_func_list)[id].back();
 
        if (last_func_id == func_id) {
-               /* clear read map upon exiting functions */
                FuncNode * func_node = func_nodes[func_id];
                func_node->clear_read_map(tid);
 
@@ -78,7 +85,7 @@ void ModelHistory::resize_func_nodes(uint32_t new_size)
        if ( old_size < new_size )
                func_nodes.resize(new_size);
 
-       for (uint32_t id = old_size; id < new_size; id++) {
+       for (uint32_t id = old_size;id < new_size;id++) {
                const char * func_name = func_map_rev[id];
                FuncNode * func_node = new FuncNode();
                func_node->set_func_id(id);
@@ -98,14 +105,14 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
        uint32_t id = id_to_int(tid);
        if ( thrd_func_list->size() <= id )
                return;
-//     else if ( (*thrd_func_list)[id] == NULL)
-//             return;
 
        /* get the function id that thread i is currently in */
+       uint32_t func_id = (*thrd_func_list)[id].back();
        SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
 
-       uint32_t func_id = (*thrd_func_list)[id].back();
-       if ( func_nodes.size() <= func_id )
+       if (func_id == 0)
+               return;
+       else if ( func_nodes.size() <= func_id )
                resize_func_nodes( func_id + 1 );
 
        FuncNode * func_node = func_nodes[func_id];
@@ -120,6 +127,9 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
        if (inst->is_read())
                func_node->store_read(act, tid);
 
+       if (inst->is_write())
+               add_to_write_history(act->get_location(), act->get_write_value());
+
        /* add to curr_inst_list */
        func_inst_list_t * curr_inst_list = func_inst_lists->back();
        ASSERT(curr_inst_list != NULL);
@@ -152,21 +162,37 @@ uint64_t ModelHistory::query_last_read(void * location, thread_id_t tid)
        return last_read_val;
 }
 
-void ModelHistory::print()
+void ModelHistory::add_to_write_history(void * location, uint64_t write_val)
+{
+       write_set_t * write_set = write_history.get(location);
+
+       if (write_set == NULL) {
+               write_set = new write_set_t();
+               write_history.put(location, write_set);
+       }
+
+       write_set->add(write_val);
+       write_locations.add(location);
+}
+
+void ModelHistory::print_write()
+{
+}
+
+void ModelHistory::print_func_node()
 {
        /* function id starts with 1 */
-       for (uint32_t i = 1;i < func_nodes.size();i++) {
+       for (uint32_t i = 1; i < func_nodes.size(); i++) {
                FuncNode * func_node = func_nodes[i];
 
                func_inst_list_mt * entry_insts = func_node->get_entry_insts();
                model_print("function %s has entry actions\n", func_node->get_func_name());
 
-               func_inst_list_mt::iterator it;
-               for (it = entry_insts->begin();it != entry_insts->end();it++) {
-                       FuncInst *inst = *it;
+               mllnode<FuncInst*>* it;
+               for (it = entry_insts->begin();it != NULL;it=it->getNext()) {
+                       FuncInst *inst = it->getVal();
                        model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
                }
-
 /*
                 func_inst_list_mt * inst_list = funcNode->get_inst_list();
 
@@ -176,6 +202,6 @@ void ModelHistory::print()
                         FuncInst *inst = *it;
                         model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
                 }
- */
+*/
        }
 }