@@ -1376,17 +1376,17 @@ Function: verilog_synthesist::instantiate_ports
1376
1376
1377
1377
void verilog_synthesist::instantiate_ports (
1378
1378
const irep_idt &instance,
1379
- const exprt &inst,
1379
+ const verilog_instt::instancet &inst,
1380
1380
const symbolt &symbol,
1381
1381
const replace_mapt &replace_map,
1382
1382
transt &trans)
1383
1383
{
1384
- if (inst.operands ().size ()== 0 )
1384
+ if (inst.connections ().size () == 0 )
1385
1385
return ;
1386
1386
1387
1387
// named port connection?
1388
1388
1389
- if (to_multi_ary_expr ( inst). op0 (). id () == ID_named_port_connection )
1389
+ if (inst. named_connections () )
1390
1390
{
1391
1391
const irept::subt &ports = symbol.type .find (ID_ports).get_sub ();
1392
1392
@@ -1397,7 +1397,7 @@ void verilog_synthesist::instantiate_ports(
1397
1397
to_symbol_expr ((const exprt &)(port)).get_identifier ());
1398
1398
1399
1399
// no requirement that all ports are connected
1400
- for (const auto &o_it : inst.operands ())
1400
+ for (const auto &o_it : inst.connections ())
1401
1401
{
1402
1402
if (o_it.operands ().size ()==2 )
1403
1403
{
@@ -1418,17 +1418,17 @@ void verilog_synthesist::instantiate_ports(
1418
1418
{
1419
1419
const irept::subt &ports = symbol.type .find (ID_ports).get_sub ();
1420
1420
1421
- if (inst.operands ().size ()!= ports.size ())
1421
+ if (inst.connections ().size () != ports.size ())
1422
1422
{
1423
1423
throw errort ().with_location (inst.source_location ())
1424
1424
<< " wrong number of ports: expected " << ports.size () << " but got "
1425
- << inst.operands ().size ();
1425
+ << inst.connections ().size ();
1426
1426
}
1427
1427
1428
1428
irept::subt::const_iterator p_it=
1429
1429
ports.begin ();
1430
1430
1431
- for (const auto &o_it : inst.operands ())
1431
+ for (const auto &o_it : inst.connections ())
1432
1432
{
1433
1433
DATA_INVARIANT (o_it.is_not_nil (), " all ports must be connected" );
1434
1434
0 commit comments