Do not unset FuncInst locations when new executions start; check if execution numbers...

[c11tester.git] / funcinst.h

diff --git a/funcinst.h b/funcinst.h
index 6bbed2c88ca452c8af13ec31e72eb156f5c50e60..ae3aa09325148a58925819c977faa4d66aa3684c 100644 (file)
--- a/funcinst.h
+++ b/funcinst.h
@@ -17,7 +17,6 @@ public:
 
        void * get_location() const { return location; }
        void set_location(void * loc) { location = loc; }
 
        void * get_location() const { return location; }
        void set_location(void * loc) { location = loc; }

-       void unset_location() { location = NULL; }

 
        action_type get_type() const { return type; }
        memory_order get_mo() const { return order; }
 
        action_type get_type() const { return type; }
        memory_order get_mo() const { return order; }


@@ -37,6 +36,9 @@ public:
        bool is_single_location() { return single_location; }
        void not_single_location() { single_location = false; }
 
        bool is_single_location() { return single_location; }
        void not_single_location() { single_location = false; }
 

+       void set_execution_number(int new_number) { execution_number = new_number; }
+       int get_execution_number() { return execution_number; }
+

        void print();
 
        MEMALLOC
        void print();
 
        MEMALLOC


@@ -57,6 +59,7 @@ private:
        FuncNode * func_node;
 
        bool single_location;
        FuncNode * func_node;
 
        bool single_location;

+       int execution_number;

 
        /* Currently not in use. May remove this field later
         *
 
        /* Currently not in use. May remove this field later
         *