mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-08-10 13:10:51 +00:00
Code Activity

Use more ID::{A,B,Y,blackbox,whitebox}

Browse source
This commit is contained in:
Eddie Hung 2019-08-15 14:50:10 -07:00
parent 6cd8cace0c
commit 52355f5185
40 changed files with 889 additions and 887 deletions
Download patch file Download diff file Expand all files Collapse all files

22
passes/techmap/tribuf.cc
View file

@ -64,37 +64,37 @@ struct TribufWorker {
for (auto cell : module->selected_cells())
{
if (cell->type == ID($tribuf))
tribuf_cells[sigmap(cell->getPort(ID(Y)))].push_back(cell);
tribuf_cells[sigmap(cell->getPort(ID::Y))].push_back(cell);
if (cell->type == ID($_TBUF_))
tribuf_cells[sigmap(cell->getPort(ID(Y)))].push_back(cell);
tribuf_cells[sigmap(cell->getPort(ID::Y))].push_back(cell);
if (cell->type.in(ID($mux), ID($_MUX_)))
{
IdString en_port = cell->type == ID($mux) ? ID(EN) : ID(E);
IdString tri_type = cell->type == ID($mux) ? ID($tribuf) : ID($_TBUF_);
if (is_all_z(cell->getPort(ID(A))) && is_all_z(cell->getPort(ID(B)))) {
if (is_all_z(cell->getPort(ID::A)) && is_all_z(cell->getPort(ID::B))) {
module->remove(cell);
continue;
}
if (is_all_z(cell->getPort(ID(A)))) {
cell->setPort(ID(A), cell->getPort(ID(B)));
if (is_all_z(cell->getPort(ID::A))) {
cell->setPort(ID::A, cell->getPort(ID::B));
cell->setPort(en_port, cell->getPort(ID(S)));
cell->unsetPort(ID(B));
cell->unsetPort(ID::B);
cell->unsetPort(ID(S));
cell->type = tri_type;
tribuf_cells[sigmap(cell->getPort(ID(Y)))].push_back(cell);
tribuf_cells[sigmap(cell->getPort(ID::Y))].push_back(cell);
continue;
}
if (is_all_z(cell->getPort(ID(B)))) {
if (is_all_z(cell->getPort(ID::B))) {
cell->setPort(en_port, module->Not(NEW_ID, cell->getPort(ID(S))));
cell->unsetPort(ID(B));
cell->unsetPort(ID::B);
cell->unsetPort(ID(S));
cell->type = tri_type;
tribuf_cells[sigmap(cell->getPort(ID(Y)))].push_back(cell);
tribuf_cells[sigmap(cell->getPort(ID::Y))].push_back(cell);
continue;
}
}
@ -122,7 +122,7 @@ struct TribufWorker {
pmux_s.append(cell->getPort(ID(EN)));
else
pmux_s.append(cell->getPort(ID(E)));
pmux_b.append(cell->getPort(ID(A)));
pmux_b.append(cell->getPort(ID::A));
module->remove(cell);
}