Add a collision list for FuncInsts with the same source line number

[c11tester.git] / history.cc

diff --git a/history.cc b/history.cc
index 4fde914419161b3697561d5f71936065c40017f8..afd1f1d1752d9d4a0fde35ccef3d91c99ae572f2 100644 (file)
--- a/history.cc
+++ b/history.cc
@@ -200,11 +200,6 @@ void ModelHistory::process_action(ModelAction *act, thread_id_t tid)
 
        if (act->is_read()) {
                func_node->update_inst_act_map(tid, act);
-
-               // Update predicate tree position
-               Fuzzer * fuzzer = execution->getFuzzer();
-               Predicate * selected_branch = fuzzer->get_selected_child_branch(tid);
-               func_node->set_predicate_tree_position(tid, selected_branch);
        }
 }
 
@@ -341,7 +336,7 @@ void ModelHistory::check_waiting_write(ModelAction * write_act)
                /* Check if the written value satisfies every predicate expression */
                for (uint i = 0; i < concrete_exprs->size(); i++) {
                        struct concrete_pred_expr concrete = (*concrete_exprs)[i];
-                       bool equality;
+                       bool equality = false;
                        switch (concrete.token) {
                                case EQUALITY:
                                        equality = (value == concrete.value);
@@ -569,6 +564,8 @@ void ModelHistory::print_func_node()
        for (uint32_t i = 1; i < func_nodes.size(); i++) {
                FuncNode * func_node = func_nodes[i];
 
+               func_node->print_predicate_tree();
+/*
                func_inst_list_mt * entry_insts = func_node->get_entry_insts();
                model_print("function %s has entry actions\n", func_node->get_func_name());
 
@@ -577,6 +574,7 @@ void ModelHistory::print_func_node()
                        FuncInst *inst = it->getVal();
                        model_print("type: %d, at: %s\n", inst->get_type(), inst->get_position());
                }
+               */
        }
 }