mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-02 12:37:53 +00:00
Code Activity

Added RTLIL::Cell::has(portname)

Browse source
This commit is contained in:
Clifford Wolf 2014-07-26 16:11:28 +02:00
parent a84cb04935
commit 97a59851a6
12 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
passes/fsm/fsm_detect.cc
View file

@ -80,7 +80,7 @@ static bool check_state_users(RTLIL::SigSpec sig)
continue;
if (cellport.second != "\\A" && cellport.second != "\\B")
return false;
if (cell->connections().count("\\A") == 0 || cell->connections().count("\\B") == 0 || cell->connections().count("\\Y") == 0)
if (!cell->has("\\A") || !cell->has("\\B") || !cell->has("\\Y"))
return false;
for (auto &port_it : cell->connections())
if (port_it.first != "\\A" && port_it.first != "\\B" && port_it.first != "\\Y")

16
passes/fsm/fsm_expand.cc
View file

@ -47,13 +47,13 @@ struct FsmExpand
return true;
RTLIL::SigSpec new_signals;
if (cell->connections().count("\\A") > 0)
if (cell->has("\\A"))
new_signals.append(assign_map(cell->get("\\A")));
if (cell->connections().count("\\B") > 0)
if (cell->has("\\B"))
new_signals.append(assign_map(cell->get("\\B")));
if (cell->connections().count("\\S") > 0)
if (cell->has("\\S"))
new_signals.append(assign_map(cell->get("\\S")));
if (cell->connections().count("\\Y") > 0)
if (cell->has("\\Y"))
new_signals.append(assign_map(cell->get("\\Y")));
new_signals.sort_and_unify();
@ -65,7 +65,7 @@ struct FsmExpand
if (new_signals.size() > 3)
return false;
if (cell->connections().count("\\Y") > 0) {
if (cell->has("\\Y")) {
new_signals.append(assign_map(cell->get("\\Y")));
new_signals.sort_and_unify();
new_signals.remove_const();
@ -148,11 +148,11 @@ struct FsmExpand
for (int i = 0; i < (1 << input_sig.size()); i++) {
RTLIL::Const in_val(i, input_sig.size());
RTLIL::SigSpec A, B, S;
if (cell->connections().count("\\A") > 0)
if (cell->has("\\A"))
A = assign_map(cell->get("\\A"));
if (cell->connections().count("\\B") > 0)
if (cell->has("\\B"))
B = assign_map(cell->get("\\B"));
if (cell->connections().count("\\S") > 0)
if (cell->has("\\S"))
S = assign_map(cell->get("\\S"));
A.replace(input_sig, RTLIL::SigSpec(in_val));
B.replace(input_sig, RTLIL::SigSpec(in_val));

2
passes/fsm/fsm_extract.cc
View file

@ -350,7 +350,7 @@ struct FsmExtractPass : public Pass {
assign_map.apply(sig);
sig2driver.insert(sig, sig2driver_entry_t(cell_it.first, conn_it.first));
}
if (ct.cell_input(cell_it.second->type, conn_it.first) && cell_it.second->connections().count("\\Y") > 0 &&
if (ct.cell_input(cell_it.second->type, conn_it.first) && cell_it.second->has("\\Y") &&
cell_it.second->get("\\Y").size() == 1 && (conn_it.first == "\\A" || conn_it.first == "\\B")) {
RTLIL::SigSpec sig = conn_it.second;
assign_map.apply(sig);