Merge branch 'branch-weiyu' of /home/git/random-fuzzer into new_fuzzer
authorroot <root@dw-6.eecs.uci.edu>
Mon, 29 Jul 2019 19:21:02 +0000 (12:21 -0700)
committerroot <root@dw-6.eecs.uci.edu>
Mon, 29 Jul 2019 19:21:02 +0000 (12:21 -0700)
1  2 
execution.cc
history.cc

diff --cc execution.cc
Simple merge
diff --cc history.cc
@@@ -57,12 -52,11 +52,10 @@@ void ModelHistory::exit_function(const 
        SnapVector< SnapList<func_inst_list_t *> *> *
                thrd_func_inst_lists = model->get_execution()->get_thrd_func_inst_lists();
  
-       func_id_list_t * func_list = thrd_func_list->at(id);
        SnapList<func_inst_list_t *> * func_inst_lists = thrd_func_inst_lists->at(id);
-       uint32_t last_func_id = func_list->back();
+       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);
  
@@@ -126,9 -116,12 +115,12 @@@ void ModelHistory::process_action(Model
        if (inst == NULL)
                return;
  
 -      if (inst->is_read())
 -              func_node->store_read(act, 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);