From 2f8f421dee5d71a3c2c6ca0dbf09610b2b4d0e84 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 13 Oct 2025 09:47:18 +0200 Subject: [PATCH] verifix: fix bits() deprecation warnings --- frontends/verific/verific.cc | 21 ++++++++++----------- frontends/verific/verificsva.cc | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc index 408542131..e56fd9e50 100644 --- a/frontends/verific/verific.cc +++ b/frontends/verific/verific.cc @@ -1663,7 +1663,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma if (*ascii_initdata == 0) break; if (*ascii_initdata == '0' || *ascii_initdata == '1') { - initval.bits()[bit_idx] = (*ascii_initdata == '0') ? State::S0 : State::S1; + initval.set(bit_idx, (*ascii_initdata == '0') ? State::S0 : State::S1); initval_valid = true; } ascii_initdata++; @@ -1787,9 +1787,9 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma if (init_nets.count(net)) { if (init_nets.at(net) == '0') - initval.bits().at(bitidx) = State::S0; + initval.set(bitidx, State::S0); if (init_nets.at(net) == '1') - initval.bits().at(bitidx) = State::S1; + initval.set(bitidx, State::S1); initval_valid = true; init_nets.erase(net); } @@ -1862,13 +1862,12 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma if (bit.wire->attributes.count(ID::init)) initval = bit.wire->attributes.at(ID::init); - while (GetSize(initval) < GetSize(bit.wire)) - initval.bits().push_back(State::Sx); + initval.resize(GetSize(bit.wire), State::Sx); if (it.second == '0') - initval.bits().at(bit.offset) = State::S0; + initval.set(bit.offset, State::S0); if (it.second == '1') - initval.bits().at(bit.offset) = State::S1; + initval.set(bit.offset, State::S1); bit.wire->attributes[ID::init] = initval; } @@ -2055,7 +2054,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma } Const qx_init = Const(State::S1, width); - qx_init.bits().resize(2 * width, State::S0); + qx_init.resize(2 * width, State::S0); clocking.addDff(new_verific_id(inst), sig_dx, sig_qx, qx_init); module->addXnor(new_verific_id(inst), sig_dx, sig_qx, sig_ox); @@ -2320,7 +2319,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma continue; if (non_ff_bits.count(SigBit(wire, i))) - initval.bits()[i] = State::Sx; + initval.set(i, State::Sx); } if (wire->port_input) { @@ -2513,7 +2512,7 @@ Cell *VerificClocking::addDff(IdString name, SigSpec sig_d, SigSpec sig_q, Const if (c.wire && c.wire->attributes.count(ID::init)) { Const val = c.wire->attributes.at(ID::init); for (int i = 0; i < GetSize(c); i++) - initval.bits()[offset+i] = val[c.offset+i]; + initval.set(offset+i, val[c.offset+i]); } offset += GetSize(c); } @@ -2584,7 +2583,7 @@ Cell *VerificClocking::addAldff(IdString name, RTLIL::SigSpec sig_aload, RTLIL:: if (c.wire && c.wire->attributes.count(ID::init)) { Const val = c.wire->attributes.at(ID::init); for (int i = 0; i < GetSize(c); i++) - initval.bits()[offset+i] = val[c.offset+i]; + initval.set(offset+i, val[c.offset+i]); } offset += GetSize(c); } diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc index 50e0049ae..dffe6e8e0 100644 --- a/frontends/verific/verificsva.cc +++ b/frontends/verific/verificsva.cc @@ -577,7 +577,7 @@ struct SvaFsm if (delta_pos >= 0 && i_within_j && j_within_i) { did_something = true; - values[i].bits()[delta_pos] = State::Sa; + values[i].set(delta_pos, State::Sa); values[j] = values.back(); values.pop_back(); goto next_pair;