change the data structure for storing last read values. The old one 'loc_thrd_read_ma...

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index 7452c5c1916b310d3eff2684830cb80eff2148f2..d3e36c6a37b7aaac6dd1ed02c98278b1b70020d6 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -10,10 +10,10 @@
 
 /** @brief Constructor */
 ModelHistory::ModelHistory() :
-       func_counter(0), /* function id starts with 0 */
+       func_counter(1), /* function id starts with 1 */
        func_map(),
        func_map_rev(),
-       func_atomics()
+       func_nodes()
 {}
 
 void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
@@ -46,6 +46,7 @@ void ModelHistory::enter_function(const uint32_t func_id, thread_id_t tid)
        func_inst_lists->push_back( new func_inst_list_t() );
 }
 
+/* @param func_id a non-zero value */
 void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
 {
        uint32_t id = id_to_int(tid);
@@ -72,7 +73,7 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
        //model_print("thread %d exiting func %d\n", tid, func_id);
 }
 
-void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid)
+void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
 {
        /* return if thread i has not entered any function or has exited
           from all functions */
@@ -92,26 +93,31 @@ void ModelHistory::add_func_atomic(ModelAction *act, thread_id_t tid)
 
        uint32_t func_id = func_list->back();
 
-       if ( func_atomics.size() <= func_id )
-               func_atomics.resize( func_id + 1 );
+       if ( func_nodes.size() <= func_id )
+               func_nodes.resize( func_id + 1 );
 
-       FuncNode * func_node = func_atomics[func_id];
+       FuncNode * func_node = func_nodes[func_id];
        if (func_node == NULL) {
                const char * func_name = func_map_rev[func_id];
                func_node = new FuncNode();
                func_node->set_func_id(func_id);
                func_node->set_func_name(func_name);
 
-               func_atomics[func_id] = func_node;
+               func_nodes[func_id] = func_node;
        }
 
+       /* add corresponding FuncInst to func_node and curr_inst_list*/
        FuncInst * inst = func_node->get_or_add_action(act);
-       if (inst != NULL) {
-               func_inst_list_t * curr_inst_list = func_inst_lists->back();
 
-               ASSERT(curr_inst_list != NULL);
-               curr_inst_list->push_back(inst);
-       }
+       if (inst == NULL)
+               return;
+
+       if (inst->is_read())
+               func_node->store_read(act, tid);
+
+       func_inst_list_t * curr_inst_list = func_inst_lists->back();
+       ASSERT(curr_inst_list != NULL);
+       curr_inst_list->push_back(inst);
 }
 
 /* Link FuncInsts in a list - add one FuncInst to another's predecessors and successors */
@@ -121,9 +127,17 @@ void ModelHistory::link_insts(func_inst_list_t * inst_list)
                return;
 
        func_inst_list_t::iterator it = inst_list->begin();
-       func_inst_list_t::iterator prev = inst_list->end();
-       it++;
+       func_inst_list_t::iterator prev;
+
+       if (inst_list->size() == 0)
+               return;
 
+       /* add the first instruction to the list of entry insts */
+       FuncInst * entry_inst = *it;
+       FuncNode * func_node = entry_inst->get_func_node();
+       func_node->add_entry_inst(entry_inst);
+
+       it++;
        while (it != inst_list->end()) {
                prev = it;
                prev--;
@@ -140,18 +154,29 @@ void ModelHistory::link_insts(func_inst_list_t * inst_list)
 
 void ModelHistory::print()
 {
-       for (uint32_t i = 0; i < func_atomics.size(); i++ ) {
-               FuncNode * funcNode = func_atomics[i];
-               func_inst_list_mt * inst_list = funcNode->get_inst_list();
-
+       for (uint32_t i = 0; i < func_nodes.size(); i++ ) {
+               FuncNode * funcNode = func_nodes[i];
                if (funcNode == NULL)
                        continue;
 
+               func_inst_list_mt * entry_insts = funcNode->get_entry_insts();
+
+               model_print("function %s has entry actions\n", funcNode->get_func_name());
+               func_inst_list_mt::iterator it;
+               for (it = entry_insts->begin(); it != entry_insts->end(); it++) {
+                       FuncInst *inst = *it;
+                       model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
+               }
+
+/*
+               func_inst_list_mt * inst_list = funcNode->get_inst_list();
+
                model_print("function %s has following actions\n", funcNode->get_func_name());
                func_inst_list_mt::iterator it;
                for (it = inst_list->begin(); it != inst_list->end(); it++) {
                        FuncInst *inst = *it;
                        model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
                }
+*/
        }
 }