experiment with adding NULLITY predicate

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index 2875489189329dc95362d5079b3db7f994df4f43..a3a2874ec7ce2c0044956803b03caefacf23ba62 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,18 +1,28 @@
 #include "funcinst.h"
 
-FuncInst::FuncInst(ModelAction *act) :
-       collisions()
+FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
+       single_location(true)
 {
        ASSERT(act);
+       ASSERT(func_node);
        this->position = act->get_position();
        this->location = act->get_location();
        this->type = act->get_type();
+       this->order = act->get_mo();
+       this->func_node = func_node;
 }
 
-bool FuncInst::add_pred(FuncInst * other) {
-       func_inst_list_mt::iterator it;
-       for (it = predecessors.begin(); it != predecessors.end(); it++) {
-               FuncInst * inst = *it;
+/* @param other Preceding FuncInst in the same execution trace
+ * Add other to predecessors if it has been added
+ *
+ * @return false: other is already in predecessors
+ *         true : other is added to precedessors
+ */
+bool FuncInst::add_pred(FuncInst * other)
+{
+       mllnode<FuncInst*> * it;
+       for (it = predecessors.begin();it != NULL;it=it->getNext()) {
+               FuncInst * inst = it->getVal();
                if (inst == other)
                        return false;
        }
@@ -21,10 +31,11 @@ bool FuncInst::add_pred(FuncInst * other) {
        return true;
 }
 
-bool FuncInst::add_succ(FuncInst * other) {
-       func_inst_list_mt::iterator it;
-       for (it = successors.begin(); it != successors.end(); it++) {
-               FuncInst * inst = *it;
+bool FuncInst::add_succ(FuncInst * other)
+{
+       mllnode<FuncInst*>* it;
+       for (it = successors.begin();it != NULL;it=it->getNext()) {
+               FuncInst * inst = it->getVal();
                if ( inst == other )
                        return false;
        }
@@ -33,14 +44,32 @@ bool FuncInst::add_succ(FuncInst * other) {
        return true;
 }
 
-FuncInst * FuncInst::search_in_collision(ModelAction *act) {
+/*
+FuncInst * FuncInst::search_in_collision(ModelAction *act)
+{
        action_type type = act->get_type();
 
-       func_inst_list_mt::iterator it;
-       for (it = collisions.begin(); it != collisions.end(); it++) {
-               FuncInst * inst = *it;
-               if ( inst->get_type() == type )
+       mllnode<FuncInst*> * it;
+       for (it = collisions.begin(); it != NULL; it = it->getNext()) {
+               FuncInst * inst = it->getVal();
+               if (inst->get_type() == type)
                        return inst;
        }
        return NULL;
 }
+*/
+
+bool FuncInst::is_read() const
+{
+       return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
+}
+
+bool FuncInst::is_write() const
+{
+       return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
+}
+
+void FuncInst::print()
+{
+       model_print("func inst - pos: %s, loc: %p, type: %d,\n", position, location, type);
+}