diff --git a/elab_net.cc b/elab_net.cc index e24041e0b..2a3fbce6a 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 */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: elab_net.cc,v 1.61 2001/01/25 02:05:16 steve Exp $" +#ident "$Id: elab_net.cc,v 1.62 2001/02/08 01:10:30 steve Exp $" #endif # include "PExpr.h" @@ -167,13 +167,7 @@ NetNet* PEBinary::elaborate_net_add_(Design*des, const string&path, if (rsig->pin_count() > lsig->pin_count()) width = rsig->pin_count(); - // If the desired output size if creater then the largest - // operand, then include the carry of the adder as an output. -#if 0 - unsigned owidth = width; - if (lwidth > owidth) - owidth = width + 1; -#else + /* The owidth is the output width of the lpm_add_sub device. If the desired with is greater then the width of the operands, then widen the adder and let code below pad @@ -196,7 +190,7 @@ NetNet* PEBinary::elaborate_net_add_(Design*des, const string&path, default: assert(0); } -#endif + // Pad out the operands, if necessary, the match the width of // the adder device. @@ -1902,6 +1896,9 @@ NetNet* PEUnary::elaborate_net(Design*des, const string&path, /* * $Log: elab_net.cc,v $ + * Revision 1.62 2001/02/08 01:10:30 steve + * Remove dead code. + * * Revision 1.61 2001/01/25 02:05:16 steve * Handle wide net constants with unary minus. * diff --git a/netlist.cc b/netlist.cc index 3abbaca8d..eeeb64ff3 100644 --- a/netlist.cc +++ b/netlist.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: netlist.cc,v 1.155 2001/02/07 21:47:13 steve Exp $" +#ident "$Id: netlist.cc,v 1.156 2001/02/08 01:10:30 steve Exp $" #endif # include @@ -1789,19 +1789,6 @@ bool NetExpr::has_width() const NetEBAdd::NetEBAdd(char op, NetExpr*l, NetExpr*r) : NetEBinary(op, l, r) { -#if 0 - if (l->expr_width() > r->expr_width()) - r->set_width(l->expr_width()); - - if (r->expr_width() > l->expr_width()) - l->set_width(r->expr_width()); - - if (l->expr_width() < r->expr_width()) - r->set_width(l->expr_width()); - - if (r->expr_width() < l->expr_width()) - l->set_width(r->expr_width()); -#endif if (r->expr_width() > l->expr_width()) expr_width(r->expr_width()); else @@ -1829,31 +1816,6 @@ NetEBAdd* NetEBAdd::dup_expr() const NetEBBits::NetEBBits(char op, NetExpr*l, NetExpr*r) : NetEBinary(op, l, r) { -#if 0 - /* First try to naturally adjust the size of the - expressions to match. */ - if (l->expr_width() > r->expr_width()) - r->set_width(l->expr_width()); - - if (r->expr_width() > l->expr_width()) - l->set_width(r->expr_width()); - - if (l->expr_width() < r->expr_width()) - r->set_width(l->expr_width()); - - if (r->expr_width() < l->expr_width()) - l->set_width(r->expr_width()); - - /* If the expressions cannot be matched, pad them to fit. */ - if (l->expr_width() > r->expr_width()) - right_ = pad_to_width(r, l->expr_width()); - - if (r->expr_width() > l->expr_width()) - left_ = pad_to_width(l, r->expr_width()); - - assert(left_->expr_width() == right_->expr_width()); - expr_width(left_->expr_width()); -#endif if (r->expr_width() > l->expr_width()) expr_width(r->expr_width()); else @@ -2493,6 +2455,9 @@ bool NetUDP::sequ_glob_(string input, char output) /* * $Log: netlist.cc,v $ + * Revision 1.156 2001/02/08 01:10:30 steve + * Remove dead code. + * * Revision 1.155 2001/02/07 21:47:13 steve * Fix expression widths for rvalues and parameters (PR#131,132) * diff --git a/set_width.cc b/set_width.cc index ef28e6989..5455dd483 100644 --- a/set_width.cc +++ b/set_width.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: set_width.cc,v 1.16 2001/02/07 21:47:13 steve Exp $" +#ident "$Id: set_width.cc,v 1.17 2001/02/08 01:10:30 steve Exp $" #endif /* @@ -115,17 +115,11 @@ bool NetEBBits::set_width(unsigned w) left_->set_width(w); right_->set_width(w); - /* Now increase me up to the size of the largest operand. This - accounts for operands that can't shrink. */ + + /* */ unsigned use_width = w; -#if 0 - if (use_width < left_->expr_width()) - use_width = left_->expr_width(); - if (use_width < right_->expr_width()) - use_width = right_->expr_width(); -#endif /* If the operands end up too small, then pad them to suit. */ @@ -343,6 +337,9 @@ bool NetEUnary::set_width(unsigned w) /* * $Log: set_width.cc,v $ + * Revision 1.17 2001/02/08 01:10:30 steve + * Remove dead code. + * * Revision 1.16 2001/02/07 21:47:13 steve * Fix expression widths for rvalues and parameters (PR#131,132) *