mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-10-31 03:32:29 +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
				
			
		|  | @ -657,7 +657,7 @@ struct AigerWriter | |||
| 
 | ||||
| struct AigerBackend : public Backend { | ||||
| 	AigerBackend() : Backend("aiger", "write design to AIGER file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -690,7 +690,7 @@ struct AigerBackend : public Backend { | |||
| 		log("        like -map, but more verbose\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		bool ascii_mode = false; | ||||
| 		bool zinit_mode = false; | ||||
|  |  | |||
|  | @ -464,7 +464,7 @@ struct BlifDumper | |||
| 
 | ||||
| struct BlifBackend : public Backend { | ||||
| 	BlifBackend() : Backend("blif", "write design to BLIF file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -534,7 +534,7 @@ struct BlifBackend : public Backend { | |||
| 		log("        do not write definitions for the $true, $false and $undef wires.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		std::string top_module_name; | ||||
| 		std::string buf_type, buf_in, buf_out; | ||||
|  |  | |||
|  | @ -1076,7 +1076,7 @@ struct BtorWorker | |||
| 
 | ||||
| struct BtorBackend : public Backend { | ||||
| 	BtorBackend() : Backend("btor", "write design to BTOR file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -1091,7 +1091,7 @@ struct BtorBackend : public Backend { | |||
| 		log("    Output only a single bad property for all asserts\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		bool verbose = false, single_bad = false; | ||||
| 
 | ||||
|  |  | |||
|  | @ -90,7 +90,7 @@ struct EdifNames | |||
| 
 | ||||
| struct EdifBackend : public Backend { | ||||
| 	EdifBackend() : Backend("edif", "write design to EDIF netlist file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -116,7 +116,7 @@ struct EdifBackend : public Backend { | |||
| 		log("is targeted.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		log_header(design, "Executing EDIF backend.\n"); | ||||
| 		std::string top_module_name; | ||||
|  |  | |||
|  | @ -527,7 +527,7 @@ struct FirrtlWorker | |||
| 
 | ||||
| struct FirrtlBackend : public Backend { | ||||
| 	FirrtlBackend() : Backend("firrtl", "write design to a FIRRTL file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -536,7 +536,7 @@ struct FirrtlBackend : public Backend { | |||
| 		log("Write a FIRRTL netlist of the current design.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		size_t argidx; | ||||
| 		for (argidx = 1; argidx < args.size(); argidx++) | ||||
|  |  | |||
|  | @ -382,7 +382,7 @@ PRIVATE_NAMESPACE_BEGIN | |||
| 
 | ||||
| struct IlangBackend : public Backend { | ||||
| 	IlangBackend() : Backend("ilang", "write design to ilang file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -395,7 +395,7 @@ struct IlangBackend : public Backend { | |||
| 		log("        only write selected parts of the design.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		bool selected = false; | ||||
| 
 | ||||
|  | @ -422,7 +422,7 @@ struct IlangBackend : public Backend { | |||
| 
 | ||||
| struct DumpPass : public Pass { | ||||
| 	DumpPass() : Pass("dump", "print parts of the design in ilang format") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -445,7 +445,7 @@ struct DumpPass : public Pass { | |||
| 		log("        like -outfile but append instead of overwrite\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::string filename; | ||||
| 		bool flag_m = false, flag_n = false, append = false; | ||||
|  |  | |||
|  | @ -46,7 +46,7 @@ static std::string netname(std::set<std::string> &conntypes_code, std::set<std:: | |||
| 
 | ||||
| struct IntersynthBackend : public Backend { | ||||
| 	IntersynthBackend() : Backend("intersynth", "write design to InterSynth netlist file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -71,7 +71,7 @@ struct IntersynthBackend : public Backend { | |||
| 		log("http://www.clifford.at/intersynth/\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		log_header(design, "Executing INTERSYNTH backend.\n"); | ||||
| 		log_push(); | ||||
|  |  | |||
|  | @ -250,7 +250,7 @@ struct JsonWriter | |||
| 
 | ||||
| struct JsonBackend : public Backend { | ||||
| 	JsonBackend() : Backend("json", "write design to a JSON file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -458,7 +458,7 @@ struct JsonBackend : public Backend { | |||
| 		log("format. A program processing this format must ignore all unknown fields.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		bool aig_mode = false; | ||||
| 
 | ||||
|  | @ -482,7 +482,7 @@ struct JsonBackend : public Backend { | |||
| 
 | ||||
| struct JsonPass : public Pass { | ||||
| 	JsonPass() : Pass("json", "write design in JSON format") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -499,7 +499,7 @@ struct JsonPass : public Pass { | |||
| 		log("See 'help write_json' for a description of the JSON format 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::string filename; | ||||
| 		bool aig_mode = false; | ||||
|  |  | |||
|  | @ -231,7 +231,7 @@ struct ProtobufDesignSerializer | |||
| 
 | ||||
| struct ProtobufBackend : public Backend { | ||||
| 	ProtobufBackend(): Backend("protobuf", "write design to a Protocol Buffer file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -249,7 +249,7 @@ struct ProtobufBackend : public Backend { | |||
| 		log("Yosys source code distribution.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		bool aig_mode = false; | ||||
| 		bool text_mode = false; | ||||
|  | @ -286,7 +286,7 @@ struct ProtobufBackend : public Backend { | |||
| 
 | ||||
| struct ProtobufPass : public Pass { | ||||
| 	ProtobufPass() : Pass("protobuf", "write design in Protobuf format") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -307,7 +307,7 @@ struct ProtobufPass : public Pass { | |||
| 		log("Yosys source code distribution.\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::string filename; | ||||
| 		bool aig_mode = false; | ||||
|  |  | |||
|  | @ -742,7 +742,7 @@ struct SimplecWorker | |||
| 
 | ||||
| struct SimplecBackend : public Backend { | ||||
| 	SimplecBackend() : Backend("simplec", "convert design to simple C code") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -761,7 +761,7 @@ struct SimplecBackend : public Backend { | |||
| 		log("THIS COMMAND IS UNDER CONSTRUCTION\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		reserved_cids.clear(); | ||||
| 		id2cid.clear(); | ||||
|  |  | |||
|  | @ -1251,7 +1251,7 @@ struct Smt2Worker | |||
| 
 | ||||
| struct Smt2Backend : public Backend { | ||||
| 	Smt2Backend() : Backend("smt2", "write design to SMT-LIBv2 file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -1407,7 +1407,7 @@ struct Smt2Backend : public Backend { | |||
| 		log("from non-zero to zero in the test design.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		std::ifstream template_f; | ||||
| 		bool bvmode = true, memmode = true, wiresmode = false, verbose = false, statebv = false, statedt = false; | ||||
|  |  | |||
|  | @ -675,7 +675,7 @@ struct SmvWorker | |||
| 
 | ||||
| struct SmvBackend : public Backend { | ||||
| 	SmvBackend() : Backend("smv", "write design to SMV file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -693,7 +693,7 @@ struct SmvBackend : public Backend { | |||
| 		log("THIS COMMAND IS UNDER CONSTRUCTION\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		std::ifstream template_f; | ||||
| 		bool verbose = false; | ||||
|  |  | |||
|  | @ -132,7 +132,7 @@ static void print_spice_module(std::ostream &f, RTLIL::Module *module, RTLIL::De | |||
| 
 | ||||
| struct SpiceBackend : public Backend { | ||||
| 	SpiceBackend() : Backend("spice", "write design to SPICE netlist file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -161,7 +161,7 @@ struct SpiceBackend : public Backend { | |||
| 		log("        set the specified module as design top module\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		std::string top_module_name; | ||||
| 		RTLIL::Module *top_module = NULL; | ||||
|  |  | |||
|  | @ -29,7 +29,7 @@ PRIVATE_NAMESPACE_BEGIN | |||
| 
 | ||||
| struct TableBackend : public Backend { | ||||
| 	TableBackend() : Backend("table", "write design as connectivity table") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -48,7 +48,7 @@ struct TableBackend : public Backend { | |||
| 		log("module inputs and outputs are output using cell type and port '-' and with\n"); | ||||
| 		log("'pi' (primary input) or 'po' (primary output) or 'pio' as direction.\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		log_header(design, "Executing TABLE backend.\n"); | ||||
| 
 | ||||
|  |  | |||
|  | @ -1482,7 +1482,7 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module) | |||
| 
 | ||||
| struct VerilogBackend : public Backend { | ||||
| 	VerilogBackend() : Backend("verilog", "write design to Verilog file") { } | ||||
| 	virtual void help() | ||||
| 	void help() YS_OVERRIDE | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
|  | @ -1550,7 +1550,7 @@ struct VerilogBackend : public Backend { | |||
| 		log("this command is called on a design with RTLIL processes.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	virtual void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) | ||||
| 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) YS_OVERRIDE | ||||
| 	{ | ||||
| 		log_header(design, "Executing Verilog backend.\n"); | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue