riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bugfix in fsm_detect 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2019-11-12 14:26:02 +01:00
parent e0ba78bdf2
commit 16df8f5a32
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
passes/fsm/fsm_detect.cc
View File

@ -158,22 +158,24 @@ static void detect_fsm(RTLIL::Wire *wire)
std::set<sig2driver_entry_t> cellport_list; std::set<sig2driver_entry_t> cellport_list;
sig2user.find(sig_q, cellport_list); sig2user.find(sig_q, cellport_list);
auto sig_q_bits = sig_q.to_sigbit_pool();
for (auto &cellport : cellport_list) for (auto &cellport : cellport_list)
{ {
RTLIL::Cell *cell = cellport.first; RTLIL::Cell *cell = cellport.first;
bool set_output = false, clr_output = false; bool set_output = false, clr_output = false;
if (cell->type == "$ne") if (cell->type.in("$ne", "$reduce_or", "$reduce_bool"))
set_output = true; set_output = true;
if (cell->type == "$eq") if (cell->type.in("$eq", "$logic_not", "$reduce_and"))
clr_output = true; clr_output = true;
if (!set_output && !clr_output) { if (set_output || clr_output) {
clr_output = true;
for (auto &port_it : cell->connections()) for (auto &port_it : cell->connections())
if (port_it.first != "\\A" || port_it.first != "\\Y") for (auto bit : assign_map(port_it.second))
clr_output = false; if (bit.wire != nullptr && !sig_q_bits.count(bit))
goto next_cellport;
} }
if (set_output || clr_output) { if (set_output || clr_output) {
@ -184,6 +186,7 @@ static void detect_fsm(RTLIL::Wire *wire)
ce.set(sig, val); ce.set(sig, val);
} }
} }
next_cellport:;
} }
SigSpec sig_y = sig_d, sig_undef; SigSpec sig_y = sig_d, sig_undef;