From: root <root@dw-6.eecs.uci.edu>
Date: Mon, 29 Jul 2019 19:21:02 +0000 (-0700)
Subject: Merge branch 'branch-weiyu' of /home/git/random-fuzzer into new_fuzzer
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=db26d1e3370a583f8eef79194c87ba9d2ef92530;p=c11tester.git

Merge branch 'branch-weiyu' of /home/git/random-fuzzer into new_fuzzer
---

db26d1e3370a583f8eef79194c87ba9d2ef92530
diff --cc history.cc
index ca176b19,7b6e3c87..3c000e7d
--- a/history.cc
+++ b/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);