mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-06 17:44:09 +00:00
Code Activity

Bugfix in fsm_extract

Browse source
This commit is contained in:
Clifford Wolf 2015-07-03 18:42:36 +02:00
parent f0c9a099d2
commit 766dd51447
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
passes/fsm/fsm_extract.cc
View file

@ -56,6 +56,17 @@ static bool find_states(RTLIL::SigSpec sig, const RTLIL::SigSpec &dff_out, RTLIL
std::set<sig2driver_entry_t> cellport_list; std::set<sig2driver_entry_t> cellport_list;
sig2driver.find(sig, cellport_list); sig2driver.find(sig, cellport_list);
if (GetSize(cellport_list) > 1) {
log(" found %d combined drivers for state signal %s.\n", GetSize(cellport_list), log_signal(sig));
return false;
}
if (GetSize(cellport_list) < 1) {
log(" found no driver for state signal %s.\n", log_signal(sig));
return false;
}
for (auto &cellport : cellport_list) for (auto &cellport : cellport_list)
{ {
RTLIL::Cell *cell = module->cells_.at(cellport.first); RTLIL::Cell *cell = module->cells_.at(cellport.first);
@ -90,9 +101,11 @@ static bool find_states(RTLIL::SigSpec sig, const RTLIL::SigSpec &dff_out, RTLIL
log(" found reset state: %s (guessed from mux tree)\n", log_signal(*reset_state)); log(" found reset state: %s (guessed from mux tree)\n", log_signal(*reset_state));
} while (0); } while (0);
if (ctrl.extract(sig_s).size() == 0) { for (auto sig_s_bit : sig_s) {
log(" found ctrl input: %s\n", log_signal(sig_s)); if (ctrl.extract(sig_s_bit).empty()) {
ctrl.append(sig_s); log(" found ctrl input: %s\n", log_signal(sig_s_bit));
ctrl.append(sig_s_bit);
}
} }
if (!find_states(sig_aa, dff_out, ctrl, states)) if (!find_states(sig_aa, dff_out, ctrl, states))