@@ -1663,7 +1663,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
16631663 if (*ascii_initdata == 0 )
16641664 break ;
16651665 if (*ascii_initdata == ' 0' || *ascii_initdata == ' 1' ) {
1666- initval.bits ()[ bit_idx] = (*ascii_initdata == ' 0' ) ? State::S0 : State::S1;
1666+ initval.set ( bit_idx, (*ascii_initdata == ' 0' ) ? State::S0 : State::S1) ;
16671667 initval_valid = true ;
16681668 }
16691669 ascii_initdata++;
@@ -1787,9 +1787,9 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
17871787
17881788 if (init_nets.count (net)) {
17891789 if (init_nets.at (net) == ' 0' )
1790- initval.bits (). at ( bitidx) = State::S0;
1790+ initval.set ( bitidx, State::S0) ;
17911791 if (init_nets.at (net) == ' 1' )
1792- initval.bits (). at ( bitidx) = State::S1;
1792+ initval.set ( bitidx, State::S1) ;
17931793 initval_valid = true ;
17941794 init_nets.erase (net);
17951795 }
@@ -1862,13 +1862,12 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
18621862 if (bit.wire ->attributes .count (ID::init))
18631863 initval = bit.wire ->attributes .at (ID::init);
18641864
1865- while (GetSize (initval) < GetSize (bit.wire ))
1866- initval.bits ().push_back (State::Sx);
1865+ initval.resize (GetSize (bit.wire ), State::Sx);
18671866
18681867 if (it.second == ' 0' )
1869- initval.bits (). at ( bit.offset ) = State::S0;
1868+ initval.set ( bit.offset , State::S0) ;
18701869 if (it.second == ' 1' )
1871- initval.bits (). at ( bit.offset ) = State::S1;
1870+ initval.set ( bit.offset , State::S1) ;
18721871
18731872 bit.wire ->attributes [ID::init] = initval;
18741873 }
@@ -2055,7 +2054,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
20552054 }
20562055
20572056 Const qx_init = Const (State::S1, width);
2058- qx_init.bits (). resize (2 * width, State::S0);
2057+ qx_init.resize (2 * width, State::S0);
20592058
20602059 clocking.addDff (new_verific_id (inst), sig_dx, sig_qx, qx_init);
20612060 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
23202319 continue ;
23212320
23222321 if (non_ff_bits.count (SigBit (wire, i)))
2323- initval.bits ()[i] = State::Sx;
2322+ initval.set (i, State::Sx) ;
23242323 }
23252324
23262325 if (wire->port_input ) {
@@ -2513,7 +2512,7 @@ Cell *VerificClocking::addDff(IdString name, SigSpec sig_d, SigSpec sig_q, Const
25132512 if (c.wire && c.wire ->attributes .count (ID::init)) {
25142513 Const val = c.wire ->attributes .at (ID::init);
25152514 for (int i = 0 ; i < GetSize (c); i++)
2516- initval.bits ()[ offset+i] = val[c.offset +i];
2515+ initval.set ( offset+i, val[c.offset +i]) ;
25172516 }
25182517 offset += GetSize (c);
25192518 }
@@ -2584,7 +2583,7 @@ Cell *VerificClocking::addAldff(IdString name, RTLIL::SigSpec sig_aload, RTLIL::
25842583 if (c.wire && c.wire ->attributes .count (ID::init)) {
25852584 Const val = c.wire ->attributes .at (ID::init);
25862585 for (int i = 0 ; i < GetSize (c); i++)
2587- initval.bits ()[ offset+i] = val[c.offset +i];
2586+ initval.set ( offset+i, val[c.offset +i]) ;
25882587 }
25892588 offset += GetSize (c);
25902589 }
0 commit comments