mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-11-03 21:09:12 +00:00 
			
		
		
		
	Merge pull request #850 from daveshah1/ecp5_warn_conflict
ecp5: Demote conflicting FF init values to a warning
This commit is contained in:
		
						commit
						724576a4e2
					
				
					 1 changed files with 7 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -79,10 +79,12 @@ struct Ecp5FfinitPass : public Pass {
 | 
			
		|||
						continue;
 | 
			
		||||
 | 
			
		||||
					if (initbits.count(bit)) {
 | 
			
		||||
						if (initbits.at(bit) != val)
 | 
			
		||||
							log_error("Conflicting init values for signal %s (%s = %s, %s = %s).\n",
 | 
			
		||||
						if (initbits.at(bit) != val) {
 | 
			
		||||
							log_warning("Conflicting init values for signal %s (%s = %s, %s = %s).\n",
 | 
			
		||||
									log_signal(bit), log_signal(SigBit(wire, i)), log_signal(val),
 | 
			
		||||
									log_signal(initbit_to_wire[bit]), log_signal(initbits.at(bit)));
 | 
			
		||||
							initbits.at(bit) = State::Sx;
 | 
			
		||||
						}
 | 
			
		||||
						continue;
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -121,6 +123,9 @@ struct Ecp5FfinitPass : public Pass {
 | 
			
		|||
 | 
			
		||||
				State val = initbits.at(bit_q);
 | 
			
		||||
 | 
			
		||||
				if (val == State::Sx)
 | 
			
		||||
					continue;
 | 
			
		||||
 | 
			
		||||
				log("FF init value for cell %s (%s): %s = %c\n", log_id(cell), log_id(cell->type),
 | 
			
		||||
						log_signal(bit_q), val != State::S0 ? '1' : '0');
 | 
			
		||||
				// Initval is the same as the reset state. Matches hardware, nowt more to do
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue