diff --git a/parse.y b/parse.y index 2d2cf9f24..6090baaf8 100644 --- a/parse.y +++ b/parse.y @@ -5833,8 +5833,7 @@ dimensions net_variable : IDENTIFIER dimensions_opt { perm_string name = lex_strings.make($1); - pform_makewire(@1, name, NetNet::IMPLICIT, - NetNet::NOT_A_PORT, IVL_VT_NO_TYPE, 0); + pform_makewire(@1, name, NetNet::IMPLICIT, IVL_VT_NO_TYPE); pform_set_reg_idx(name, $2); $$ = $1; } diff --git a/pform.cc b/pform.cc index a5b178478..634768f5d 100644 --- a/pform.cc +++ b/pform.cc @@ -2741,12 +2741,11 @@ static PWire* pform_get_or_make_wire(const vlltype&li, perm_string name, * the variable/net. Other forms of pform_makewire ultimately call * this one to create the wire and stash it. */ -void pform_makewire(const vlltype&li, perm_string name, - NetNet::Type type, NetNet::PortType pt, - ivl_variable_type_t dt, - list*attr) +void pform_makewire(const vlltype&li, perm_string name, NetNet::Type type, + ivl_variable_type_t dt) { - PWire*cur = pform_get_or_make_wire(li, name, type, pt, dt); + PWire*cur = pform_get_or_make_wire(li, name, type, NetNet::NOT_A_PORT, + dt); assert(cur); bool flag; @@ -2766,13 +2765,6 @@ void pform_makewire(const vlltype&li, perm_string name, default: break; } - - if (attr) { - for (list::iterator attr_cur = attr->begin() - ; attr_cur != attr->end() ; ++attr_cur) { - cur->attributes[attr_cur->name] = attr_cur->parm; - } - } } void pform_makewire(const struct vlltype&li, @@ -2793,7 +2785,7 @@ void pform_makewire(const struct vlltype&li, for (list::iterator cur = assign_list->begin() ; cur != assign_list->end() ; ++ cur) { decl_assignment_t* curp = *cur; - pform_makewire(li, curp->name, type, NetNet::NOT_A_PORT, IVL_VT_NO_TYPE, 0); + pform_makewire(li, curp->name, type, IVL_VT_NO_TYPE); pform_set_reg_idx(curp->name, &curp->index); names->push_back(curp->name); } diff --git a/pform.h b/pform.h index 3dda00d94..8e2c6ecef 100644 --- a/pform.h +++ b/pform.h @@ -144,7 +144,6 @@ extern PWire* pform_get_wire_in_scope(perm_string name); extern PWire* pform_get_make_wire_in_scope(const struct vlltype&li, perm_string name, NetNet::Type net_type, - NetNet::PortType port_type, ivl_variable_type_t vt_type); /* @@ -350,9 +349,7 @@ extern PForeach* pform_make_foreach(const struct vlltype&loc, */ extern void pform_makewire(const struct vlltype&li, perm_string name, NetNet::Type type, - NetNet::PortType pt, - ivl_variable_type_t, - std::list*attr); + ivl_variable_type_t dt); /* This form handles assignment declarations. */ diff --git a/pform_disciplines.cc b/pform_disciplines.cc index 0e3c2e7f7..964622fef 100644 --- a/pform_disciplines.cc +++ b/pform_disciplines.cc @@ -195,8 +195,7 @@ void pform_attach_discipline(const struct vlltype&loc, PWire* cur_net = pform_get_wire_in_scope(*cur); if (cur_net == 0) { /* Not declared yet, declare it now. */ - pform_makewire(loc, *cur, NetNet::WIRE, - NetNet::NOT_A_PORT, IVL_VT_REAL, 0); + pform_makewire(loc, *cur, NetNet::WIRE, IVL_VT_REAL); cur_net = pform_get_wire_in_scope(*cur); assert(cur_net); }