mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-11-03 21:09:12 +00:00 
			
		
		
		
	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)
This commit is contained in:
		
							parent
							
								
									323f6f6f60
								
							
						
					
					
						commit
						3aa4484a3c
					
				
					 170 changed files with 414 additions and 416 deletions
				
			
		| 
						 | 
				
			
			@ -25,7 +25,7 @@ PRIVATE_NAMESPACE_BEGIN
 | 
			
		|||
 | 
			
		||||
struct EquivAddPass : public Pass {
 | 
			
		||||
	EquivAddPass() : Pass("equiv_add", "add a $equiv cell") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -39,7 +39,7 @@ struct EquivAddPass : public Pass {
 | 
			
		|||
		log("This command adds $equiv cells for the ports of the specified cells.\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		bool try_mode = false;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -162,7 +162,7 @@ struct EquivInductWorker
 | 
			
		|||
 | 
			
		||||
struct EquivInductPass : public Pass {
 | 
			
		||||
	EquivInductPass() : Pass("equiv_induct", "proving $equiv cells using temporal induction") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -192,7 +192,7 @@ struct EquivInductPass : public Pass {
 | 
			
		|||
		log("after reset.\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		int success_counter = 0;
 | 
			
		||||
		bool model_undef = false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -390,7 +390,7 @@ struct EquivMakeWorker
 | 
			
		|||
 | 
			
		||||
struct EquivMakePass : public Pass {
 | 
			
		||||
	EquivMakePass() : Pass("equiv_make", "prepare a circuit for equivalence checking") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -415,7 +415,7 @@ struct EquivMakePass : public Pass {
 | 
			
		|||
		log("checking problem. Use 'miter -equiv' if you want to create a 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
 | 
			
		||||
	{
 | 
			
		||||
		EquivMakeWorker worker;
 | 
			
		||||
		worker.ct.setup(design);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -204,7 +204,7 @@ struct EquivMarkWorker
 | 
			
		|||
 | 
			
		||||
struct EquivMarkPass : public Pass {
 | 
			
		||||
	EquivMarkPass() : Pass("equiv_mark", "mark equivalence checking regions") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -216,7 +216,7 @@ struct EquivMarkPass : public Pass {
 | 
			
		|||
		log("wires and cells.\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		log_header(design, "Executing EQUIV_MARK pass.\n");
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -261,7 +261,7 @@ struct EquivMiterWorker
 | 
			
		|||
 | 
			
		||||
struct EquivMiterPass : public Pass {
 | 
			
		||||
	EquivMiterPass() : Pass("equiv_miter", "extract miter from equiv circuit") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -282,7 +282,7 @@ struct EquivMiterPass : public Pass {
 | 
			
		|||
		log("        Create compare logic that handles undefs correctly\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
 | 
			
		||||
	{
 | 
			
		||||
		EquivMiterWorker worker;
 | 
			
		||||
		worker.ct.setup(design);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -176,7 +176,7 @@ struct EquivPurgeWorker
 | 
			
		|||
 | 
			
		||||
struct EquivPurgePass : public Pass {
 | 
			
		||||
	EquivPurgePass() : Pass("equiv_purge", "purge equivalence checking module") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -187,7 +187,7 @@ struct EquivPurgePass : public Pass {
 | 
			
		|||
		log("ports as needed.\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		log_header(design, "Executing EQUIV_PURGE pass.\n");
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ PRIVATE_NAMESPACE_BEGIN
 | 
			
		|||
 | 
			
		||||
struct EquivRemovePass : public Pass {
 | 
			
		||||
	EquivRemovePass() : Pass("equiv_remove", "remove $equiv cells") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -40,7 +40,7 @@ struct EquivRemovePass : public Pass {
 | 
			
		|||
		log("        keep gate circuit\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		bool mode_gold = false;
 | 
			
		||||
		bool mode_gate = false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -273,7 +273,7 @@ struct EquivSimpleWorker
 | 
			
		|||
 | 
			
		||||
struct EquivSimplePass : public Pass {
 | 
			
		||||
	EquivSimplePass() : Pass("equiv_simple", "try proving simple $equiv instances") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -298,7 +298,7 @@ struct EquivSimplePass : public Pass {
 | 
			
		|||
		log("        the max. number of time steps to be considered (default = 1)\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		bool verbose = false, short_cones = false, model_undef = false, nogroup = false;
 | 
			
		||||
		int success_counter = 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ PRIVATE_NAMESPACE_BEGIN
 | 
			
		|||
 | 
			
		||||
struct EquivStatusPass : public Pass {
 | 
			
		||||
	EquivStatusPass() : Pass("equiv_status", "print status of equivalent checking module") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -36,7 +36,7 @@ struct EquivStatusPass : public Pass {
 | 
			
		|||
		log("        produce an error if any unproven $equiv cell is found\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		bool assert_mode = false;
 | 
			
		||||
		int unproven_count = 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -283,7 +283,7 @@ struct EquivStructWorker
 | 
			
		|||
 | 
			
		||||
struct EquivStructPass : public Pass {
 | 
			
		||||
	EquivStructPass() : Pass("equiv_struct", "structural equivalence checking") { }
 | 
			
		||||
	virtual void help()
 | 
			
		||||
	void help() YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | 
			
		||||
		log("\n");
 | 
			
		||||
| 
						 | 
				
			
			@ -314,7 +314,7 @@ struct EquivStructPass : public Pass {
 | 
			
		|||
		log("        maximum number of iterations to run before aborting\n");
 | 
			
		||||
		log("\n");
 | 
			
		||||
	}
 | 
			
		||||
	virtual void execute(std::vector<std::string> args, Design *design)
 | 
			
		||||
	void execute(std::vector<std::string> args, Design *design) YS_OVERRIDE
 | 
			
		||||
	{
 | 
			
		||||
		pool<IdString> fwonly_cells({ "$equiv" });
 | 
			
		||||
		bool mode_icells = false;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue