mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-10-31 03:32:29 +00:00 
			
		
		
		
	Compile with hier_tree separate SV and VHDL as well
This commit is contained in:
		
							parent
							
								
									e2e189647f
								
							
						
					
					
						commit
						7c3094633d
					
				
					 1 changed files with 8 additions and 9 deletions
				
			
		|  | @ -2696,13 +2696,13 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin | ||||||
| 
 | 
 | ||||||
| 	std::map<std::string,Netlist*> nl_todo, nl_done; | 	std::map<std::string,Netlist*> nl_todo, nl_done; | ||||||
| 	Array *netlists = NULL; | 	Array *netlists = NULL; | ||||||
| #ifdef VERIFIC_VHDL_SUPPORT |  | ||||||
| 	Array vhdl_libs; | 	Array vhdl_libs; | ||||||
|  | #ifdef VERIFIC_VHDL_SUPPORT | ||||||
| 	VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary("work", 1); | 	VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary("work", 1); | ||||||
| 	if (vhdl_lib) vhdl_libs.InsertLast(vhdl_lib); | 	if (vhdl_lib) vhdl_libs.InsertLast(vhdl_lib); | ||||||
| #endif | #endif | ||||||
| #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT |  | ||||||
| 	Array veri_libs; | 	Array veri_libs; | ||||||
|  | #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT | ||||||
| 	VeriLibrary *veri_lib = veri_file::GetLibrary("work", 1); | 	VeriLibrary *veri_lib = veri_file::GetLibrary("work", 1); | ||||||
| 	if (veri_lib) veri_libs.InsertLast(veri_lib); | 	if (veri_lib) veri_libs.InsertLast(veri_lib); | ||||||
| #endif | #endif | ||||||
|  | @ -2748,9 +2748,8 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin | ||||||
| 		for (int static_elaborate = 1; static_elaborate >= 0; static_elaborate--) | 		for (int static_elaborate = 1; static_elaborate >= 0; static_elaborate--) | ||||||
| #endif | #endif | ||||||
| 		{ | 		{ | ||||||
| #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT |  | ||||||
| 			Array veri_modules; | 			Array veri_modules; | ||||||
| 
 | #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT | ||||||
| 			if (veri_lib) { | 			if (veri_lib) { | ||||||
| 				VeriModule *veri_module = veri_lib->GetModule(top.c_str(), 1); | 				VeriModule *veri_module = veri_lib->GetModule(top.c_str(), 1); | ||||||
| 				if (veri_module) { | 				if (veri_module) { | ||||||
|  | @ -2783,8 +2782,8 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin | ||||||
| 			} | 			} | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #ifdef VERIFIC_VHDL_SUPPORT |  | ||||||
| 			Array vhdl_units; | 			Array vhdl_units; | ||||||
|  | #ifdef VERIFIC_VHDL_SUPPORT | ||||||
| 			if (vhdl_lib) { | 			if (vhdl_lib) { | ||||||
| 				VhdlDesignUnit *vhdl_unit = vhdl_lib->GetPrimUnit(top.c_str()); | 				VhdlDesignUnit *vhdl_unit = vhdl_lib->GetPrimUnit(top.c_str()); | ||||||
| 				if (vhdl_unit) | 				if (vhdl_unit) | ||||||
|  | @ -3965,13 +3964,13 @@ struct VerificPass : public Pass { | ||||||
| #endif | #endif | ||||||
| 				log("Running hier_tree::ElaborateAll().\n"); | 				log("Running hier_tree::ElaborateAll().\n"); | ||||||
| 
 | 
 | ||||||
| #ifdef VERIFIC_VHDL_SUPPORT |  | ||||||
| 				Array vhdl_libs; | 				Array vhdl_libs; | ||||||
|  | #ifdef VERIFIC_VHDL_SUPPORT | ||||||
| 				VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary(work.c_str(), 1); | 				VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary(work.c_str(), 1); | ||||||
| 				if (vhdl_lib) vhdl_libs.InsertLast(vhdl_lib); | 				if (vhdl_lib) vhdl_libs.InsertLast(vhdl_lib); | ||||||
| #endif | #endif | ||||||
| #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT |  | ||||||
| 				Array veri_libs; | 				Array veri_libs; | ||||||
|  | #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT | ||||||
| 				VeriLibrary *veri_lib = veri_file::GetLibrary(work.c_str(), 1); | 				VeriLibrary *veri_lib = veri_file::GetLibrary(work.c_str(), 1); | ||||||
| 				if (veri_lib) veri_libs.InsertLast(veri_lib); | 				if (veri_lib) veri_libs.InsertLast(veri_lib); | ||||||
| #endif | #endif | ||||||
|  | @ -4018,12 +4017,12 @@ struct VerificPass : public Pass { | ||||||
| #endif | #endif | ||||||
| 				{ | 				{ | ||||||
| 
 | 
 | ||||||
| #ifdef VERIFIC_VHDL_SUPPORT |  | ||||||
| 					Array vhdl_units; | 					Array vhdl_units; | ||||||
|  | #ifdef VERIFIC_VHDL_SUPPORT | ||||||
| 					VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary(work.c_str(), 1); | 					VhdlLibrary *vhdl_lib = vhdl_file::GetLibrary(work.c_str(), 1); | ||||||
| #endif | #endif | ||||||
| #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT |  | ||||||
| 					Array veri_modules; | 					Array veri_modules; | ||||||
|  | #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT | ||||||
| 					VeriLibrary* veri_lib = veri_file::GetLibrary(work.c_str(), 1); | 					VeriLibrary* veri_lib = veri_file::GetLibrary(work.c_str(), 1); | ||||||
| #endif | #endif | ||||||
| 					for (int i = argidx; i < GetSize(args); i++) | 					for (int i = argidx; i < GetSize(args); i++) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue