diff options
| author | Henner Zeller <h.zeller@acm.org> | 2018-07-20 23:41:18 -0700 | 
|---|---|---|
| committer | Henner Zeller <h.zeller@acm.org> | 2018-07-20 23:51:06 -0700 | 
| commit | 3aa4484a3cd9a2e82fddd499cde575eaf8c565cc (patch) | |
| tree | 39d2caa1122c32a56231ecd99fe3364721b53c3c /passes/sat | |
| parent | 323f6f6f6006eadcaec180f2cc1556f1f3303be3 (diff) | |
| download | yosys-3aa4484a3cd9a2e82fddd499cde575eaf8c565cc.tar.gz yosys-3aa4484a3cd9a2e82fddd499cde575eaf8c565cc.tar.bz2 yosys-3aa4484a3cd9a2e82fddd499cde575eaf8c565cc.zip  | |
Consistent use of 'override' for virtual methods in derived classes.
o Not all derived methods were marked 'override', but it is a great
  feature of C++11 that we should make use of.
o While at it: touched header files got a -*- c++ -*- for emacs to
  provide support for that language.
o use YS_OVERRIDE for all override keywords (though we should probably
  use the plain keyword going forward now that C++11 is established)
Diffstat (limited to 'passes/sat')
| -rw-r--r-- | passes/sat/assertpmux.cc | 4 | ||||
| -rw-r--r-- | passes/sat/async2sync.cc | 4 | ||||
| -rw-r--r-- | passes/sat/clk2fflogic.cc | 4 | ||||
| -rw-r--r-- | passes/sat/eval.cc | 4 | ||||
| -rw-r--r-- | passes/sat/expose.cc | 4 | ||||
| -rw-r--r-- | passes/sat/freduce.cc | 4 | ||||
| -rw-r--r-- | passes/sat/miter.cc | 4 | ||||
| -rw-r--r-- | passes/sat/sat.cc | 4 | ||||
| -rw-r--r-- | passes/sat/sim.cc | 4 | 
9 files changed, 18 insertions, 18 deletions
diff --git a/passes/sat/assertpmux.cc b/passes/sat/assertpmux.cc index 63a907671..509cb0ba9 100644 --- a/passes/sat/assertpmux.cc +++ b/passes/sat/assertpmux.cc @@ -181,7 +181,7 @@ struct AssertpmuxWorker  struct AssertpmuxPass : public Pass {  	AssertpmuxPass() : Pass("assertpmux", "convert internal signals to module ports") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -199,7 +199,7 @@ struct AssertpmuxPass : public Pass {  		log("        additional constrained and check the $pmux condition always.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		bool flag_noinit = false;  		bool flag_always = false; diff --git a/passes/sat/async2sync.cc b/passes/sat/async2sync.cc index 85933acc2..c92db7118 100644 --- a/passes/sat/async2sync.cc +++ b/passes/sat/async2sync.cc @@ -25,7 +25,7 @@ PRIVATE_NAMESPACE_BEGIN  struct Async2syncPass : public Pass {  	Async2syncPass() : Pass("async2sync", "convert async FF inputs to sync circuits") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -42,7 +42,7 @@ struct Async2syncPass : public Pass {  		log("Currently only $adff cells are supported by this pass.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		// bool flag_noinit = false; diff --git a/passes/sat/clk2fflogic.cc b/passes/sat/clk2fflogic.cc index 736c6f571..49ec795d3 100644 --- a/passes/sat/clk2fflogic.cc +++ b/passes/sat/clk2fflogic.cc @@ -25,7 +25,7 @@ PRIVATE_NAMESPACE_BEGIN  struct Clk2fflogicPass : public Pass {  	Clk2fflogicPass() : Pass("clk2fflogic", "convert clocked FFs to generic $ff cells") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -36,7 +36,7 @@ struct Clk2fflogicPass : public Pass {  		log("multiple clocks.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		// bool flag_noinit = false; diff --git a/passes/sat/eval.cc b/passes/sat/eval.cc index 09f69cc5c..008cd2dfa 100644 --- a/passes/sat/eval.cc +++ b/passes/sat/eval.cc @@ -360,7 +360,7 @@ struct VlogHammerReporter  struct EvalPass : public Pass {  	EvalPass() : Pass("eval", "evaluate the circuit given an input") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -383,7 +383,7 @@ struct EvalPass : public Pass {  		log("        then all output ports of the current module are used.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		std::vector<std::pair<std::string, std::string>> sets;  		std::vector<std::string> shows, tables; diff --git a/passes/sat/expose.cc b/passes/sat/expose.cc index fa8f0c6be..809345486 100644 --- a/passes/sat/expose.cc +++ b/passes/sat/expose.cc @@ -220,7 +220,7 @@ RTLIL::Wire *add_new_wire(RTLIL::Module *module, RTLIL::IdString name, int width  struct ExposePass : public Pass {  	ExposePass() : Pass("expose", "convert internal signals to module ports") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -257,7 +257,7 @@ struct ExposePass : public Pass {  		log("        designator for the exposed signal.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		bool flag_shared = false;  		bool flag_evert = false; diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc index a3028bfce..f29631639 100644 --- a/passes/sat/freduce.cc +++ b/passes/sat/freduce.cc @@ -760,7 +760,7 @@ struct FreduceWorker  struct FreducePass : public Pass {  	FreducePass() : Pass("freduce", "perform functional reduction") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -791,7 +791,7 @@ struct FreducePass : public Pass {  		log("circuit that is analyzed.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		reduce_counter = 0;  		reduce_stop_at = 0; diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc index 9e150b60c..d37f1b126 100644 --- a/passes/sat/miter.cc +++ b/passes/sat/miter.cc @@ -358,7 +358,7 @@ void create_miter_assert(struct Pass *that, std::vector<std::string> args, RTLIL  struct MiterPass : public Pass {  	MiterPass() : Pass("miter", "automatically create a miter circuit") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -402,7 +402,7 @@ struct MiterPass : public Pass {  		log("        call 'flatten; opt_expr -keepdc -undriven;;' on the miter circuit.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		if (args.size() > 1 && args[1] == "-equiv") {  			create_miter_equiv(this, args, design); diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc index 6c0834deb..695a03e15 100644 --- a/passes/sat/sat.cc +++ b/passes/sat/sat.cc @@ -890,7 +890,7 @@ void print_qed()  struct SatPass : public Pass {  	SatPass() : Pass("sat", "solve a SAT problem in the circuit") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -1057,7 +1057,7 @@ struct SatPass : public Pass {  		log("        Like -falsify but do not return an error for timeouts.\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		std::vector<std::pair<std::string, std::string>> sets, sets_init, prove, prove_x;  		std::map<int, std::vector<std::pair<std::string, std::string>>> sets_at; diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc index b49c12529..fadffcdbc 100644 --- a/passes/sat/sim.cc +++ b/passes/sat/sim.cc @@ -745,7 +745,7 @@ struct SimWorker : SimShared  struct SimPass : public Pass {  	SimPass() : Pass("sim", "simulate the circuit") { } -	virtual void help() +	void help() YS_OVERRIDE  	{  		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|  		log("\n"); @@ -787,7 +787,7 @@ struct SimPass : public Pass {  		log("        enable debug output\n");  		log("\n");  	} -	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) +	void execute(std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE  	{  		SimWorker worker;  		int numcycles = 20;  | 
