mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-06 22:23:23 +00:00
Code Activity

kernel: fix DeleteWireWorker

Browse source
This commit is contained in:
Eddie Hung 2020-03-17 10:22:16 -07:00
parent 432a09af80
commit bc51e609cb
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/rtlil.cc
View file

@ -1586,6 +1586,7 @@ void RTLIL::Module::remove(const pool<RTLIL::Wire*> &wires)
const pool<RTLIL::Wire*> *wires_p; const pool<RTLIL::Wire*> *wires_p;
void operator()(RTLIL::SigSpec &sig) { void operator()(RTLIL::SigSpec &sig) {
sig.pack();
for (auto &c : sig.chunks_) for (auto &c : sig.chunks_)
if (c.wire != NULL && wires_p->count(c.wire)) { if (c.wire != NULL && wires_p->count(c.wire)) {
c.wire = module->addWire(NEW_ID, c.width); c.wire = module->addWire(NEW_ID, c.width);
@ -1599,16 +1600,10 @@ void RTLIL::Module::remove(const pool<RTLIL::Wire*> &wires)
rhs.unpack(); rhs.unpack();
for (int i = 0; i < GetSize(lhs); i++) { for (int i = 0; i < GetSize(lhs); i++) {
RTLIL::SigBit &lhs_bit = lhs.bits_[i]; RTLIL::SigBit &lhs_bit = lhs.bits_[i];
if (lhs_bit.wire != nullptr && wires_p->count(lhs_bit.wire)) {
lhs_bit.wire = module->addWire(NEW_ID);
lhs_bit.offset = 0;
continue;
}
RTLIL::SigBit &rhs_bit = rhs.bits_[i]; RTLIL::SigBit &rhs_bit = rhs.bits_[i];
if (rhs_bit.wire != nullptr && wires_p->count(rhs_bit.wire)) { if ((lhs_bit.wire != nullptr && wires_p->count(lhs_bit.wire)) || (rhs_bit.wire != nullptr && wires_p->count(rhs_bit.wire))) {
rhs_bit.wire = module->addWire(NEW_ID); lhs_bit = State::Sx;
rhs_bit.offset = 0; rhs_bit = State::Sx;
continue;
} }
} }
} }