mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-11-03 21:09:12 +00:00 
			
		
		
		
	Merge
This commit is contained in:
		
						commit
						5210d8614c
					
				
					 2 changed files with 7 additions and 20 deletions
				
			
		
							
								
								
									
										2
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
										
									
									
									
								
							| 
						 | 
					@ -163,7 +163,7 @@ ifeq ($(OS), Haiku)
 | 
				
			||||||
CXXFLAGS += -D_DEFAULT_SOURCE
 | 
					CXXFLAGS += -D_DEFAULT_SOURCE
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
YOSYS_VER := 0.47+61
 | 
					YOSYS_VER := 0.47+66
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Note: We arrange for .gitcommit to contain the (short) commit hash in
 | 
					# Note: We arrange for .gitcommit to contain the (short) commit hash in
 | 
				
			||||||
# tarballs generated with git-archive(1) using .gitattributes. The git repo
 | 
					# tarballs generated with git-archive(1) using .gitattributes. The git repo
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2347,29 +2347,16 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	dump_attributes(f, indent, module->attributes, "\n", /*modattr=*/true);
 | 
						dump_attributes(f, indent, module->attributes, "\n", /*modattr=*/true);
 | 
				
			||||||
	f << stringf("%s"
 | 
						f << stringf("%s" "module %s(", indent.c_str(), id(module->name, false).c_str());
 | 
				
			||||||
		     "module %s(",
 | 
					 | 
				
			||||||
		     indent.c_str(), id(module->name, false).c_str());
 | 
					 | 
				
			||||||
	int cnt = 0;
 | 
						int cnt = 0;
 | 
				
			||||||
	int max_port_id = 0;
 | 
						for (auto port : module->ports) {
 | 
				
			||||||
	for (auto wire : module->wires()) {
 | 
							Wire *wire = module->wire(port);
 | 
				
			||||||
		max_port_id = std::max(wire->port_id, max_port_id);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	std::vector<Wire *> wires(max_port_id + 1, nullptr);
 | 
					 | 
				
			||||||
	for (auto wire : module->wires()) {
 | 
					 | 
				
			||||||
		wires[wire->port_id] = wire;
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	for (int port_id = 1; port_id <= max_port_id; port_id++) {
 | 
					 | 
				
			||||||
		Wire *wire = wires[port_id];
 | 
					 | 
				
			||||||
		if (wire) {
 | 
							if (wire) {
 | 
				
			||||||
			if (port_id != 1)
 | 
								if (port != module->ports[0])
 | 
				
			||||||
				f << stringf(", ");
 | 
									f << stringf(", ");
 | 
				
			||||||
			f << stringf("%s", id(wire->name).c_str());
 | 
								f << stringf("%s", id(wire->name).c_str());
 | 
				
			||||||
			if (cnt == 20) {
 | 
								if (cnt==20) { f << stringf("\n"); cnt = 0; } else cnt++;
 | 
				
			||||||
				f << stringf("\n");
 | 
								continue;
 | 
				
			||||||
				cnt = 0;
 | 
					 | 
				
			||||||
			} else
 | 
					 | 
				
			||||||
				cnt++;
 | 
					 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	f << stringf(");\n");
 | 
						f << stringf(");\n");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue