Merge remote-tracking branch 'private/master'

[model-checker.git] / scanalysis.h

diff --git a/scanalysis.h b/scanalysis.h
index 0cd2d67e704d942c93fdf93404c8d63010e490ed..047793045e63c954b03b775fd433738aaf8d08d7 100644 (file)
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -18,11 +18,16 @@ class SCAnalysis : public TraceAnalysis {
        action_list_t * generateSC(action_list_t *);
        bool processRead(ModelAction *read, ClockVector *cv);
        ModelAction * getNextAction();
-       bool merge(ClockVector *cv, const ModelAction *act, ClockVector *cv2);
+       bool merge(ClockVector *cv, const ModelAction *act, const ModelAction *act2);
+       void check_rf(action_list_t *list);
+
+
        int maxthreads;
-       HashTable<const ModelAction *, ClockVector *, uintptr_t, 4 > *cvmap;
-       HashTable<const ModelAction *, const ModelAction *, uintptr_t, 4 > *cycleset;
-       SnapVector<action_list_t> *threadlists;
+       HashTable<const ModelAction *, ClockVector *, uintptr_t, 4 > cvmap;
+       bool cyclic;
+       HashTable<const ModelAction *, const ModelAction *, uintptr_t, 4 > badrfset;
+       HashTable<void *, const ModelAction *, uintptr_t, 4 > lastwrmap;
+       SnapVector<action_list_t> threadlists;
        const ModelExecution *execution;
 };
 #endif