From 031d91f8131d7d45c15baf240966e3f7d7b8fb45 Mon Sep 17 00:00:00 2001 From: steve Date: Wed, 18 Aug 1999 04:00:02 +0000 Subject: [PATCH] Fixup spelling and some error messages. --- README.txt | 1 + elaborate.cc | 15 +++++++++------ netlist.h | 7 +++++-- t-xnf.cc | 7 +++++-- target.cc | 14 ++++++++++---- xnfsyn.cc | 16 +++++++++++----- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/README.txt b/README.txt index 2c8d54ffb..bc1f84619 100644 --- a/README.txt +++ b/README.txt @@ -289,6 +289,7 @@ I have received aid in the form of fixes, Verilog guidance, and especially testing from many people, including (in alphabetical order): Ed Carter + Larry Doolittle Ales Hvezda James Lee Stefan Petersen diff --git a/elaborate.cc b/elaborate.cc index 0364ec6a8..cc855c265 100644 --- a/elaborate.cc +++ b/elaborate.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: elaborate.cc,v 1.70 1999/08/08 20:06:06 steve Exp $" +#ident "$Id: elaborate.cc,v 1.71 1999/08/18 04:00:02 steve Exp $" #endif /* @@ -1025,7 +1025,7 @@ NetExpr* PEString::elaborate_expr(Design*des, const string&path) const return tmp; } -NetExpr*PEIdent::elaborate_expr(Design*des, const string&path) const +NetExpr* PEIdent::elaborate_expr(Design*des, const string&path) const { // System identifiers show up in the netlist as identifiers. if (text_[0] == '$') @@ -1033,7 +1033,7 @@ NetExpr*PEIdent::elaborate_expr(Design*des, const string&path) const string name = path+"."+text_; - // If the identifier name a paramter name, then return + // If the identifier name a parameter name, then return // the expression that it represents. if (const NetExpr*ex = des->find_parameter(path, text_)) return ex->dup_expr(); @@ -1304,7 +1304,7 @@ NetProc* PAssign::elaborate(Design*des, const string&path) const This rewriting of the expression allows me to not bother to actually and literally represent the delayed assign in the - netlist. The compound statement is exactly equivilent. */ + netlist. The compound statement is exactly equivalent. */ if (dex) { string n = des->local_symbol(path); @@ -1808,7 +1808,7 @@ NetProc* PForever::elaborate(Design*des, const string&path) const } /* - * elaborate the for loop as the equivilent while loop. This eases the + * elaborate the for loop as the equivalent while loop. This eases the * task for the target code generator. The structure is: * * begin @@ -2051,6 +2051,9 @@ Design* elaborate(const map&modules, /* * $Log: elaborate.cc,v $ + * Revision 1.71 1999/08/18 04:00:02 steve + * Fixup spelling and some error messages. + * * Revision 1.70 1999/08/08 20:06:06 steve * Uninitialized low and high indices for single gate syntax * @@ -2106,7 +2109,7 @@ Design* elaborate(const map&modules, * part select in expressions. * * Revision 1.54 1999/07/13 04:08:26 steve - * Construct delayed assignment as an equivilent block. + * Construct delayed assignment as an equivalent block. * * Revision 1.53 1999/07/12 00:59:36 steve * procedural blocking assignment delays. diff --git a/netlist.h b/netlist.h index 68f02247e..827db7d4b 100644 --- a/netlist.h +++ b/netlist.h @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: netlist.h,v 1.55 1999/08/06 04:05:28 steve Exp $" +#ident "$Id: netlist.h,v 1.56 1999/08/18 04:00:02 steve Exp $" #endif /* @@ -438,7 +438,7 @@ class NetLogic : public NetNode { * expand it out any further then this in the netlist, as this can be * used to represent target device primitives. * - * The UDP can be combinational or sequential. The sequentianl UDP + * The UDP can be combinational or sequential. The sequential UDP * includes the current output in the truth table, and supports edges, * whereas the combinational does not and is entirely level sensitive. * In any case, pin 0 is an output, and all the remaining pins are @@ -1440,6 +1440,9 @@ extern ostream& operator << (ostream&, NetNet::Type); /* * $Log: netlist.h,v $ + * Revision 1.56 1999/08/18 04:00:02 steve + * Fixup spelling and some error messages. + * * Revision 1.55 1999/08/06 04:05:28 steve * Handle scope of parameters. * diff --git a/t-xnf.cc b/t-xnf.cc index 55ba581e8..3c7aba974 100644 --- a/t-xnf.cc +++ b/t-xnf.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: t-xnf.cc,v 1.7 1999/07/17 03:39:11 steve Exp $" +#ident "$Id: t-xnf.cc,v 1.8 1999/08/18 04:00:02 steve Exp $" #endif /* XNF BACKEND @@ -82,7 +82,7 @@ class target_xnf : public target_t { }; /* - * This function takes a signal name and mangles it into an equivilent + * This function takes a signal name and mangles it into an equivalent * name that is suitable to the XNF format. */ string target_xnf::mangle(const string&name) @@ -333,6 +333,9 @@ extern const struct target tgt_xnf = { "xnf", &target_xnf_obj }; /* * $Log: t-xnf.cc,v $ + * Revision 1.8 1999/08/18 04:00:02 steve + * Fixup spelling and some error messages. + * * Revision 1.7 1999/07/17 03:39:11 steve * simplified process scan for targets. * diff --git a/target.cc b/target.cc index eaf2068e1..1fe4a0819 100644 --- a/target.cc +++ b/target.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: target.cc,v 1.15 1999/07/17 19:51:00 steve Exp $" +#ident "$Id: target.cc,v 1.16 1999/08/18 04:00:02 steve Exp $" #endif # include "target.h" @@ -79,16 +79,18 @@ void target_t::net_const(ostream&os, const NetConst*) "Unhandled CONSTANT node." << endl; } -void target_t::net_esignal(ostream&os, const NetESignal*) +void target_t::net_esignal(ostream&os, const NetESignal*net) { cerr << "target (" << typeid(*this).name() << "): " "Unhandled Expression Signal node." << endl; + net->dump_node(cerr, 4); } -void target_t::net_event(ostream&os, const NetNEvent*) +void target_t::net_event(ostream&os, const NetNEvent*net) { cerr << "target (" << typeid(*this).name() << "): " "Unhandled EVENT net node." << endl; + net->dump_node(cerr, 4); } void target_t::process(ostream&os, const NetProcTop*top) @@ -140,10 +142,11 @@ void target_t::proc_delay(ostream&os, const NetPDelay*) "Unhandled proc_delay." << endl; } -void target_t::proc_event(ostream&os, const NetPEvent*) +void target_t::proc_event(ostream&os, const NetPEvent*net) { cerr << "target (" << typeid(*this).name() << "): " "Unhandled proc_event." << endl; + net->dump(cerr, 4); } void target_t::proc_forever(ostream&os, const NetForever*) @@ -241,6 +244,9 @@ void expr_scan_t::expr_binary(const NetEBinary*ex) /* * $Log: target.cc,v $ + * Revision 1.16 1999/08/18 04:00:02 steve + * Fixup spelling and some error messages. + * * Revision 1.15 1999/07/17 19:51:00 steve * netlist support for ternary operator. * diff --git a/xnfsyn.cc b/xnfsyn.cc index 1a7abb08f..58735b18e 100644 --- a/xnfsyn.cc +++ b/xnfsyn.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: xnfsyn.cc,v 1.2 1999/07/18 21:17:51 steve Exp $" +#ident "$Id: xnfsyn.cc,v 1.3 1999/08/18 04:00:02 steve Exp $" #endif /* @@ -136,13 +136,16 @@ void xnfsyn_f::proc_casn_(class Design*des) // ... and the rval must be a simple signal. NetESignal*sig = dynamic_cast(asn_->rval()); - if (sig == 0) + if (sig == 0) { + cerr << "Noted complex rval in DFF, name " << asn_->name() << + ", not yet implemented" << endl; return ; + } // The signal and the assignment must be the same width... assert(asn_->pin_count() == sig->pin_count()); - // Geneate enough DFF objects to handle the entire width. + // Generate enough DFF objects to handle the entire width. for (unsigned idx = 0 ; idx < asn_->pin_count() ; idx += 1) { // XXXX FIXME: Objects need unique names! @@ -170,7 +173,7 @@ void xnfsyn_f::proc_casn_(class Design*des) } /* - * The process si far has been matches as: + * The process so far has been matched as: * * always @(posedge nclk_) if ...; * always @(negedge nclk_) if ...; @@ -197,7 +200,7 @@ void xnfsyn_f::proc_ccon_(class Design*des) if (ce->pin_count() != 1) return; - // Geneate enough DFF objects to handle the entire width. + // Generate enough DFF objects to handle the entire width. for (unsigned idx = 0 ; idx < asn_->pin_count() ; idx += 1) { // XXXX FIXME: Objects need unique names! @@ -233,6 +236,9 @@ void xnfsyn(Design*des) /* * $Log: xnfsyn.cc,v $ + * Revision 1.3 1999/08/18 04:00:02 steve + * Fixup spelling and some error messages. + * * Revision 1.2 1999/07/18 21:17:51 steve * Add support for CE input to XNF DFF, and do * complete cleanup of replaced design nodes.