write_locations->add(loc);
history->update_loc_wr_func_nodes_map(loc, this);
}
-
- // Do not process writes for now
- return;
}
if (act->is_read()) {
}
// update_inst_tree(&inst_list); TODO
+
update_predicate_tree(act);
// print_predicate_tree();
bool amended;
while (true) {
FuncInst * next_inst = get_inst(next_act);
- next_inst->set_associated_read(tid, recursion_depth, this_marker, next_act->get_reads_from_value());
Predicate * unset_predicate = NULL;
bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &unset_predicate);
continue;
}
- if (next_act->is_write())
+ if (next_act->is_write()) {
curr_pred->set_write(true);
+ }
if (next_act->is_read()) {
/* Only need to store the locations of read actions */
- loc_inst_map->put(next_inst->get_location(), next_inst);
+ loc_inst_map->put(next_act->get_location(), next_inst);
}
inst_pred_map->put(next_inst, curr_pred);
curr_pred->incr_expl_count();
add_predicate_to_trace(tid, curr_pred);
+ if (next_act->is_read())
+ next_inst->set_associated_read(tid, recursion_depth, this_marker, next_act->get_reads_from_value());
+
break;
}
// A check
- if (selected_branch != NULL && !amended)
- ASSERT(selected_branch == curr_pred);
+ if (next_act->is_read()) {
+ if (selected_branch != NULL && !amended)
+ ASSERT(selected_branch == curr_pred);
+ }
}
/* Given curr_pred and next_inst, find the branch following curr_pred that
/* Check if a branch with func_inst and corresponding predicate exists */
bool branch_found = false;
thread_id_t tid = next_act->get_tid();
- int thread_id = id_to_int(tid);
- uint32_t this_marker = thrd_markers[thread_id]->back();
- int recursion_depth = thrd_recursion_depth[thread_id];
ModelVector<Predicate *> * branches = (*curr_pred)->get_children();
for (uint i = 0;i < branches->size();i++) {
case EQUALITY:
FuncInst * to_be_compared;
to_be_compared = pred_expression->func_inst;
- ASSERT(to_be_compared != next_inst);
- last_read = to_be_compared->get_associated_read(tid, recursion_depth, this_marker);
+ last_read = get_associated_read(tid, to_be_compared);
ASSERT(last_read != VALUE_NONE);
next_read = next_act->get_reads_from_value();
thrd_recursion_depth[thread_id]++;
}
-uint32_t FuncNode::get_marker(thread_id_t tid)
+uint64_t FuncNode::get_associated_read(thread_id_t tid, FuncInst * inst)
{
int thread_id = id_to_int(tid);
- return thrd_markers[thread_id]->back();
-}
+ int recursion_depth = thrd_recursion_depth[thread_id];
+ uint marker = thrd_markers[thread_id]->back();
-int FuncNode::get_recursion_depth(thread_id_t tid)
-{
- return thrd_recursion_depth[id_to_int(tid)];
+ return inst->get_associated_read(tid, recursion_depth, marker);
}
/* Make sure elements of maps are initialized properly when threads enter functions */
thrd_predicate_tree_position[thread_id]->pop_back();
// Free memories allocated in init_predicate_tree_data_structure
- predicate_trace_t * trace = thrd_predicate_trace[thread_id]->back();
- delete trace;
+ delete thrd_predicate_trace[thread_id]->back();
thrd_predicate_trace[thread_id]->pop_back();
}