diff --git a/elab_expr.cc b/elab_expr.cc index 9fb49a272..6d6f0c6fc 100644 --- a/elab_expr.cc +++ b/elab_expr.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: elab_expr.cc,v 1.112 2006/10/03 05:06:00 steve Exp $" +#ident "$Id: elab_expr.cc,v 1.113 2006/10/15 03:25:57 steve Exp $" #endif # include "config.h" @@ -679,7 +679,7 @@ NetExpr* PEIdent::elaborate_expr(Design*des, NetScope*scope, if (path_.component_count() == 1 && ((specp = scope->specparams.find(key)) != scope->specparams.end())) { NetScope::spec_val_t value = (*specp).second; - NetExpr*tmp; + NetExpr*tmp = 0; switch (value.type) { case IVL_VT_BOOL: tmp = new NetEConst(verinum(value.integer)); @@ -1427,6 +1427,9 @@ NetExpr* PEUnary::elaborate_expr(Design*des, NetScope*scope, /* * $Log: elab_expr.cc,v $ + * Revision 1.113 2006/10/15 03:25:57 steve + * More detailed internal error message. + * * Revision 1.112 2006/10/03 05:06:00 steve * Support real valued specify delays, properly scaled. * diff --git a/t-dll.cc b/t-dll.cc index e781ab64c..adf80303e 100644 --- a/t-dll.cc +++ b/t-dll.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ifdef HAVE_CVS_IDENT -#ident "$Id: t-dll.cc,v 1.159 2006/09/28 00:29:49 steve Exp $" +#ident "$Id: t-dll.cc,v 1.160 2006/10/15 03:25:58 steve Exp $" #endif # include "config.h" @@ -2191,6 +2191,12 @@ void dll_target::signal(const NetNet*net) for (unsigned pin = 0; pin < src->pin_count(); pin += 1) { const Nexus*nex = src->pin(pin).nexus(); + if (! nex->t_cookie()) { + cerr << src->get_line() << ": internal error: " + << "No signal connected to pin " << pin + << " of delay path to " << net->name() + << "." << endl; + } assert(nex->t_cookie()); obj->path[ptr].src = (ivl_nexus_t) nex->t_cookie(); @@ -2239,6 +2245,9 @@ extern const struct target tgt_dll = { "dll", &dll_target_obj }; /* * $Log: t-dll.cc,v $ + * Revision 1.160 2006/10/15 03:25:58 steve + * More detailed internal error message. + * * Revision 1.159 2006/09/28 00:29:49 steve * Allow specparams as constants in expressions. *