mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-10-31 03:32:29 +00:00 
			
		
		
		
	fix some cases of hdlname being added to objects with private names
This commit is contained in:
		
							parent
							
								
									17d45796a6
								
							
						
					
					
						commit
						d640157ec4
					
				
					 2 changed files with 10 additions and 1 deletions
				
			
		|  | @ -1464,7 +1464,8 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma | |||
| 		log("Importing module %s.\n", RTLIL::id2cstr(module->name)); | ||||
| 	} | ||||
| 	import_attributes(module->attributes, nl, nl); | ||||
| 	module->set_string_attribute(ID::hdlname, nl->CellBaseName()); | ||||
| 	if (module->name.isPublic()) | ||||
| 		module->set_string_attribute(ID::hdlname, nl->CellBaseName()); | ||||
| 	module->set_string_attribute(ID(library), nl->Owner()->Owner()->Name()); | ||||
| #ifdef VERIFIC_VHDL_SUPPORT | ||||
| 	if (nl->IsFromVhdl()) { | ||||
|  |  | |||
|  | @ -377,6 +377,10 @@ static void extract_fsm(RTLIL::Wire *wire) | |||
| 	fsm_cell->setPort(ID::CTRL_OUT, ctrl_out); | ||||
| 	fsm_cell->parameters[ID::NAME] = RTLIL::Const(wire->name.str()); | ||||
| 	fsm_cell->attributes = wire->attributes; | ||||
| 	if(fsm_cell->attributes.count(ID::hdlname)) { | ||||
| 		fsm_cell->attributes[ID(scopename)] = fsm_cell->attributes[ID::hdlname]; | ||||
| 		fsm_cell->attributes.erase(ID::hdlname); | ||||
| 	} | ||||
| 	fsm_data.copy_to_cell(fsm_cell); | ||||
| 
 | ||||
| 	// rename original state wire
 | ||||
|  | @ -385,6 +389,10 @@ static void extract_fsm(RTLIL::Wire *wire) | |||
| 	wire->attributes.erase(ID::fsm_encoding); | ||||
| 	wire->name = stringf("$fsm$oldstate%s", wire->name.c_str()); | ||||
| 	module->wires_[wire->name] = wire; | ||||
| 	if(wire->attributes.count(ID::hdlname)) { | ||||
| 		wire->attributes[ID(scopename)] = wire->attributes[ID::hdlname]; | ||||
| 		wire->attributes.erase(ID::hdlname); | ||||
| 	} | ||||
| 
 | ||||
| 	// unconnect control outputs from old drivers
 | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue