#include "funcnode.h"
-#include <fcntl.h>
FuncNode::FuncNode() :
predicate_tree_initialized(false),
if ( func_inst_map.contains(position) ) {
FuncInst * inst = func_inst_map.get(position);
- if (inst->get_type() != act->get_type() ) {
- // model_print("action with a different type occurs at line number %s\n", position);
- FuncInst * func_inst = inst->search_in_collision(act);
-
- if (func_inst != NULL)
- return;
-
- func_inst = new FuncInst(act, this);
- inst->get_collisions()->push_back(func_inst);
- inst_list.push_back(func_inst); // delete?
- }
+ ASSERT(inst->get_type() == act->get_type());
+ if (inst->get_location() != act->get_location())
+ inst->not_single_location();
return;
}
/* build inst_list from act_list for later processing */
func_inst_list_t inst_list;
action_list_t read_act_list;
- HashTable<ModelAction *, FuncInst *, uintptr_t, 4> act_inst_map(128);
for (sllnode<ModelAction *> * it = act_list->begin(); it != NULL; it = it->getNext()) {
ModelAction * act = it->getVal();
// model_print("position: %s ", act->get_position());
// act->print();
- if (func_inst->is_read()) {
+ if (func_inst->is_read())
read_act_list.push_back(act);
- act_inst_map.put(act, func_inst);
- }
}
+ model_print("function %s\n", func_name);
update_inst_tree(&inst_list);
- update_predicate_tree(&read_act_list, &act_inst_map);
+ update_predicate_tree(&read_act_list);
+ deep_update(predicate_tree_entry);
+
+ print_predicate_tree();
}
/**
uint64_t FuncNode::query_last_read(void * location, uint32_t tid)
{
if (thrd_read_map.size() <= tid)
- return 0xdeadbeef;
+ return VALUE_NONE;
read_map_t * read_map = thrd_read_map[tid];
/* last read value not found */
if ( !read_map->contains(location) )
- return 0xdeadbeef;
+ return VALUE_NONE;
uint64_t read_val = read_map->get(location);
return read_val;
thrd_read_map[tid]->reset();
}
-void FuncNode::update_predicate_tree(action_list_t * act_list, HashTable<ModelAction *, FuncInst *, uintptr_t, 4> * act_inst_map)
+void FuncNode::update_predicate_tree(action_list_t * act_list)
{
if (act_list == NULL || act_list->size() == 0)
return;
*/
/* map a FuncInst to the parent of its predicate */
HashTable<FuncInst *, Predicate *, uintptr_t, 0> inst_pred_map(128);
- HashTable<FuncInst *, uint64_t, uintptr_t, 4> read_val_map(128);
- HashTable<void *, FuncInst *, uintptr_t, 4> loc_inst_map(128);
+ HashTable<void *, ModelAction *, uintptr_t, 0> loc_act_map(128);
sllnode<ModelAction *> *it = act_list->begin();
Predicate * curr_pred = predicate_tree_entry;
while (it != NULL) {
- ModelAction * curr_act = it->getVal();
- FuncInst * curr_inst = act_inst_map->get(curr_act);
+ ModelAction * next_act = it->getVal();
+ FuncInst * next_inst = get_inst(next_act);
Predicate * old_pred = curr_pred;
- read_val_map.put(curr_inst, curr_act->get_reads_from_value());
- bool branch_found = follow_branch(&curr_pred, curr_inst, &read_val_map, &loc_inst_map);
+ bool branch_found = follow_branch(&curr_pred, next_inst, next_act, &loc_act_map);
// check back edges
if (!branch_found) {
continue;
}
- if (inst_pred_map.contains(curr_inst)) {
- back_pred = inst_pred_map.get(curr_inst);
+ if (inst_pred_map.contains(next_inst)) {
+ back_pred = inst_pred_map.get(next_inst);
curr_pred->set_backedge(back_pred);
curr_pred = back_pred;
continue;
}
}
- if (!inst_pred_map.contains(curr_inst))
- inst_pred_map.put(curr_inst, old_pred);
+ if (!inst_pred_map.contains(next_inst))
+ inst_pred_map.put(next_inst, old_pred);
if (!branch_found) {
- if ( loc_inst_map.contains(curr_inst->get_location()) ) {
- Predicate * new_pred1 = new Predicate(curr_inst);
- new_pred1->add_predicate(EQUALITY, curr_inst->get_location(), true);
+ if ( loc_act_map.contains(next_act->get_location()) ) {
+ Predicate * new_pred1 = new Predicate(next_inst);
+ new_pred1->add_predicate(EQUALITY, next_act->get_location(), true);
- Predicate * new_pred2 = new Predicate(curr_inst);
- new_pred2->add_predicate(EQUALITY, curr_inst->get_location(), false);
+ Predicate * new_pred2 = new Predicate(next_inst);
+ new_pred2->add_predicate(EQUALITY, next_act->get_location(), false);
curr_pred->add_child(new_pred1);
curr_pred->add_child(new_pred2);
- //new_pred1->add_parent(curr_pred);
- //new_pred2->add_parent(curr_pred);
+ new_pred1->set_parent(curr_pred);
+ new_pred2->set_parent(curr_pred);
+
+ ModelAction * last_act = loc_act_map.get(next_act->get_location());
+ uint64_t last_read = last_act->get_reads_from_value();
+ uint64_t next_read = next_act->get_reads_from_value();
- FuncInst * last_inst = loc_inst_map.get(curr_inst->get_location());
- uint64_t last_read = read_val_map.get(last_inst);
- if ( last_read == read_val_map.get(curr_inst) )
+ if ( last_read == next_read )
curr_pred = new_pred1;
else
curr_pred = new_pred2;
} else {
- Predicate * new_pred = new Predicate(curr_inst);
+ Predicate * new_pred = new Predicate(next_inst);
curr_pred->add_child(new_pred);
- //new_pred->add_parent(curr_pred);
+ new_pred->set_parent(curr_pred);
curr_pred = new_pred;
}
}
- loc_inst_map.put(curr_inst->get_location(), curr_inst);
+ loc_act_map.put(next_act->get_location(), next_act);
it = it->getNext();
}
+}
+
+void FuncNode::deep_update(Predicate * curr_pred)
+{
+ FuncInst * func_inst = curr_pred->get_func_inst();
+ if (func_inst != NULL && !func_inst->is_single_location()) {
+ bool has_null_pred = false;
+ PredExprSet * pred_expressions = curr_pred->get_pred_expressions();
+ PredExprSetIter * pred_expr_it = pred_expressions->iterator();
+ while (pred_expr_it->hasNext()) {
+ pred_expr * pred_expression = pred_expr_it->next();
+ if (pred_expression->token == NULLITY) {
+ has_null_pred = true;
+ break;
+ }
+ }
-// model_print("function %s\n", func_name);
-// print_predicate_tree();
+ if (!has_null_pred) {
+// func_inst->print();
+ Predicate * parent = curr_pred->get_parent();
+ curr_pred->add_predicate(NULLITY, NULL, 0);
+
+ Predicate * another_branch = new Predicate(func_inst);
+ another_branch->add_predicate(NULLITY, NULL, 1);
+ parent->add_child(another_branch);
+// another_branch.add_children(i);
+ }
+ }
+
+ ModelVector<Predicate *> * branches = curr_pred->get_children();
+ for (uint i = 0; i < branches->size(); i++) {
+ Predicate * branch = (*branches)[i];
+ deep_update(branch);
+ }
}
/* Given curr_pred and next_inst, find the branch following curr_pred that contains next_inst and the correct predicate
* @return true if branch found, false otherwise.
*/
-bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst,
- HashTable<FuncInst *, uint64_t, uintptr_t, 4> * read_val_map, HashTable<void *, FuncInst *, uintptr_t, 4> * loc_inst_map)
+bool FuncNode::follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act,
+ HashTable<void *, ModelAction *, uintptr_t, 0> * loc_act_map)
{
/* check if a branch with func_inst and corresponding predicate exists */
bool branch_found = false;
/* no predicate, follow the only branch */
if (pred_expressions->getSize() == 0) {
-// model_print("no predicate exists: "); next_inst->print();
*curr_pred = branch;
branch_found = true;
break;
while (pred_expr_it->hasNext()) {
pred_expr * pred_expression = pred_expr_it->next();
uint64_t last_read, next_read;
- FuncInst * last_inst;
+ ModelAction * last_act;
bool equality;
switch(pred_expression->token) {
case EQUALITY:
- last_inst = loc_inst_map->get(next_inst->get_location());
- last_read = read_val_map->get(last_inst);
- next_read = read_val_map->get(next_inst);
- equality = (last_read == next_read);
+ last_act = loc_act_map->get(next_act->get_location());
+ last_read = last_act->get_reads_from_value();
+ next_read = next_act->get_reads_from_value();
+ equality = (last_read == next_read);
if (equality == pred_expression->value) {
*curr_pred = branch;
// model_print("predicate: token: %d, location: %p, value: %d - ", pred_expression->token, pred_expression->location, pred_expression->value); next_inst->print();
}
break;
case NULLITY:
+ next_read = next_act->get_reads_from_value();
+ equality = ((void*)next_read == NULL);
+ //model_print("%s ", next_act->get_position()); next_act->print();
+ if (equality == pred_expression->value) {
+ *curr_pred = branch;
+ branch_found = true;
+ }
break;
default:
model_print("unkown predicate token\n");
projects / c11tester.git / blobdiff