X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=a5262d2b5c46e18e697cedf646cb0eb539fed3d6;hb=09c3eb5539455e82dcb357fbce82bf5974c3a37c;hp=960e9e1a9846a8eefd92a7f0ef394eb975adcbca;hpb=523dbecc6fc18e58918a1f36860be5eb0ab42ce2;p=model-checker.git

diff --git a/model.h b/model.h
index 960e9e1..a5262d2 100644
--- a/model.h
+++ b/model.h
@@ -121,7 +121,7 @@ public:
 	ClockVector * get_cv(thread_id_t tid) const;
 	ModelAction * get_parent_action(thread_id_t tid) const;
 	void check_promises_thread_disabled();
-	void mo_check_promises(thread_id_t tid, const ModelAction *write, const ModelAction * read);
+	void mo_check_promises(const ModelAction *act, bool is_read_check);
 	void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
 	bool isfeasibleprefix() const;
 
@@ -148,7 +148,6 @@ private:
 	modelclock_t get_next_seq_num();
 
 	bool next_execution();
-	void set_current_action(ModelAction *act);
 	ModelAction * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr, bool second_part_of_rmw);
@@ -160,7 +159,7 @@ private:
 	bool read_from(ModelAction *act, const ModelAction *rf);
 	bool check_action_enabled(ModelAction *curr);
 
-	bool take_step(ModelAction *curr);
+	Thread * take_step(ModelAction *curr);
 
 	void check_recency(ModelAction *curr, const ModelAction *rf);
 	ModelAction * get_last_conflict(ModelAction *act);
@@ -182,8 +181,10 @@ private:
 	ModelAction * get_last_unlock(ModelAction *curr) const;
 	void build_reads_from_past(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
-	void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
-	bool r_modification_order(ModelAction *curr, const ModelAction *rf);
+
+	template <typename rf_type>
+	bool r_modification_order(ModelAction *curr, const rf_type *rf);
+
 	bool w_modification_order(ModelAction *curr);
 	void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
 	bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
@@ -257,7 +258,6 @@ private:
 
 	void print_infeasibility(const char *prefix) const;
 	bool is_feasible_prefix_ignore_relseq() const;
-	bool is_infeasible_ignoreRMW() const;
 	bool is_infeasible() const;
 	bool is_deadlocked() const;
 	bool is_complete_execution() const;