From 25de448d34f591654d4a03e1b2117a76e0720ffd Mon Sep 17 00:00:00 2001 From: steve Date: Sat, 22 Jan 2005 18:16:00 +0000 Subject: [PATCH] Remove obsolete NetSubnet class. --- design_dump.cc | 12 ++++-------- elab_net.cc | 10 ++++------ elaborate.cc | 11 ++++------- netlist.cc | 16 ++++------------ netlist.h | 18 ++++-------------- 5 files changed, 20 insertions(+), 47 deletions(-) diff --git a/design_dump.cc b/design_dump.cc index 112f1bf39..9f38bf973 100644 --- a/design_dump.cc +++ b/design_dump.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: design_dump.cc,v 1.152 2005/01/09 20:16:00 steve Exp $" +#ident "$Id: design_dump.cc,v 1.153 2005/01/22 18:16:00 steve Exp $" #endif # include "config.h" @@ -119,13 +119,6 @@ void NetNet::dump_net(ostream&o, unsigned ind) const dump_obj_attr(o, ind+4); } -void NetSubnet::dump_net(ostream&o, unsigned ind) const -{ - o << setw(ind) << "" << "** " << name() << " is a NetSubnet **" - << endl; - NetNet::dump_net(o, ind); -} - void NetMemory::dump(ostream&o, unsigned ind) const { o << setw(ind) << "" << name_ << "[" << width_ << "] " << @@ -1109,6 +1102,9 @@ void Design::dump(ostream&o) const /* * $Log: design_dump.cc,v $ + * Revision 1.153 2005/01/22 18:16:00 steve + * Remove obsolete NetSubnet class. + * * Revision 1.152 2005/01/09 20:16:00 steve * Use PartSelect/PV and VP to handle part selects through ports. * diff --git a/elab_net.cc b/elab_net.cc index 15f2f328f..8ed67ff17 100644 --- a/elab_net.cc +++ b/elab_net.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: elab_net.cc,v 1.143 2005/01/22 01:06:55 steve Exp $" +#ident "$Id: elab_net.cc,v 1.144 2005/01/22 18:16:00 steve Exp $" #endif # include "config.h" @@ -149,11 +149,6 @@ NetNet* PEBinary::elaborate_net(Design*des, NetScope*scope, osig = 0; } - if (NetSubnet*tmp = dynamic_cast(lsig)) - delete tmp; - if (NetSubnet*tmp = dynamic_cast(rsig)) - delete tmp; - return osig; } @@ -2456,6 +2451,9 @@ NetNet* PEUnary::elaborate_net(Design*des, NetScope*scope, /* * $Log: elab_net.cc,v $ + * Revision 1.144 2005/01/22 18:16:00 steve + * Remove obsolete NetSubnet class. + * * Revision 1.143 2005/01/22 01:06:55 steve * Change case compare from logic to an LPM node. * diff --git a/elaborate.cc b/elaborate.cc index 7d77263b0..e94cb16a9 100644 --- a/elaborate.cc +++ b/elaborate.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: elaborate.cc,v 1.314 2005/01/12 03:17:36 steve Exp $" +#ident "$Id: elaborate.cc,v 1.315 2005/01/22 18:16:00 steve Exp $" #endif # include "config.h" @@ -522,8 +522,6 @@ void PGBuiltin::elaborate(Design*des, NetScope*scope) const des->errors += 1; } - if (NetSubnet*tmp = dynamic_cast(sig)) - delete tmp; } } @@ -1043,10 +1041,6 @@ void PGModule::elaborate_udp_(Design*des, PUdp*udp, NetScope*scope) const } connect(sig->pin(0), net->pin(idx)); - - // Delete excess holding signal. - if (NetSubnet*tmp = dynamic_cast(sig)) - delete tmp; } // All done. Add the object to the design. @@ -2886,6 +2880,9 @@ Design* elaborate(listroots) /* * $Log: elaborate.cc,v $ + * Revision 1.315 2005/01/22 18:16:00 steve + * Remove obsolete NetSubnet class. + * * Revision 1.314 2005/01/12 03:17:36 steve * Properly pad vector widths in pgassign. * diff --git a/netlist.cc b/netlist.cc index ae4f2f7e3..84c606f91 100644 --- a/netlist.cc +++ b/netlist.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: netlist.cc,v 1.231 2005/01/22 01:06:55 steve Exp $" +#ident "$Id: netlist.cc,v 1.232 2005/01/22 18:16:01 steve Exp $" #endif # include "config.h" @@ -455,17 +455,6 @@ unsigned NetNet::get_refs() const } -NetSubnet::NetSubnet(NetNet*sig, unsigned off, unsigned wid) -: NetNet(sig->scope(), sig->scope()->local_symbol(), sig->type(), wid-1,0) -{ - for (unsigned idx = 0 ; idx < wid ; idx += 1) - connect(sig->pin(idx+off), pin(idx)); - - port_type(sig->port_type()); - local_flag(true); - set_line(*sig); -} - NetPartSelect::NetPartSelect(NetNet*sig, unsigned off, unsigned wid, NetPartSelect::dir_t dir) : NetNode(sig->scope(), sig->scope()->local_symbol(), 2), @@ -2347,6 +2336,9 @@ const NetProc*NetTaskDef::proc() const /* * $Log: netlist.cc,v $ + * Revision 1.232 2005/01/22 18:16:01 steve + * Remove obsolete NetSubnet class. + * * Revision 1.231 2005/01/22 01:06:55 steve * Change case compare from logic to an LPM node. * diff --git a/netlist.h b/netlist.h index 0ad237804..e2da61429 100644 --- a/netlist.h +++ b/netlist.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: netlist.h,v 1.327 2005/01/22 01:06:55 steve Exp $" +#ident "$Id: netlist.h,v 1.328 2005/01/22 18:16:01 steve Exp $" #endif /* @@ -1153,19 +1153,6 @@ class NetECRealParam : public NetECReal { perm_string name_; }; -/* DEPRECATED -- REMOVE ME! Use NetPartSelect instead. - * This is a special, magical NetNet object. It represents a constant - * bit or part select of another NetNet, so is used to return that - * selection from elaborate function. None of these should remain once - * the elaboration is complete. - */ -class NetSubnet : public NetNet { - - public: - explicit NetSubnet(NetNet*sig, unsigned off, unsigned wid); - virtual void dump_net(ostream&, unsigned) const; -}; - /* * The NetPartSelect device represents a netlist part select of a * signal vector. Pin 0 is a vector that is a part select of pin 1, @@ -3419,6 +3406,9 @@ extern ostream& operator << (ostream&, NetNet::Type); /* * $Log: netlist.h,v $ + * Revision 1.328 2005/01/22 18:16:01 steve + * Remove obsolete NetSubnet class. + * * Revision 1.327 2005/01/22 01:06:55 steve * Change case compare from logic to an LPM node. *