X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=scanalysis.h;h=047793045e63c954b03b775fd433738aaf8d08d7;hb=473bdc841f3b03b722911a5fa0b4f21ba3a217ed;hp=79f78f1c00d630b6a1557015d2c5e4683f231879;hpb=38cb7400c16ad0a04355ec77af2bf5da2dbfaad5;p=model-checker.git

diff --git a/scanalysis.h b/scanalysis.h
index 79f78f1..0477930 100644
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -3,9 +3,9 @@
 #include "traceanalysis.h"
 #include "hashtable.h"
 
-class SCAnalysis : public Trace_Analysis {
+class SCAnalysis : public TraceAnalysis {
  public:
-	SCAnalysis();
+	SCAnalysis(const ModelExecution *execution);
 	~SCAnalysis();
 	virtual void analyze(action_list_t *);
 
@@ -18,8 +18,16 @@ class SCAnalysis : public Trace_Analysis {
 	action_list_t * generateSC(action_list_t *);
 	bool processRead(ModelAction *read, ClockVector *cv);
 	ModelAction * getNextAction();
+	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;
-	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