Remove the uses of inst_act_maps

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index 762849bf1fb92a8d3a93df7133ecab65da6a00cb..081f85d1e8fd23e724cedae4040a95432d61e7c6 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -28,7 +28,6 @@ ModelHistory::ModelHistory() :
        thrd_last_entered_func = new SnapVector<uint32_t>();
        thrd_waiting_write = new SnapVector<ConcretePredicate *>();
        thrd_wait_obj = new SnapVector<WaitObj *>();
-       func_inst_act_maps = new HashTable<uint32_t, SnapVector<inst_act_map_t *> *, int, 0>(128);
 }
 
 ModelHistory::~ModelHistory()
@@ -87,8 +86,7 @@ void ModelHistory::exit_function(const uint32_t func_id, thread_id_t tid)
 
                (*thrd_func_list)[id].pop_back();
        } else {
-               model_print("trying to exit with a wrong function id\n");
-               model_print("--- last_func: %d, func_id: %d\n", last_func_id, func_id);
+               ASSERT(false);
        }
        //model_print("thread %d exiting func %d\n", tid, func_id);
 }
@@ -150,8 +148,6 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
        func_node->add_inst(act);
 
        if (act->is_read()) {
-               func_node->update_inst_act_map(tid, act);
-
 //             Fuzzer * fuzzer = model->get_execution()->getFuzzer();
 //             Predicate * selected_branch = ((NewFuzzer *)fuzzer)->get_selected_child_branch(tid);
 //             func_node->set_predicate_tree_position(tid, selected_branch);
@@ -403,19 +399,6 @@ void ModelHistory::stop_waiting_for_node(thread_id_t self_id,
        }
 }
 
-SnapVector<inst_act_map_t *> * ModelHistory::getThrdInstActMap(uint32_t func_id)
-{
-       ASSERT(func_id != 0);
-
-       SnapVector<inst_act_map_t *> * maps = func_inst_act_maps->get(func_id);
-       if (maps == NULL) {
-               maps = new SnapVector<inst_act_map_t *>();
-               func_inst_act_maps->put(func_id, maps);
-       }
-
-       return maps;
-}
-
 bool ModelHistory::skip_action(ModelAction * act)
 {
        bool second_part_of_rmw = act->is_rmwc() || act->is_rmw();