Allow VPI callbacks to var array words.

Functions like $monitor need to attach callbacks to array words if
those words are to be monitored. Have the array hold all the callbacks
for words in the array, under the assumption that the monitored words
are sparse.

.cvsignore

@@ -17,6 +17,7 @@ configure
 Makefile
 check
 check.cc
+check.vvp
 config.status
 config.log
 config.cache

BUGS.txt

@@ -72,11 +72,11 @@ reporting problems with. However, if you clearly explain what is right
 and wrong about the generated netlist, I will probably be able to fix
 the problem. It may take a few iterations.
 
-In this case, if possible include not only the sample verilog program,
+In this case, if possible include not only the sample Verilog program,
 but the generated netlist file(s) and a clear indication of what went
 wrong. If it is not clear to me, I will ask for clarification.
 
-* The Output is Correct, But Less Then Ideal
+* The Output is Correct, But Less Than Ideal
 
 If the output is strictly correct, but just not good enough for
 practical use, I would like to know. These sorts of problems are
@@ -104,7 +104,7 @@ module may not be needed as long as the ``-s <name>'' switch is
 given.
 
 So when you send a test case, ask yourself "Can poor overworked Steve
-invoke the error without any Verilog other then what is included?" And
+invoke the error without any Verilog other than what is included?" And
 while we are at it, please place a copyright notice in your test
 program and include a GPL license statement if you can. Your test
 program may find its way into the test suite, and the notices will
@@ -160,8 +160,11 @@ I must insist that any copyright material submitted for inclusion
 include the GPL license notice as shown in the rest of the source.
 
 
-$Id: BUGS.txt,v 1.4 2003/02/19 04:36:31 steve Exp $
+$Id: BUGS.txt,v 1.5 2007/03/22 16:08:14 steve Exp $
 $Log: BUGS.txt,v $
+Revision 1.5  2007/03/22 16:08:14  steve
+ Spelling fixes from Larry
+
 Revision 1.4  2003/02/19 04:36:31  steve
  Notes on hte bug database.
 

HName.cc

@@ -17,247 +17,120 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: HName.cc,v 1.5 2002/11/02 03:27:52 steve Exp $"
+#ident "$Id: HName.cc,v 1.8 2007/06/02 03:42:12 steve Exp $"
 #endif
 
 # include  "config.h"
 # include  "HName.h"
 # include  <iostream>
-# include  <string.h>
-# include  <stdlib.h>
+# include  <cstring>
+# include  <cstdlib>
+# include  <climits>
 #ifdef HAVE_MALLOC_H
 # include  <malloc.h>
 #endif
 
+
 hname_t::hname_t()
 {
-      item_ = 0;
-      count_ = 0;
+      number_ = INT_MIN;
 }
 
-hname_t::hname_t(const char*text)
+hname_t::hname_t(perm_string text)
 {
-      item_ = strdup(text);
-      count_ = 1;
+      name_ = text;
+      number_ = INT_MIN;
+}
+
+hname_t::hname_t(perm_string text, int num)
+{
+      name_ = text;
+      number_ = num;
 }
 
 hname_t::hname_t(const hname_t&that)
 {
-      count_ = that.count_;
-      switch (count_) {
-	  case 0:
-	    item_ = 0;
-	    break;
-	  case 1:
-	    item_ = strdup(that.item_);
-	    break;
-	  default:
-	    array_ = new char*[count_];
-	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
-		  array_[idx] = strdup(that.array_[idx]);
-	    break;
-      }
+      name_ = that.name_;
+      number_ = that.number_;
+}
+
+hname_t& hname_t::operator = (const hname_t&that)
+{
+      name_ = that.name_;
+      number_ = that.number_;
+      return *this;
 }
 
 hname_t::~hname_t()
 {
-      switch (count_) {
-	  case 0:
-	    break;
-	  case 1:
-	    free(item_);
-	    break;
-	  default:
-	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
-		  free(array_[idx]);
-	    delete[]array_;
-	    break;
-      }
 }
 
-unsigned hname_t::component_count() const
+perm_string hname_t::peek_name(void) const
 {
-      return count_;
+      return name_;
 }
 
-void hname_t::append(const char*text)
+bool hname_t::has_number() const
 {
-      char**tmp;
-
-      switch (count_) {
-	  case 0:
-	    count_ = 1;
-	    item_ = strdup(text);
-	    break;
-	  case 1:
-	    count_ = 2;
-	    tmp = new char*[2];
-	    tmp[0] = item_;
-	    tmp[1] = strdup(text);
-	    array_ = tmp;
-	    break;
-	  default:
-	    tmp = new char*[count_+1];
-	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
-		  tmp[idx] = array_[idx];
-	    delete[]array_;
-	    array_ = tmp;
-	    array_[count_] = strdup(text);
-	    count_ += 1;
-      }
+      return number_ != INT_MIN;
 }
 
-void hname_t::prepend(const char*text)
+int hname_t::peek_number() const
 {
-      char**tmp;
-
-      switch (count_) {
-	  case 0:
-	    count_ = 1;
-	    item_ = strdup(text);
-	    break;
-	  case 1:
-	    count_ = 2;
-	    tmp = new char*[2];
-	    tmp[0] = strdup(text);
-	    tmp[1] = item_;
-	    array_ = tmp;
-	    break;
-	  default:
-	    tmp = new char*[count_+1];
-	    tmp[0] = strdup(text);
-	    for (unsigned idx = 0 ;  idx < count_ ;  idx += 1)
-		  tmp[idx+1] = array_[idx];
-	    delete[]array_;
-	    array_ = tmp;
-	    count_ += 1;
-      }
-}
-
-char* hname_t::remove_tail_name()
-{
-      if (count_ == 0)
-	    return 0;
-
-      if (count_ == 1) {
-	    char*tmp = item_;
-	    count_ = 0;
-	    item_ = 0;
-	    return tmp;
-      }
-
-      if (count_ == 2) {
-	    char*tmp1 = array_[0];
-	    char*tmp2 = array_[1];
-	    delete[]array_;
-	    count_ = 1;
-	    item_ = tmp1;
-	    return tmp2;
-      }
-
-      char*tmpo = array_[count_-1];
-      char**tmpa = new char*[count_-1];
-      for (unsigned idx = 0 ;  idx < count_-1 ;  idx += 1)
-	    tmpa[idx] = array_[idx];
-
-      delete[]array_;
-      array_ = tmpa;
-      count_ -= 1;
-      return tmpo;
-}
-
-const char* hname_t::peek_name(unsigned idx) const
-{
-      if (idx >= count_)
-	    return 0;
-
-      if (count_ == 1)
-	    return item_;
-
-      return array_[idx];
-}
-
-const char* hname_t::peek_tail_name() const
-{
-      switch (count_) {
-	  case 0:
-	    return 0;
-	  case 1:
-	    return item_;
-	  default:
-	    return array_[count_-1];
-      }
+      return number_;
 }
 
 bool operator < (const hname_t&l, const hname_t&r)
 {
-      unsigned idx = 0;
-      const char*lc = l.peek_name(idx);
-      const char*rc = r.peek_name(idx);
-
-      while (lc && rc) {
-	    int cmp = strcmp(lc, rc);
-	    if (cmp < 0)
-		  return true;
-	    if (cmp > 0)
-		  return false;
-	    idx += 1;
-	    lc = l.peek_name(idx);
-	    rc = r.peek_name(idx);
-      }
-
-      if (lc && !rc)
+      int cmp = strcmp(l.peek_name(), r.peek_name());
+      if (cmp < 0) return true;
+      if (cmp > 0) return false;
+      if (l.has_number() && r.has_number())
+	    return l.peek_number() < r.peek_number();
+      else
 	    return false;
-      if (rc && !lc)
-	    return true;
-
-	// Must be ==
-      return false;
 }
 
 bool operator == (const hname_t&l, const hname_t&r)
 {
-      unsigned idx = 0;
-      const char*lc = l.peek_name(idx);
-      const char*rc = r.peek_name(idx);
-
-      while (lc && rc) {
-	    int cmp = strcmp(lc, rc);
-	    if (cmp != 0)
-		  return false;
-	    idx += 1;
-	    lc = l.peek_name(idx);
-	    rc = r.peek_name(idx);
+      if (l.peek_name() == r.peek_name()) {
+	    if (l.has_number() && r.has_number())
+		  return l.peek_number() == r.peek_number();
+	    else
+		  return true;
       }
 
-      if (lc || rc)
-	    return false;
-
-	// Must be ==
-      return true;
+      return false;
 }
 
+bool operator != (const hname_t&l, const hname_t&r)
+{ return ! (l==r); }
+
 ostream& operator<< (ostream&out, const hname_t&that)
 {
-      switch (that.count_) {
-	  case 0:
+      if (that.peek_name() == 0) {
 	    out << "";
 	    return out;
-	  case 1:
-	    out << that.item_;
-	    return out;
-
-	  default:
-	    out << that.array_[0];
-	    for (unsigned idx = 1 ;  idx < that.count_ ;  idx += 1)
-		  out << "." << that.array_[idx];
-
-	    return out;
       }
+
+      out << that.peek_name();
+      if (that.has_number())
+	    out << "[" << that.peek_number() << "]";
+
+      return out;
 }
 
 /*
  * $Log: HName.cc,v $
+ * Revision 1.8  2007/06/02 03:42:12  steve
+ *  Properly evaluate scope path expressions.
+ *
+ * Revision 1.7  2007/05/16 19:12:33  steve
+ *  Fix hname_t use of space for 1 perm_string.
+ *
+ * Revision 1.6  2007/04/26 03:06:21  steve
+ *  Rework hname_t to use perm_strings.
+ *
  * Revision 1.5  2002/11/02 03:27:52  steve
  *  Allow named events to be referenced by
  *  hierarchical names.

HName.h

@@ -1,7 +1,7 @@
 #ifndef __HName_H
 #define __HName_H
 /*
- * Copyright (c) 2001 Stephen Williams ([email protected])
+ * Copyright (c) 2001-2007 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -19,10 +19,11 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: HName.h,v 1.4 2002/11/02 03:27:51 steve Exp $"
+#ident "$Id: HName.h,v 1.7 2007/06/02 03:42:12 steve Exp $"
 #endif
 
 # include  <iostream>
+# include  "StringHeap.h"
 #ifdef __GNUC__
 #if __GNUC__ > 2
 using namespace std;
@@ -30,59 +31,56 @@ using namespace std;
 #endif
 
 /*
- * This class represents a Verilog hierarchical name. A hierarchical
- * name is an ordered list of simple names.
+ * This class represents a component of a Verilog hierarchical name. A
+ * hierarchical component contains a name string (represented here
+ * with a perm_string) and an optional signed number. This signed
+ * number is used if the scope is part of an array, for example an
+ * array of module instances or a loop generated scope.
  */
 
 class hname_t {
 
     public:
       hname_t ();
-      explicit hname_t (const char*text);
+      explicit hname_t (perm_string text);
+      explicit hname_t (perm_string text, int num);
       hname_t (const hname_t&that);
       ~hname_t();
 
-	// This method adds a name to the end of the hierarchical
-	// path. This becomes a new base name.
-      void append(const char*text);
+      hname_t& operator= (const hname_t&);
 
-	// This method adds a name to the *front* of the hierarchical
-	// path. The base name remains the same, unless this is the
-	// only component.
-      void prepend(const char*text);
+	// Return the string part of the hname_t.
+      perm_string peek_name(void) const;
 
-	// This method removes the tail name from the hierarchy, and
-	// returns a pointer to that tail name. That tail name now
-	// must be removed by the caller.
-      char* remove_tail_name();
-
-	// Return the given component in the hierarchical name. If the
-	// idx is too large, return 0.
-      const char*peek_name(unsigned idx) const;
-      const char*peek_tail_name() const;
-
-	// Return the number of components in the hierarchical
-	// name. If this is a simple name, this will return 1.
-      unsigned component_count() const;
-
-      friend ostream& operator<< (ostream&, const hname_t&);
+      bool has_number() const;
+      int peek_number() const;
 
     private:
-      union {
-	    char**array_;
-	    char* item_;
-      };
-      unsigned count_;
+      perm_string name_;
+	// If the number is anything other then INT_MIN, then this is
+	// the numeric part of the name. Otherwise, it is not part of
+	// the name at all.
+      int number_;
 
     private: // not implemented
-      hname_t& operator= (const hname_t&);
 };
 
 extern bool operator <  (const hname_t&, const hname_t&);
 extern bool operator == (const hname_t&, const hname_t&);
+extern bool operator != (const hname_t&, const hname_t&);
+extern ostream& operator<< (ostream&, const hname_t&);
 
 /*
  * $Log: HName.h,v $
+ * Revision 1.7  2007/06/02 03:42:12  steve
+ *  Properly evaluate scope path expressions.
+ *
+ * Revision 1.6  2007/05/16 19:12:33  steve
+ *  Fix hname_t use of space for 1 perm_string.
+ *
+ * Revision 1.5  2007/04/26 03:06:21  steve
+ *  Rework hname_t to use perm_strings.
+ *
  * Revision 1.4  2002/11/02 03:27:51  steve
  *  Allow named events to be referenced by
  *  hierarchical names.

LineInfo.cc

@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: LineInfo.cc,v 1.4 2003/01/17 05:49:03 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -26,7 +23,7 @@
 # include  <sstream>
 
 LineInfo::LineInfo()
-: file_(0), lineno_(0)
+: lineno_(0)
 {
 }
 
@@ -34,10 +31,10 @@ LineInfo::~LineInfo()
 {
 }
 
-string LineInfo::get_line() const
+string LineInfo::get_fileline() const
 {
       ostringstream buf;
-      buf << (file_? file_ : "") << ":" << lineno_;
+      buf << (file_.str()? file_.str() : "") << ":" << lineno_;
 
       string res = buf.str();
       return res;
@@ -49,7 +46,7 @@ void LineInfo::set_line(const LineInfo&that)
       lineno_ = that.lineno_;
 }
 
-void LineInfo::set_file(const char*f)
+void LineInfo::set_file(perm_string f)
 {
       file_ = f;
 }
@@ -58,21 +55,3 @@ void LineInfo::set_lineno(unsigned n)
 {
       lineno_ = n;
 }
-
-/*
- * $Log: LineInfo.cc,v $
- * Revision 1.4  2003/01/17 05:49:03  steve
- *  Use stringstream in place of sprintf.
- *
- * Revision 1.3  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.2  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.1  2000/11/30 17:31:42  steve
- *  Change LineInfo to store const C strings.
- *
- */
-

LineInfo.h

@@ -18,10 +18,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: LineInfo.h,v 1.8 2005/06/14 19:13:43 steve Exp $"
-#endif
 
+# include  "StringHeap.h"
 # include  <string>
 
 using namespace std;
@@ -40,36 +38,20 @@ class LineInfo {
       LineInfo();
       ~LineInfo();
 
-      string get_line() const;
-
+	// Get a fully formatted file/lineno
+      string get_fileline() const;
+	// Set the file/line fro another LineInfo object.
       void set_line(const LineInfo&that);
 
-      void set_file(const char*f);
+	// Access parts of LineInfo data
+      void set_file(perm_string f);
       void set_lineno(unsigned n);
 
+      perm_string get_file() const { return file_; }
+      unsigned  get_lineno() const { return lineno_; }
     private:
-      const char* file_;
+      perm_string file_;
       unsigned lineno_;
 };
 
-/*
- * $Log: LineInfo.h,v $
- * Revision 1.8  2005/06/14 19:13:43  steve
- *  gcc3/4 compile errors.
- *
- * Revision 1.7  2003/01/17 05:49:03  steve
- *  Use stringstream in place of sprintf.
- *
- * Revision 1.6  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.5  2000/11/30 17:31:42  steve
- *  Change LineInfo to store const C strings.
- *
- * Revision 1.4  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.3  1999/02/15 02:06:15  steve
- *  Elaborate gate ranges.
- */
 #endif

Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.176 2006/05/01 20:47:29 steve Exp $"
+#ident "$Id: Makefile.in,v 1.181 2007/05/24 04:07:11 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -30,6 +30,7 @@ VERSION = 0.9.devel
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
+datarootdir = @datarootdir@
 
 SUBDIRS = @subdirs@
 
@@ -40,10 +41,7 @@ libdir = @libdir@
 includedir = @includedir@
 mandir = @mandir@
 
-libdir64 = @libdir64@
-
 dllib=@DLLIB@
-strip_dynamic=@strip_dynamic@
 
 CC = @CC@
 CXX = @CXX@
@@ -51,7 +49,6 @@ INSTALL = @INSTALL@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
-STRIP = @STRIP@
 LEX = @LEX@
 YACC = @YACC@
 
@@ -60,15 +57,15 @@ CXXFLAGS = -Wall @CXXFLAGS@
 PICFLAGS = @PICFLAG@
 LDFLAGS = @rdynamic@ @LDFLAGS@
 
-all: dep ivl@EXEEXT@
+all: dep version.h ivl@EXEEXT@
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-	for dir in ivlpp tgt-verilog ; \
+	for dir in ivlpp ; \
 	    do (cd $$dir ; $(MAKE) $@); done
 	cd driver ; $(MAKE) VERSION=$(VERSION) $@
 
 # In the windows world, the installer will need a dosify program to
 # dosify text files.
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
 all: dep dosify.exe
 dosify.exe: dosify.c
 	$(CC) -o dosify.exe dosify.c
@@ -84,17 +81,20 @@ check: all
 
 clean:
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-	for dir in vpi ivlpp tgt-verilog driver; \
+	for dir in vpi ivlpp tgt-verilog tgt-pal driver driver-vpi; \
 	    do (cd $$dir ; $(MAKE) $@); done
 	rm -f *.o parse.cc parse.cc.output parse.h lexor.cc
+	rm -f ivl.exp iverilog-vpi.pdf iverilog-vpi.ps parse.output
+	rm -f syn-rules.output dosify.exe ivl@EXEEXT@ check.vvp
 	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc*
-	rm -rf dep ivl@EXEEXT@
+	rm -rf dep
 
 distclean: clean
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-	for dir in vpi ivlpp tgt-verilog driver; \
+	for dir in vpi ivlpp tgt-verilog tgt-pal driver driver-vpi; \
 	    do (cd $$dir ; $(MAKE) $@); done
 	rm -f Makefile config.status config.log config.cache config.h
+	rm -f _pli_types.h
 
 TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o
 FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o
@@ -107,11 +107,11 @@ load_module.o netlist.o netmisc.o net_assign.o \
 net_design.o net_event.o net_expr.o net_force.o net_func.o \
 net_link.o net_modulo.o net_nex_input.o net_nex_output.o \
 net_proc.o net_scope.o net_udp.o pad_to_width.o \
-parse.o parse_misc.o pform.o pform_dump.o \
+parse.o parse_misc.o pform.o pform_dump.o pform_types.o \
 set_width.o symbol_search.o sync.o sys_funcs.o \
 verinum.o verireal.o target.o targets.o \
 Attrib.o HName.o LineInfo.o Module.o PDelays.o PEvent.o \
-PExpr.o PGate.o PGenerate.o \
+PExpr.o PGate.o PGenerate.o PScope.o PSpec.o \
 PTask.o PUdp.o PFunction.o PWire.o Statement.o StringHeap.o \
 $(FF) $(TT)
 
@@ -124,15 +124,14 @@ ifeq (@WIN32@,yes)
 # The first step makes an ivl.exe that dlltool can use to make an
 # export and import library, and the last link makes a, ivl.exe
 # that really exports the things that the import library imports.
-ivl@EXEEXT@: $O ivl.def
+ivl@EXEEXT@: $O $(srcdir)/ivl.def
 	$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
-	dlltool --dllname ivl@EXEEXT@ --def ivl.def \
+	dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
 		--output-lib libivl.a --output-exp ivl.exp
-	$(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
+	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
 else
 ivl@EXEEXT@: $O
 	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib)
-
 endif
 
 ifeq (@MINGW32@,yes)
@@ -142,9 +141,10 @@ all: dep iverilog-vpi
 
 iverilog-vpi: iverilog-vpi.sh
 	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
+	    -e 's;@IVCC@;$(CC);' \
+	    -e 's;@IVCXX@;$(CXX);' \
+	    -e 's;@IVCFLAGS@;$(CXXFLAGS);' \
 	    -e 's;@INCLUDEDIR@;@includedir@;' \
-	    -e 's;@LIBDIR64@;@libdir64@;' \
-	    -e 's;@VPIDIR1@;@vpidir1@;' -e 's;@VPIDIR2@;@vpidir2@;' \
 	    -e 's;@LIBDIR@;@libdir@;' $< > $@
 	chmod +x $@
 endif
@@ -182,7 +182,25 @@ iverilog-vpi.ps: $(srcdir)/iverilog-vpi.man
 iverilog-vpi.pdf: iverilog-vpi.ps
 	ps2pdf iverilog-vpi.ps iverilog-vpi.pdf
 
-ifeq (@WIN32@,yes)
+# For VERSION_TAG in driver/main.c, first try git-describe, then look for a
+# version.h file in the source tree (included in snapshots and releases), and
+# finally use nothing.
+.PHONY: version.h
+version.h:
+	@if test -d $(srcdir)/.git; then \
+	    echo "Using git-describe for VERSION_TAG"; \
+	    tmp=`git --git-dir $(srcdir)/.git describe \
+		   | sed -e 's;\(.*\);#define VERSION_TAG "\1";'`; \
+	    echo "$$tmp" | diff - $@ > /dev/null 2>&1 || echo "$$tmp" > $@ || exit 1; \
+	elif test -r $(srcdir)/$@; then \
+	    echo "Using $(srcdir)/$@ for VERSION_TAG"; \
+	    diff $(srcdir)/$@ $@ > /dev/null 2>&1 || cp $(srcdir)/$@ $@; \
+	else \
+	    echo "Using empty VERSION_TAG"; \
+	    echo '#define VERSION_TAG ""' > $@; \
+	fi
+
+ifeq (@MING32@,yes)
 INSTALL_DOC = $(prefix)/iverilog-vpi.pdf $(mandir)/man1/iverilog-vpi.1
 INSTALL_DOCDIR = $(mandir)/man1
 all: dep iverilog-vpi.pdf
@@ -199,44 +217,46 @@ endif
 
 XNF_INSTALL = $(libdir)/ivl/xnf.conf $(libdir)/ivl/xnf-s.conf
 
-install: all installdirs $(libdir)/ivl/ivl@EXEEXT@  $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
+install: all installdirs $(libdir)/ivl/ivl@EXEEXT@  $(libdir)/ivl/include/constants.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
 	for dir in vpi ivlpp driver; \
 	    do (cd $$dir ; $(MAKE) $@); done
 
 $(bindir)/iverilog-vpi: ./iverilog-vpi
-	$(INSTALL_SCRIPT) ./iverilog-vpi $(bindir)/iverilog-vpi
+	$(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi
 
 $(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
-	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl/ivl@EXEEXT@
-	$(STRIP) $(strip_dynamic) $(libdir)/ivl/ivl@EXEEXT@
+	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl/ivl@EXEEXT@
+
+$(libdir)/ivl/include/constants.vams: $(srcdir)/constants.vams
+	$(INSTALL_DATA) $(srcdir)/constants.vams $@
 
 $(libdir)/ivl/xnf-s.conf: $(srcdir)/xnf-s.conf
-	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl/xnf-s.conf
+	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(DESTDIR)$(libdir)/ivl/xnf-s.conf
 
 $(libdir)/ivl/xnf.conf: $(srcdir)/xnf.conf
-	$(INSTALL_DATA) $(srcdir)/xnf.conf $(libdir)/ivl/xnf.conf
+	$(INSTALL_DATA) $(srcdir)/xnf.conf $(DESTDIR)$(libdir)/ivl/xnf.conf
 
 $(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
-	$(INSTALL_DATA) $(srcdir)/ivl_target.h $(includedir)/ivl_target.h
+	$(INSTALL_DATA) $(srcdir)/ivl_target.h $(DESTDIR)$(includedir)/ivl_target.h
 
 $(includedir)/_pli_types.h: _pli_types.h
-	$(INSTALL_DATA) $< $(includedir)/_pli_types.h
+	$(INSTALL_DATA) $< $(DESTDIR)$(includedir)/_pli_types.h
 
 $(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
-	$(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h
+	$(INSTALL_DATA) $(srcdir)/vpi_user.h $(DESTDIR)$(includedir)/vpi_user.h
 
 $(includedir)/acc_user.h: $(srcdir)/acc_user.h
-	$(INSTALL_DATA) $(srcdir)/acc_user.h $(includedir)/acc_user.h
+	$(INSTALL_DATA) $(srcdir)/acc_user.h $(DESTDIR)$(includedir)/acc_user.h
 
 $(includedir)/veriuser.h: $(srcdir)/veriuser.h
-	$(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h
+	$(INSTALL_DATA) $(srcdir)/veriuser.h $(DESTDIR)$(includedir)/veriuser.h
 
 $(mandir)/man1/iverilog-vpi.1: $(srcdir)/iverilog-vpi.man
-	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi.1
+	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi.1
 
 $(prefix)/iverilog-vpi.pdf: iverilog-vpi.pdf
-	$(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi.pdf
+	$(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi.pdf
 
 # In windows installations, put a few examples and the quick_start
 # into the destination directory.
@@ -259,21 +279,22 @@ $(prefix)/QUICK_START.txt: $(srcdir)/QUICK_START.txt
 endif
 
 installdirs: mkinstalldirs
-	$(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl \
-	    $(mandir) $(mandir)/man1
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl \
+	    $(DESTDIR)$(libdir)/ivl/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
 
 uninstall:
 	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
 	for dir in vpi ivlpp driver; \
 	    do (cd $$dir ; $(MAKE) $@); done
-	for f in xnf.conf xnf-s.conf ivl; \
-	    do rm -f $(libdir)/ivl/$$f; done
-	-rmdir $(libdir)/ivl
+	for f in xnf.conf xnf-s.conf ivl@EXEEXT@ include/constants.vams; \
+	    do rm -f $(DESTDIR)$(libdir)/ivl/$$f; done
+	-rmdir $(DESTDIR)$(libdir)/ivl/include
+	-rmdir $(DESTDIR)$(libdir)/ivl
 	for f in verilog iverilog-vpi gverilog@EXEEXT@; \
-	    do rm -f $(bindir)/$$f; done
+	    do rm -f $(DESTDIR)$(bindir)/$$f; done
 	for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
-	    do rm -f $(includedir)/$$f; done
-	rm -f $(mandir)/man1/iverilog-vpi.1
+	    do rm -f $(DESTDIR)$(includedir)/$$f; done
+	rm -f $(DESTDIR)$(mandir)/man1/iverilog-vpi.1 $(DESTDIR)$(prefix)/iverilog-vpi.pdf
 
 
 -include $(patsubst %.o, dep/%.d, $O)

Module.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: Module.cc,v 1.25 2004/10/04 01:10:51 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -29,8 +26,9 @@
 
 /* n is a permallocated string. */
 Module::Module(perm_string n)
-: name_(n)
+: PScope(n, 0)
 {
+      library_flag = false;
       default_nettype = NetNet::NONE;
 }
 
@@ -53,21 +51,6 @@ void Module::add_function(perm_string name, PFunction *func)
       funcs_[name] = func;
 }
 
-PWire* Module::add_wire(PWire*wire)
-{
-      PWire*&ep = wires_[wire->path()];
-      if (ep) return ep;
-
-      assert(ep == 0);
-      ep = wire;
-      return wire;
-}
-
-void Module::add_behavior(PProcess*b)
-{
-      behaviors_.push_back(b);
-}
-
 unsigned Module::port_count() const
 {
       return ports.count();
@@ -91,7 +74,7 @@ const svector<PEIdent*>& Module::get_port(unsigned idx) const
 
 unsigned Module::find_port(const char*name) const
 {
-      assert(name != "");
+      assert(name != 0);
       for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
 	    if (ports[idx] == 0) {
 		    /* It is possible to have undeclared ports. These
@@ -110,15 +93,6 @@ unsigned Module::find_port(const char*name) const
 }
 
 
-PWire* Module::get_wire(const hname_t&name) const
-{
-      map<hname_t,PWire*>::const_iterator obj = wires_.find(name);
-      if (obj == wires_.end())
-	    return 0;
-      else
-	    return (*obj).second;
-}
-
 PGate* Module::get_gate(perm_string name)
 {
       for (list<PGate*>::iterator cur = gates_.begin()
@@ -132,105 +106,8 @@ PGate* Module::get_gate(perm_string name)
       return 0;
 }
 
-const map<hname_t,PWire*>& Module::get_wires() const
-{
-      return wires_;
-}
-
 const list<PGate*>& Module::get_gates() const
 {
       return gates_;
 }
 
-const list<PProcess*>& Module::get_behaviors() const
-{
-      return behaviors_;
-}
-
-
-/*
- * $Log: Module.cc,v $
- * Revision 1.25  2004/10/04 01:10:51  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.24  2004/06/13 04:56:53  steve
- *  Add support for the default_nettype directive.
- *
- * Revision 1.23  2004/02/20 06:22:56  steve
- *  parameter keys are per_strings.
- *
- * Revision 1.22  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.21  2003/04/02 03:00:14  steve
- *  Cope with empty module ports while binding by name.
- *
- * Revision 1.20  2003/03/06 04:37:12  steve
- *  lex_strings.add module names earlier.
- *
- * Revision 1.19  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.18  2002/05/19 23:37:28  steve
- *  Parse port_declaration_lists from the 2001 Standard.
- *
- * Revision 1.17  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.16  2001/10/20 05:21:51  steve
- *  Scope/module names are char* instead of string.
- *
- * Revision 1.15  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.14  2000/11/15 20:31:05  steve
- *  Fix warning about temporaries.
- *
- * Revision 1.13  2000/11/05 06:05:59  steve
- *  Handle connectsion to internally unconnected modules (PR#38)
- *
- * Revision 1.12  2000/05/16 04:05:15  steve
- *  Module ports are really special PEIdent
- *  expressions, because a name can be used
- *  many places in the port list.
- *
- * Revision 1.11  2000/03/12 17:09:40  steve
- *  Support localparam.
- *
- * Revision 1.10  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.9  2000/01/09 20:37:57  steve
- *  Careful with wires connected to multiple ports.
- *
- * Revision 1.8  1999/12/11 05:45:41  steve
- *  Fix support for attaching attributes to primitive gates.
- *
- * Revision 1.7  1999/09/17 02:06:25  steve
- *  Handle unconnected module ports.
- *
- * Revision 1.6  1999/08/04 02:13:02  steve
- *  Elaborate module ports that are concatenations of
- *  module signals.
- *
- * Revision 1.5  1999/08/03 04:14:49  steve
- *  Parse into pform arbitrarily complex module
- *  port declarations.
- *
- * Revision 1.4  1999/07/31 19:14:47  steve
- *  Add functions up to elaboration (Ed Carter)
- *
- * Revision 1.3  1999/07/03 02:12:51  steve
- *  Elaborate user defined tasks.
- *
- * Revision 1.2  1999/06/17 05:34:42  steve
- *  Clean up interface of the PWire class,
- *  Properly match wire ranges.
- *
- * Revision 1.1  1998/11/03 23:28:51  steve
- *  Introduce verilog to CVS.
- *
- */
-

Module.h

@@ -1,7 +1,7 @@
 #ifndef __Module_H
 #define __Module_H
 /*
- * Copyright (c) 1998-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,9 +18,7 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: Module.h,v 1.40 2006/04/10 00:37:42 steve Exp $"
-#endif
+
 
 # include  <list>
 # include  <map>
@@ -28,13 +26,15 @@
 # include  "StringHeap.h"
 # include  "HName.h"
 # include  "named.h"
+# include  "PScope.h"
 # include  "LineInfo.h"
 # include  "netlist.h"
-class PEvent;
+# include  "pform_types.h"
 class PExpr;
 class PEIdent;
 class PGate;
 class PGenerate;
+class PSpecPath;
 class PTask;
 class PFunction;
 class PWire;
@@ -48,7 +48,7 @@ class NetScope;
  * therefore the handle for grasping the described circuit.
  */
 
-class Module : public LineInfo {
+class Module : public PScope, public LineInfo {
 
 	/* The module ports are in general a vector of port_t
 	   objects. Each port has a name and an ordered list of
@@ -67,6 +67,12 @@ class Module : public LineInfo {
       explicit Module(perm_string name);
       ~Module();
 
+	/* Initially false. This is set to true if the module has been
+	   declared as a library module. This makes the module
+	   ineligible for being chosen as an implicit root. It has no
+	   other effect. */
+      bool library_flag;
+
       NetNet::Type default_nettype;
 
 	/* The module has parameters that are evaluated when the
@@ -76,6 +82,8 @@ class Module : public LineInfo {
 	    PExpr*expr;
 	    PExpr*msb;
 	    PExpr*lsb;
+	    perm_string file;
+	    unsigned lineno;
 	    bool signed_flag;
       };
       map<perm_string,param_expr_t>parameters;
@@ -91,7 +99,7 @@ class Module : public LineInfo {
 	   new parameters within the module, but may be used to set
 	   values within this module (when instantiated) or in other
 	   instantiated modules. */
-      map<hname_t,PExpr*>defparms;
+      map<pform_name_t,PExpr*>defparms;
 
         /* Parameters may be overridden at instantiation time;
            the overrides do not contain explicit parameter names,
@@ -105,9 +113,6 @@ class Module : public LineInfo {
 	   named array of PEident pointers. */
       svector<port_t*> ports;
 
-	/* Keep a table of named events declared in the module. */
-      map<perm_string,PEvent*>events;
-
       map<perm_string,PExpr*> attributes;
 
 	/* These are the timescale for this module. The default is
@@ -116,22 +121,18 @@ class Module : public LineInfo {
 
 	/* The module has a list of genvars that may be used in
 	   various generate schemes. */
-      list<perm_string> genvars;
+      map<perm_string,LineInfo*> genvars;
 
 	/* the module has a list of generate schemes that appear in
 	   the module definition. These are used at elaboration time. */
       list<PGenerate*> generate_schemes;
 
-      perm_string mod_name() const { return name_; }
+      list<PSpecPath*> specify_paths;
+
+	// The mod_name() is the name of the module type.
+      perm_string mod_name() const { return pscope_name(); }
 
       void add_gate(PGate*gate);
-
-	// The add_wire method adds a wire by name, but only if the
-	// wire name doesn't already exist. Either way, the result is
-	// the existing wire or the pointer passed in.
-      PWire* add_wire(PWire*wire);
-
-      void add_behavior(PProcess*behave);
       void add_task(perm_string name, PTask*def);
       void add_function(perm_string name, PFunction*def);
 
@@ -139,14 +140,9 @@ class Module : public LineInfo {
       const svector<PEIdent*>& get_port(unsigned idx) const;
       unsigned find_port(const char*name) const;
 
-	// Find a wire by name. This is used for connecting gates to
-	// existing wires, etc.
-      PWire* get_wire(const hname_t&name) const;
       PGate* get_gate(perm_string name);
 
-      const map<hname_t,PWire*>& get_wires() const;
       const list<PGate*>& get_gates() const;
-      const list<PProcess*>& get_behaviors() const;
 
       void dump(ostream&out) const;
       bool elaborate(Design*, NetScope*scope) const;
@@ -157,29 +153,17 @@ class Module : public LineInfo {
       bool elaborate_sig(Design*, NetScope*scope) const;
 
     private:
-      perm_string name_;
-
-      map<hname_t,PWire*> wires_;
       list<PGate*> gates_;
-      list<PProcess*> behaviors_;
       map<perm_string,PTask*> tasks_;
       map<perm_string,PFunction*> funcs_;
 
+      static void elaborate_parm_item_(perm_string name, const param_expr_t&cur,
+				       Design*des, NetScope*scope,
+				       perm_string file, unsigned lineno);
+
     private: // Not implemented
       Module(const Module&);
       Module& operator= (const Module&);
 };
 
-
-/*
- * $Log: Module.h,v $
- * Revision 1.40  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.39  2006/03/30 01:49:07  steve
- *  Fix instance arrays indexed by overridden parameters.
- *
- * Revision 1.38  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- */
 #endif

PDelays.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PDelays.cc,v 1.14 2006/06/02 04:48:49 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -27,6 +24,7 @@
 # include  "PDelays.h"
 # include  "PExpr.h"
 # include  "verinum.h"
+# include  "netmisc.h"
 
 PDelays::PDelays()
 {
@@ -66,10 +64,7 @@ static NetExpr*calculate_val(Design*des, NetScope*scope, const PExpr*expr)
 {
 
       NetExpr*dex = expr->elaborate_expr(des, scope, -1, false);
-      if (NetExpr*tmp = dex->eval_tree()) {
-	    delete dex;
-	    dex = tmp;
-      }
+      eval_expr(dex);
 
 	/* If the delay expression is a real constant or vector
 	   constant, then evaluate it, scale it to the local time
@@ -115,6 +110,12 @@ static NetExpr* make_delay_nets(Design*des, NetExpr*expr)
 	    return expr;
 
       NetNet*sig = expr->synthesize(des);
+      if (sig == 0) {
+	    cerr << expr->get_fileline() << ": error: Expression " << *expr
+		 << " is not suitable for delay expression." << endl;
+	    return 0;
+      }
+
       expr = new NetESignal(sig);
       return expr;
 }
@@ -160,60 +161,3 @@ void PDelays::eval_delays(Design*des, NetScope*scope,
 	    decay_time = 0;
       }
 }
-
-/*
- * $Log: PDelays.cc,v $
- * Revision 1.14  2006/06/02 04:48:49  steve
- *  Make elaborate_expr methods aware of the width that the context
- *  requires of it. In the process, fix sizing of the width of unary
- *  minus is context determined sizes.
- *
- * Revision 1.13  2006/01/03 05:22:14  steve
- *  Handle complex net node delays.
- *
- * Revision 1.12  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
- *
- * Revision 1.11  2003/06/21 01:21:42  steve
- *  Harmless fixup of warnings.
- *
- * Revision 1.10  2003/02/08 19:49:21  steve
- *  Calculate delay statement delays using elaborated
- *  expressions instead of pre-elaborated expression
- *  trees.
- *
- *  Remove the eval_pexpr methods from PExpr.
- *
- * Revision 1.9  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.8  2001/12/29 20:19:31  steve
- *  Do not delete delay expressions of UDP instances.
- *
- * Revision 1.7  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
- *
- * Revision 1.6  2001/11/07 04:01:59  steve
- *  eval_const uses scope instead of a string path.
- *
- * Revision 1.5  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.4  2001/01/20 02:15:50  steve
- *  apologize for not supporting non-constant delays.
- *
- * Revision 1.3  2001/01/14 23:04:55  steve
- *  Generalize the evaluation of floating point delays, and
- *  get it working with delay assignment statements.
- *
- *  Allow parameters to be referenced by hierarchical name.
- *
- * Revision 1.2  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.1  1999/09/04 19:11:46  steve
- *  Add support for delayed non-blocking assignments.
- *
- */
-

PExpr.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-1999 Stephen Williams <[email protected]>
+ * Copyright (c) 1998-2007 Stephen Williams <[email protected]>
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PExpr.cc,v 1.37 2005/10/04 04:09:25 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -46,16 +43,16 @@ bool PExpr::is_constant(Module*) const
       return false;
 }
 
-NetNet* PExpr::elaborate_lnet(Design*des, NetScope*, bool) const
+NetNet* PExpr::elaborate_lnet(Design*des, NetScope*) const
 {
-      cerr << get_line() << ": error: expression not valid in assign l-value: "
+      cerr << get_fileline() << ": error: expression not valid in assign l-value: "
 	   << *this << endl;
       return 0;
 }
 
 NetNet* PExpr::elaborate_bi_net(Design*des, NetScope*) const
 {
-      cerr << get_line() << ": error: "
+      cerr << get_fileline() << ": error: "
 	   << "expression not valid as argument to inout port: "
 	   << *this << endl;
       return 0;
@@ -75,13 +72,44 @@ bool PEBinary::is_constant(Module*mod) const
       return left_->is_constant(mod) && right_->is_constant(mod);
 }
 
-PECallFunction::PECallFunction(const hname_t&n, const svector<PExpr *> &parms)
+PEBComp::PEBComp(char op, PExpr*l, PExpr*r)
+: PEBinary(op, l, r)
+{
+}
+
+PEBComp::~PEBComp()
+{
+}
+
+PEBShift::PEBShift(char op, PExpr*l, PExpr*r)
+: PEBinary(op, l, r)
+{
+}
+
+PEBShift::~PEBShift()
+{
+}
+
+PECallFunction::PECallFunction(const pform_name_t&n, const svector<PExpr *> &parms)
 : path_(n), parms_(parms)
 {
 }
 
-PECallFunction::PECallFunction(const hname_t&n)
-: path_(n)
+static pform_name_t pn_from_ps(perm_string n)
+{
+      name_component_t tmp_name (n);
+      pform_name_t tmp;
+      tmp.push_back(tmp_name);
+      return tmp;
+}
+
+PECallFunction::PECallFunction(perm_string n, const svector<PExpr*>&parms)
+: path_(pn_from_ps(n)), parms_(parms)
+{
+}
+
+PECallFunction::PECallFunction(perm_string n)
+: path_(pn_from_ps(n))
 {
 }
 
@@ -147,33 +175,32 @@ bool PEFNumber::is_constant(Module*) const
       return true;
 }
 
-PEIdent::PEIdent(const hname_t&s)
-: path_(s), msb_(0), lsb_(0), sel_(SEL_NONE), idx_(0)
+PEIdent::PEIdent(const pform_name_t&that)
+: path_(that)
 {
 }
 
+PEIdent::PEIdent(perm_string s)
+{
+      path_.push_back(name_component_t(s));
+}
+
 PEIdent::~PEIdent()
 {
 }
 
-const hname_t& PEIdent::path() const
-{
-      return path_;
-}
-
 /*
  * An identifier can be in a constant expression if (and only if) it is
- * a parameter.
+ * a parameter or genvar.
+ *
+ * NOTE: This test does not work if the name is hierarchical!
  */
 bool PEIdent::is_constant(Module*mod) const
 {
       if (mod == 0) return false;
 
-	/* This is a work-around for map not matching < even when
-	   there is a perm_string operator that can do the comprare.
-
-	   The real fix is to make the path_ carry perm_strings. */
-      perm_string tmp = perm_string::literal(path_.peek_name(0));
+	/*  */
+      perm_string tmp = path_.back().name;
 
       { map<perm_string,Module::param_expr_t>::const_iterator cur;
         cur = mod->parameters.find(tmp);
@@ -185,6 +212,11 @@ bool PEIdent::is_constant(Module*mod) const
 	if (cur != mod->localparams.end()) return true;
       }
 
+      { map<perm_string,LineInfo*>::const_iterator cur;
+        cur = mod->genvars.find(tmp);
+	if (cur != mod->genvars.end()) return true;
+      }
+
       return false;
 }
 
@@ -268,148 +300,3 @@ bool PEUnary::is_constant(Module*m) const
       return expr_->is_constant(m);
 }
 
-/*
- * $Log: PExpr.cc,v $
- * Revision 1.37  2005/10/04 04:09:25  steve
- *  Add support for indexed select attached to parameters.
- *
- * Revision 1.36  2005/08/06 17:58:16  steve
- *  Implement bi-directional part selects.
- *
- * Revision 1.35  2004/10/04 01:10:51  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.34  2004/02/20 06:22:56  steve
- *  parameter keys are per_strings.
- *
- * Revision 1.33  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.32  2002/11/09 19:20:48  steve
- *  Port expressions for output ports are lnets, not nets.
- *
- * Revision 1.31  2002/08/19 02:39:16  steve
- *  Support parameters with defined ranges.
- *
- * Revision 1.30  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.29  2001/12/30 21:32:03  steve
- *  Support elaborate_net for PEString objects.
- *
- * Revision 1.28  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.27  2001/11/08 05:15:50  steve
- *  Remove string paths from PExpr elaboration.
- *
- * Revision 1.26  2001/11/07 04:26:46  steve
- *  elaborate_lnet uses scope instead of string path.
- *
- * Revision 1.25  2001/11/06 06:11:55  steve
- *  Support more real arithmetic in delay constants.
- *
- * Revision 1.24  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.23  2001/01/14 23:04:55  steve
- *  Generalize the evaluation of floating point delays, and
- *  get it working with delay assignment statements.
- *
- *  Allow parameters to be referenced by hierarchical name.
- *
- * Revision 1.22  2001/01/12 04:31:27  steve
- *  Handle error idents in constants not in any scope (PR#97)
- *
- * Revision 1.21  2000/12/16 19:03:30  steve
- *  Evaluate <= and ?: in parameter expressions (PR#81)
- *
- * Revision 1.20  2000/12/10 22:01:35  steve
- *  Support decimal constants in behavioral delays.
- *
- * Revision 1.19  2000/06/30 15:50:20  steve
- *  Allow unary operators in constant expressions.
- *
- * Revision 1.18  2000/05/07 04:37:55  steve
- *  Carry strength values from Verilog source to the
- *  pform and netlist for gates.
- *
- *  Change vvm constants to use the driver_t to drive
- *  a constant value. This works better if there are
- *  multiple drivers on a signal.
- *
- * Revision 1.17  2000/05/04 03:37:58  steve
- *  Add infrastructure for system functions, move
- *  $time to that structure and add $random.
- *
- * Revision 1.16  2000/04/12 04:23:57  steve
- *  Named events really should be expressed with PEIdent
- *  objects in the pform,
- *
- *  Handle named events within the mix of net events
- *  and edges. As a unified lot they get caught together.
- *  wait statements are broken into more complex statements
- *  that include a conditional.
- *
- *  Do not generate NetPEvent or NetNEvent objects in
- *  elaboration. NetEvent, NetEvWait and NetEvProbe
- *  take over those functions in the netlist.
- *
- * Revision 1.15  2000/04/01 19:31:57  steve
- *  Named events as far as the pform.
- *
- * Revision 1.14  2000/03/12 18:22:11  steve
- *  Binary and unary operators in parameter expressions.
- *
- * Revision 1.13  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.12  1999/12/31 17:38:37  steve
- *  Standardize some of the error messages.
- *
- * Revision 1.11  1999/10/31 04:11:27  steve
- *  Add to netlist links pin name and instance number,
- *  and arrange in vvm for pin connections by name
- *  and instance number.
- *
- * Revision 1.10  1999/09/25 02:57:29  steve
- *  Parse system function calls.
- *
- * Revision 1.9  1999/09/16 04:18:15  steve
- *  elaborate concatenation repeats.
- *
- * Revision 1.8  1999/09/15 04:17:52  steve
- *  separate assign lval elaboration for error checking.
- *
- * Revision 1.7  1999/07/22 02:05:20  steve
- *  is_constant method for PEConcat.
- *
- * Revision 1.6  1999/07/17 19:50:59  steve
- *  netlist support for ternary operator.
- *
- * Revision 1.5  1999/06/16 03:13:29  steve
- *  More syntax parse with sorry stubs.
- *
- * Revision 1.4  1999/06/10 04:03:52  steve
- *  Add support for the Ternary operator,
- *  Add support for repeat concatenation,
- *  Correct some seg faults cause by elaboration
- *  errors,
- *  Parse the casex anc casez statements.
- *
- * Revision 1.3  1999/05/16 05:08:42  steve
- *  Redo constant expression detection to happen
- *  after parsing.
- *
- *  Parse more operators and expressions.
- *
- * Revision 1.2  1998/11/11 00:01:51  steve
- *  Check net ranges in declarations.
- *
- * Revision 1.1  1998/11/03 23:28:53  steve
- *  Introduce verilog to CVS.
- *
- */
-

PExpr.h

@@ -1,7 +1,7 @@
 #ifndef __PExpr_H
 #define __PExpr_H
 /*
- * Copyright (c) 1998-2000 Stephen Williams <[email protected]>
+ * Copyright (c) 1998-2008 Stephen Williams <[email protected]>
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,15 +18,13 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PExpr.h,v 1.83 2006/06/18 04:15:50 steve Exp $"
-#endif
 
 # include  <string>
 # include  <vector>
 # include  "netlist.h"
 # include  "verinum.h"
 # include  "LineInfo.h"
+# include  "pform_types.h"
 
 class Design;
 class Module;
@@ -51,11 +49,46 @@ class PExpr : public LineInfo {
 
       virtual void dump(ostream&) const;
 
+	// This method tests the width that the expression wants to
+	// be. It is used by elaboration of assignments to figure out
+	// the width of the expression.
+	//
+	// The "min" is the width of the local context, so it the
+	// minimum width that this function should return. Initially
+	// this is the same as the lval width.
+	//
+	// The "lval" is the width of the destination where this
+	// result is going to go. This can be used to constrain the
+	// amount that an expression can reasonably expand. For
+	// example, there is no point expanding an addition to beyond
+	// the lval. This extra bit of information allows the
+	// expression to optimize itself a bit. If the lval==0, then
+	// the subexpression should not make l-value related
+	// optimizations.
+	//
+	// The unsigned_flag is set to true if the expression is
+	// unsized and therefore expandable. This happens if a
+	// sub-expression is an unsized literal. Some expressions make
+	// special use of that.
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
+	// During the elaborate_sig phase, we may need to scan
+	// expressions to find implicit net declarations.
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
+
 	// Procedural elaboration of the expression. The expr_width is
 	// the width of the context of the expression (i.e. the
-	// l-value width of an assignment) or -1 if the expression is
-	// self-determinted. The sys_task_arg flag is true if
-	// expressions are allowed to be incomplete.
+	// l-value width of an assignment),
+	//
+	// ... or -1 if the expression is self-determined. or
+	// ... or -2 if the expression is losslessly
+	// self-determined. This can happen in situations where the
+	// result is going to a pseudo-infinitely wide context.
+	//
+	// The sys_task_arg flag is true if expressions are allowed to
+	// be incomplete.
       virtual NetExpr*elaborate_expr(Design*des, NetScope*scope,
 				     int expr_width, bool sys_task_arg) const;
 
@@ -78,8 +111,7 @@ class PExpr : public LineInfo {
 
 	// This method elaborates the expression as gates, but
 	// restricted for use as l-values of continuous assignments.
-      virtual NetNet* elaborate_lnet(Design*des, NetScope*scope,
-				     bool implicit_net_ok =false) const;
+      virtual NetNet* elaborate_lnet(Design*des, NetScope*scope) const;
 
 	// This is similar to elaborate_lnet, except that the
 	// expression is evaluated to be bi-directional. This is
@@ -90,7 +122,7 @@ class PExpr : public LineInfo {
 	// Expressions that can be in the l-value of procedural
 	// assignments can be elaborated with this method. If the
 	// is_force flag is true, then the set of valid l-value types
-	// is slightly modified to accomodate the Verilog force
+	// is slightly modified to accommodate the Verilog force
 	// statement
       virtual NetAssign_* elaborate_lval(Design*des,
 					 NetScope*scope,
@@ -99,7 +131,7 @@ class PExpr : public LineInfo {
 	// This attempts to evaluate a constant expression, and return
 	// a verinum as a result. If the expression cannot be
 	// evaluated, return 0.
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
 
 	// This method returns true if that expression is the same as
 	// this expression. This method is used for comparing
@@ -125,11 +157,11 @@ class PEConcat : public PExpr {
       PEConcat(const svector<PExpr*>&p, PExpr*r =0);
       ~PEConcat();
 
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
       virtual void dump(ostream&) const;
 
-      virtual NetNet* elaborate_lnet(Design*des, NetScope*scope,
-				     bool implicit_net_ok =false) const;
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
+      virtual NetNet* elaborate_lnet(Design*des, NetScope*scope) const;
       virtual NetNet* elaborate_bi_net(Design*des, NetScope*scope) const;
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned width,
@@ -148,7 +180,6 @@ class PEConcat : public PExpr {
 
     private:
       NetNet* elaborate_lnet_common_(Design*des, NetScope*scope,
-				     bool implicit_net_ok,
 				     bool bidirectional_flag) const;
     private:
       svector<PExpr*>parms_;
@@ -196,7 +227,7 @@ class PEFNumber : public PExpr {
 	/* The eval_const method as applied to a floating point number
 	   gets the *integer* value of the number. This accounts for
 	   any rounding that is needed to get the value. */
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
 
 	/* A PEFNumber is a constant, so this returns true. */
       virtual bool is_constant(Module*) const;
@@ -222,14 +253,23 @@ class PEFNumber : public PExpr {
 class PEIdent : public PExpr {
 
     public:
-      explicit PEIdent(const hname_t&s);
+      explicit PEIdent(perm_string);
+      explicit PEIdent(const pform_name_t&);
       ~PEIdent();
 
+	// Add another name to the string of hierarchy that is the
+	// current identifier.
+      void append_name(perm_string);
+
       virtual void dump(ostream&) const;
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
 
 	// Identifiers are allowed (with restrictions) is assign l-values.
-      virtual NetNet* elaborate_lnet(Design*des, NetScope*scope,
-				     bool implicit_net_ok =false) const;
+      virtual NetNet* elaborate_lnet(Design*des, NetScope*scope) const;
 
       virtual NetNet* elaborate_bi_net(Design*des, NetScope*scope) const;
 
@@ -256,14 +296,23 @@ class PEIdent : public PExpr {
       NetNet* elaborate_port(Design*des, NetScope*sc) const;
 
       virtual bool is_constant(Module*) const;
-      verinum* eval_const(const Design*des, NetScope*sc) const;
+      verinum* eval_const(Design*des, NetScope*sc) const;
 
-      const hname_t& path() const;
+      const pform_name_t& path() const { return path_; }
 
     private:
-      NetAssign_*elaborate_lval_net_part_(Design*, NetScope*, NetNet*) const;
-      NetAssign_*elaborate_lval_net_idx_up_(Design*, NetScope*, NetNet*) const;
-      NetAssign_*elaborate_lval_net_idx_do_(Design*, NetScope*, NetNet*) const;
+      pform_name_t path_;
+
+    private:
+	// Common functions to calculate parts of part/bit selects.
+      bool calculate_parts_(Design*, NetScope*, long&msb, long&lsb) const;
+      bool calculate_up_do_width_(Design*, NetScope*, unsigned long&wid) const;
+
+    private:
+      NetAssign_*elaborate_lval_net_word_(Design*, NetScope*, NetNet*) const;
+      bool elaborate_lval_net_part_(Design*, NetScope*, NetAssign_*) const;
+      bool elaborate_lval_net_idx_(Design*, NetScope*, NetAssign_*,
+                                   index_component_t::ctype_t) const;
 
     private:
       NetExpr*elaborate_expr_param(Design*des,
@@ -273,45 +322,56 @@ class PEIdent : public PExpr {
 				   const NetExpr*par_msb,
 				   const NetExpr*par_lsb) const;
       NetExpr*elaborate_expr_net(Design*des,
-				   NetScope*scope,
-				   NetNet*net,
-				   NetScope*found) const;
+				 NetScope*scope,
+				 NetNet*net,
+				 NetScope*found,
+				 bool sys_task_arg) const;
+      NetExpr*elaborate_expr_net_word_(Design*des,
+				       NetScope*scope,
+				       NetNet*net,
+				       NetScope*found,
+				       bool sys_task_arg) const;
       NetExpr*elaborate_expr_net_part_(Design*des,
 				   NetScope*scope,
-				   NetNet*net,
+				   NetESignal*net,
 				   NetScope*found) const;
       NetExpr*elaborate_expr_net_idx_up_(Design*des,
 				   NetScope*scope,
-				   NetNet*net,
+				   NetESignal*net,
 				   NetScope*found) const;
       NetExpr*elaborate_expr_net_idx_do_(Design*des,
 				   NetScope*scope,
-				   NetNet*net,
+				   NetESignal*net,
 				   NetScope*found) const;
       NetExpr*elaborate_expr_net_bit_(Design*des,
 				   NetScope*scope,
-				   NetNet*net,
+				   NetESignal*net,
 				   NetScope*found) const;
-      hname_t path_;
 
     public:
-	// Use these to support part-select operators.
-      PExpr*msb_;
-      PExpr*lsb_;
 
-      enum { SEL_NONE, SEL_PART, SEL_IDX_UP, SEL_IDX_DO } sel_;
+      NetNet* elaborate_net_array_(Design*des, NetScope*scope,
+				   NetNet*sig, unsigned lwidth,
+				   const NetExpr* rise,
+				   const NetExpr* fall,
+				   const NetExpr* decay,
+				   Link::strength_t drive0,
+				   Link::strength_t drive1) const;
 
-	// If this is a reference to a memory/array, this is the index
-	// expression. If this is a reference to a vector, this is a
-	// bit select.
-      std::vector<PExpr*> idx_;
-
-      NetNet* elaborate_net_ram_(Design*des, NetScope*scope,
-				 NetMemory*mem, unsigned lwidth,
+      NetNet* elaborate_net_net_(Design*des, NetScope*scope,
+				 NetNet*sig, unsigned lwidth,
 				 const NetExpr* rise,
 				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-
+				 const NetExpr* decay,
+				 Link::strength_t drive0,
+				 Link::strength_t drive1) const;
+      NetNet* elaborate_net_net_idx_up_(Design*des, NetScope*scope,
+					NetNet*sig, unsigned lwidth,
+					const NetExpr* rise,
+					const NetExpr* fall,
+					const NetExpr* decay,
+					Link::strength_t drive0,
+					Link::strength_t drive1) const;
       NetNet* elaborate_net_bitmux_(Design*des, NetScope*scope,
 				    NetNet*sig,
 				    const NetExpr* rise,
@@ -321,17 +381,14 @@ class PEIdent : public PExpr {
 				    Link::strength_t drive1) const;
 
     private:
-      NetAssign_* elaborate_mem_lval_(Design*des, NetScope*scope,
-				      NetMemory*mem) const;
-
       NetNet* elaborate_lnet_common_(Design*des, NetScope*scope,
-				     bool implicit_net_ok,
 				     bool bidirectional_flag) const;
 
       NetNet*make_implicit_net_(Design*des, NetScope*scope) const;
 
       bool eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
-			     unsigned&midx, unsigned&lidx) const;
+			     long&midx, long&lidx) const;
+      NetNet*process_select_(Design*des, NetScope*scope, NetNet*sig) const;
 
 };
 
@@ -344,6 +401,10 @@ class PENumber : public PExpr {
       const verinum& value() const;
 
       virtual void dump(ostream&) const;
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned lwidth,
 				    const NetExpr* rise,
@@ -358,7 +419,7 @@ class PENumber : public PExpr {
 					 NetScope*scope,
 					 bool is_force) const;
 
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
 
       virtual bool is_the_same(const PExpr*that) const;
       virtual bool is_constant(Module*) const;
@@ -382,6 +443,11 @@ class PEString : public PExpr {
 
       string value() const;
       virtual void dump(ostream&) const;
+
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned width,
 				    const NetExpr* rise,
@@ -392,7 +458,7 @@ class PEString : public PExpr {
       virtual NetEConst*elaborate_expr(Design*des, NetScope*,
 				       int expr_width, bool) const;
       virtual NetEConst*elaborate_pexpr(Design*des, NetScope*sc) const;
-      verinum* eval_const(const Design*, NetScope*) const;
+      verinum* eval_const(Design*, NetScope*) const;
 
       virtual bool is_constant(Module*) const;
 
@@ -407,6 +473,9 @@ class PEUnary : public PExpr {
       ~PEUnary();
 
       virtual void dump(ostream&out) const;
+
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
+
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned width,
 				    const NetExpr* rise,
@@ -417,10 +486,36 @@ class PEUnary : public PExpr {
       virtual NetExpr*elaborate_expr(Design*des, NetScope*,
 				     int expr_width, bool sys_task_arg) const;
       virtual NetExpr*elaborate_pexpr(Design*des, NetScope*sc) const;
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
 
       virtual bool is_constant(Module*) const;
 
+    private:
+      NetNet* elab_net_uminus_const_logic_(Design*des, NetScope*scope,
+					   NetEConst*expr,
+					   unsigned width,
+					   const NetExpr* rise,
+					   const NetExpr* fall,
+					   const NetExpr* decay,
+					   Link::strength_t drive0,
+					   Link::strength_t drive1) const;
+      NetNet* elab_net_uminus_const_real_(Design*des, NetScope*scope,
+					   NetECReal*expr,
+					   unsigned width,
+					   const NetExpr* rise,
+					   const NetExpr* fall,
+					   const NetExpr* decay,
+					   Link::strength_t drive0,
+					   Link::strength_t drive1) const;
+      NetNet* elab_net_unary_real_(Design*des, NetScope*scope,
+				   NetExpr*expr,
+				   unsigned width,
+				   const NetExpr* rise,
+				   const NetExpr* fall,
+				   const NetExpr* decay,
+				   Link::strength_t drive0,
+				   Link::strength_t drive1) const;
+
     private:
       char op_;
       PExpr*expr_;
@@ -435,6 +530,13 @@ class PEBinary : public PExpr {
       virtual bool is_constant(Module*) const;
 
       virtual void dump(ostream&out) const;
+
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
+
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned width,
 				    const NetExpr* rise,
@@ -442,18 +544,22 @@ class PEBinary : public PExpr {
 				    const NetExpr* decay,
 				    Link::strength_t drive0,
 				    Link::strength_t drive1) const;
-      virtual NetEBinary*elaborate_expr(Design*des, NetScope*,
+      virtual NetExpr*elaborate_expr(Design*des, NetScope*,
 					int expr_width, bool sys_task_arg) const;
       virtual NetExpr*elaborate_pexpr(Design*des, NetScope*sc) const;
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
 
-    private:
+    protected:
       char op_;
       PExpr*left_;
       PExpr*right_;
 
-      NetEBinary*elaborate_expr_base_(Design*, NetExpr*lp, NetExpr*rp) const;
+      NetExpr*elaborate_expr_base_(Design*, NetExpr*lp, NetExpr*rp, int use_wid) const;
+      NetExpr*elaborate_eval_expr_base_(Design*, NetExpr*lp, NetExpr*rp, int use_wid) const;
 
+      static void suppress_operand_sign_if_needed_(NetExpr*lp, NetExpr*rp);
+
+    private:
       NetNet* elaborate_net_add_(Design*des, NetScope*scope,
 				 unsigned lwidth,
 				 const NetExpr* rise,
@@ -489,6 +595,11 @@ class PEBinary : public PExpr {
 				 const NetExpr* rise,
 				 const NetExpr* fall,
 				 const NetExpr* decay) const;
+      NetNet* elaborate_net_pow_(Design*des, NetScope*scope,
+				 unsigned lwidth,
+				 const NetExpr* rise,
+				 const NetExpr* fall,
+				 const NetExpr* decay) const;
       NetNet* elaborate_net_shift_(Design*des, NetScope*scope,
 				   unsigned lwidth,
 				   const NetExpr* rise,
@@ -496,6 +607,34 @@ class PEBinary : public PExpr {
 				   const NetExpr* decay) const;
 };
 
+/*
+ * Here are a few specialized classes for handling specific binary
+ * operators.
+ */
+class PEBComp  : public PEBinary {
+
+    public:
+      explicit PEBComp(char op, PExpr*l, PExpr*r);
+      ~PEBComp();
+
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&flag) const;
+
+      NetExpr* elaborate_expr(Design*des, NetScope*scope,
+			      int expr_width, bool sys_task_arg) const;
+};
+
+class PEBShift  : public PEBinary {
+
+    public:
+      explicit PEBShift(char op, PExpr*l, PExpr*r);
+      ~PEBShift();
+
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval, bool&flag) const;
+};
+
 /*
  * This class supports the ternary (?:) operator. The operator takes
  * three expressions, the test, the true result and the false result.
@@ -509,6 +648,12 @@ class PETernary : public PExpr {
       virtual bool is_constant(Module*) const;
 
       virtual void dump(ostream&out) const;
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
+
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned width,
 				    const NetExpr* rise,
@@ -519,7 +664,7 @@ class PETernary : public PExpr {
       virtual NetETernary*elaborate_expr(Design*des, NetScope*,
 					 int expr_width, bool sys_task_arg) const;
       virtual NetETernary*elaborate_pexpr(Design*des, NetScope*sc) const;
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+      virtual verinum* eval_const(Design*des, NetScope*sc) const;
 
     private:
       PExpr*expr_;
@@ -534,11 +679,14 @@ class PETernary : public PExpr {
  */
 class PECallFunction : public PExpr {
     public:
-      explicit PECallFunction(const hname_t&n, const svector<PExpr *> &parms);
-      explicit PECallFunction(const hname_t&n);
+      explicit PECallFunction(const pform_name_t&n, const svector<PExpr *> &parms);
+	// Call of system function (name is not hierarchical)
+      explicit PECallFunction(perm_string n, const svector<PExpr *> &parms);
+      explicit PECallFunction(perm_string n);
       ~PECallFunction();
 
       virtual void dump(ostream &) const;
+
       virtual NetNet* elaborate_net(Design*des, NetScope*scope,
 				    unsigned width,
 				    const NetExpr* rise,
@@ -549,13 +697,17 @@ class PECallFunction : public PExpr {
       virtual NetExpr*elaborate_expr(Design*des, NetScope*scope,
 				     int expr_wid, bool sys_task_arg) const;
 
+      virtual unsigned test_width(Design*des, NetScope*scope,
+				  unsigned min, unsigned lval,
+				  bool&unsized_flag) const;
+
     private:
-      hname_t path_;
+      pform_name_t path_;
       svector<PExpr *> parms_;
 
       bool check_call_matches_definition_(Design*des, NetScope*dscope) const;
 
-      NetExpr* elaborate_sfunc_(Design*des, NetScope*scope) const;
+      NetExpr* elaborate_sfunc_(Design*des, NetScope*scope, int expr_wid) const;
       NetNet* elaborate_net_sfunc_(Design*des, NetScope*scope,
 				   unsigned width,
 				   const NetExpr* rise,
@@ -563,133 +715,9 @@ class PECallFunction : public PExpr {
 				   const NetExpr* decay,
 				   Link::strength_t drive0,
 				   Link::strength_t drive1) const;
+      unsigned test_width_sfunc_(Design*des, NetScope*scope,
+				 unsigned min, unsigned lval,
+				 bool&unsized_flag) const;
 };
 
-/*
- * $Log: PExpr.h,v $
- * Revision 1.83  2006/06/18 04:15:50  steve
- *  Add support for system functions in continuous assignments.
- *
- * Revision 1.82  2006/06/02 04:48:49  steve
- *  Make elaborate_expr methods aware of the width that the context
- *  requires of it. In the process, fix sizing of the width of unary
- *  minus is context determined sizes.
- *
- * Revision 1.81  2006/04/28 04:28:35  steve
- *  Allow concatenations as arguments to inout ports.
- *
- * Revision 1.80  2006/04/16 00:54:04  steve
- *  Cleanup lval part select handling.
- *
- * Revision 1.79  2006/04/16 00:15:43  steve
- *  Fix part selects in l-values.
- *
- * Revision 1.78  2006/03/25 02:36:26  steve
- *  Get rid of excess PESTring:: prefix within class declaration.
- *
- * Revision 1.77  2006/02/02 02:43:57  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.76  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
- *
- * Revision 1.75  2005/12/07 04:04:23  steve
- *  Allow constant concat expressions.
- *
- * Revision 1.74  2005/11/27 17:01:56  steve
- *  Fix for stubborn compiler.
- *
- * Revision 1.73  2005/11/27 05:56:20  steve
- *  Handle bit select of parameter with ranges.
- *
- * Revision 1.72  2005/11/10 13:28:11  steve
- *  Reorganize signal part select handling, and add support for
- *  indexed part selects.
- *
- *  Expand expression constant propagation to eliminate extra
- *  sums in certain cases.
- *
- * Revision 1.71  2005/10/04 04:09:25  steve
- *  Add support for indexed select attached to parameters.
- *
- * Revision 1.70  2005/08/06 17:58:16  steve
- *  Implement bi-directional part selects.
- *
- * Revision 1.69  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.68  2005/01/09 20:16:00  steve
- *  Use PartSelect/PV and VP to handle part selects through ports.
- *
- * Revision 1.67  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
- *
- *  Generate NetConcat devices for gate outputs that feed into a
- *  vector results. Use this to hande gate arrays. Also let gate
- *  arrays handle vectors of gates when the outputs allow for it.
- *
- * Revision 1.66  2004/10/04 01:10:51  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.65  2003/02/08 19:49:21  steve
- *  Calculate delay statement delays using elaborated
- *  expressions instead of pre-elaborated expression
- *  trees.
- *
- *  Remove the eval_pexpr methods from PExpr.
- *
- * Revision 1.64  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.63  2002/11/09 19:20:48  steve
- *  Port expressions for output ports are lnets, not nets.
- *
- * Revision 1.62  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.61  2002/06/04 05:38:43  steve
- *  Add support for memory words in l-value of
- *  blocking assignments, and remove the special
- *  NetAssignMem class.
- *
- * Revision 1.60  2002/05/23 03:08:51  steve
- *  Add language support for Verilog-2001 attribute
- *  syntax. Hook this support into existing $attribute
- *  handling, and add number and void value types.
- *
- *  Add to the ivl_target API new functions for access
- *  of complex attributes attached to gates.
- *
- * Revision 1.59  2002/04/23 03:53:59  steve
- *  Add support for non-constant bit select.
- *
- * Revision 1.58  2002/04/14 03:55:25  steve
- *  Precalculate unary - if possible.
- *
- * Revision 1.57  2002/04/13 02:33:17  steve
- *  Detect missing indices to memories (PR#421)
- *
- * Revision 1.56  2002/03/09 04:02:26  steve
- *  Constant expressions are not l-values for task ports.
- *
- * Revision 1.55  2002/03/09 02:10:22  steve
- *  Add the NetUserFunc netlist node.
- *
- * Revision 1.54  2001/12/30 21:32:03  steve
- *  Support elaborate_net for PEString objects.
- *
- * Revision 1.53  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.52  2001/11/08 05:15:50  steve
- *  Remove string paths from PExpr elaboration.
- *
- * Revision 1.51  2001/11/07 04:26:46  steve
- *  elaborate_lnet uses scope instead of string path.
- *
- * Revision 1.50  2001/11/07 04:01:59  steve
- *  eval_const uses scope instead of a string path.
- */
 #endif

PFunction.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,16 +16,13 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PFunction.cc,v 1.7 2004/05/31 23:34:36 steve Exp $"
-#endif
 
 # include "config.h"
 
 #include "PTask.h"
 
-PFunction::PFunction(perm_string name)
-: name_(name), ports_(0), statement_(0)
+PFunction::PFunction(perm_string name, PScope*parent)
+: PScope(name, parent), ports_(0), statement_(0)
 {
       return_type_.type = PTF_NONE;
 }
@@ -51,28 +48,3 @@ void PFunction::set_return(PTaskFuncArg t)
 {
       return_type_ = t;
 }
-
-/*
- * $Log: PFunction.cc,v $
- * Revision 1.7  2004/05/31 23:34:36  steve
- *  Rewire/generalize parsing an elaboration of
- *  function return values to allow for better
- *  speed and more type support.
- *
- * Revision 1.6  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.5  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.4  2001/01/13 22:20:08  steve
- *  Parse parameters within nested scopes.
- *
- * Revision 1.3  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.2  1999/08/25 22:22:41  steve
- *  elaborate some aspects of functions.
- *
- */

PGate.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2007 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PGate.cc,v 1.18 2006/01/03 05:22:14 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -120,9 +117,9 @@ void PGate::eval_delays(Design*des, NetScope*scope,
 	    rise_time = tmp->value().as_ulong();
 
       } else {
-	    cerr << get_line() << ": error: Delay expressions must be "
+	    cerr << get_fileline() << ": error: Delay expressions must be "
 		 << "constant here." << endl;
-	    cerr << get_line() << ":      : Cannot calculate "
+	    cerr << get_fileline() << ":      : Cannot calculate "
 		 << *rise_expr << endl;
 	    des->errors += 1;
 	    rise_time = 0;
@@ -133,9 +130,9 @@ void PGate::eval_delays(Design*des, NetScope*scope,
 
       } else {
 	    if (fall_expr != rise_expr) {
-		  cerr << get_line() << ": error: Delay expressions must be "
+		  cerr << get_fileline() << ": error: Delay expressions must be "
 		       << "constant here." << endl;
-		  cerr << get_line() << ":      : Cannot calculate "
+		  cerr << get_fileline() << ":      : Cannot calculate "
 		       << *rise_expr << endl;
 	    }
 	    des->errors += 1;
@@ -146,9 +143,9 @@ void PGate::eval_delays(Design*des, NetScope*scope,
 	    decay_time = tmp->value().as_ulong();
 
       } else {
-	    cerr << get_line() << ": error: Delay expressions must be "
+	    cerr << get_fileline() << ": error: Delay expressions must be "
 		 << "constant here." << endl;
-	    cerr << get_line() << ":      : Cannot calculate "
+	    cerr << get_fileline() << ":      : Cannot calculate "
 		 << *rise_expr << endl;
 	    des->errors += 1;
 	    decay_time = 0;
@@ -246,68 +243,3 @@ perm_string PGModule::get_type()
       return type_;
 }
 
-/*
- * $Log: PGate.cc,v $
- * Revision 1.18  2006/01/03 05:22:14  steve
- *  Handle complex net node delays.
- *
- * Revision 1.17  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
- *
- * Revision 1.16  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.15  2003/03/06 04:37:12  steve
- *  lex_strings.add module names earlier.
- *
- * Revision 1.14  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.13  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
- *
- * Revision 1.12  2001/10/21 00:42:47  steve
- *  Module types in pform are char* instead of string.
- *
- * Revision 1.11  2001/10/19 01:55:32  steve
- *  Method to get the type_ member
- *
- * Revision 1.10  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.9  2000/05/06 15:41:56  steve
- *  Carry assignment strength to pform.
- *
- * Revision 1.8  2000/03/08 04:36:53  steve
- *  Redesign the implementation of scopes and parameters.
- *  I now generate the scopes and notice the parameters
- *  in a separate pass over the pform. Once the scopes
- *  are generated, I can process overrides and evalutate
- *  paremeters before elaboration begins.
- *
- * Revision 1.7  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.6  2000/02/18 05:15:02  steve
- *  Catch module instantiation arrays.
- *
- * Revision 1.5  1999/09/14 01:50:35  steve
- *  Handle gates without delays.
- *
- * Revision 1.4  1999/09/04 19:11:46  steve
- *  Add support for delayed non-blocking assignments.
- *
- * Revision 1.3  1999/08/01 21:18:55  steve
- *  elaborate rise/fall/decay for continuous assign.
- *
- * Revision 1.2  1999/08/01 16:34:50  steve
- *  Parse and elaborate rise/fall/decay times
- *  for gates, and handle the rules for partial
- *  lists of times.
- *
- * Revision 1.1  1999/02/15 02:06:15  steve
- *  Elaborate gate ranges.
- *
- */
-

PGate.h

@@ -27,12 +27,11 @@
 # include  "named.h"
 # include  "LineInfo.h"
 # include  "PDelays.h"
+# include  "netlist.h"
 # include  <map>
 # include  <string>
 class PExpr;
 class PUdp;
-class Design;
-class NetScope;
 class Module;
 
 /*
@@ -130,6 +129,7 @@ class PGAssign  : public PGate {
 
       void dump(ostream&out, unsigned ind =4) const;
       virtual void elaborate(Design*des, NetScope*scope) const;
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
 
     private:
 };
@@ -167,6 +167,7 @@ class PGBuiltin  : public PGate {
 
       virtual void dump(ostream&out, unsigned ind =4) const;
       virtual void elaborate(Design*, NetScope*scope) const;
+      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
 
     private:
       Type type_;
@@ -235,137 +236,11 @@ class PGModule  : public PGate {
       void elaborate_udp_(Design*, PUdp  *udp, NetScope*scope) const;
       void elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const;
       bool elaborate_sig_mod_(Design*des, NetScope*scope, Module*mod) const;
+      bool elaborate_sig_udp_(Design*des, NetScope*scope, PUdp*udp) const;
+
+      NetNet*resize_net_to_port_(Design*des, NetScope*scope,
+				 NetNet*sig, unsigned port_wid,
+				 NetNet::PortType dir) const;
 };
 
-/*
- * $Log: PGate.h,v $
- * Revision 1.32  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.31  2006/01/03 05:22:14  steve
- *  Handle complex net node delays.
- *
- * Revision 1.30  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
- *
- * Revision 1.29  2004/10/04 01:10:52  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.28  2004/03/08 00:47:44  steve
- *  primitive ports can bind bi name.
- *
- * Revision 1.27  2004/02/20 18:53:33  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.26  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.25  2003/03/06 04:37:12  steve
- *  lex_strings.add module names earlier.
- *
- * Revision 1.24  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.23  2002/05/23 03:08:51  steve
- *  Add language support for Verilog-2001 attribute
- *  syntax. Hook this support into existing $attribute
- *  handling, and add number and void value types.
- *
- *  Add to the ivl_target API new functions for access
- *  of complex attributes attached to gates.
- *
- * Revision 1.22  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
- *
- * Revision 1.21  2001/10/21 00:42:47  steve
- *  Module types in pform are char* instead of string.
- *
- * Revision 1.20  2001/10/19 01:55:32  steve
- *  Method to get the type_ member
- *
- * Revision 1.19  2001/04/22 23:09:45  steve
- *  More UDP consolidation from Stephan Boettcher.
- *
- * Revision 1.18  2000/05/06 15:41:56  steve
- *  Carry assignment strength to pform.
- *
- * Revision 1.17  2000/05/02 16:27:38  steve
- *  Move signal elaboration to a seperate pass.
- *
- * Revision 1.16  2000/03/29 04:37:10  steve
- *  New and improved combinational primitives.
- *
- * Revision 1.15  2000/03/08 04:36:53  steve
- *  Redesign the implementation of scopes and parameters.
- *  I now generate the scopes and notice the parameters
- *  in a separate pass over the pform. Once the scopes
- *  are generated, I can process overrides and evalutate
- *  paremeters before elaboration begins.
- *
- * Revision 1.14  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.13  2000/02/18 05:15:02  steve
- *  Catch module instantiation arrays.
- *
- * Revision 1.12  2000/01/09 05:50:48  steve
- *  Support named parameter override lists.
- *
- * Revision 1.11  1999/12/11 05:45:41  steve
- *  Fix support for attaching attributes to primitive gates.
- *
- * Revision 1.10  1999/09/04 19:11:46  steve
- *  Add support for delayed non-blocking assignments.
- *
- * Revision 1.9  1999/08/23 16:48:39  steve
- *  Parameter overrides support from Peter Monta
- *  AND and XOR support wide expressions.
- *
- * Revision 1.8  1999/08/01 21:18:55  steve
- *  elaborate rise/fall/decay for continuous assign.
- *
- * Revision 1.7  1999/08/01 16:34:50  steve
- *  Parse and elaborate rise/fall/decay times
- *  for gates, and handle the rules for partial
- *  lists of times.
- *
- * Revision 1.6  1999/05/29 02:36:17  steve
- *  module parameter bind by name.
- *
- * Revision 1.5  1999/05/10 00:16:58  steve
- *  Parse and elaborate the concatenate operator
- *  in structural contexts, Replace vector<PExpr*>
- *  and list<PExpr*> with svector<PExpr*>, evaluate
- *  constant expressions with parameters, handle
- *  memories as lvalues.
- *
- *  Parse task declarations, integer types.
- *
- * Revision 1.4  1999/02/15 02:06:15  steve
- *  Elaborate gate ranges.
- *
- * Revision 1.3  1999/01/25 05:45:56  steve
- *  Add the LineInfo class to carry the source file
- *  location of things. PGate, Statement and PProcess.
- *
- *  elaborate handles module parameter mismatches,
- *  missing or incorrect lvalues for procedural
- *  assignment, and errors are propogated to the
- *  top of the elaboration call tree.
- *
- *  Attach line numbers to processes, gates and
- *  assignment statements.
- *
- * Revision 1.2  1998/12/01 00:42:13  steve
- *  Elaborate UDP devices,
- *  Support UDP type attributes, and
- *  pass those attributes to nodes that
- *  are instantiated by elaboration,
- *  Put modules into a map instead of
- *  a simple list.
- *
- * Revision 1.1  1998/11/03 23:28:54  steve
- *  Introduce verilog to CVS.
- *
- */
 #endif

PGenerate.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: PGenerate.cc,v 1.1 2006/04/10 02:40:18 steve Exp $"
+#ident "$Id: PGenerate.cc,v 1.4 2007/06/02 03:42:12 steve Exp $"
 #endif
 
 # include  "PGenerate.h"
@@ -26,25 +26,16 @@
 PGenerate::PGenerate(unsigned id)
 : id_number(id)
 {
+      parent = 0;
 }
 
 PGenerate::~PGenerate()
 {
 }
 
-PWire* PGenerate::add_wire(PWire*wire)
+PWire* PGenerate::get_wire(perm_string name) const
 {
-      PWire*&ep = wires[wire->path()];
-      if (ep) return ep;
-
-      assert(ep == 0);
-      ep = wire;
-      return wire;
-}
-
-PWire* PGenerate::get_wire(const hname_t&name) const
-{
-      map<hname_t,PWire*>::const_iterator obj = wires.find(name);
+      map<perm_string,PWire*>::const_iterator obj = wires.find(name);
       if (obj == wires.end())
 	    return 0;
       else
@@ -55,3 +46,8 @@ void PGenerate::add_gate(PGate*gate)
 {
       gates.push_back(gate);
 }
+
+void PGenerate::add_behavior(PProcess*proc)
+{
+      behaviors.push_back(proc);
+}

PGenerate.h

@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: PGenerate.h,v 1.1 2006/04/10 02:40:18 steve Exp $"
+#ident "$Id: PGenerate.h,v 1.4 2007/06/02 03:42:12 steve Exp $"
 #endif
 
 # include  "LineInfo.h"
@@ -27,15 +27,27 @@
 # include  "HName.h"
 # include  <list>
 # include  <map>
+# include  "pform_types.h"
 
 class Design;
 class NetScope;
 class PExpr;
+class PProcess;
 class PGate;
 class PWire;
 
 /*
- * This represents a generate scheme.
+ * This represents a generate scheme. The interpretation of the
+ * members depends on the scheme_type.
+ *
+ * GS_LOOP
+ *
+ * GS_CASE
+ *    loop_test is the expression to be compared.
+ *    generates contains only GS_CASE_ITEM schemes.
+ * GS_CASE_ITEM
+ *    The parent points to the GS_CASE that contains this item.
+ *    the loop_test is compared with the parent->loop_test expression.
  */
 class PGenerate : public LineInfo {
 
@@ -48,7 +60,8 @@ class PGenerate : public LineInfo {
       const unsigned id_number;
       perm_string scope_name;
 
-      enum scheme_t {GS_NONE, GS_LOOP, GS_CONDIT};
+      enum scheme_t {GS_NONE, GS_LOOP, GS_CONDIT, GS_ELSE,
+		     GS_CASE, GS_CASE_ITEM};
       scheme_t scheme_type;
 
 	// generate loops have an index variable and three
@@ -58,25 +71,37 @@ class PGenerate : public LineInfo {
       PExpr*loop_test;
       PExpr*loop_step;
 
-      map<hname_t,PWire*>wires;
-      PWire* add_wire(PWire*);
-      PWire* get_wire(const hname_t&name) const;
+      map<perm_string,PWire*>wires;
+      PWire* get_wire(perm_string name) const;
 
       list<PGate*> gates;
       void add_gate(PGate*);
 
+      list<PProcess*> behaviors;
+      void add_behavior(PProcess*behave);
+
+      list<PGenerate*> generates;
+      PGenerate*parent;
+
 	// This method is called by the elaboration of a module to
 	// generate scopes. the container is the scope that is to
 	// contain the generated scope.
       bool generate_scope(Design*des, NetScope*container);
 
-      bool elaborate_sig(Design*des) const;
-      bool elaborate(Design*des) const;
+	// Elaborate signals within any of the generated scopes that
+	// were made by this generate block within the given container scope.
+      bool elaborate_sig(Design*des, NetScope*container) const;
+      bool elaborate(Design*des, NetScope*container) const;
 
-      void dump(ostream&out) const;
+      void dump(ostream&out, unsigned indent) const;
 
     private:
       bool generate_scope_loop_(Design*des, NetScope*container);
+      bool generate_scope_condit_(Design*des, NetScope*container, bool else_flag);
+      bool generate_scope_case_(Design*des, NetScope*container);
+
+	// Elaborate_scope within a generated scope.
+      void elaborate_subscope_(Design*des, NetScope*scope);
 
 	// These are the scopes created by generate_scope.
       list<NetScope*>scope_list_;

PScope.cc

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2008 Stephen Williams ([email protected])
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+# include  "PScope.h"
+
+PScope::PScope(perm_string n, PScope*p)
+    : name_(n), parent_(p)
+{
+}
+
+PScope::~PScope()
+{
+}
+
+PWire* PScope::wires_find(perm_string name)
+{
+      map<perm_string,PWire*>::const_iterator cur = wires.find(name);
+      if (cur == wires.end())
+	    return 0;
+      else
+	    return (*cur).second;
+}

PScope.h

@@ -0,0 +1,80 @@
+#ifndef __PScope_H
+#define __PScope_H
+/*
+ * Copyright (c) 2008 Stephen Williams ([email protected])
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+# include  "StringHeap.h"
+# include  "pform_types.h"
+# include  <map>
+
+class PEvent;
+class PProcess;
+class PWire;
+
+class Design;
+class NetScope;
+
+/*
+ * The PScope class is a base representation of an object that
+ * represents lexical scope. For example, a module, a function/task, a
+ * named block is derived from a PScope.
+ *
+ * NOTE: This is note the same concept as the "scope" of an elaborated
+ * hierarchy. That is represented by NetScope objects after elaboration.
+ */
+class PScope {
+
+    public:
+	// When created, a scope has a name and a parent. The name is
+	// the name of the definition. For example, if this is a
+	// module declaration, the name is the name after the "module"
+	// keyword, and if this is a task scope, the name is the task
+	// name. The parent is the lexical parent of this scope. Since
+	// modules do not nest in Verilog, the parent must be nil for
+	// modules. Scopes for tasks and functions point to their
+	// containing module.
+      PScope(perm_string name, PScope*parent);
+      virtual ~PScope();
+
+      perm_string pscope_name() const { return name_; }
+      PScope* pscope_parent() { return parent_; }
+
+	// Nets an variables (wires) in the scope
+      map<perm_string,PWire*>wires;
+      PWire* wires_find(perm_string name);
+
+	// Named events in the scope.
+      map<perm_string,PEvent*>events;
+
+	// Behaviors (processes) in this scope
+      list<PProcess*> behaviors;
+
+    protected:
+      void dump_wires_(ostream&out, unsigned indent) const;
+
+      bool elaborate_sig_wires_(Design*des, NetScope*scope) const;
+
+      bool elaborate_behaviors_(Design*des, NetScope*scope) const;
+
+    private:
+      perm_string name_;
+      PScope*parent_;
+};
+
+#endif

PSpec.cc

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006 Stephen Williams <[email protected]>
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PSpec.cc,v 1.2 2007/02/12 01:52:21 steve Exp $"
+#endif
+
+# include  "PSpec.h"
+
+PSpecPath::PSpecPath(unsigned src_cnt, unsigned dst_cnt)
+: conditional(false), condition(0), edge(0),
+  src(src_cnt), dst(dst_cnt),
+  data_source_expression(0)
+{
+}
+
+PSpecPath::~PSpecPath()
+{
+}

PSpec.h

@@ -0,0 +1,79 @@
+#ifndef __PSpec_H
+#define __PSpec_H
+/*
+ * Copyright (c) 2006 Stephen Williams <[email protected]>
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: PSpec.h,v 1.3 2007/04/13 02:34:35 steve Exp $"
+#endif
+
+# include  "LineInfo.h"
+# include  "StringHeap.h"
+# include  <vector>
+
+class PExpr;
+
+/*
+* The PSpecPath is the parse of a specify path, which is in its most
+* general form <path> = <delays>. The <delays> are collected into the
+* "delays" vector in all cases, and the variety is in the other
+* members.
+*
+* All paths also have a list of source names in the src vector, and a
+* list of destination names in the dst vector. These pairs are the
+* actual paths.
+*
+* If the path is a simple path, then:
+*      condition == nil
+*      edge == 0
+*      data_source_expression == nil
+*
+* If the path is conditional, then conditional == true and condition
+* is the condition expression. If the condition expression is nil,
+* then this is an ifnone conditional path.
+*
+* If data_source_expression != nil, then the path is edge sensitive
+* and the edge might not be 0.
+*/
+class PSpecPath  : public LineInfo {
+
+    public:
+      PSpecPath(unsigned src_cnt, unsigned dst_cnt);
+      ~PSpecPath();
+
+      void elaborate(class Design*des, class NetScope*scope) const;
+
+      void dump(std::ostream&out, unsigned ind) const;
+
+    public:
+	// Condition expression, if present.
+      bool conditional;
+      class PExpr* condition;
+	// Edge specification (-1==negedge, 0 = no edge, 1==posedge)
+      int edge;
+	// Ordered set of source nodes of a path
+      std::vector<perm_string> src;
+	// Ordered set of destination nodes of a path
+      std::vector<perm_string> dst;
+	// Data source expression
+      class PExpr* data_source_expression;
+
+      std::vector<class PExpr*>delays;
+};
+
+#endif

PTask.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,16 +16,13 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PTask.cc,v 1.7 2002/08/12 01:34:58 steve Exp $"
-#endif
 
 # include "config.h"
 
 # include  "PTask.h"
 
-PTask::PTask()
-: ports_(0), statement_(0)
+PTask::PTask(perm_string name, PScope*parent)
+: PScope(name, parent), ports_(0), statement_(0)
 {
 }
 

PTask.h

@@ -1,7 +1,7 @@
 #ifndef __PTask_H
 #define __PTask_H
 /*
- * Copyright (c) 1999-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,11 +18,9 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PTask.h,v 1.13 2004/05/31 23:34:36 steve Exp $"
-#endif
 
 # include  "LineInfo.h"
+# include  "PScope.h"
 # include  "svector.h"
 # include  "StringHeap.h"
 # include  <string>
@@ -35,6 +33,7 @@ class PExpr;
 enum PTaskFuncEnum {
       PTF_NONE,
       PTF_REG,
+      PTF_REG_S,
       PTF_INTEGER,
       PTF_REAL,
       PTF_REALTIME,
@@ -49,10 +48,10 @@ struct PTaskFuncArg {
 /*
  * The PTask holds the parsed definitions of a task.
  */
-class PTask  : public LineInfo {
+class PTask  : public PScope, public LineInfo {
 
     public:
-      explicit PTask();
+      explicit PTask(perm_string name, PScope*parent);
       ~PTask();
 
       void set_ports(svector<PWire *>*p);
@@ -88,10 +87,10 @@ class PTask  : public LineInfo {
  *
  * The output value is not elaborated until elaborate_sig.
  */
-class PFunction : public LineInfo {
+class PFunction : public PScope, public LineInfo {
 
     public:
-      explicit PFunction(perm_string name);
+      explicit PFunction(perm_string name, PScope*parent);
       ~PFunction();
 
       void set_ports(svector<PWire *>*p);
@@ -109,65 +108,9 @@ class PFunction : public LineInfo {
       void dump(ostream&, unsigned) const;
 
     private:
-      perm_string name_;
       PTaskFuncArg return_type_;
       svector<PWire *> *ports_;
       Statement *statement_;
 };
 
-/*
- * $Log: PTask.h,v $
- * Revision 1.13  2004/05/31 23:34:36  steve
- *  Rewire/generalize parsing an elaboration of
- *  function return values to allow for better
- *  speed and more type support.
- *
- * Revision 1.12  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.11  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
- *
- * Revision 1.10  2001/01/13 22:20:08  steve
- *  Parse parameters within nested scopes.
- *
- * Revision 1.9  2000/07/30 18:25:43  steve
- *  Rearrange task and function elaboration so that the
- *  NetTaskDef and NetFuncDef functions are created during
- *  signal enaboration, and carry these objects in the
- *  NetScope class instead of the extra, useless map in
- *  the Design class.
- *
- * Revision 1.8  2000/03/08 04:36:53  steve
- *  Redesign the implementation of scopes and parameters.
- *  I now generate the scopes and notice the parameters
- *  in a separate pass over the pform. Once the scopes
- *  are generated, I can process overrides and evalutate
- *  paremeters before elaboration begins.
- *
- * Revision 1.7  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.6  1999/09/30 21:28:34  steve
- *  Handle mutual reference of tasks by elaborating
- *  task definitions in two passes, like functions.
- *
- * Revision 1.5  1999/09/01 20:46:19  steve
- *  Handle recursive functions and arbitrary function
- *  references to other functions, properly pass
- *  function parameters and save function results.
- *
- * Revision 1.4  1999/08/25 22:22:41  steve
- *  elaborate some aspects of functions.
- *
- * Revision 1.3  1999/07/31 19:14:47  steve
- *  Add functions up to elaboration (Ed Carter)
- *
- * Revision 1.2  1999/07/24 02:11:19  steve
- *  Elaborate task input ports.
- *
- * Revision 1.1  1999/07/03 02:12:51  steve
- *  Elaborate user defined tasks.
- *
- */
 #endif

PWire.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2007 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,36 +16,21 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: PWire.cc,v 1.11 2005/07/07 16:22:49 steve Exp $"
-#endif
 
 # include "config.h"
 # include  "PWire.h"
+# include  "PExpr.h"
 # include  <assert.h>
 
-PWire::PWire(const hname_t&n,
+PWire::PWire(perm_string n,
 	     NetNet::Type t,
 	     NetNet::PortType pt,
 	     ivl_variable_type_t dt)
-: hname_(n), type_(t), port_type_(pt), data_type_(dt),
+: name_(n), type_(t), port_type_(pt), data_type_(dt),
   signed_(false), isint_(false),
-lidx_(0), ridx_(0)
-{
-      if (t == NetNet::INTEGER) {
-	    type_ = NetNet::REG;
-	    signed_ = true;
-	    isint_ = true;
-      }
-}
-
-PWire::PWire(char*n,
-	     NetNet::Type t,
-	     NetNet::PortType pt,
-	     ivl_variable_type_t dt)
-: hname_(n), type_(t), port_type_(pt), data_type_(dt),
-  signed_(false), isint_(false),
-lidx_(0), ridx_(0)
+  port_msb_(0), port_lsb_(0), port_set_(false),
+  net_msb_(0), net_lsb_(0), net_set_(false), error_cnt_(0),
+  lidx_(0), ridx_(0)
 {
       if (t == NetNet::INTEGER) {
 	    type_ = NetNet::REG;
@@ -59,9 +44,9 @@ NetNet::Type PWire::get_wire_type() const
       return type_;
 }
 
-const hname_t& PWire::path() const
+perm_string PWire::basename() const
 {
-      return hname_;
+      return name_;
 }
 
 bool PWire::set_wire_type(NetNet::Type t)
@@ -118,17 +103,23 @@ bool PWire::set_port_type(NetNet::PortType pt)
 
 bool PWire::set_data_type(ivl_variable_type_t dt)
 {
-      if (data_type_ != IVL_VT_NO_TYPE)
+      if (data_type_ != IVL_VT_NO_TYPE) {
 	    if (data_type_ != dt)
 		  return false;
 	    else
 		  return true;
+      }
 
       assert(data_type_ == IVL_VT_NO_TYPE);
       data_type_ = dt;
       return true;
 }
 
+ivl_variable_type_t PWire::get_data_type() const
+{
+      return data_type_;
+}
+
 void PWire::set_signed(bool flag)
 {
       signed_ = flag;
@@ -144,59 +135,79 @@ bool PWire::get_isint() const
       return isint_;
 }
 
-void PWire::set_range(PExpr*m, PExpr*l)
+/*
+ * Since implicitly defined list of port declarations are no longer
+ * considered fully defined we no longer need this routine to force
+ * them to be fully defined.
+ *
+void PWire::set_net_range()
 {
-      msb_ = svector<PExpr*>(msb_,m);
-      lsb_ = svector<PExpr*>(lsb_,l);
+      net_msb_ = port_msb_;
+      net_lsb_ = port_lsb_;
+      net_set_ = true;
+}
+*/
+
+void PWire::set_range(PExpr*m, PExpr*l, PWSRType type)
+{
+      switch (type) {
+	  case SR_PORT:
+	    if (port_set_) {
+		  cerr << get_fileline() << ": error: Port ``" << name_
+		       << "'' has already been declared a port." << endl;
+		  error_cnt_ += 1;
+	    } else {
+		  port_msb_ = m;
+		  port_lsb_ = l;
+		  port_set_ = true;
+	    }
+	    return;
+
+	  case SR_NET:
+	    if (net_set_) {
+		  cerr << get_fileline() << ": error: Net ``" << name_
+		       << "'' has already been declared." << endl;
+		  error_cnt_ += 1;
+	    } else {
+		  net_msb_ = m;
+		  net_lsb_ = l;
+		  net_set_ = true;
+	    }
+	    return;
+
+	  case SR_BOTH:
+	    if (port_set_ || net_set_) {
+		  if (port_set_) {
+		        cerr << get_fileline() << ": error: Port ``" << name_
+		             << "'' has already been declared a port." << endl;
+		        error_cnt_ += 1;
+		  }
+		  if (net_set_) {
+		        cerr << get_fileline() << ": error: Net ``" << name_
+		             << "'' has already been declared." << endl;
+		        error_cnt_ += 1;
+		  }
+	    } else {
+		  port_msb_ = m;
+		  port_lsb_ = l;
+		  port_set_ = true;
+		  net_msb_ = m;
+		  net_lsb_ = l;
+		  net_set_ = true;
+	    }
+	    return;
+      }
 }
 
 void PWire::set_memory_idx(PExpr*ldx, PExpr*rdx)
 {
-      assert(lidx_ == 0);
-      assert(ridx_ == 0);
-      assert(type_ == NetNet::REG);
-      lidx_ = ldx;
-      ridx_ = rdx;
+      if (lidx_ != 0 || ridx_ != 0) {
+	    cerr << get_fileline() << ": error: Array ``" << name_
+	         << "'' has already been declared." << endl;
+	    error_cnt_ += 1;
+      } else {
+            lidx_ = ldx;
+            ridx_ = rdx;
+      }
 }
 
-/*
- * $Log: PWire.cc,v $
- * Revision 1.11  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.10  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.9  2002/06/21 04:59:35  steve
- *  Carry integerness throughout the compilation.
- *
- * Revision 1.8  2002/01/26 05:28:28  steve
- *  Detect scalar/vector declarion mismatch.
- *
- * Revision 1.7  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.6  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.5  2001/01/06 02:29:35  steve
- *  Support arrays of integers.
- *
- * Revision 1.4  2000/12/11 00:31:43  steve
- *  Add support for signed reg variables,
- *  simulate in t-vvm signed comparisons.
- *
- * Revision 1.3  2000/02/23 02:56:54  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.2  1999/09/10 05:02:09  steve
- *  Handle integers at task parameters.
- *
- * Revision 1.1  1999/06/17 05:34:42  steve
- *  Clean up interface of the PWire class,
- *  Properly match wire ranges.
- *
- */
-

PWire.h

@@ -1,7 +1,7 @@
 #ifndef __PWire_H
 #define __PWire_H
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2007 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -19,13 +19,14 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: PWire.h,v 1.19 2006/04/10 00:37:42 steve Exp $"
+#ident "$Id: PWire.h,v 1.21 2007/05/24 04:07:11 steve Exp $"
 #endif
 
 # include  "netlist.h"
 # include  "LineInfo.h"
 # include  <map>
 # include  "svector.h"
+# include  "StringHeap.h"
 
 #ifdef HAVE_IOSFWD
 # include  <iosfwd>
@@ -36,30 +37,32 @@ class ostream;
 class PExpr;
 class Design;
 
+/*
+ * The different type of PWire::set_range() calls.
+ */
+enum PWSRType {SR_PORT, SR_NET, SR_BOTH};
+
 /*
  * Wires include nets, registers and ports. A net or register becomes
  * a port by declaration, so ports are not separate. The module
  * identifies a port by keeping it in its port list.
  *
  * The hname parameter to the constructor is a hierarchical name. It
- * is an array of strings starting with the root, running towards
- * the base name, and terminated by a null pointer. The environment
- * allocates the memory for me.
+ * is the name of the wire within a module, so does not include the
+ * current scope or any instances. Modules contain all the wires, so
+ * from that perspective, sub-scopes within the module are a part of
+ * the wire name.
  */
 class PWire : public LineInfo {
 
     public:
-      PWire(const hname_t&hname,
-	    NetNet::Type t,
-	    NetNet::PortType pt,
-	    ivl_variable_type_t dt);
-      PWire(char*name,
+      PWire(perm_string name,
 	    NetNet::Type t,
 	    NetNet::PortType pt,
 	    ivl_variable_type_t dt);
 
 	// Return a hierarchical name.
-      const hname_t&path() const;
+      perm_string basename() const;
 
       NetNet::Type get_wire_type() const;
       bool set_wire_type(NetNet::Type);
@@ -74,7 +77,8 @@ class PWire : public LineInfo {
       bool set_data_type(ivl_variable_type_t dt);
       ivl_variable_type_t get_data_type() const;
 
-      void set_range(PExpr*msb, PExpr*lsb);
+      void set_range(PExpr*msb, PExpr*lsb, PWSRType type);
+      void set_net_range();
 
       void set_memory_idx(PExpr*ldx, PExpr*rdx);
 
@@ -83,10 +87,10 @@ class PWire : public LineInfo {
 	// Write myself to the specified stream.
       void dump(ostream&out, unsigned ind=4) const;
 
-      void elaborate_sig(Design*, NetScope*scope) const;
+      NetNet* elaborate_sig(Design*, NetScope*scope) const;
 
     private:
-      hname_t hname_;
+      perm_string name_;
       NetNet::Type type_;
       NetNet::PortType port_type_;
       ivl_variable_type_t data_type_;
@@ -95,8 +99,13 @@ class PWire : public LineInfo {
 
 	// These members hold expressions for the bit width of the
 	// wire. If they do not exist, the wire is 1 bit wide.
-      svector<PExpr*>msb_;
-      svector<PExpr*>lsb_;
+      PExpr*port_msb_;
+      PExpr*port_lsb_;
+      bool port_set_;
+      PExpr*net_msb_;
+      PExpr*net_lsb_;
+      bool net_set_;
+      unsigned error_cnt_;
 
 	// If this wire is actually a memory, these indices will give
 	// me the size and address range of the memory.
@@ -108,78 +117,4 @@ class PWire : public LineInfo {
       PWire& operator= (const PWire&);
 };
 
-/*
- * $Log: PWire.h,v $
- * Revision 1.19  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.18  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.17  2004/02/20 18:53:33  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.16  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.15  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
- *
- * Revision 1.14  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.13  2002/06/21 04:59:35  steve
- *  Carry integerness throughout the compilation.
- *
- * Revision 1.12  2002/05/23 03:08:51  steve
- *  Add language support for Verilog-2001 attribute
- *  syntax. Hook this support into existing $attribute
- *  handling, and add number and void value types.
- *
- *  Add to the ivl_target API new functions for access
- *  of complex attributes attached to gates.
- *
- * Revision 1.11  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.10  2001/01/16 02:44:18  steve
- *  Use the iosfwd header if available.
- *
- * Revision 1.9  2000/12/11 00:31:43  steve
- *  Add support for signed reg variables,
- *  simulate in t-vvm signed comparisons.
- *
- * Revision 1.8  2000/05/02 16:27:38  steve
- *  Move signal elaboration to a seperate pass.
- *
- * Revision 1.7  2000/02/23 02:56:54  steve
- *  Macintosh compilers do not support ident.
- *
- * Revision 1.6  1999/11/27 19:07:57  steve
- *  Support the creation of scopes.
- *
- * Revision 1.5  1999/06/17 05:34:42  steve
- *  Clean up interface of the PWire class,
- *  Properly match wire ranges.
- *
- * Revision 1.4  1999/06/02 15:38:46  steve
- *  Line information with nets.
- *
- * Revision 1.3  1999/04/19 01:59:36  steve
- *  Add memories to the parse and elaboration phases.
- *
- * Revision 1.2  1998/11/23 00:20:22  steve
- *  NetAssign handles lvalues as pin links
- *  instead of a signal pointer,
- *  Wire attributes added,
- *  Ability to parse UDP descriptions added,
- *  XNF generates EXT records for signals with
- *  the PAD attribute.
- *
- * Revision 1.1  1998/11/03 23:28:55  steve
- *  Introduce verilog to CVS.
- *
- */
 #endif

Statement.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: Statement.cc,v 1.29 2004/02/18 17:11:54 steve Exp $"
+#ident "$Id: Statement.cc,v 1.30 2007/05/24 04:07:11 steve Exp $"
 #endif
 
 # include "config.h"
@@ -86,18 +86,13 @@ PAssignNB::~PAssignNB()
 {
 }
 
-PBlock::PBlock(perm_string n, BL_TYPE t, const svector<Statement*>&st)
-: name_(n), bl_type_(t), list_(st)
-{
-}
-
-PBlock::PBlock(BL_TYPE t, const svector<Statement*>&st)
-: bl_type_(t), list_(st)
+PBlock::PBlock(perm_string n, PScope*parent, BL_TYPE t)
+: PScope(n, parent), bl_type_(t)
 {
 }
 
 PBlock::PBlock(BL_TYPE t)
-: bl_type_(t)
+: PScope(perm_string(),0), bl_type_(t)
 {
 }
 
@@ -107,16 +102,27 @@ PBlock::~PBlock()
 	    delete list_[idx];
 }
 
-PCallTask::PCallTask(const hname_t&n, const svector<PExpr*>&p)
+void PBlock::set_statement(const svector<Statement*>&st)
+{
+      list_ = st;
+}
+
+PCallTask::PCallTask(const pform_name_t&n, const svector<PExpr*>&p)
 : path_(n), parms_(p)
 {
 }
 
+PCallTask::PCallTask(perm_string n, const svector<PExpr*>&p)
+: parms_(p)
+{
+      path_.push_back(name_component_t(n));
+}
+
 PCallTask::~PCallTask()
 {
 }
 
-const hname_t& PCallTask::path() const
+const pform_name_t& PCallTask::path() const
 {
       return path_;
 }
@@ -178,7 +184,7 @@ PDelayStatement::~PDelayStatement()
 {
 }
 
-PDisable::PDisable(const hname_t&sc)
+PDisable::PDisable(const pform_name_t&sc)
 : scope_(sc)
 {
 }
@@ -273,7 +279,7 @@ PRepeat::~PRepeat()
       delete statement_;
 }
 
-PTrigger::PTrigger(const hname_t&e)
+PTrigger::PTrigger(const pform_name_t&e)
 : event_(e)
 {
 }
@@ -295,6 +301,10 @@ PWhile::~PWhile()
 
 /*
  * $Log: Statement.cc,v $
+ * Revision 1.30  2007/05/24 04:07:11  steve
+ *  Rework the heirarchical identifier parse syntax and pform
+ *  to handle more general combinations of heirarch and bit selects.
+ *
  * Revision 1.29  2004/02/18 17:11:54  steve
  *  Use perm_strings for named langiage items.
  *

Statement.h

@@ -1,7 +1,7 @@
 #ifndef __Statement_H
 #define __Statement_H
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,15 +18,13 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: Statement.h,v 1.42 2005/12/05 21:21:18 steve Exp $"
-#endif
 
 # include  <string>
 # include  "svector.h"
 # include  "StringHeap.h"
 # include  "PDelays.h"
 # include  "PExpr.h"
+# include  "PScope.h"
 # include  "HName.h"
 # include  "LineInfo.h"
 class PExpr;
@@ -55,6 +53,8 @@ class PProcess : public LineInfo {
 
       virtual ~PProcess();
 
+      bool elaborate(Design*des, NetScope*scope) const;
+
       Type type() const { return type_; }
       Statement*statement() { return statement_; }
 
@@ -81,6 +81,7 @@ class Statement : public LineInfo {
       virtual void dump(ostream&out, unsigned ind) const;
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
 };
 
 /*
@@ -145,25 +146,27 @@ class PAssignNB  : public PAssign_ {
  * statements before constructing this object, so it knows a priori
  * what is contained.
  */
-class PBlock  : public Statement {
+class PBlock  : public PScope, public Statement {
 
     public:
       enum BL_TYPE { BL_SEQ, BL_PAR };
 
-      explicit PBlock(perm_string n, BL_TYPE t, const svector<Statement*>&st);
-      explicit PBlock(BL_TYPE t, const svector<Statement*>&st);
+	// If the block has a name, it is a scope and also has a parent.
+      explicit PBlock(perm_string n, PScope*parent, BL_TYPE t);
+	// If it doesn't have a name, it's not a scope
       explicit PBlock(BL_TYPE t);
       ~PBlock();
 
       BL_TYPE bl_type() const { return bl_type_; }
 
+      void set_statement(const svector<Statement*>&st);
 
       virtual void dump(ostream&out, unsigned ind) const;
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
 
     private:
-      perm_string name_;
       const BL_TYPE bl_type_;
       svector<Statement*>list_;
 };
@@ -171,10 +174,11 @@ class PBlock  : public Statement {
 class PCallTask  : public Statement {
 
     public:
-      explicit PCallTask(const hname_t&n, const svector<PExpr*>&parms);
+      explicit PCallTask(const pform_name_t&n, const svector<PExpr*>&parms);
+      explicit PCallTask(perm_string n, const svector<PExpr*>&parms);
       ~PCallTask();
 
-      const hname_t& path() const;
+      const pform_name_t& path() const;
 
       unsigned nparms() const { return parms_.count(); }
 
@@ -195,7 +199,7 @@ class PCallTask  : public Statement {
       NetProc* elaborate_sys(Design*des, NetScope*scope) const;
       NetProc* elaborate_usr(Design*des, NetScope*scope) const;
 
-      hname_t path_;
+      pform_name_t path_;
       svector<PExpr*> parms_;
 };
 
@@ -212,6 +216,7 @@ class PCase  : public Statement {
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -247,6 +252,7 @@ class PCondit  : public Statement {
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -281,6 +287,7 @@ class PDelayStatement  : public Statement {
       virtual void dump(ostream&out, unsigned ind) const;
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
 
     private:
       PExpr*delay_;
@@ -294,14 +301,14 @@ class PDelayStatement  : public Statement {
 class PDisable  : public Statement {
 
     public:
-      explicit PDisable(const hname_t&sc);
+      explicit PDisable(const pform_name_t&sc);
       ~PDisable();
 
       virtual void dump(ostream&out, unsigned ind) const;
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
 
     private:
-      hname_t scope_;
+      pform_name_t scope_;
 };
 
 /*
@@ -328,6 +335,7 @@ class PEventStatement  : public Statement {
       virtual void dump(ostream&out, unsigned ind) const;
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
 
 	// This method is used to elaborate, but attach a previously
 	// elaborated statement to the event.
@@ -361,6 +369,7 @@ class PForever : public Statement {
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -376,6 +385,7 @@ class PForStatement  : public Statement {
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -404,6 +414,7 @@ class PRepeat : public Statement {
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -431,14 +442,14 @@ class PRelease  : public Statement {
 class PTrigger  : public Statement {
 
     public:
-      explicit PTrigger(const hname_t&ev);
+      explicit PTrigger(const pform_name_t&ev);
       ~PTrigger();
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
-      hname_t event_;
+      pform_name_t event_;
 };
 
 class PWhile  : public Statement {
@@ -449,6 +460,7 @@ class PWhile  : public Statement {
 
       virtual NetProc* elaborate(Design*des, NetScope*scope) const;
       virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual void elaborate_sig(Design*des, NetScope*scope) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -456,86 +468,4 @@ class PWhile  : public Statement {
       Statement*statement_;
 };
 
-/*
- * $Log: Statement.h,v $
- * Revision 1.42  2005/12/05 21:21:18  steve
- *  Fixes for stubborn compilers.
- *
- * Revision 1.41  2004/12/11 02:31:25  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.40  2004/02/20 18:53:33  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.39  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.38  2003/05/19 02:50:58  steve
- *  Implement the wait statement behaviorally instead of as nets.
- *
- * Revision 1.37  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.36  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.35  2002/06/04 05:38:44  steve
- *  Add support for memory words in l-value of
- *  blocking assignments, and remove the special
- *  NetAssignMem class.
- *
- * Revision 1.34  2002/05/26 01:39:02  steve
- *  Carry Verilog 2001 attributes with processes,
- *  all the way through to the ivl_target API.
- *
- *  Divide signal reference counts between rval
- *  and lval references.
- *
- * Revision 1.33  2002/04/21 22:31:02  steve
- *  Redo handling of assignment internal delays.
- *  Leave it possible for them to be calculated
- *  at run time.
- *
- * Revision 1.32  2002/04/21 04:59:07  steve
- *  Add support for conbinational events by finding
- *  the inputs to expressions and some statements.
- *  Get case and assignment statements working.
- *
- * Revision 1.31  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.30  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
- *
- * Revision 1.29  2000/09/09 15:21:26  steve
- *  move lval elaboration to PExpr virtual methods.
- *
- * Revision 1.28  2000/09/03 17:58:35  steve
- *  Change elaborate_lval to return NetAssign_ objects.
- *
- * Revision 1.27  2000/07/26 05:08:07  steve
- *  Parse disable statements to pform.
- *
- * Revision 1.26  2000/05/11 23:37:26  steve
- *  Add support for procedural continuous assignment.
- *
- * Revision 1.25  2000/04/22 04:20:19  steve
- *  Add support for force assignment.
- *
- * Revision 1.24  2000/04/12 04:23:57  steve
- *  Named events really should be expressed with PEIdent
- *  objects in the pform,
- *
- *  Handle named events within the mix of net events
- *  and edges. As a unified lot they get caught together.
- *  wait statements are broken into more complex statements
- *  that include a conditional.
- *
- *  Do not generate NetPEvent or NetNEvent objects in
- *  elaboration. NetEvent, NetEvWait and NetEvProbe
- *  take over those functions in the netlist.
- */
 #endif

_pli_types.h.in

@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: _pli_types.h.in,v 1.7 2003/11/12 02:38:44 steve Exp $"
+#ident "$Id: _pli_types.h.in,v 1.8 2007/06/05 21:32:30 steve Exp $"
 #endif
 
 # undef HAVE_INTTYPES_H
@@ -42,7 +42,7 @@ typedef int32_t  PLI_INT32;
 
 typedef signed short   PLI_INT16;
 typedef unsigned short PLI_UINT16;
-typedef signed char    PLI_BYTE8;
+typedef char           PLI_BYTE8;
 typedef unsigned char  PLI_UBYTE8;
 
 # define PLI_UINT64_FMT PRIu64
@@ -84,12 +84,15 @@ typedef signed int     PLI_INT32;
 typedef unsigned int   PLI_UINT32;
 typedef signed short   PLI_INT16;
 typedef unsigned short PLI_UINT16;
-typedef signed char    PLI_BYTE8;
+typedef char           PLI_BYTE8;
 typedef unsigned char  PLI_UBYTE8;
 #endif
 
 /*
  * $Log: _pli_types.h.in,v $
+ * Revision 1.8  2007/06/05 21:32:30  steve
+ *  More standard PLI_BYTE8.
+ *
  * Revision 1.7  2003/11/12 02:38:44  steve
  *  Clean up manual definitions of PLI_UINT64_FMT.
  *

aclocal.m4

@@ -14,7 +14,7 @@
 AC_DEFUN([AX_CPP_IDENT],
 [AC_CACHE_CHECK([for ident support in C compiler], ax_cv_cpp_ident,
 [AC_TRY_COMPILE([
-#ident "$Id: aclocal.m4,v 1.6 2004/10/04 01:10:52 steve Exp $"
+#ident "$Id: aclocal.m4,v 1.7 2007/05/16 23:59:12 steve Exp $"
 ],[while (0) {}],
 [AS_VAR_SET(ax_cv_cpp_ident, yes)],
 [AS_VAR_SET(ax_cv_cpp_ident, no)])])
@@ -48,7 +48,7 @@ AC_DEFUN([AX_C_UNDERSCORES_LEADING],
 [AS_VAR_SET(ax_cv_c_underscores_leading, yes)],
 [AS_VAR_SET(ax_cv_c_underscores_leading, no)])])
 if test $ax_cv_c_underscores_leading = yes -a "$CYGWIN" != "yes" -a "$MINGW32" != "yes"; then
- AC_DEFINE(NEED_LU)
+ AC_DEFINE([NEED_LU], [1], [Symbol names in object files produced by C compiler have leading underscores.])
 fi
 ])# AX_C_UNDERSCORES_LEADING
 
@@ -63,7 +63,7 @@ AC_DEFUN([AX_C_UNDERSCORES_TRAILING],
 [AS_VAR_SET(ax_cv_c_underscores_trailing, yes)],
 [AS_VAR_SET(ax_cv_c_underscores_trailing, no)])])
 if test $ax_cv_c_underscores_trailing = yes; then
- AC_DEFINE(NEED_TU)
+ AC_DEFINE([NEED_TU], [1], [Symbol names in object files produced by C compiler have trailing underscores.])
 fi
 ])# AX_C_UNDERSCORES_TRAILING
 

autoconf.sh

@@ -7,12 +7,12 @@
 # to just run this script to autoconf wherever needed.
 #
 echo "Autoconf in root..."
-autoconf
+autoconf -f
 
 for dir in vpip vpi vvp tgt-vvp tgt-fpga tgt-stub libveriuser cadpli
 do
     echo "Autoconf in $dir..."
-    ( cd ./$dir ; autoconf --include=.. )
+    ( cd ./$dir ; autoconf -f --include=.. )
 done
 
 echo "Precompiling lexor_keyword.gperf"

cadpli/Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.12 2006/02/15 18:42:42 steve Exp $"
+#ident "$Id: Makefile.in,v 1.13 2007/02/06 05:07:31 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -33,9 +33,7 @@ bindir = @bindir@
 libdir = @libdir@
 includedir = $(prefix)/include
 
-vpidir = @libdir@/ivl/@vpidir1@
-
-strip_dynamic=@strip_dynamic@
+vpidir = @libdir@/ivl
 
 CC = @CC@
 INSTALL = @INSTALL@
@@ -45,20 +43,11 @@ INSTALL_DATA = @INSTALL_DATA@
 CPPFLAGS = @ident_support@ -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@
 CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
-STRIP = @STRIP@
 
 SHARED = @shared@
 
 all:
 
-ifeq (@enable_vvp32@,yes)
-vpidir32 = $(libdir)/ivl/@vpidir2@
-ALL32 = all32
-INSTALL32 = install32
-UNINSTALL32 = uninstall32
-include $(srcdir)/enable_vvp32.mk
-endif
-
 all: dep cadpli.vpl $(ALL32)
 
 # No specific check operations.
@@ -74,7 +63,7 @@ dep:
 O = cadpli.o
 
 SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
     SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif
 
@@ -100,8 +89,4 @@ uninstall: $(UNINSTALL32)
 
 uninstall32:
 
-ifeq (@enable_vvp32@,yes)
-include $(srcdir)/enable_vvp32.mk
-endif
-
 -include $(patsubst %.o, dep/%.d, $O)

cadpli/configure.in

@@ -12,10 +12,6 @@ AX_WIN32
 
 AC_PROG_INSTALL
 
-# vvp32 is by default disabled
-#enable_vvp32=no
-AC_SUBST(enable_vvp32)
-
 AC_CHECK_HEADERS(malloc.h)
 
 AC_CHECK_SIZEOF(unsigned long long)
@@ -37,7 +33,7 @@ AC_SUBST(DLLIB)
 
 AX_CPP_PRECOMP
 
-# Compiler option for position independent code, needed whan making shared objects.
+# Compiler option for position independent code, needed when making shared objects.
 AX_C_PICFLAG
 
 # Linker option used when compiling the target
@@ -62,15 +58,4 @@ AX_C_UNDERSCORES_TRAILING
 
 AX_CPP_IDENT
 
-# where to put vpi subdirectories
-AC_MSG_CHECKING(for VPI subdirectories)
-if test x${vpidir1} = x
-then
-	vpidir1="."
-fi
-
-AC_SUBST(vpidir1)
-AC_SUBST(vpidir2)
-AC_MSG_RESULT(${vpidir1} ${vpidir2})
-
 AC_OUTPUT(Makefile)

cadpli/enable_vvp32.mk

@@ -1,39 +0,0 @@
-#
-#    This source code is free software; you can redistribute it
-#    and/or modify it in source code form under the terms of the GNU
-#    Library General Public License as published by the Free Software
-#    Foundation; either version 2 of the License, or (at your option)
-#    any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Library General Public License for more details.
-#
-#    You should have received a copy of the GNU Library General Public
-#    License along with this program; if not, write to the Free
-#    Software Foundation, Inc.,
-#    59 Temple Place - Suite 330
-#    Boston, MA 02111-1307, USA
-#
-#ident "$Id: enable_vvp32.mk,v 1.1 2003/10/09 01:07:20 steve Exp $"
-#
-
-all32: bin32 bin32/cadpli.vpl
-
-bin32:
-	mkdir bin32
-
-bin32/%.o: %.c
-	$(CC) -m32 -Wall -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@
-
-bin32/cadpli.vpl: $(addprefix bin32/,$O) ../vvp/bin32/libvpi.a ../libveriuser/bin32/libveriuser.o
-	$(CC) $(SHARED) -m32 -o $@ $(addprefix bin32/,$O) ../libveriuser/bin32/libveriuser.o ../vvp/bin32/libvpi.a
-
-install32: all32 $(vpidir32)/cadpli.vpl
-
-$(vpidir32)/cadpli.vpl: bin32/cadpli.vpl
-	$(INSTALL_PROGRAM) bin32/cadpli.vpl $(vpidir32)/cadpli.vpl
-
-uninstall32:
-	rm -f $(vpidir32)/cadpli.vpl

cadpli/ivl_dlfcn.h

@@ -35,16 +35,16 @@ typedef shl_t ivl_dll_t;
 #endif
 
 #if defined(__MINGW32__)
-inline ivl_dll_t ivl_dlopen(const char *name)
+static inline ivl_dll_t ivl_dlopen(const char *name)
 { return (void *)LoadLibrary(name); }
 
-inline void *ivl_dlsym(ivl_dll_t dll, const char *nm)
+static inline void *ivl_dlsym(ivl_dll_t dll, const char *nm)
 { return (void *)GetProcAddress((HINSTANCE)dll,nm);}
 
-inline void ivl_dlclose(ivl_dll_t dll)
+static inline void ivl_dlclose(ivl_dll_t dll)
 { (void)FreeLibrary((HINSTANCE)dll);}
 
-inline const char *dlerror(void)
+static inline const char *dlerror(void)
 {
   static char msg[256];
   unsigned long err = GetLastError();
@@ -61,10 +61,10 @@ inline const char *dlerror(void)
 }
 
 #elif defined(HAVE_DLFCN_H)
-inline ivl_dll_t ivl_dlopen(const char*name)
+static inline ivl_dll_t ivl_dlopen(const char*name)
 { return dlopen(name,RTLD_LAZY); }
 
-inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
+static inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
 {
       void*sym = dlsym(dll, nm);
 	/* Not found? try without the leading _ */
@@ -73,24 +73,24 @@ inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
       return sym;
 }
 
-inline void ivl_dlclose(ivl_dll_t dll)
+static inline void ivl_dlclose(ivl_dll_t dll)
 { dlclose(dll); }
 
 #elif defined(HAVE_DL_H)
-inline ivl_dll_t ivl_dlopen(const char*name)
+static inline ivl_dll_t ivl_dlopen(const char*name)
 { return shl_load(name, BIND_IMMEDIATE, 0); }
 
-inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
+static inline void* ivl_dlsym(ivl_dll_t dll, const char*nm)
 {
       void*sym;
       int rc = shl_findsym(&dll, nm, TYPE_PROCEDURE, &sym);
       return (rc == 0) ? sym : 0;
 }
 
-inline void ivl_dlclose(ivl_dll_t dll)
+static inline void ivl_dlclose(ivl_dll_t dll)
 { shl_unload(dll); }
 
-inline const char*dlerror(void)
+static inline const char*dlerror(void)
 { return strerror( errno ); }
 #endif
 

compiler.h

@@ -1,7 +1,7 @@
 #ifndef __compiler_H
 #define __compiler_H
 /*
- * Copyright (c) 1999-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,9 +18,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: compiler.h,v 1.30 2005/07/11 16:56:50 steve Exp $"
-#endif
 
 # include  <list>
 # include  <map>
@@ -32,11 +29,12 @@
  */
 
 
-/* The INTEGER_WIDTH is the default width of integer variables, and
-   the presumed width of unsigned literal numbers. */
-#ifndef INTEGER_WIDTH
-# define INTEGER_WIDTH 32
-#endif
+/*
+ * The integer_width is the width of integer variables. This is also
+ * the minimum width of unsized integers when they are found in
+ * self-determined contexts.
+ */
+extern unsigned integer_width;
 
 /* The TIME_WIDTH is the width of time variables. */
 #ifndef TIME_WIDTH
@@ -78,6 +76,9 @@ extern bool warn_timescale;
 /* Warn about legal but questionable module port bindings. */
 extern bool warn_portbinding;
 
+/* Warn about structures that may have infinite loops. */
+extern bool warn_inf_loop;
+
 /* This is true if verbose output is requested. */
 extern bool verbose_flag;
 
@@ -99,28 +100,68 @@ extern int build_library_index(const char*path, bool key_case_sensitive);
 enum generation_t {
       GN_VER1995  = 1,
       GN_VER2001  = 2,
-      GN_VER2001X = 3,
+      GN_VER2005  = 3,
       GN_DEFAULT  = 3
 };
 
 extern generation_t generation_flag;
+
+/* If this flag is true, enable extended types support. */
 extern bool gn_cadence_types_flag;
 
-/* These functions test that specific features are enabled. */
-inline bool gn_cadence_types_enabled()
-{ return gn_cadence_types_flag && generation_flag==GN_VER2001X; }
+/* If this flag is true, enable miscellaneous extensions. */
+extern bool gn_icarus_misc_flag;
+
+/* If this flag is true, then elaborate specify blocks. If this flag
+   is false, then skip elaboration of specify behavior. */
+extern bool gn_specify_blocks_flag;
+
+/* If this flag is true, then support/elaborate Verilog-AMS. */
+extern bool gn_verilog_ams_flag;
+
+/* If this flag is false a warning is printed when the port declaration
+   is scalar and the net/register definition is vectored. */
+extern bool gn_io_range_error_flag;
+
+/* The bits of these GN_KEYWORDS_* constants define non-intersecting
+   sets of keywords. The compiler enables groups of keywords by setting
+   lexor_keyword_mask with the OR of the bits for the keywords to be
+   enabled. */
+enum { GN_KEYWORDS_1364_1995        = 0x0001,
+       GN_KEYWORDS_1364_2001        = 0x0002,
+       GN_KEYWORDS_1364_2001_CONFIG = 0x0004,
+       GN_KEYWORDS_1364_2005        = 0x0008,
+       GN_KEYWORDS_VAMS_2_3         = 0x0010,
+       GN_KEYWORDS_ICARUS           = 0x8000
+};
+extern int lexor_keyword_mask;
 
   /* This is the string to use to invoke the preprocessor. */
 extern char*ivlpp_string;
 
 extern map<perm_string,unsigned> missing_modules;
 
+  /* Files that are library files are in this map. The lexor compares
+     file names as it processes `line directives, and if the file name
+     matches an entry in this table, it will turn on the
+     library_active_flag so that modules know that they are in a
+     library. */
+extern map<perm_string,bool> library_file_map;
+
 /*
  * the lex_strings are perm_strings made up of tokens from the source
  * file. Identifiers are so likely to be used many times that it makes
  * much sense to use a StringHeapLex to hold them.
  */
 extern StringHeapLex lex_strings;
+extern StringHeap misc_strings;
+
+/*
+ * The filename_strings are perm_strings for file names. They are put
+ * into their own StringHeapLex because these paths are used a *lot*
+ * and this makes them more sure to hash together.
+ */
+extern StringHeapLex filename_strings;
 
 
 /*
@@ -141,57 +182,4 @@ struct sfunc_return_type {
 extern const struct sfunc_return_type* lookup_sys_func(const char*name);
 extern int load_sys_func_table(const char*path);
 
-/*
- * $Log: compiler.h,v $
- * Revision 1.30  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.29  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.28  2005/06/28 04:25:55  steve
- *  Remove reference to SystemVerilog.
- *
- * Revision 1.27  2005/04/24 23:44:01  steve
- *  Update DFF support to new data flow.
- *
- * Revision 1.26  2004/10/04 01:10:52  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.25  2004/09/25 01:58:44  steve
- *  Add a debug_elaborate flag
- *
- * Revision 1.24  2004/09/10 23:51:42  steve
- *  Fix the evaluation of constant ternary expressions.
- *
- * Revision 1.23  2004/09/05 17:44:41  steve
- *  Add support for module instance arrays.
- *
- * Revision 1.22  2004/03/10 04:51:24  steve
- *  Add support for system function table files.
- *
- * Revision 1.21  2004/03/09 04:29:42  steve
- *  Separate out the lookup_sys_func table, for eventual
- *  support for function type tables.
- *
- *  Remove ipal compile flags.
- *
- * Revision 1.20  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.19  2003/11/13 05:55:33  steve
- *  Move the DLL= flag to target config files.
- *
- * Revision 1.18  2003/11/08 20:06:21  steve
- *  Spelling fixes in comments.
- *
- * Revision 1.17  2003/09/25 00:25:14  steve
- *  Summary list of missing modules.
- *
- * Revision 1.16  2003/03/01 06:25:30  steve
- *  Add the lex_strings string handler, and put
- *  scope names and system task/function names
- *  into this table. Also, permallocate event
- *  names from the beginning.
- */
 #endif

config.h.in

@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: config.h.in,v 1.11 2004/10/04 01:10:52 steve Exp $"
+#ident "$Id: config.h.in,v 1.12 2007/02/02 04:33:00 steve Exp $"
 #endif
 
 #if defined(__cplusplus)
@@ -37,6 +37,7 @@
 # undef HAVE_TIMES
 # undef HAVE_IOSFWD
 # undef HAVE_GETOPT_H
+# undef HAVE_INTTYPES_H
 # undef HAVE_LIBIBERTY_H
 # undef HAVE_MALLOC_H
 # undef HAVE_DLFCN_H
@@ -48,8 +49,15 @@
 # undef HAVE_SYS_WAIT_H
 # undef WORDS_BIGENDIAN
 
+#ifdef HAVE_INTTYPES_H
+# include  <inttypes.h>
+#endif
+
 /*
  * $Log: config.h.in,v $
+ * Revision 1.12  2007/02/02 04:33:00  steve
+ *  Use inttypes.h instead of stdint.h for portability.
+ *
  * Revision 1.11  2004/10/04 01:10:52  steve
  *  Clean up spurious trailing white space.
  *

configure.in

@@ -42,11 +42,6 @@ AC_SUBST(EXEEXT)
 # Combined check for Microsoft-related bogosities; sets WIN32 if found
 AX_WIN32
 
-# vvp32 is by default disabled
-#enable_vvp32=no
-AC_SUBST(enable_vvp32)
-
-
 AC_LANG_CPLUSPLUS
 
 AC_CHECK_HEADERS(getopt.h malloc.h inttypes.h libiberty.h iosfwd sys/wait.h)
@@ -56,9 +51,12 @@ AC_CHECK_LIB(z, gzwrite, HAVE_LIBZ=yes, HAVE_LIBZ=no)
 AC_SUBST(HAVE_LIBZ)
 if test "$WIN32" = "yes"; then
 AC_CHECK_LIB(bz2, main)
+AC_CHECK_LIB(bz2, main, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
 else
 AC_CHECK_LIB(bz2, BZ2_bzdopen)
+AC_CHECK_LIB(bz2, BZ2_bzdopen, HAVE_LIBBZ2=yes, HAVE_LIBBZ2=no)
 fi
+AC_SUBST(HAVE_LIBBZ2)
 
 AC_MSG_CHECKING(for sys/times)
 AC_TRY_LINK(
@@ -66,7 +64,7 @@ AC_TRY_LINK(
 #include <sys/times.h>
 ,{clock_t a = times(0)/sysconf(_SC_CLK_TCK);},
 do_times=yes
-AC_DEFINE(HAVE_TIMES,1),
+AC_DEFINE([HAVE_TIMES], [1], [The times system call is available in the host operating system.]),
 do_times=no
 )
 AC_MSG_RESULT($do_times)
@@ -93,7 +91,7 @@ AC_C_BIGENDIAN
 
 AX_LD_EXTRALIBS
 
-# Compiler option for position independent code, needed whan making shared objects.
+# Compiler option for position independent code, needed when making shared objects.
 # CFLAGS inherited by cadpli/Makefile?
 AX_C_PICFLAG
 
@@ -120,27 +118,6 @@ AX_C_UNDERSCORES_TRAILING
 
 AX_CPP_IDENT
 
-# If not otherwise specified, set the libdir64 variable
-# to the same as libdir.
-AC_MSG_CHECKING(for libdir64 path)
-if test x${libdir64} = x
-then
-	libdir64="${libdir}"
-fi
-AC_SUBST(libdir64)
-AC_MSG_RESULT(${libdir64})
-
-# where to put vpi subdirectories
-AC_MSG_CHECKING(for VPI subdirectories)
-if test x${vpidir1} = x
-then
-	vpidir1="."
-fi
-
-AC_SUBST(vpidir1)
-AC_SUBST(vpidir2)
-AC_MSG_RESULT(${vpidir1} ${vpidir2})
-
 # XXX disable tgt-fpga for the moment
 AC_CONFIG_SUBDIRS(vvp vpi tgt-stub tgt-null tgt-vvp libveriuser cadpli)
 

constants.vams

@@ -0,0 +1,43 @@
+// Mathematical and physical constants
+
+`ifdef CONSTANTS_VAMS
+`else
+`define CONSTANTS_VAMS 1
+ 
+// M_ is a mathematical constant
+`define M_E        2.7182818284590452354
+`define M_LOG2E    1.4426950408889634074
+`define M_LOG10E   0.43429448190325182765
+`define M_LN2      0.69314718055994530942
+`define M_LN10     2.30258509299404568402
+`define M_PI       3.14159265358979323846
+`define M_TWO_PI   6.28318530717958647693
+`define M_PI_2     1.57079632679489661923
+`define M_PI_4     0.78539816339744830962
+`define M_1_PI     0.31830988618379067154
+`define M_2_PI     0.63661977236758134308
+`define M_2_SQRTPI 1.12837916709551257390
+`define M_SQRT2    1.41421356237309504880
+`define M_SQRT1_2  0.70710678118654752440
+
+/*
+ * Do we need these? For now they are not available.
+ *
+// The following constants have been taken from http://physics.nist.gov
+// P_ is a physical constant
+// charge of electron in coulombs
+`define P_Q        1.602176462e-19
+// speed of light in vacuum in meters/sec
+`define P_C        2.99792458e8
+// Boltzmann's constant in joules/kelvin
+`define P_K        1.3806503e-23
+// Planck's constant in joules*sec
+`define P_H        6.62606876e-34
+// permittivity of vacuum in farads/meter
+`define P_EPS0     8.854187817e-12
+// permeability of vacuum in henrys/meter
+`define P_U0       (4.0e-7 * `M_PI)
+// zero celsius in kelvin
+`define P_CELSIUS0 273.15
+*/
+`endif

cprop.cc

@@ -16,16 +16,14 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: cprop.cc,v 1.55 2006/05/24 04:32:57 steve Exp $"
-#endif
 
 # include "config.h"
 
+# include  <cstdlib>
 # include  "netlist.h"
 # include  "netmisc.h"
 # include  "functor.h"
-# include  <assert.h>
+# include  "ivl_assert.h"
 
 
 
@@ -215,7 +213,9 @@ void cprop_functor::lpm_ff(Design*des, NetFF*obj)
 
 void cprop_functor::lpm_logic(Design*des, NetLogic*obj)
 {
+#if 0
       NetScope*scope = obj->scope();
+#endif
 
       switch (obj->type()) {
 #if 0
@@ -844,15 +844,17 @@ struct cprop_dc_functor  : public functor_t {
 void cprop_dc_functor::lpm_const(Design*des, NetConst*obj)
 {
 	// 'bz constant values drive high impedance to whatever is
-	// connected to it. In other words, it is a noop.
+	// connected to it. In other words, it is a noop. But that is
+	// only true if *all* the bits of the vectors.
       { unsigned tmp = 0;
-        for (unsigned idx = 0 ;  idx < obj->pin_count() ;  idx += 1)
+	ivl_assert(*obj, obj->pin_count()==1);
+	for (unsigned idx = 0 ;  idx < obj->width() ;  idx += 1) {
 	      if (obj->value(idx) == verinum::Vz) {
-		    obj->pin(idx).unlink();
 		    tmp += 1;
 	      }
+	}
 
-	if (tmp == obj->pin_count()) {
+	if (tmp == obj->width()) {
 	      delete obj;
 	      return;
 	}
@@ -946,78 +948,3 @@ void cprop(Design*des)
       des->functor(&dc);
 }
 
-/*
- * $Log: cprop.cc,v $
- * Revision 1.55  2006/05/24 04:32:57  steve
- *  Fix handling of ternary-to-bufif0 constant propagation.
- *
- * Revision 1.54  2005/07/15 19:22:52  steve
- *  bufif enable is LOGIC.
- *
- * Revision 1.53  2005/05/15 04:44:30  steve
- *  Disable obsolete logic constant fixup code.
- *
- * Revision 1.52  2005/04/24 23:44:01  steve
- *  Update DFF support to new data flow.
- *
- * Revision 1.51  2005/02/12 22:52:45  steve
- *  Fix copyright notice.
- *
- * Revision 1.50  2005/02/12 06:25:40  steve
- *  Restructure NetMux devices to pass vectors.
- *  Generate NetMux devices from ternary expressions,
- *  Reduce NetMux devices to bufif when appropriate.
- *
- * Revision 1.49  2005/01/16 04:20:32  steve
- *  Implement LPM_COMPARE nodes as two-input vector functors.
- *
- * Revision 1.48  2004/12/11 02:31:25  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.47  2004/02/20 18:53:34  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.46  2003/11/08 17:53:34  steve
- *  Do not remove constants accessible to VPI.
- *
- * Revision 1.45  2003/10/31 02:40:06  steve
- *  Donot elide FF that has set or clr connections.
- *
- * Revision 1.44  2003/04/25 05:06:32  steve
- *  Handle X values in constant == nets.
- *
- * Revision 1.43  2003/03/06 00:28:41  steve
- *  All NetObj objects have lex_string base names.
- *
- * Revision 1.42  2003/02/26 01:29:24  steve
- *  LPM objects store only their base names.
- *
- * Revision 1.41  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.40  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.39  2002/08/20 04:12:22  steve
- *  Copy gate delays when doing gate delay substitutions.
- *
- * Revision 1.38  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.37  2002/06/25 01:33:22  steve
- *  Cache calculated driven value.
- *
- * Revision 1.36  2002/06/24 01:49:38  steve
- *  Make link_drive_constant cache its results in
- *  the Nexus, to improve cprop performance.
- *
- * Revision 1.35  2002/05/26 01:39:02  steve
- *  Carry Verilog 2001 attributes with processes,
- *  all the way through to the ivl_target API.
- *
- *  Divide signal reference counts between rval
- *  and lval references.
- */
-

design_dump.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: design_dump.cc,v 1.166 2006/06/18 04:15:50 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -30,6 +27,7 @@
 # include  <iomanip>
 # include  "netlist.h"
 # include  "compiler.h"
+# include  "ivl_assert.h"
 
 static ostream& operator<< (ostream&o, NetBlock::Type t)
 {
@@ -90,11 +88,56 @@ ostream& operator << (ostream&o, ivl_variable_type_t val)
       return o;
 }
 
+static inline void dump_scope_path(ostream&o, const NetScope*scope)
+{
+      if (const NetScope*parent = scope->parent()) {
+	    dump_scope_path(o, parent);
+	    o << ".";
+      }
+      const hname_t name = scope->fullname();
+      o << name.peek_name();
+      if (name.has_number())
+	    o << "[" << name.peek_number() << "]";
+}
+
+ostream& operator <<(ostream&o, struct __ScopePathManip marg)
+{
+      if (marg.scope != 0)
+	    dump_scope_path(o, marg.scope);
+      return o;
+}
+
+void NetDelaySrc::dump(ostream&o, unsigned ind) const
+{
+      o << setw(ind) << "" << "specify delay";
+      if (posedge_) o << " posedge";
+      if (negedge_) o << " negedge";
+      if (is_condit()) {
+	    if (has_condit()) o << " if";
+	    else o << " ifnone";
+      }
+      o << " src "
+	<< "(" << transition_delays_[IVL_PE_01]
+	<< "," << transition_delays_[IVL_PE_10]
+	<< "," << transition_delays_[IVL_PE_0z]
+	<< "/" << transition_delays_[IVL_PE_z1]
+	<< "," << transition_delays_[IVL_PE_1z]
+	<< "," << transition_delays_[IVL_PE_z0]
+	<< "/" << transition_delays_[IVL_PE_0x]
+	<< "," << transition_delays_[IVL_PE_x1]
+	<< "," << transition_delays_[IVL_PE_1x]
+	<< "/" << transition_delays_[IVL_PE_x0]
+	<< "," << transition_delays_[IVL_PE_xz]
+	<< "," << transition_delays_[IVL_PE_zx]
+	<< ") scope=" << scope_path(scope()) << endl;
+      dump_node_pins(o, ind+4);
+}
+
 /* Dump a net. This can be a wire or register. */
 void NetNet::dump_net(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << type() << ": " << name() << "[" <<
-	    pin_count() << "]";
+      o << setw(ind) << "" << type() << ": " << name()
+	<< "[" << s0_ << ":" << e0_ << " count=" << pin_count() << "]";
       if (local_flag_)
 	    o << " (local)";
       o << " " << data_type_;
@@ -118,7 +161,7 @@ void NetNet::dump_net(ostream&o, unsigned ind) const
       }
       o << " (eref=" << peek_eref() << ", lref=" << peek_lref() << ")";
       if (scope())
-	    o << " scope=" << scope()->name();
+	    o << " scope=" << scope_path(scope());
       o << " #(" << rise_time() << "," << fall_time() << ","
 	<<  decay_time() << ") vector_width=" << vector_width()
 	<< " pin_count=" << pin_count()
@@ -139,16 +182,15 @@ void NetNet::dump_net(ostream&o, unsigned ind) const
 	    o << setw(ind+4) << "" << "[" << idx << "]: " << nex
 	      << " " << nex->name() << endl;
       }
+
+      for (unsigned idx = 0 ;  idx < delay_paths_.size() ;  idx += 1) {
+	    const NetDelaySrc*cur = delay_paths_[idx];
+	    cur->dump(o, ind+4);
+      }
+
       dump_obj_attr(o, ind+4);
 }
 
-void NetMemory::dump(ostream&o, unsigned ind) const
-{
-      o << setw(ind) << ""  << name_ << "[" << width_ << "] " <<
-	    "[" << idxh_ << ":" << idxl_ << "]" << endl;
-}
-
-
 /* Dump a NetNode and its pins. Dump what I know about the netnode on
    the first line, then list all the pins, with the name of the
    connected signal. */
@@ -205,6 +247,15 @@ void NetObj::dump_obj_attr(ostream&o, unsigned ind) const
       }
 }
 
+void NetAbs::dump_node(ostream&o, unsigned ind) const
+{
+      o << setw(ind) << "" << "Absolute value (NetAbs): " << name()
+	<< " width=" << width() << " pin_count=" << pin_count()
+	<< endl;
+      dump_node_pins(o, ind+4);
+      dump_obj_attr(o, ind+4);
+}
+
 void NetAddSub::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "Adder (NetAddSub): " << name()
@@ -214,6 +265,15 @@ void NetAddSub::dump_node(ostream&o, unsigned ind) const
       dump_obj_attr(o, ind+4);
 }
 
+void NetArrayDq::dump_node(ostream&o, unsigned ind) const
+{
+      o << setw(ind) << "" << "NetArrayDq: " << name()
+	<< " array=" << mem_->name()
+	<< endl;
+      dump_node_pins(o, ind+4);
+      dump_obj_attr(o, ind+4);
+}
+
 void NetCLShift::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "Combinatorial shift (NetCLShift): " <<
@@ -232,8 +292,13 @@ void NetCompare::dump_node(ostream&o, unsigned ind) const
 void NetConcat::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "NetConcat: "
-	<< name()
-	<< " scope=" << (scope()? scope()->name() : "")
+	<< name();
+      if (rise_time())
+	    o << " #(" << *rise_time()
+	      << "," << *fall_time() << "," << *decay_time() << ")";
+      else
+	    o << " #(0,0,0)";
+      o << " scope=" << scope_path(scope())
 	<< " width=" << width_ << endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
@@ -253,11 +318,27 @@ void NetMult::dump_node(ostream&o, unsigned ind) const
       dump_obj_attr(o, ind+4);
 }
 
+void NetPow::dump_node(ostream&o, unsigned ind) const
+{
+      o << setw(ind) << "" << "LPM_POW (NetPow): " << name()
+	<< " scope=" << scope_path(scope())
+	<< " delay=(";
+      if (rise_time())
+	    o << *rise_time() << "," << *fall_time() << ","
+	      <<  *decay_time();
+      else
+	    o << "0,0,0";
+
+      o << ")"  << endl;
+      dump_node_pins(o, ind+4);
+      dump_obj_attr(o, ind+4);
+}
+
 void NetMux::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "Multiplexer (NetMux): " << name()
 	<< " width=" << width_ << " swidth=" << swidth_ << " size=" << size_
-	<< " scope=" << scope()->name() << endl;
+	<< " scope=" << scope_path(scope()) << endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
@@ -265,7 +346,7 @@ void NetMux::dump_node(ostream&o, unsigned ind) const
 void NetBUFZ::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "NetBUFZ: " << name()
-	<< " scope=" << (scope()? scope()->name() : "")
+	<< " scope=" << scope_path(scope())
 	<< " delay=(" << rise_time() << "," << fall_time() << "," <<
 	    decay_time() << ") width=" << width() << endl;
       dump_node_pins(o, ind+4);
@@ -286,14 +367,21 @@ void NetConst::dump_node(ostream&o, unsigned ind) const
       o << setw(ind) << "" << "constant " << width_ << "'b";
       for (unsigned idx = width_ ;  idx > 0 ;  idx -= 1)
 	    o << value_[idx-1];
-      o << ": " << name() << endl;
+      o << ": " << name();
+      if (rise_time())
+	    o << " #(" << *rise_time()
+	      << "," << *fall_time()
+	      << "," << *decay_time() << ")";
+      else
+	    o << " #(.,.,.)";
+      o << endl;
       dump_node_pins(o, ind+4);
 }
 
 void NetFF::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "LPM_FF: " << name()
-	<< " scope=" << (scope()? scope()->name() : "")
+	<< " scope=" << scope_path(scope())
 	<< " aset_value=" << aset_value_ << endl;
 
       dump_node_pins(o, ind+4);
@@ -303,7 +391,14 @@ void NetFF::dump_node(ostream&o, unsigned ind) const
 void NetLiteral::dump_node(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "constant real " << real_
-	<< ": " << name() << endl;
+	<< ": " << name();
+      if (rise_time())
+	    o << " #(" << *rise_time()
+	      << "," << *fall_time()
+	      << "," << *decay_time() << ")";
+      else
+	    o << " #(.,.,.)";
+      o << endl;
       dump_node_pins(o, ind+4);
 }
 
@@ -323,6 +418,9 @@ void NetLogic::dump_node(ostream&o, unsigned ind) const
 	  case BUFIF1:
 	    o << "bufif1";
 	    break;
+	  case CMOS:
+	    o << "cmos";
+	    break;
 	  case NAND:
 	    o << "nand";
 	    break;
@@ -350,6 +448,9 @@ void NetLogic::dump_node(ostream&o, unsigned ind) const
 	  case PULLUP:
 	    o << "pullup";
 	    break;
+	  case RCMOS:
+	    o << "rcmos";
+	    break;
 	  case RNMOS:
 	    o << "rnmos";
 	    break;
@@ -368,7 +469,7 @@ void NetLogic::dump_node(ostream&o, unsigned ind) const
       }
       o << " #(" << rise_time()
 	<< "," << fall_time() << "," << decay_time() << ") " << name()
-	<< " scope=" << (scope()? scope()->name() : "")
+	<< " scope=" << scope_path(scope())
 	<< endl;
 
       dump_node_pins(o, ind+4);
@@ -397,15 +498,14 @@ void NetPartSelect::dump_node(ostream&o, unsigned ind) const
 	    break;
       }
       o << setw(ind) << "" << "NetPartSelect(" << pt << "): "
-	<< name() << " off=" << off_ << " wid=" << wid_ <<endl;
-      dump_node_pins(o, ind+4);
-      dump_obj_attr(o, ind+4);
-}
-
-void NetRamDq::dump_node(ostream&o, unsigned ind) const
-{
-      o << setw(ind) << "" << "LPM_RAM_DQ (" << mem_->name() << "): "
-	<< name() << endl;
+	<< name();
+      if (rise_time())
+	    o << " #(" << *rise_time()
+	      << "," << *fall_time()
+	      << "," << *decay_time() << ")";
+      else
+	    o << " #(.,.,.)";
+      o << " off=" << off_ << " wid=" << wid_ <<endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
@@ -455,7 +555,7 @@ void NetUReduce::dump_node(ostream&o, unsigned ind) const
       }
       o << " #(" << rise_time()
 	<< "," << fall_time() << "," << decay_time() << ") " << name()
-	<< " scope=" << (scope()? scope()->name() : "")
+	<< " scope=" << scope_path(scope())
 	<< endl;
 
       dump_node_pins(o, ind+4);
@@ -464,22 +564,27 @@ void NetUReduce::dump_node(ostream&o, unsigned ind) const
 
 void NetSysFunc::dump_node(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << def_->name << "(...)" << endl;
+      o << setw(ind) << "" << def_->name << "(...) -->"
+	<< data_type() << " width=" << vector_width() << endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
 
 void NetUserFunc::dump_node(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << def_->name() << "(";
-      o << ")" << endl;
+      o << setw(ind) << "" << "USER FUNC: "
+	<< scope_path(def_);
+      if (rise_time())
+	    o << " #(" <<*rise_time()
+	      <<","<<*fall_time()
+	      << "," <<*decay_time() << ")" << endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
 
 void NetTaskDef::dump(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << "task " << name_ << ";" << endl;
+      o << setw(ind) << "" << "task " << scope_path(scope_) << ";" << endl;
 
       for (unsigned idx = 0 ;  idx < ports_.count() ;  idx += 1) {
 	    o << setw(ind+4) << "";
@@ -520,12 +625,12 @@ void NetProcTop::dump(ostream&o, unsigned ind) const
 {
       switch (type_) {
 	  case NetProcTop::KINITIAL:
-	    o << "initial  /* " << get_line() << " in "
-	      << scope_->name() << " */" << endl;
+	    o << "initial  /* " << get_fileline() << " in "
+	      << scope_path(scope_) << " */" << endl;
 	    break;
 	  case NetProcTop::KALWAYS:
-	    o << "always  /* " << get_line() << " in "
-	      << scope_->name() << " */" << endl;
+	    o << "always  /* " << get_fileline() << " in "
+	      << scope_path(scope_) << " */" << endl;
 	    break;
       }
 
@@ -541,21 +646,9 @@ void NetAssign_::dump_lval(ostream&o) const
 {
       if (sig_) {
 	    o << sig_->name();
-	    if (bmux_) {
-		  o << "[" << *bmux_ << "]";
-
-	    } else if (base_) {
-		  o << "[" << *base_ << " +: " << lwid_ << "]";
+	    if (word_) {
+		  o << "[word=" << *word_ << "]";
 	    }
-      } else if (mem_) {
-	    // Is there an obvious way to flag memories in the dump
-	    // as different from the _real_ bit mux case?
-	    // o << "**memory**";
-	    o << mem_->name() << "[";
-	    if (bmux_) o << *bmux_;
-	      else     o << "**oops**";
-	    o << "]";
-
 	    if (base_) {
 		  o << "[" << *base_ << " +: " << lwid_ << "]";
 	    }
@@ -619,7 +712,7 @@ void NetBlock::dump(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << type_;
       if (subscope_)
-	    o << " : " << subscope_->name();
+	    o << " : " << scope_path(subscope_);
       o << endl;
 
       if (last_) {
@@ -669,7 +762,7 @@ void NetCAssign::dump(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "cassign ";
       dump_lval(o);
-      o << " = " << *rval() << "; /* " << get_line() << " */" << endl;
+      o << " = " << *rval() << "; /* " << get_fileline() << " */" << endl;
 }
 
 void NetCondit::dump(ostream&o, unsigned ind) const
@@ -691,13 +784,13 @@ void NetDeassign::dump(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "deassign ";
       dump_lval(o);
-      o << "; /* " << get_line() << " */" << endl;
+      o << "; /* " << get_fileline() << " */" << endl;
 }
 
 void NetDisable::dump(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << "disable " << target_->name() << "; "
-	<< "/* " << get_line() << " */" << endl;
+      o << setw(ind) << "" << "disable " << scope_path(target_) << "; "
+	<< "/* " << get_fileline() << " */" << endl;
 }
 
 void NetEvProbe::dump_node(ostream&o, unsigned ind) const
@@ -715,7 +808,7 @@ void NetEvProbe::dump_node(ostream&o, unsigned ind) const
 	    o << "negedge ";
 	    break;
       }
-      o << setw(ind) << "" << "-> " << event_->full_name() << "; " << endl;
+      o << setw(ind) << "" << "-> " << event_->name() << "; " << endl;
       dump_node_pins(o, ind+4);
       dump_obj_attr(o, ind+4);
 }
@@ -723,18 +816,20 @@ void NetEvProbe::dump_node(ostream&o, unsigned ind) const
 void NetEvTrig::dump(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "-> " << event_->name() << "; "
-	<< "// " << get_line() << endl;
+	<< "// " << get_fileline() << endl;
 }
 
 void NetEvWait::dump(ostream&o, unsigned ind) const
 {
-      assert(nevents() > 0);
-      o << setw(ind) <<"" << "@(" << event(0)->full_name();
+      o << setw(ind) <<"" << "@(";
+
+      if (nevents() > 0)
+	    o << event(0)->name();
 
       for (unsigned idx = 1 ;  idx < nevents() ;  idx += 1)
-	    o << " or " << event(idx)->full_name();
+	    o << " or " << event(idx)->name();
 
-      o << ")  // " << get_line() << endl;
+      o << ")  // " << get_fileline() << endl;
 
       if (statement_)
 	    statement_->dump(o, ind+2);
@@ -746,7 +841,7 @@ void NetForce::dump(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "force ";
       dump_lval(o);
-      o << " = " << *rval() << "; /* " << get_line() << " */" << endl;
+      o << " = " << *rval() << "; /* " << get_fileline() << " */" << endl;
 }
 
 void NetForever::dump(ostream&o, unsigned ind) const
@@ -757,10 +852,36 @@ void NetForever::dump(ostream&o, unsigned ind) const
 
 void NetFuncDef::dump(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << "function " << scope_->name() << endl;
-      if (result_sig_)
-	    o << setw(ind+2) << "" << "Return signal: "
-	      << result_sig_->name() << endl;
+      o << setw(ind) << "" << "function definition for " << scope_path(scope_) << endl;
+      if (result_sig_) {
+	    o << setw(ind+2) << "" << "Return signal: ";
+	    if (result_sig_->get_signed()) o << "+";
+	    o << result_sig_->name() << "[" << result_sig_->msb() << ":"
+	      << result_sig_->lsb() << "]" << endl;
+      }
+      o << setw(ind+2) << "" << "Arguments: ";
+      if (port_count() == 0) o << "<none>";
+      o << endl;
+      for (unsigned idx = 0; idx < port_count(); idx += 1) {
+	    o << setw(ind+4) << "" << "Arg[" << idx+1 << "] = ";
+	    switch (port(idx)->port_type()) {
+		default:
+		  o << "implicit-port? ";
+		  break;
+		case NetNet::PINPUT:
+		  o << "input ";
+		  break;
+		case NetNet::POUTPUT:
+		  o << "output ";
+		  break;
+		case NetNet::PINOUT:
+		  o << "inout ";
+		  break;
+	    }
+	    if (port(idx)->get_signed()) o << "+";
+	    o << port(idx)->name() << "[" << port(idx)->msb() << ":"
+	      << port(idx)->lsb() << "]" << endl;
+      }
       if (statement_)
 	    statement_->dump(o, ind+2);
       else
@@ -788,7 +909,7 @@ void NetRelease::dump(ostream&o, unsigned ind) const
 {
       o << setw(ind) << "" << "release ";
       dump_lval(o);
-      o << "; /* " << get_line() << " */" << endl;
+      o << "; /* " << get_fileline() << " */" << endl;
 }
 
 void NetRepeat::dump(ostream&o, unsigned ind) const
@@ -800,7 +921,7 @@ void NetRepeat::dump(ostream&o, unsigned ind) const
 void NetScope::dump(ostream&o) const
 {
 	/* This is a constructed hierarchical name. */
-      o << name();
+      o << scope_path(this);
 
       switch (type_) {
 	  case BEGIN_END:
@@ -858,7 +979,7 @@ void NetScope::dump(ostream&o) const
 
 	/* Dump the saved defparam assignments here. */
       {
-	    map<hname_t,NetExpr*>::const_iterator pp;
+	    map<pform_name_t,NetExpr*>::const_iterator pp;
 	    for (pp = defparams.begin()
 		       ; pp != defparams.end() ;  pp ++ ) {
 		  o << "    defparam " << (*pp).first << " = " <<
@@ -869,7 +990,8 @@ void NetScope::dump(ostream&o) const
 	/* Dump the events in this scope. */
       for (NetEvent*cur = events_ ;  cur ;  cur = cur->snext_) {
 	    o << "    event " << cur->name() << "; nprobe="
-	      << cur->nprobe() << " // " << cur->get_line() << endl;
+	      << cur->nprobe() << " scope=" << scope_path(cur->scope())
+	      << " // " << cur->get_fileline() << endl;
       }
 
 	// Dump the signals,
@@ -881,13 +1003,25 @@ void NetScope::dump(ostream&o) const
 	    } while (cur != signals_->sig_next_);
       }
 
-	// Dump the memories,
-      if (memories_) {
-	    NetMemory*cur = memories_->snext_;
-	    do {
-		  cur->dump(o, 4);
-		  cur = cur->snext_;
-	    } while (cur != memories_->snext_);
+	// Dump specparams
+      typedef map<perm_string,spec_val_t>::const_iterator specparam_it_t;
+      for (specparam_it_t cur = specparams.begin()
+		 ; cur != specparams.end() ;  cur ++ ) {
+	    o << "    specparam " << (*cur).first
+	      << " = ";
+	    spec_val_t value = (*cur).second;
+	    switch (value.type) {
+		case IVL_VT_REAL:
+		  o << "R:" << value.real_val;
+		  break;
+		case IVL_VT_BOOL:
+		  o << "I:" << value.integer;
+		  break;
+		default:
+		  o << "<bad type>";
+		  break;
+	    }
+	    o << endl;
       }
 
       switch (type_) {
@@ -898,7 +1032,10 @@ void NetScope::dump(ostream&o) const
 		  o << "    MISSING FUNCTION DEFINITION" << endl;
 	    break;
 	  case TASK:
-	    task_def()->dump(o, 4);
+	    if (task_def())
+		  task_def()->dump(o, 4);
+	    else
+		  o << "    MISSING TASK DEFINITION" << endl;
 	    break;
 	  default:
 	    break;
@@ -931,7 +1068,7 @@ void NetSTask::dump(ostream&o, unsigned ind) const
 
 void NetUTask::dump(ostream&o, unsigned ind) const
 {
-      o << setw(ind) << "" << task_->name() << ";" << endl;
+      o << setw(ind) << "" << scope_path(task_) << ";" << endl;
 }
 
 void NetWhile::dump(ostream&o, unsigned ind) const
@@ -954,6 +1091,20 @@ void NetExpr::dump(ostream&o) const
 
 void NetEBinary::dump(ostream&o) const
 {
+      if (op_ == 'm' || op_ == 'M') {
+	    if (op_ == 'm')
+		  o << "min";
+	    else
+		  o << "max";
+
+	    o << "(";
+	    left_->dump(o);
+	    o << ", ";
+	    right_->dump(o);
+	    o << ")";
+	    return;
+      }
+
       o << "(";
       left_->dump(o);
       o << ")";
@@ -991,6 +1142,9 @@ void NetEBinary::dump(ostream&o) const
 	  case 'O':
 	    o << "~|";
 	    break;
+	  case 'p':
+	    o << "**";
+	    break;
 	  case 'r':
 	    o << ">>";
 	    break;
@@ -1063,7 +1217,7 @@ void NetEEvent::dump(ostream&o) const
 
 void NetEScope::dump(ostream&o) const
 {
-      o << "<scope=" << scope_->name() << ">";
+      o << "<scope=" << scope_path(scope_) << ">";
 }
 
 void NetESelect::dump(ostream&o) const
@@ -1099,22 +1253,19 @@ void NetESignal::dump(ostream&o) const
 {
       if (has_sign())
 	    o << "+";
-      o << name() << "[" << msi()<<":"<<lsi() << "]";
-}
-
-void NetEMemory::dump(ostream&o) const
-{
-      o << mem_->name() << "[";
-      if (idx_) idx_->dump(o);
-      o << "]";
+      o << name();
+      if (word_) o << "[word=" << *word_ << "]";
+      o << "[" << msi()<<":"<<lsi() << "]";
 }
 
 void NetEParam::dump(ostream&o) const
 {
       if (scope_ != 0)
-	    o << "<" << scope_->name() << "." << name_ << ">";
-      else
+	    o << "<" << scope_path(scope_) << "." << name_ << ">";
+      else if (name_)
 	    o << "<" << name_ << ">";
+      else
+	    o << "<" "???" ">";
 }
 
 void NetETernary::dump(ostream&o) const
@@ -1125,7 +1276,7 @@ void NetETernary::dump(ostream&o) const
 
 void NetEUFunc::dump(ostream&o) const
 {
-      o << name() << "(";
+      o << func_->basename() << "(";
       if (parms_.count() > 0) {
 	    parms_[0]->dump(o);
 	    for (unsigned idx = 1 ;  idx < parms_.count() ;  idx += 1) {
@@ -1139,6 +1290,9 @@ void NetEUFunc::dump(ostream&o) const
 void NetEUnary::dump(ostream&o) const
 {
       switch (op_) {
+	  case 'm':
+	    o << "abs";
+	    break;
 	  case 'N':
 	    o << "~|";
 	    break;
@@ -1165,6 +1319,7 @@ void Design::dump(ostream&o) const
       if (nodes_) {
 	    NetNode*cur = nodes_->node_next_;
 	    do {
+		  assert(cur);
 		  cur->dump_node(o, 0);
 		  cur = cur->node_next_;
 	    } while (cur != nodes_->node_next_);
@@ -1177,355 +1332,3 @@ void Design::dump(ostream&o) const
 	    idx->dump(o, 0);
 
 }
-
-/*
- * $Log: design_dump.cc,v $
- * Revision 1.166  2006/06/18 04:15:50  steve
- *  Add support for system functions in continuous assignments.
- *
- * Revision 1.165  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.164  2006/02/02 02:43:57  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.163  2005/08/27 04:32:08  steve
- *  Handle synthesis of fully packed case statements.
- *
- * Revision 1.162  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.161  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.160  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
- *
- * Revision 1.159  2005/05/17 20:56:55  steve
- *  Parameters cannot have their width changed.
- *
- * Revision 1.158  2005/05/07 03:13:30  steve
- *  Include delay expressions for assignments in dump.
- *
- * Revision 1.157  2005/03/09 05:52:03  steve
- *  Handle case inequality in netlists.
- *
- * Revision 1.156  2005/02/08 00:12:36  steve
- *  Add the NetRepeat node, and code generator support.
- *
- * Revision 1.155  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
- *
- * Revision 1.154  2005/01/24 05:28:30  steve
- *  Remove the NetEBitSel and combine all bit/part select
- *  behavior into the NetESelect node and IVL_EX_SELECT
- *  ivl_target expression type.
- *
- * 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.
- *
- * Revision 1.151  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
- *
- *  Generate NetConcat devices for gate outputs that feed into a
- *  vector results. Use this to hande gate arrays. Also let gate
- *  arrays handle vectors of gates when the outputs allow for it.
- *
- * Revision 1.150  2004/12/11 02:31:25  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.149  2004/10/04 01:10:52  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.148  2004/05/31 23:34:36  steve
- *  Rewire/generalize parsing an elaboration of
- *  function return values to allow for better
- *  speed and more type support.
- *
- * Revision 1.147  2004/02/20 06:22:56  steve
- *  parameter keys are per_strings.
- *
- * Revision 1.146  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.145  2003/12/17 16:52:39  steve
- *  Debug dumps for synth2.
- *
- * Revision 1.144  2003/07/26 03:34:42  steve
- *  Start handling pad of expressions in code generators.
- *
- * Revision 1.143  2003/07/05 20:42:08  steve
- *  Fix some enumeration warnings.
- *
- * Revision 1.142  2003/06/20 00:53:19  steve
- *  Module attributes from the parser
- *  through to elaborated form.
- *
- * Revision 1.141  2003/06/18 03:55:18  steve
- *  Add arithmetic shift operators.
- *
- * Revision 1.140  2003/05/30 02:55:32  steve
- *  Support parameters in real expressions and
- *  as real expressions, and fix multiply and
- *  divide with real results.
- *
- * Revision 1.139  2003/04/22 04:48:29  steve
- *  Support event names as expressions elements.
- *
- * Revision 1.138  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
- *
- * Revision 1.137  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.136  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
- *
- * Revision 1.135  2002/10/23 01:47:17  steve
- *  Fix synth2 handling of aset/aclr signals where
- *  flip-flops are split by begin-end blocks.
- *
- * Revision 1.134  2002/10/19 22:59:49  steve
- *  Redo the parameter vector support to allow
- *  parameter names in range expressions.
- *
- * Revision 1.133  2002/08/19 00:06:11  steve
- *  Allow release to handle removal of target net.
- *
- * Revision 1.132  2002/08/13 05:35:00  steve
- *  Do not elide named blocks.
- *
- * Revision 1.131  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.130  2002/08/04 18:28:14  steve
- *  Do not use hierarchical names of memories to
- *  generate vvp labels. -tdll target does not
- *  used hierarchical name string to look up the
- *  memory objects in the design.
- *
- * Revision 1.129  2002/06/19 04:20:03  steve
- *  Remove NetTmp and add NetSubnet class.
- *
- * Revision 1.128  2002/06/14 21:38:41  steve
- *  Fix expression width for repeat concatenations.
- *
- * Revision 1.127  2002/06/08 23:42:46  steve
- *  Add NetRamDq synthsesis from memory l-values.
- *
- * Revision 1.126  2002/06/05 03:44:25  steve
- *  Add support for memory words in l-value of
- *  non-blocking assignments, and remove the special
- *  NetAssignMem_ and NetAssignMemNB classes.
- *
- * Revision 1.125  2002/06/04 05:38:44  steve
- *  Add support for memory words in l-value of
- *  blocking assignments, and remove the special
- *  NetAssignMem class.
- *
- * Revision 1.124  2002/05/26 01:39:02  steve
- *  Carry Verilog 2001 attributes with processes,
- *  all the way through to the ivl_target API.
- *
- *  Divide signal reference counts between rval
- *  and lval references.
- *
- * Revision 1.123  2002/05/05 21:11:49  steve
- *  Put off evaluation of concatenation repeat expresions
- *  until after parameters are defined. This allows parms
- *  to be used in repeat expresions.
- *
- *  Add the builtin $signed system function.
- *
- * Revision 1.122  2002/03/09 02:10:22  steve
- *  Add the NetUserFunc netlist node.
- *
- * Revision 1.121  2001/12/31 00:03:05  steve
- *  Include s indicator in dump of signed numbers.
- *
- * Revision 1.120  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.119  2001/11/19 01:46:38  steve
- *  Print typename is fallback expression node dump.
- *
- * Revision 1.118  2001/10/19 21:53:24  steve
- *  Support multiple root modules (Philip Blundell)
- *
- * Revision 1.117  2001/08/25 23:50:02  steve
- *  Change the NetAssign_ class to refer to the signal
- *  instead of link into the netlist. This is faster
- *  and uses less space. Make the NetAssignNB carry
- *  the delays instead of the NetAssign_ lval objects.
- *
- *  Change the vvp code generator to support multiple
- *  l-values, i.e. concatenations of part selects.
- *
- * Revision 1.116  2001/07/27 04:51:44  steve
- *  Handle part select expressions as variants of
- *  NetESignal/IVL_EX_SIGNAL objects, instead of
- *  creating new and useless temporary signals.
- *
- * Revision 1.115  2001/07/27 02:41:55  steve
- *  Fix binding of dangling function ports. do not elide them.
- *
- * Revision 1.114  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.113  2001/04/29 20:19:10  steve
- *  Add pullup and pulldown devices.
- *
- * Revision 1.112  2001/04/22 23:09:46  steve
- *  More UDP consolidation from Stephan Boettcher.
- *
- * Revision 1.111  2001/02/17 05:13:36  steve
- *  Check that the port really exists here.
- *
- * Revision 1.110  2001/01/18 03:16:35  steve
- *  NetMux needs a scope. (PR#115)
- *
- * Revision 1.109  2001/01/13 22:20:08  steve
- *  Parse parameters within nested scopes.
- *
- * Revision 1.108  2000/12/16 01:45:47  steve
- *  Detect recursive instantiations (PR#2)
- *
- * Revision 1.107  2000/12/11 00:31:43  steve
- *  Add support for signed reg variables,
- *  simulate in t-vvm signed comparisons.
- *
- * Revision 1.106  2000/12/10 06:41:59  steve
- *  Support delays on continuous assignment from idents. (PR#40)
- *
- * Revision 1.105  2000/12/04 17:37:03  steve
- *  Add Attrib class for holding NetObj attributes.
- *
- * Revision 1.104  2000/11/11 01:52:09  steve
- *  change set for support of nmos, pmos, rnmos, rpmos, notif0, and notif1
- *  change set to correct behavior of bufif0 and bufif1
- *  (Tim Leight)
- *
- *  Also includes fix for PR#27
- *
- * Revision 1.103  2000/11/11 00:03:36  steve
- *  Add support for the t-dll backend grabing flip-flops.
- *
- * Revision 1.102  2000/11/04 06:36:24  steve
- *  Apply sequential UDP rework from Stephan Boettcher  (PR#39)
- *
- * Revision 1.101  2000/10/28 00:51:41  steve
- *  Add scope to threads in vvm, pass that scope
- *  to vpi sysTaskFunc objects, and add vpi calls
- *  to access that information.
- *
- *  $display displays scope in %m (PR#1)
- *
- * Revision 1.100  2000/10/07 19:45:42  steve
- *  Put logic devices into scopes.
- *
- * Revision 1.99  2000/10/06 23:46:50  steve
- *  ivl_target updates, including more complete
- *  handling of ivl_nexus_t objects. Much reduced
- *  dependencies on pointers to netlist objects.
- *
- * Revision 1.98  2000/09/26 01:35:42  steve
- *  Remove the obsolete NetEIdent class.
- *
- * Revision 1.97  2000/09/17 21:26:15  steve
- *  Add support for modulus (Eric Aardoom)
- *
- * Revision 1.96  2000/09/10 02:18:16  steve
- *  elaborate complex l-values
- *
- * Revision 1.95  2000/09/02 20:54:20  steve
- *  Rearrange NetAssign to make NetAssign_ separate.
- *
- * Revision 1.94  2000/07/30 18:25:43  steve
- *  Rearrange task and function elaboration so that the
- *  NetTaskDef and NetFuncDef functions are created during
- *  signal enaboration, and carry these objects in the
- *  NetScope class instead of the extra, useless map in
- *  the Design class.
- *
- * Revision 1.93  2000/07/29 03:55:38  steve
- *  fix problem coalescing events w/ probes.
- *
- * Revision 1.92  2000/07/27 05:13:44  steve
- *  Support elaboration of disable statements.
- *
- * Revision 1.91  2000/07/22 22:09:03  steve
- *  Parse and elaborate timescale to scopes.
- *
- * Revision 1.90  2000/07/14 06:12:57  steve
- *  Move inital value handling from NetNet to Nexus
- *  objects. This allows better propogation of inital
- *  values.
- *
- *  Clean up constant propagation  a bit to account
- *  for regs that are not really values.
- *
- * Revision 1.89  2000/07/07 04:53:53  steve
- *  Add support for non-constant delays in delay statements,
- *  Support evaluating ! in constant expressions, and
- *  move some code from netlist.cc to net_proc.cc.
- *
- * Revision 1.88  2000/06/25 19:59:42  steve
- *  Redesign Links to include the Nexus class that
- *  carries properties of the connected set of links.
- *
- * Revision 1.87  2000/06/24 22:55:19  steve
- *  Get rid of useless next_link method.
- *
- * Revision 1.86  2000/06/13 03:24:48  steve
- *  Index in memory assign should be a NetExpr.
- *
- * Revision 1.85  2000/05/11 23:37:27  steve
- *  Add support for procedural continuous assignment.
- *
- * Revision 1.84  2000/05/07 18:20:07  steve
- *  Import MCD support from Stephen Tell, and add
- *  system function parameter support to the IVL core.
- *
- * Revision 1.83  2000/05/07 04:37:56  steve
- *  Carry strength values from Verilog source to the
- *  pform and netlist for gates.
- *
- *  Change vvm constants to use the driver_t to drive
- *  a constant value. This works better if there are
- *  multiple drivers on a signal.
- *
- * Revision 1.82  2000/05/04 03:37:58  steve
- *  Add infrastructure for system functions, move
- *  $time to that structure and add $random.
- *
- * Revision 1.81  2000/05/02 03:13:30  steve
- *  Move memories to the NetScope object.
- *
- * Revision 1.80  2000/05/02 00:58:11  steve
- *  Move signal tables to the NetScope class.
- *
- * Revision 1.79  2000/04/28 21:00:29  steve
- *  Over agressive signal elimination in constant probadation.
- *
- * Revision 1.78  2000/04/23 03:45:24  steve
- *  Add support for the procedural release statement.
- *
- * Revision 1.77  2000/04/22 04:20:19  steve
- *  Add support for force assignment.
- *
- * Revision 1.76  2000/04/12 20:02:52  steve
- *  Finally remove the NetNEvent and NetPEvent classes,
- *  Get synthesis working with the NetEvWait class,
- *  and get started supporting multiple events in a
- *  wait in vvm.
- */
-

driver-vpi/Makefile.in

@@ -16,16 +16,17 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.7 2004/10/13 22:01:34 steve Exp $"
+#ident "$Id: Makefile.in,v 1.7.2.1 2006/10/04 17:08:59 steve Exp $"
 #
 #
 SHELL = /bin/sh
 
-VERSION = 0.8
+VERSION = 0.8.3
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
+datarootdir = @datarootdir@
 
 VPATH = $(srcdir)
 
@@ -48,7 +49,7 @@ LDFLAGS = @LDFLAGS@
 all: iverilog-vpi@EXEEXT@
 
 clean:
-	rm -f *.o
+	rm -f *.o config.h
 	rm -f iverilog-vpi@EXEEXT@
 
 distclean: clean
@@ -60,9 +61,14 @@ iverilog-vpi@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@
 
 
-main.o: main.c
+main.o: main.c config.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c
 
+config.h: config.h.in
+	sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \
+	    -e 's;@IVLCFLAGS@;@CXXFLAGS@;' \
+	    -e 's;@SHARED@;@shared@;' $< > $@
+
 # Windows specific...
 res.o: res.rc
 	windres -i res.rc -o res.o

driver-vpi/config.h.in

@@ -0,0 +1,8 @@
+/* For now do not put the Icarus Verilog include or library paths here.
+ * They are generated from a registry entry the user must set (-ivl=).
+ * This may change in the future once I have thought about it more. */
+#define IVERILOG_VPI_CC        "@IVLCC@"
+#define IVERILOG_VPI_CXX       "@IVLCXX@"
+#define IVERILOG_VPI_CFLAGS    " @IVLCFLAGS@"
+#define IVERILOG_VPI_LDFLAGS   "@SHARED@"
+#define IVERILOG_VPI_LDLIBS    "-lveriuser -lvpi"

driver-vpi/main.c

@@ -32,28 +32,28 @@
 
 #include <windows.h>
 
-/* Macros used for compiling and linking */
+static void setup_ivl_environment();
+static void assign(char **ptr, char *str);
 
-#define IVERILOG_VPI_CC        "gcc"				/* no .exe extension  */
-#define IVERILOG_VPI_CXX       "gcc"				/* no .exe extension  */
-#define IVERILOG_VPI_CFLAGS    "-O"					/* -I appended  later */
-#define IVERILOG_VPI_LD        "gcc"				/* no .exe extension  */
-#define IVERILOG_VPI_LDFLAGS   "-shared -Wl,--enable-auto-image-base"
-#define IVERILOG_VPI_LDLIBS    "-lveriuser -lvpi"	/* -L prepended later */
+/* The compile options: compiler, flags, etc. are in here */
+#include "config.h"
 
 /* pointers to global strings */
 
 static struct global_strings {
-	char *pCCSRC;		/* list of C source files */
-	char *pCXSRC;		/* list of C++ source files */
+	char *pCCSRC;		/* list of C source files (*.c) */
+	char *pCXSRC;		/* list of C++ source files (*.cc, *.cpp) */
 	char *pOBJ;			/* list of object files */
 	char *pLIB;			/* list of library files */
+	char *pINCS;			/* list of include directories */
+	char *pDEFS;			/* list of definitions */
 	char *pOUT;			/* output file name (.vpi extension), if 0 length then no source files specified */
 	char *pMINGW;		/* path to MinGW directory */
 	char *pIVL;			/* path to IVL directory */
 	char *pCFLAGS;		/* CFLAGS option */
 	char *pLDLIBS;		/* LDLIBS option */
 	char *pNewPath;		/* new PATH environment variable setting */
+	char *pLD;		/* what to use for a linker */
 } gstr;
 
 
@@ -70,12 +70,15 @@ static void myExit(int exitVal)
 	deInitDynString(gstr.pCXSRC);
 	deInitDynString(gstr.pOBJ);
 	deInitDynString(gstr.pLIB);
+	deInitDynString(gstr.pINCS);
+	deInitDynString(gstr.pDEFS);
 	deInitDynString(gstr.pOUT);
 	deInitDynString(gstr.pMINGW);
 	deInitDynString(gstr.pIVL);
 	deInitDynString(gstr.pCFLAGS);
 	deInitDynString(gstr.pLDLIBS);
 	deInitDynString(gstr.pNewPath);
+	free(gstr.pLD);
 
 	exit(exitVal);
 }
@@ -84,7 +87,7 @@ static void myExit(int exitVal)
 
 static void usage()
 {
-	fprintf(stderr,"usage: iverilog-vpi [--name=name] [-llibrary] [-mingw=dir] [-ivl=dir] sourcefile...\n");
+	fprintf(stderr,"usage: iverilog-vpi [src and obj files]...\n");
 	fprintf(stderr,"   or  iverilog-vpi -mingw=dir\n");
 	fprintf(stderr,"   or  iverilog-vpi -ivl=dir\n");
 	myExit(1);
@@ -110,12 +113,16 @@ static void init()
 	initDynString(&gstr.pCXSRC);
 	initDynString(&gstr.pOBJ);
 	initDynString(&gstr.pLIB);
+	initDynString(&gstr.pINCS);
+	initDynString(&gstr.pDEFS);
 	initDynString(&gstr.pOUT);
 	initDynString(&gstr.pMINGW);
 	initDynString(&gstr.pIVL);
 	initDynString(&gstr.pCFLAGS);
 	initDynString(&gstr.pLDLIBS);
 	initDynString(&gstr.pNewPath);
+	  /* By default use the C compiler to link the programs. */
+	assign(&gstr.pLD, IVERILOG_VPI_CC);
 }
 
 /* return true if "str" is terminated with with "end", case insensitive */
@@ -277,63 +284,124 @@ static int parse(int argc, char *argv[])
 
 	char dot_c_ext[]    = ".c";
 	char dot_cc_ext[]   = ".cc";
+	char dot_cpp_ext[]  = ".cpp";
 	char dot_o_ext[]    = ".o";
 	char name_option[]  = "--name=";
 	char lib_option[]   = "-l";
+	char inc_option[]   = "-I";
 	char mingw_option[] = "-mingw=";
 	char ivl_option[]   = "-ivl=";
+	char def_option[]   = "-D";
 
-	if (argc == 1)
-		return 0;
+	if (argc == 1) return 0;
 
 	for (idx=1; idx<argc; ++idx) {
-		if (endsIn(dot_c_ext,argv[idx])) {				/* check for C source files */
+		  /* Check for C source files (*.c) */
+		if (endsIn(dot_c_ext, argv[idx])) {
 			++srcFileCnt;
-			append(&gstr.pCCSRC,argv[idx]);
-			append(&gstr.pCCSRC," ");
+			append(&gstr.pCCSRC, argv[idx]);
+			append(&gstr.pCCSRC, " ");
 			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_c_ext));
+			   assignn(&gstr.pOUT, argv[idx],
+			           strlen(argv[idx])-strlen(dot_c_ext));
 		}
-		else if (endsIn(dot_cc_ext,argv[idx])) {		/* check for C++ source files */
+		  /* Check for C++ source files (*.cc) */
+		else if (endsIn(dot_cc_ext, argv[idx])) {
+			  /* We need to link with the C++ compiler. */
+			assign(&gstr.pLD, IVERILOG_VPI_CXX);
 			++srcFileCnt;
-			append(&gstr.pCXSRC,argv[idx]);
-			append(&gstr.pCXSRC," ");
+			append(&gstr.pCXSRC, argv[idx]);
+			append(&gstr.pCXSRC, " ");
 			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_cc_ext));
+			   assignn(&gstr.pOUT, argv[idx],
+			           strlen(argv[idx])-strlen(dot_cc_ext));
 		}
-		else if (endsIn(dot_o_ext,argv[idx])) {			/* check for compiled object files */
+		  /* Check for C++ source files (*.cpp) */
+		else if (endsIn(dot_cpp_ext, argv[idx])) {
+			  /* We need to link with the C++ compiler. */
+			assign(&gstr.pLD, IVERILOG_VPI_CXX);
+			++srcFileCnt;
+			append(&gstr.pCXSRC, argv[idx]);
+			append(&gstr.pCXSRC, " ");
+			if (!*gstr.pOUT)
+			   assignn(&gstr.pOUT, argv[idx],
+			           strlen(argv[idx])-strlen(dot_cpp_ext));
+		}
+		  /* Check for compiled object files */
+		else if (endsIn(dot_o_ext, argv[idx])) {
 			++srcFileCnt;
-			append(&gstr.pOBJ,argv[idx]);
 			append(&gstr.pOBJ," ");
+			append(&gstr.pOBJ, argv[idx]);
 			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_o_ext));
+			   assignn(&gstr.pOUT, argv[idx],
+			           strlen(argv[idx])-strlen(dot_o_ext));
 		}
-		else if (startsWith(name_option,argv[idx])) {	/* check for --name option */
-			assignn(&gstr.pOUT,argv[idx]+sizeof(name_option)-1,strlen(argv[idx])-(sizeof(name_option)-1));
+		  /* Check for the --name option */
+		else if (startsWith(name_option, argv[idx])) {
+			assignn(&gstr.pOUT, argv[idx]+sizeof(name_option)-1,
+			        strlen(argv[idx])-(sizeof(name_option)-1));
 		}
-		else if (startsWith(lib_option,argv[idx])) {	/* check for -l option */
-			append(&gstr.pLIB,argv[idx]);
-			append(&gstr.pLIB," ");
+		  /* Check for the -l option */
+		else if (startsWith(lib_option, argv[idx])) {
+			append(&gstr.pLIB, " ");
+			append(&gstr.pLIB, argv[idx]);
 		}
-		else if (startsWith(mingw_option,argv[idx]))	/* check for -mingw option */
-			assignn(&gstr.pMINGW,argv[idx]+sizeof(mingw_option)-1,strlen(argv[idx])-(sizeof(mingw_option)-1));
-		else if (startsWith(ivl_option,argv[idx]))		/* check for -ivl   option */
-			assignn(&gstr.pIVL,argv[idx]+sizeof(ivl_option)-1,strlen(argv[idx])-(sizeof(ivl_option)-1));
-		else
-			return 0;	/* different from iverilog-vpi.sh, we don't ignore accept arguments */
+		  /* Check for the -I option */
+		else if (startsWith(inc_option, argv[idx])) {
+			append(&gstr.pINCS, " ");
+			append(&gstr.pINCS, argv[idx]);
+		}
+		  /* Check for the -D option */
+		else if (startsWith(def_option, argv[idx])) {
+			append(&gstr.pDEFS, " ");
+			append(&gstr.pDEFS, argv[idx]);
+		}
+		  /* Check for the -mingw option */
+		else if (startsWith(mingw_option, argv[idx]))
+			assignn(&gstr.pMINGW, argv[idx]+sizeof(mingw_option)-1,
+			        strlen(argv[idx])-(sizeof(mingw_option)-1));
+		  /* Check for the -ivl   option */
+		else if (startsWith(ivl_option, argv[idx]))
+			assignn(&gstr.pIVL, argv[idx]+sizeof(ivl_option)-1,
+			        strlen(argv[idx])-(sizeof(ivl_option)-1));
+		  /* Check for the --cflags option */
+		else if (stricmp("--cflags", argv[idx]) == 0) {
+			setup_ivl_environment();
+			printf("%s\n", gstr.pCFLAGS);
+			myExit(0);
+		}
+		  /* Check for the --ldflags option */
+		else if (stricmp("--ldflags", argv[idx]) == 0) {
+			printf("%s\n", IVERILOG_VPI_LDFLAGS);
+			myExit(0);
+		}
+		  /* Check for the --ldlibs option */
+		else if (stricmp("--ldlibs", argv[idx]) == 0) {
+			setup_ivl_environment();
+			printf("%s\n", gstr.pLDLIBS);
+			myExit(0);
+		}
+		  /* Check for the --install-dir option */
+		else if (stricmp("--install-dir", argv[idx]) == 0) {
+			setup_ivl_environment();
+			printf("%s\\\\lib\\\\ivl\\\\.\n", gstr.pIVL);
+			myExit(0);
+		}
+		  /* This is different than iverilog-vpi.sh, we don't
+		   * ignore unknown arguments */
+		else return 0;
 	}
 
-	if (0 == srcFileCnt)
-		assign(&gstr.pOUT,"");				/* in case they used --name with no source files */
+	  /* In case there is a --name without source/object files */
+	if (0 == srcFileCnt) assign(&gstr.pOUT,"");
 
-	if (!*gstr.pOUT) {						/* normally it's an error if there are no *.c,*.cc,*.o files */
-		if (!*gstr.pMINGW && !*gstr.pIVL)	/* unless they are just setting the IVL or MinGW registry entries */
-			usage();
-	}
-	else {
-		append(&gstr.pOUT,".vpi");			/* the result file should have a .vpi extension */
-		append(&gstr.pOUT," ");
-	}
+	  /* Normally it's an error if there are no source or object files */
+	  /* Unless we are setting the IVL or MinGW registry entries */
+	if (!*gstr.pOUT) {
+		if (!*gstr.pMINGW && !*gstr.pIVL) return 0;
+	} else
+		  /* We have a valid result file so add the .vpi extension */
+		append(&gstr.pOUT, ".vpi");
 
 	return 1;
 }
@@ -403,9 +471,7 @@ static void setup_mingw_environment()
 	if (*gstr.pMINGW) {
 		checkMingwDir(gstr.pMINGW);
 		SetRegistryKey(IVL_REGKEY_MINGW,gstr.pMINGW);
-	}
-	else
-		if (!GetRegistryKey(IVL_REGKEY_MINGW,&gstr.pMINGW)) {
+	} else if (!GetRegistryKey(IVL_REGKEY_MINGW,&gstr.pMINGW)) {
 			fprintf(stderr,"error: can not locate the MinGW root directory, use the -mingw option of\n");
 			fprintf(stderr,"       iverilog-vpi.exe to point to the MinGW root directory.  For\n");
 			fprintf(stderr,"       a Windows command shell the option would be something like\n");
@@ -414,13 +480,16 @@ static void setup_mingw_environment()
 			myExit(5);
 		}
 
-	assign(&gstr.pNewPath,"PATH=");			/* create new path */
+	  /* Create new path with MinGW in it */
+	assign(&gstr.pNewPath,"PATH=");
 	append(&gstr.pNewPath,gstr.pMINGW);
 	appendBackSlash(&gstr.pNewPath);
+	append(&gstr.pNewPath, "\\");
 	append(&gstr.pNewPath,"bin;");
 	append(&gstr.pNewPath,pOldPATH);
 
-	_putenv(gstr.pNewPath);					/* place new path in environment variable */
+	  /* Place new path in environment */
+	_putenv(gstr.pNewPath);
 }
 
 /* see if we can find iverilog root */
@@ -432,9 +501,7 @@ static void setup_ivl_environment()
 	if (*gstr.pIVL) {
 		checkIvlDir(gstr.pIVL);
 		SetRegistryKey(IVL_REGKEY_IVL,gstr.pIVL);
-	}
-	else
-		if (!GetRegistryKey(IVL_REGKEY_IVL,&gstr.pIVL)) {
+	} else if (!GetRegistryKey(IVL_REGKEY_IVL,&gstr.pIVL)) {
 			fprintf(stderr,"error: can not locate the Icarus Verilog root directory, use the -ivl option\n");
 			fprintf(stderr,"       of iverilog-vpi.exe to point to the Icarus Verilog root directory.\n");
 			fprintf(stderr,"       For a Windows command shell the option would be something like\n");
@@ -443,56 +510,68 @@ static void setup_ivl_environment()
 			myExit(6);
 		}
 
-	/* build up the CFLAGS option string */
-
+	  /* Build up the CFLAGS option string */
 	assign(&gstr.pCFLAGS,IVERILOG_VPI_CFLAGS);
 	append(&gstr.pCFLAGS," -I");
 	append(&gstr.pCFLAGS,gstr.pIVL);
 	appendBackSlash(&gstr.pCFLAGS);
+	append(&gstr.pCFLAGS, "\\");
 	append(&gstr.pCFLAGS,"include");
 
-	/* build up the LDFLAGS option string */
-
+	  /* Build up the LDFLAGS option string */
 	assign(&gstr.pLDLIBS,"-L");
 	append(&gstr.pLDLIBS,gstr.pIVL);
 	appendBackSlash(&gstr.pLDLIBS);
+	append(&gstr.pLDLIBS, "\\");
 	append(&gstr.pLDLIBS,"lib ");
 	append(&gstr.pLDLIBS,IVERILOG_VPI_LDLIBS);
 }
 
 /* compile source modules */
 
-static void compile(char *pSource, char **pObject, char *ext, int *compile_errors, char *compiler)
+static void compile(char *pSource, char **pObject, int *compile_errors, char *compiler)
 {
 	char *ptr1 = pSource;
-	char *ptr2 = strchr(pSource,' ');
-	char *buf=0,*src=0,*obj=0;
+	char *ptr2 = strchr(ptr1, ' ');
+	char *buf=0, *src=0, *obj=0;
 
 	while (ptr2) {
 		int len = ptr2 - ptr1;
-		assignn(&src,ptr1,len);
+		char *ostart;
+		int olen;
+		assignn(&src, ptr1, len);
 
-		assignn(&obj,ptr1,len-strlen(ext));		/* strip off the extension */
-		append (&obj,".o");
+		  /* Build the object file name */
+		ostart = strrchr(ptr1, '/');
+		if (ostart == NULL) ostart = ptr1;
+		else ostart += 1;
+		olen = strrchr(ptr1, '.') - ostart;
+		assignn(&obj, ostart, olen);
+		append(&obj, ".o");
 
-		assign (&buf,compiler);
-		append (&buf," -c -o ");
-		append (&buf,obj);
-		append (&buf," ");
-		append (&buf,gstr.pCFLAGS);
-		append (&buf," ");
-		append (&buf,src);
+		  /* Build the compile line */
+		assign(&buf, compiler);
+		append(&buf, " -c -o ");
+		append(&buf, obj);
+		append(&buf, " ");
+		append(&buf, gstr.pDEFS);
+		append(&buf, " ");
+		append(&buf, gstr.pCFLAGS);
+		append(&buf, " ");
+		append(&buf, gstr.pINCS);
+		append(&buf, " ");
+		append(&buf, src);
 
-		append (pObject,obj);
-		append (pObject," ");
+		append (pObject, " ");
+		append (pObject, obj);
 
-		printf("%s\n",buf);
+		printf("Compiling %s...\n", src);
 
-		if (system(buf))
-			++*compile_errors;
+		if (system(buf)) ++*compile_errors;
 
-		ptr1 = ptr2 + 1;					/* advance to next token */
-		ptr2 = strchr(ptr1,' ');
+		  /* advance to next token */
+		ptr1 = ptr2 + 1;
+		ptr2 = strchr(ptr1, ' ');
 	}
 
 	free(buf);
@@ -507,43 +586,44 @@ static void compile_and_link()
 	char *buf=0;
 	int iRet, compile_errors = 0;
 
-	/* print out the mingw and ivl directories to help the user debug problems */
+	  /* To make the output match iverilog-vpi.sh do not print out the
+	   * root directories */
 
-	printf("info:  %s will be used as the MinGW root directory.\n",gstr.pMINGW);
+//	printf("MinGW root directory:  %s.\n", gstr.pMINGW);
 	checkMingwDir(gstr.pMINGW);
 
-	printf("info:  %s will be used as the Icarus Verilog root directory.\n",gstr.pIVL);
+//	printf("Icarus Verilog root directory:  %s.\n", gstr.pIVL);
 	checkIvlDir(gstr.pIVL);
 
-	/* compile */
-
-	compile(gstr.pCCSRC,&gstr.pOBJ,".c" ,&compile_errors,IVERILOG_VPI_CC );		/* compile the C   source files */
-	compile(gstr.pCXSRC,&gstr.pOBJ,".cc",&compile_errors,IVERILOG_VPI_CXX);		/* compile the C++ source files */
+	  /* compile the C source files (*.c) */
+	compile(gstr.pCCSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CC );
+	  /* compile the C++ source files (*.cc, *.cpp) */
+	compile(gstr.pCXSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CXX);
 
 	if (compile_errors) {
-		fprintf(stderr,"iverilog-vpi: Some %d files failed to compile.\n",compile_errors);
+		fprintf(stderr,"iverilog-vpi: %d file(s) failed to compile.\n",
+		        compile_errors);
 		myExit(2);
 	}
 
-	/* link */
+	  /* link */
+	assign(&buf, gstr.pLD);
+	append(&buf, " -o ");
+	append(&buf, gstr.pOUT);
+	append(&buf, " ");
+	append(&buf, IVERILOG_VPI_LDFLAGS);
+	append(&buf, " ");
+	append(&buf, gstr.pOBJ);
+	append(&buf, " ");
+	append(&buf, gstr.pLIB);
+	append(&buf, " ");
+	append(&buf, gstr.pLDLIBS);
 
-	assign(&buf,IVERILOG_VPI_LD);
-	append(&buf," -o ");
-	append(&buf,gstr.pOUT);				/* has a trailing space */
-	append(&buf,IVERILOG_VPI_LDFLAGS);
-	append(&buf," ");
-	append(&buf,gstr.pOBJ)				/* has a trailing space */;
-	append(&buf,gstr.pLIB);				/* has a trailing space */
-	append(&buf,gstr.pLDLIBS);
-
-	printf("%s\n",buf);
+	printf("Making %s from %s...\n", gstr.pOUT,gstr.pOBJ);
 
 	iRet = system(buf);
-
 	free(buf);
-
-	if (iRet)
-		myExit(3);
+	if (iRet) myExit(3);
 }
 
 /* program execution starts here */
@@ -552,14 +632,14 @@ int main(int argc, char *argv[])
 {
 	init();
 
-	if (!parse(argc,argv))
-		usage();
+	if (!parse(argc,argv)) usage();
 
 	setup_mingw_environment();
 	setup_ivl_environment();
 
-	if (*gstr.pOUT)				/* are there any *.c,*.cc,*.o files specified */
-		compile_and_link();
+	  /* are there any source or object files specified */
+	if (*gstr.pOUT) compile_and_link();
 
 	myExit(0);
+	return 0; // eliminate warnings.
 }

driver/Makefile.in

@@ -16,16 +16,17 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.24 2004/10/13 22:01:34 steve Exp $"
+#ident "$Id: Makefile.in,v 1.26 2007/02/06 05:07:31 steve Exp $"
 #
 #
 SHELL = /bin/sh
 
-VERSION = 0.8
+VERSION = 0.9.devel
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
+datarootdir = @datarootdir@
 
 VPATH = $(srcdir)
 
@@ -50,7 +51,7 @@ all: iverilog@EXEEXT@
 clean:
 	rm -f *.o lexor.c parse.c parse.h parse.output
 	rm -f cflexor.c cfparse.c cfparse.h cfparse.output
-	rm -f iverilog@EXEEXT@
+	rm -f iverilog@EXEEXT@ iverilog.pdf iverilog.ps
 
 distclean: clean
 	rm -f Makefile
@@ -67,7 +68,7 @@ cfparse.h cfparse.c: cfparse.y
 	bison --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y
 
 
-main.o: main.c globals.h
+main.o: main.c globals.h ../version.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -DIVL_ROOT='"@libdir@/ivl"'  -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
 
 build_string.o: build_string.c globals.h
@@ -80,7 +81,7 @@ iverilog.ps: $(srcdir)/iverilog.man
 iverilog.pdf: iverilog.ps
 	ps2pdf iverilog.ps iverilog.pdf
 
-ifeq (@WIN32@,yes)
+ifeq (@MING32@,yes)
 INSTALL_DOC = $(prefix)/iverilog.pdf $(mandir)/man1/iverilog.1
 INSTALL_DOCDIR = $(mandir)/man1
 all: iverilog.pdf
@@ -105,4 +106,4 @@ installdirs: ../mkinstalldirs
 
 uninstall:
 	rm -f $(bindir)/iverilog@EXEEXT@
-	rm -f $(mandir)/man1/iverilog.1
+	rm -f $(mandir)/man1/iverilog.1 $(prefix)/iverilog.pdf

driver/cflexor.lex

@@ -1,4 +1,7 @@
 
+%option nounput
+%option noinput
+
 %{
 /*
  * Copyright (c) 2001 Stephen Williams ([email protected])
@@ -19,7 +22,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: cflexor.lex,v 1.8 2004/10/04 01:10:56 steve Exp $"
+#ident "$Id: cflexor.lex,v 1.11 2007/03/22 16:08:18 steve Exp $"
 #endif
 
 # include  "cfparse.h"
@@ -27,34 +30,40 @@
 # include  "globals.h"
 # include  <string.h>
 
-/*
- * Lexical location information is passed in the yylloc variable to th
- * parser. The file names, strings, are kept in a list so that I can
- * re-use them. The set_file_name function will return a pointer to
- * the name as it exists in the list (and delete the passed string.)
- * If the name is new, it will be added to the list.
- */
-YYLTYPE yylloc;
-
 static int comment_enter;
+static char* trim_trailing_white(char*txt, int trim);
+
+/*
+ * Mostly copied from the flex manual. Do not make this arbitrary
+ * depth without checking for looping files.
+ */
+#define MAX_CMDFILE_DEPTH 15
+
+typedef struct t_cmdfile {
+      char *cmdfile;
+      YY_BUFFER_STATE buffer;
+} s_cmdfile;
+s_cmdfile cmdfile_stack[MAX_CMDFILE_DEPTH];
+int cmdfile_stack_ptr = 0;
 
 %}
 
 %x CCOMMENT
 %x LCOMMENT
 %x PLUS_ARGS
+%x FILE_NAME
 
 %%
 
   /* Accept C++ style comments. */
 "//".* { comment_enter = YY_START; BEGIN(LCOMMENT); }
 <LCOMMENT>.    { yymore(); }
-<LCOMMENT>\n   { yylloc.first_line += 1; BEGIN(comment_enter); }
+<LCOMMENT>\n   { cflloc.first_line += 1; BEGIN(comment_enter); }
 
   /* Accept C style comments. */
 "/*" { comment_enter = YY_START; BEGIN(CCOMMENT); }
 <CCOMMENT>.    { yymore(); }
-<CCOMMENT>\n   { yylloc.first_line += 1; yymore(); }
+<CCOMMENT>\n   { cflloc.first_line += 1; yymore(); }
 <CCOMMENT>"*/" { BEGIN(comment_enter); }
 
   /* Accept shell type comments. */
@@ -63,7 +72,7 @@ static int comment_enter;
   /* Skip white space. */
 [ \t\f\r] { ; }
   /* Skip line ends, but also count the line. */
-\n { yylloc.first_line += 1; }
+\n { cflloc.first_line += 1; }
 
 
 "+define+" { BEGIN(PLUS_ARGS); return TOK_DEFINE; }
@@ -76,6 +85,7 @@ static int comment_enter;
 
 "+libext+" { BEGIN(PLUS_ARGS); return TOK_LIBEXT; }
 
+"+integer-width+" { BEGIN(PLUS_ARGS); return TOK_INTEGER_WIDTH; }
 
   /* If it is not any known plus-flag, return the generic form. */
 "+"[^\n \t\b\f\r+]* {
@@ -97,12 +107,16 @@ static int comment_enter;
 <PLUS_ARGS>[ \t\b\f\r] { BEGIN(0); }
 
 <PLUS_ARGS>\n {
-      yylloc.first_line += 1;
+      cflloc.first_line += 1;
       BEGIN(0); }
 
   /* Notice the -a flag. */
 "-a" { return TOK_Da; }
 
+  /* Notice the -c or -f flag. */
+"-c" { return TOK_Dc; }
+"-f" { return TOK_Dc; }
+
   /* Notice the -v flag. */
 "-v" { return TOK_Dv; }
 
@@ -112,26 +126,113 @@ static int comment_enter;
   /* This rule matches paths and strings that may be file names. This
      is a little bit tricky, as we don't want to mistake a comment for
      a string word. */
-"/"[^\*\/].* { cflval.text = strdup(yytext);
-               return TOK_STRING; }
-
-[^/\n \t\b\r+-].* { cflval.text = strdup(yytext);
-                   return TOK_STRING; }
+"/"[\r\n] { /* Special case of file name "/" */
+      cflval.text = trim_trailing_white(yytext, 0);
+      return TOK_STRING; }
+"/"[^\*\/] { /* A file name that starts with "/". */
+      yymore();
+      BEGIN(FILE_NAME); }
+[^/\n \t\b\r+-][^/\n\r]* { /* A file name that starts with other than "/" */
+      yymore();
+      BEGIN(FILE_NAME); }
 
+<FILE_NAME>"//" {
+	/* Found a trailing comment. Returning the terminated name. */
+      cflval.text = trim_trailing_white(yytext, 2);
+      BEGIN(LCOMMENT);
+      return TOK_STRING; }
+<FILE_NAME>"/"?[^/\n\r]* {
+      yymore();
+      /* not a comment... continuing */; }
+<FILE_NAME>[\n\r] {
+	/* No trailing comment. Return the file name. */
+      cflval.text = trim_trailing_white(yytext, 0);
+      BEGIN(0);
+      return TOK_STRING; }
+       
   /* Fallback match. */
 . { return yytext[0]; }
 
+  /* At the end of file switch back to the previous buffer. */
+<<EOF>> {
+      if (--cmdfile_stack_ptr < 0) {
+	    free(current_file);
+	    yyterminate();
+      } else {
+	    yy_delete_buffer(YY_CURRENT_BUFFER);
+	    yy_switch_to_buffer(cmdfile_stack[cmdfile_stack_ptr].buffer);
+	    free(current_file);
+	    current_file = cmdfile_stack[cmdfile_stack_ptr].cmdfile;
+      } }
+
 %%
 
+static char* trim_trailing_white(char*text, int trim)
+{
+      char*cp = text + strlen(text);
+      while (cp > text && trim > 0) {
+	    trim -= 1;
+	    cp -= 1;
+	    *cp = 0;
+      }
+      while (cp > text && strchr("\n\r\t\b", cp[-1]))
+	    cp -= 1;
+
+      cp[0] = 0;
+      return strdup(text);
+}
+
 int yywrap()
 {
       return 1;
 }
 
+void switch_to_command_file(const char *file)
+{
+      char path[4096];
+      char *cp;
+
+      if (cmdfile_stack_ptr >= MAX_CMDFILE_DEPTH) {
+	    fprintf(stderr, "Error: command files nested too deeply (%d) "
+                    "at %s:%d.\n", MAX_CMDFILE_DEPTH, current_file,
+                    cflloc.first_line);
+	    exit(1);
+      }
+
+      cmdfile_stack[cmdfile_stack_ptr].buffer = YY_CURRENT_BUFFER;
+      cmdfile_stack[cmdfile_stack_ptr].cmdfile = current_file;
+      cmdfile_stack_ptr += 1;
+
+        /*
+         * If this is a relative file then add the current path to the
+         * file name.
+         */
+      if (file[0] != '/') {
+	    strcpy(path, current_file);
+	    cp = strrchr(path, '/');
+	    if (cp == 0) strcpy(path, file);  /* A base file. */
+	    else {
+	          *(cp+1) = '\0';
+	          strcat(path, file);
+	    }
+      } else strcpy(path, file);  /* An absolute path. */
+
+      yyin = fopen(path, "r");
+      if (yyin == NULL) {
+	    fprintf(stderr, "Error: unable to read nested command file (%s) "
+                    "at %s:%d.\n", path, current_file, cflloc.first_line);
+	    exit(1);
+      }
+
+      current_file = strdup(path);
+      yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+      cflloc.first_line = 1;
+}
+
 void cfreset(FILE*fd, const char*path)
 {
       yyin = fd;
       yyrestart(fd);
-      yylloc.first_line = 1;
-      yylloc.text = (char*)path;
+      current_file = strdup(path);
+      cflloc.first_line = 1;
 }

driver/cfparse.y

@@ -18,7 +18,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: cfparse.y,v 1.10 2003/09/26 21:25:58 steve Exp $"
+#ident "$Id: cfparse.y,v 1.12 2007/04/19 02:52:53 steve Exp $"
 #endif
 
 
@@ -60,8 +60,9 @@ static void translate_file_name(char*text)
       char*text;
 };
 
-%token TOK_Da TOK_Dv TOK_Dy
+%token TOK_Da TOK_Dc TOK_Dv TOK_Dy
 %token TOK_DEFINE TOK_INCDIR TOK_LIBDIR TOK_LIBDIR_NOCASE TOK_LIBEXT
+%token TOK_INTEGER_WIDTH
 %token <text> TOK_PLUSARG TOK_PLUSWORD TOK_STRING
 
 %%
@@ -83,7 +84,7 @@ item
 	: TOK_STRING
 		{ char*tmp = substitutions($1);
 		  translate_file_name(tmp);
-		  process_file_name(tmp);
+		  process_file_name(tmp, 0);
 		  free($1);
 		  free(tmp);
 		}
@@ -92,15 +93,23 @@ item
 
         | TOK_Da { }
 
+  /* Match a -c <cmdfile> or -f <cmdfile> */
+
+        | TOK_Dc TOK_STRING
+		{ char*tmp = substitutions($2);
+		  translate_file_name(tmp);
+		  switch_to_command_file(tmp);
+		  free($2);
+		  free(tmp);
+		}
+
   /* The -v <libfile> flag is ignored, and the <libfile> is processed
      as an ordinary source file. */
 
         | TOK_Dv TOK_STRING
 		{ char*tmp = substitutions($2);
 		  translate_file_name(tmp);
-		  process_file_name(tmp);
-		  fprintf(stderr, "%s:%u: Ignoring -v in front of %s\n",
-			  @1.text, @1.first_line, $2);
+		  process_file_name(tmp, 1);
 		  free($2);
 		  free(tmp);
 		}
@@ -145,6 +154,15 @@ item
 
 	| TOK_LIBEXT libext_args
 
+  /* These are various misc flags that are supported. */
+
+	| TOK_INTEGER_WIDTH TOK_PLUSARG
+                { char*tmp = substitutions($2);
+		  free($2);
+		  integer_width = strtoul(tmp,0,10);
+		  free(tmp);
+		}
+
   /* The +<word> tokens that are not otherwise matched, are
      ignored. The skip_args rule arranges for all the argument words
      to be consumed. */
@@ -165,6 +183,12 @@ item
 		  }
 		  free($1);
 		}
+
+	| error
+		{ fprintf(stderr, "Error: unable to parse line %d in "
+		          "%s.\n", cflloc.first_line, current_file);
+		  return 1;
+		}
 	;
 
   /* inc_args are +incdir+ arguments in order. */

driver/cfparse_misc.h

@@ -19,9 +19,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: cfparse_misc.h,v 1.6 2004/02/15 18:03:30 steve Exp $"
-#endif
 
 /*
  * The vlltype supports the passing of detailed source file location
@@ -36,32 +33,11 @@ struct cfltype {
       const char*text;
 };
 # define YYLTYPE struct cfltype
-extern YYLTYPE yylloc;
 
 int cflex(void);
 int cferror(const char *);
 int cfparse(void);
+void switch_to_command_file(const char *);
+char *current_file;
 
-/*
- * $Log: cfparse_misc.h,v $
- * Revision 1.6  2004/02/15 18:03:30  steve
- *  Cleanup of warnings.
- *
- * Revision 1.5  2003/09/26 21:25:58  steve
- *  Warnings cleanup.
- *
- * Revision 1.4  2002/08/12 01:35:01  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.3  2002/01/02 02:39:34  steve
- *  Use my own cfltype to defend against bison 1.30.
- *
- * Revision 1.2  2001/11/12 18:47:32  steve
- *  Support +incdir in command files, and ignore other
- *  +args flags. Also ignore -a and -v flags.
- *
- * Revision 1.1  2001/11/12 01:26:36  steve
- *  More sophisticated command file parser.
- *
- */
 #endif

driver/globals.h

@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: globals.h,v 1.19 2003/11/18 06:31:46 steve Exp $"
+#ident "$Id: globals.h,v 1.21 2007/04/19 02:52:53 steve Exp $"
 #endif
 
 # include  <stddef.h>
@@ -31,10 +31,10 @@ extern const char*base;
 extern char* iconfig_path;
 extern char* iconfig_common_path;
 
-  /* Ths is the optional -M<dependfile> value, if one was supplied. */
+  /* This is the optional -M<dependfile> value, if one was supplied. */
 extern const char*depfile;
 
-  /* Ths is the optional -N<path> value, if one was supplied. */
+  /* This is the optional -N<path> value, if one was supplied. */
 extern const char*npath;
 
   /* This is the name of the output file that the user selected. */
@@ -49,11 +49,14 @@ extern int synth_flag;
   /* This is the name of the selected target. */
 extern const char*targ;
 
+  /* This is the integer-width argument that will be passed to ivl. */
+extern unsigned integer_width;
+
   /* Perform variable substitutions on the string. */
 extern char* substitutions(const char*str);
 
   /* Add the name to the list of source files. */
-extern void process_file_name(const char*name);
+extern void process_file_name(const char*name, int lib_flag);
 
   /* Add the name to the list of library directories. */
 extern void process_library_switch(const char*name);
@@ -77,6 +80,12 @@ extern char* library_flags2;
 
 /*
  * $Log: globals.h,v $
+ * Revision 1.21  2007/04/19 02:52:53  steve
+ *  Add support for -v flag in command file.
+ *
+ * Revision 1.20  2007/03/07 04:24:59  steve
+ *  Make integer width controllable.
+ *
  * Revision 1.19  2003/11/18 06:31:46  steve
  *  Remove the iverilog.conf file.
  *

driver/iverilog.man

@@ -1,10 +1,11 @@
-.TH iverilog 1 "$Date: 2005/06/28 04:25:55 $" Version "$Date: 2005/06/28 04:25:55 $"
+.TH iverilog 1 "April 22nd, 2008" Version "0.9.devel"
 .SH NAME
 iverilog - Icarus Verilog compiler
 
 .SH SYNOPSIS
 .B iverilog
-[-ESVv] [-Bpath] [-ccmdfile] [-g1|-g2|-g2x] [-Dmacro[=defn]] [-pflag=value]
+[-ESVv] [-Bpath] [-ccmdfile|-fcmdfile] [-Dmacro[=defn]] [-pflag=value]
+[-dname] [-g1995|-g2001|-g2005|-g<feature>]
 [-Iincludedir] [-mmodule] [-Mfile] [-Nfile] [-ooutputfilename]
 [-stopmodule] [-ttype] [-Tmin/typ/max] [-Wclass] [-ypath] sourcefile
 
@@ -28,8 +29,8 @@ program. However, the \fB-B\fP switch allows the user to select a
 different set of programs. The path given is used to locate
 \fIivlpp\fP, \fIivl\fP, code generators and the VPI modules.
 .TP 8
-.B -c\fIfile\fP
-This flag specifies an input file that contains a list of Verilog
+.B -c\fIfile\fP -f\fIfile\fP
+These flags specifies an input file that contains a list of Verilog
 source files. This is similar to the \fIcommand file\fP of other
 Verilog simulators, in that it is a file that contains the file names
 instead of taking them on the command line. See \fBCommand Files\fP below.
@@ -42,21 +43,60 @@ Verilog source.
 .B -D\fImacro=defn\fP
 Defines macro \fImacro\fP as \fIdefn\fP.
 .TP 8
+.B -d\fIname\fP
+Activate a class of compiler debugging messages. The \fB-d\fP switch may
+be used as often as necessary to activate all the desired messages.
+Supported names are scopes, eval_tree, elaborate, and synth2;
+any other names are ignored.
+.TP 8
 .B -E
 Preprocess the Verilog source, but do not compile it. The output file
 is the Verilog input, but with file inclusions and macro references
 expanded and removed. This is useful, for example, to preprocess
 Verilog source for use by other compilers.
 .TP 8
-.B -g1\fI|\fP-g2\fI|\fP-g2x
+.B -g1995\fI|\fP-g2001\fI|\fP-g2005
 Select the Verilog language \fIgeneration\fP to support in the
-compiler. This selects between \fIIEEE1364-1995\fP(1),
-\fIIEEE1364-2001\fP(2), or \fIVerilog with extension\fP(2x). Normally,
+compiler. This selects between \fIIEEE1364-1995\fP,
+\fIIEEE1364-2001\fP(2), or \fIIEEE1364-2005\fP. Normally,
 Icarus Verilog defaults to the latest known generation of the
 language. This flag is most useful to restrict the language to a set
 supported by tools of specific generations, for compatibility with
 other tools.
 .TP 8
+.B -gverilog-ams\fI|-fP-gno-verilog-ams
+Enable or disable (default) support for Verilog-AMS.
+.TP 8
+.B -gspecify\fI|\fP-gno-specify
+Enable (default) or disable specify block support. When enabled,
+specify block code is elaborated. When disabled, specify blocks are
+parsed but ignored. Specify blocks are commonly not needed for RTL
+simulation, and in fact can hurt performance of the
+simulation. However, disabling specify blocks reduces accuracy of
+full-timing simulations.
+.TP 8
+.B -gstd-include\fI|\fP-gno-std-include
+Enable (default) or disable the search of a standard installation
+include directory after all other explicit include directories. This
+standard include directory is a convenient place to install standard
+header files that a Verilog program may include.
+.TP 8
+.B -gxtypes\fI|\fP-gno-xtypes
+Enable (default) or disable support for extended types. Enabling
+extended types allows for new types that are supported by Icarus
+Verilog as extensions beyond the baseline Verilog. It may be necessary
+to disable extended types if compiling code that clashes with the few
+new keywords used to implement the type system.
+.TP 8
+.B -gio-range-error\fI|\fP-gno-io-range-error
+The standards requires that a vectored port have matching ranges for its
+port declaration as well as any net/register declaration. It was common
+practice in the past to only specify the range for the net/register
+declaration and some tools still allow this. By default any mismatch is
+reported as a error. Using \fI-gno-io-range-error\fP will produce a
+warning instead of a fatal error for the case of a vectored net/register
+and a scalar port declaration.
+.TP 8
 .B -I\fIincludedir\fP
 Append directory \fIincludedir\fP to list of directories searched
 for Verilog include files. The \fB-I\fP switch may be used many times
@@ -74,6 +114,8 @@ leading or trailing space.
 Add this module to the list of VPI modules to be loaded by the
 simulation. Many modules can be specified, and all will be loaded, in
 the order specified. The system module is implicit and always included.
+If a System Function Table file (<module>.sft) exists for the module it
+will be loaded automatically.
 .TP 8
 .B -N\fIpath\fP
 This is used for debugging the compiler proper. Dump the final netlist
@@ -108,9 +150,9 @@ they will be used as root modules instead.
 .B -T\fImin|typ|max\fP
 Use this switch to select min, typ or max times from min:typ:max
 expressions. Normally, the compiler will simply use the typ value from
-these expressions (with a warning) but this switch will tell the
-compiler explicitly which value to use. This will suppress the
-warning that the compiler is making a choice.
+these expressions (printing a warning for the first ten it finds) but
+this switch will tell the compiler explicitly which value to use. This
+will suppress the warning that the compiler is making a choice.
 .TP 8
 .B -t\fItarget\fP
 Use this switch to specify the target output format. See the
@@ -184,7 +226,7 @@ implies the synthesis \fB-S\fP flag.
 
 .SH "WARNING TYPES"
 These are the types of warnings that can be selected by the \fB-W\fP
-switch. All the warning types (other then \fBall\fP) can also be
+switch. All the warning types (other than \fBall\fP) can also be
 prefixed with \fBno-\fP to turn off that warning. This is most useful
 after a \fB-Wall\fP argument to suppress isolated warning types.
 
@@ -212,6 +254,21 @@ inherit timescale from another file. Both probably mean that
 timescales are inconsistent, and simulation timing can be confusing
 and dependent on compilation order.
 
+.TP 8
+.B infloop
+This enables warnings for \fRalways\fP statements that may have runtime
+infinite loops (has paths with no or zero delay). This class of warnings
+is not included in \fB-Wall\fP and hence does not have a \fBno-\fP variant.
+A fatal error message will always be printed when the compiler can
+determine that there will definitely be an infinite loop (all paths have
+no or zero delay).
+
+When you suspect an always statement is producing a runtime infinite loop
+use this flag to find the always statements that need to have their logic
+verified. It is expected that many of the warnings will be false
+positives, since the code treats the value of all variables and signals
+as indeterminate.
+
 .SH "SYSTEM FUNCTION TABLE FILES"
 If the source file name as a \fB.sft\fP suffix, then it is taken to be
 a system function table file. A System function table file is used to
@@ -249,7 +306,13 @@ well as # comments, if the # starts the line.
 .I "file name"
 A simple file name or file path is taken to be the name of a Verilog
 source file. The path starts with the first non-white-space
-character. Variables are substitued in file names.
+character. Variables are substituted in file names.
+
+.TP 8
+.B -c\ \fIcmdfile\fP -f\ \fIcmdfile\fP
+A \fB-c\fP or \fB-f\fP token prefixes a command file, exactly like it
+does on the command line. The cmdfile may be on the same line or the
+next non-comment line.
 
 .TP 8
 .B -y\ \fIlibdir\fP
@@ -304,18 +367,35 @@ become munged.
 .B +tolower-filename\fP
 This is similar to the \fB+toupper-filename\fP hack described above.
 
+.TP 8
+.B +integer-width+\fIvalue\fP
+This allows the programmer to select the width for integer variables
+in the Verilog source. The default is 32, the value can be any desired
+integer value.
+
 .SH "VARIABLES IN COMMAND FILES"
 
 In certain cases, iverilog supports variables in command files. These
 are strings of the form "$(\fIvarname\fP)", where \fIvarname\fP is the
 name of the environment variable to read. The entire string is
 replaced with the contents of that variable. Variables are only
-substitued in contexts that explicitly support them, including file
+substituted in contexts that explicitly support them, including file
 and directory strings.
 
 Variable values come from the operating system environment, and not
 from preprocessor defines elsewhere in the file or the command line.
 
+.SH PREDEFINED MACROS
+
+The following macros are predefined by the compiler:
+.TP 8
+.B __ICARUS__ = 1\fP
+This is defined always when compiling with Icarus Verilog.
+
+.TP 8
+.B __VAMS_ENABLE__ = 1\fp
+This is defined if Verilog-AMS is enabled.
+
 .SH EXAMPLES
 These examples assume that you have a Verilog source file called hello.v in
 the current directory
@@ -345,9 +425,12 @@ Steve Williams ([email protected])
 vvp(1),
 .BR "<http://www.icarus.com/eda/verilog/>"
 
+Tips on using, debugging, and developing the compiler can be found at
+.BR "<http://iverilog.wikia.com/>"
+
 .SH COPYRIGHT
 .nf
-Copyright \(co  2002 Stephen Williams
+Copyright \(co  2002-2008 Stephen Williams
 
 This document can be freely redistributed according to the terms of the
 GNU General Public License version 2.0

driver/main.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Stephen Williams ([email protected])
+ * Copyright (c) 2000-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,11 +16,9 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: main.c,v 1.67 2005/07/14 23:38:44 steve Exp $"
-#endif
 
 # include "config.h"
+# include "version.h"
 
 const char NOTICE[] =
 "  This program is free software; you can redistribute it and/or modify\n"
@@ -39,12 +37,13 @@ const char NOTICE[] =
 ;
 
 const char HELP[] =
-"Usage: iverilog [-ESvV] [-B base] [-c cmdfile] [-g1|-g2|-g2x]\n"
+"Usage: iverilog [-ESvV] [-B base] [-c cmdfile|-f cmdfile] [-g1|-g2|-g2x]\n"
 "                [-D macro[=defn]] [-I includedir] [-M depfile] [-m module]\n"
 "                [-N file] [-o filename] [-p flag=value]\n"
 "                [-s topmodule] [-t target] [-T min|typ|max]\n"
 "                [-W class] [-y dir] [-Y suf] source_file(s)\n"
-"See man page for details.";
+"\n"
+"See the man page for details.";
 
 #define MAXSIZE 4096
 
@@ -108,11 +107,19 @@ const char*targ  = "vvp";
 const char*depfile = 0;
 
 const char*generation = "2x";
+const char*gen_specify = "specify";
+const char*gen_xtypes = "xtypes";
+const char*gen_icarus = "icarus-misc";
+const char*gen_io_range_error = "io-range-error";
+const char*gen_verilog_ams = "no-verilog-ams";
+
+/* Boolean: true means use a default include dir, false means don't */
+int gen_std_include = 1;
 
 char warning_flags[16] = "";
 
-char*inc_list = 0;
-char*def_list = 0;
+unsigned integer_width = 32;
+
 char*mod_list = 0;
 char*command_filename = 0;
 
@@ -123,15 +130,19 @@ char*source_path = 0;
 FILE*source_file = 0;
 unsigned source_count = 0;
 
+char*defines_path = 0;
+FILE*defines_file = 0;
+
 char*iconfig_path = 0;
 FILE*iconfig_file = 0;
 
+char*compiled_defines_path = 0;
+
 static char iconfig_common_path_buf[4096] = "";
 char*iconfig_common_path = iconfig_common_path_buf;
 
 int synth_flag = 0;
 int verbose_flag = 0;
-int command_file = 0;
 
 FILE *fp;
 
@@ -140,6 +151,48 @@ char tmp[MAXSIZE];
 
 static char ivl_root[MAXSIZE];
 
+/* Structure to keep a FIFO list of the command files */
+typedef struct t_command_file {
+      char *filename;
+      struct t_command_file *next;
+} s_command_file, *p_command_file;
+p_command_file cmd_file_head = NULL;  /* The FIFO head */
+p_command_file cmd_file_tail = NULL;  /* The FIFO tail */
+
+/* Function to add a command file name to the FIFO. */
+void add_cmd_file(const char* filename)
+{
+      p_command_file new;
+
+      new = (p_command_file) malloc(sizeof(s_command_file));
+      new->filename = strdup(filename);
+      new->next = NULL;
+      if (cmd_file_head == NULL) {
+            cmd_file_head = new;
+            cmd_file_tail = new;
+      } else {
+            cmd_file_tail->next = new;
+            cmd_file_tail = new;
+      }
+}
+
+/* Function to return the top command file name from the FIFO. */
+char *get_cmd_file()
+{
+      char *filename;
+
+      if (cmd_file_head == NULL) filename = NULL;
+      else {
+            p_command_file head;
+
+            filename = cmd_file_head->filename;
+            head = cmd_file_head;
+            cmd_file_head = cmd_file_head->next;
+            free(head);
+      }
+      return filename;
+}
+
 #ifdef __MINGW32__
 # include  <io.h>
 # include  <fcntl.h>
@@ -152,7 +205,7 @@ static FILE*fopen_safe(const char*path)
       if (fd != -1)
 	    file = _fdopen(fd, "w");
 
-       return file;
+      return file;
 }
 #else
 # include  <fcntl.h>
@@ -165,7 +218,7 @@ static FILE*fopen_safe(const char*path)
       if (fd != -1)
 	    file = fdopen(fd, "w");
 
-       return file;
+      return file;
 }
 #endif
 
@@ -268,9 +321,13 @@ static int t_default(char*cmd, unsigned ncmd)
 
 
       rc = system(cmd);
-      remove(source_path);
-      if ( ! getenv("IVERILOG_ICONFIG"))
+      if ( ! getenv("IVERILOG_ICONFIG")) {
+	    remove(source_path);
 	    remove(iconfig_path);
+	    remove(defines_path);
+	    remove(compiled_defines_path);
+      }
+
       if (rc != 0) {
 	    if (rc == 127) {
 		  fprintf(stderr, "Failed to execute: %s\n", cmd);
@@ -291,31 +348,37 @@ static int t_default(char*cmd, unsigned ncmd)
 static void process_warning_switch(const char*name)
 {
       if (strcmp(name,"all") == 0) {
-	    strcat(warning_flags, "ipt");
-
+	    process_warning_switch("implicit");
+	    process_warning_switch("portbind");
+	    process_warning_switch("timescale");
       } else if (strcmp(name,"implicit") == 0) {
-	    if (! strchr(warning_flags+2, 'i'))
+	    if (! strchr(warning_flags, 'i'))
 		  strcat(warning_flags, "i");
       } else if (strcmp(name,"portbind") == 0) {
-	    if (! strchr(warning_flags+2, 'p'))
+	    if (! strchr(warning_flags, 'p'))
 		  strcat(warning_flags, "p");
       } else if (strcmp(name,"timescale") == 0) {
-	    if (! strchr(warning_flags+2, 't'))
+	    if (! strchr(warning_flags, 't'))
 		  strcat(warning_flags, "t");
+	/* Since the infinite loop check is not part of 'all' it
+	 * does not have a no- version. */
+      } else if (strcmp(name,"infloop") == 0) {
+	    if (! strchr(warning_flags, 'l'))
+		  strcat(warning_flags, "l");
       } else if (strcmp(name,"no-implicit") == 0) {
-	    char*cp = strchr(warning_flags+2, 'i');
+	    char*cp = strchr(warning_flags, 'i');
 	    if (cp) while (*cp) {
 		  cp[0] = cp[1];
 		  cp += 1;
 	    }
       } else if (strcmp(name,"no-portbind") == 0) {
-	    char*cp = strchr(warning_flags+2, 'p');
+	    char*cp = strchr(warning_flags, 'p');
 	    if (cp) while (*cp) {
 		  cp[0] = cp[1];
 		  cp += 1;
 	    }
       } else if (strcmp(name,"no-timescale") == 0) {
-	    char*cp = strchr(warning_flags+2, 't');
+	    char*cp = strchr(warning_flags, 't');
 	    if (cp) while (*cp) {
 		  cp[0] = cp[1];
 		  cp += 1;
@@ -340,32 +403,12 @@ void process_library2_switch(const char *name)
 
 void process_include_dir(const char *name)
 {
-      if (inc_list == 0) {
-	    inc_list = malloc(strlen(" -I")+strlen(name)+1);
-	    strcpy(inc_list, " -I");
-	    strcat(inc_list, name);
-      } else {
-	    inc_list = realloc(inc_list, strlen(inc_list)
-			       + strlen(" -I")
-			       + strlen(name) + 1);
-	    strcat(inc_list, " -I");
-	    strcat(inc_list, name);
-      }
+      fprintf(defines_file, "I:%s\n", name);
 }
 
 void process_define(const char*name)
 {
-      if (def_list == 0) {
-	    def_list = malloc(strlen(" -D")+strlen(name)+1);
-	    strcpy(def_list, " -D");
-	    strcat(def_list, name);
-      } else {
-	    def_list = realloc(def_list, strlen(def_list)
-			       + strlen(" -D")
-			       + strlen(name) + 1);
-	    strcat(def_list, " -D");
-	    strcat(def_list, name);
-      }
+      fprintf(defines_file,"D:%s\n", name);
 }
 
 /*
@@ -374,7 +417,7 @@ void process_define(const char*name)
  * .sft suffix, and if so pass that as a sys_func file. Otherwise, it
  * is a Verilog source file to be written into the file list.
  */
-void process_file_name(const char*name)
+void process_file_name(const char*name, int lib_flag)
 {
       if (strlen(name) > 4 && strcasecmp(".sft", name+strlen(name)-4) == 0) {
 	    fprintf(iconfig_file,"sys_func:%s\n", name);
@@ -382,33 +425,107 @@ void process_file_name(const char*name)
       } else {
 	    fprintf(source_file, "%s\n", name);
 	    source_count += 1;
+	    if (lib_flag)
+		  fprintf(iconfig_file,"library_file:%s\n", name);
       }
 }
 
 int process_generation(const char*name)
 {
-      if (strcmp(name,"1") == 0)
-	    generation = "1";
+      if (strcmp(name,"1995") == 0)
+	    generation = "1995";
 
-      else if (strcmp(name,"2") == 0)
-	    generation = "2";
+      else if (strcmp(name,"2001") == 0)
+	    generation = "2001";
 
-      else if (strcmp(name,"2x") == 0)
-	    generation = "2x";
+      else if (strcmp(name,"2005") == 0)
+	    generation = "2005";
+
+      else if (strcmp(name,"1") == 0) { /* Deprecated: use 1995 */
+	    generation = "1995";
+	    gen_xtypes = "no-xtypes";
+	    gen_icarus = "no-icarus-misc";
+
+      } else if (strcmp(name,"2") == 0) { /* Deprecated: use 2001 */
+	    generation = "2001";
+	    gen_xtypes = "no-xtypes";
+	    gen_icarus = "no-icarus-misc";
+
+      } else if (strcmp(name,"2x") == 0) { /* Deprecated: use 2005/xtypes */
+	    generation = "2005";
+	    gen_xtypes = "xtypes";
+	    gen_icarus = "icarus-misc";
+
+      } else if (strcmp(name,"xtypes") == 0)
+	    gen_xtypes = "xtypes";
+
+      else if (strcmp(name,"no-xtypes") == 0)
+	    gen_xtypes = "no-xtypes";
+
+      else if (strcmp(name,"icarus-misc") == 0)
+	    gen_icarus = "icarus-misc";
+
+      else if (strcmp(name,"no-icarus-misc") == 0)
+	    gen_icarus = "no-icarus-misc";
+
+      else if (strcmp(name,"specify") == 0)
+	    gen_specify = "specify";
+
+      else if (strcmp(name,"no-specify") == 0)
+	    gen_specify = "no-specify";
+
+      else if (strcmp(name,"std-include") == 0)
+	     gen_std_include = 1;
+
+      else if (strcmp(name,"no-std-include") == 0)
+	     gen_std_include = 0;
+
+      else if (strcmp(name,"io-range-error") == 0)
+	    gen_io_range_error = "io-range-error";
+
+      else if (strcmp(name,"no-io-range-error") == 0)
+	    gen_io_range_error = "no-io-range-error";
+
+      else if (strcmp(name,"verilog-ams") == 0)
+	    gen_verilog_ams = "verilog-ams";
+
+      else if (strcmp(name,"no-verilog-ams") == 0)
+	    gen_verilog_ams = "no-verilog-ams";
 
       else {
 	    fprintf(stderr, "Unknown/Unsupported Language generation "
-		    "%s\n", name);
+		    "%s\n\n", name);
 	    fprintf(stderr, "Supported generations are:\n");
-	    fprintf(stderr, "    1   -- IEEE1364-1995 (Verilog 1)\n"
-		            "    2   -- IEEE1364-2001 (Verilog 2001)\n"
-		            "    2x  -- Verilog with extensions\n");
+	    fprintf(stderr, "    1995 -- IEEE1364-1995\n"
+		            "    2001 -- IEEE1364-2001\n"
+		            "    2005 -- IEEE1364-2005\n"
+		            "Other generation flags:\n"
+		            "    specify | no-specify\n"
+		            "    verilog-ams | no-verinlog-ams\n"
+		            "    std-include | no-std-include\n"
+		            "    xtypes | no-xtypes\n"
+		            "    icarus-misc | no-icarus-misc\n"
+		            "    io-range-error | no-io-range-error\n");
 	    return 1;
       }
 
       return 0;
 }
 
+/*
+ * If it exists add the SFT file for the given module.
+ */
+void add_sft_file(const char *module)
+{
+      char *file;
+   
+      file = (char *) malloc(strlen(base)+1+strlen(module)+4+1);
+      sprintf(file, "%s%c%s.sft", base, sep, module);
+      if (access(file, R_OK) == 0)
+            fprintf(iconfig_file, "sys_func:%s\n", file);
+      free(file);
+}
+
 int main(int argc, char **argv)
 {
       char*cmd;
@@ -465,6 +582,21 @@ int main(int argc, char **argv)
 	    return 1;
       }
 
+      defines_path = strdup(my_tempfile("ivrlg2", &defines_file));
+      if (NULL == defines_file) {
+	    fprintf(stderr, "%s: Error opening temporary file %s\n",
+		    argv[0], defines_path);
+	    fprintf(stderr, "%s: Please check TMP or TMPDIR.\n", argv[0]);
+
+	    fclose(source_file);
+	    remove(source_path);
+	    return 1;
+      }
+
+      fprintf(defines_file, "D:__ICARUS__=1\n");
+      if (strcmp(gen_verilog_ams,"verilog-ams") == 0)
+	    fprintf(defines_file, "D:__VAMS_ENABLE__=1\n");
+
 	/* Create another temporary file for passing configuration
 	   information to ivl. */
 
@@ -485,10 +617,22 @@ int main(int argc, char **argv)
 	    fprintf(stderr, "%s: Please check TMP or TMPDIR.\n", argv[0]);
 	    fclose(source_file);
 	    remove(source_path);
+
+	    fclose(defines_file);
+	    remove(defines_path);
 	    return 1;
       }
 
-      while ((opt = getopt(argc, argv, "B:c:D:Ef:g:hI:M:m:N::o:p:Ss:T:t:vVW:y:Y:")) != EOF) {
+	/* Create a temporary file (I only really need the path) that
+	   can carry preprocessor precompiled defines to the library. */
+      { FILE*tmp_file = 0;
+	compiled_defines_path = strdup(my_tempfile("ivrli", &tmp_file));
+	if (tmp_file) {
+	      fclose(tmp_file);
+	}
+      }
+
+      while ((opt = getopt(argc, argv, "B:c:D:d:Ef:g:hI:M:m:N::o:p:Ss:T:t:vVW:y:Y:")) != EOF) {
 
 	    switch (opt) {
 		case 'B':
@@ -502,9 +646,9 @@ int main(int argc, char **argv)
 			base=optarg;
 		  }
 		  break;
- 		case 'c':
-		  command_filename = malloc(strlen(optarg)+1);
- 		  strcpy(command_filename, optarg);
+		case 'c':
+		case 'f':
+		  add_cmd_file(optarg);
  		  break;
 		case 'D':
 		  process_define(optarg);
@@ -512,11 +656,12 @@ int main(int argc, char **argv)
 		case 'E':
 		  e_flag = 1;
 		  break;
-		case 'f':
-		  fprintf(stderr, "warning: The -f flag is moved to -p\n");
 		case 'p':
 		  fprintf(iconfig_file, "flag:%s\n", optarg);
 		  break;
+		case 'd':
+		  fprintf(iconfig_file, "debug:%s\n", optarg);
+		  break;
 
 		case 'g':
 		  rc = process_generation(optarg);
@@ -537,6 +682,7 @@ int main(int argc, char **argv)
 
 		case 'm':
 		  fprintf(iconfig_file, "module:%s\n", optarg);
+		  add_sft_file(optarg);
 		  break;
 
 		case 'N':
@@ -594,8 +740,8 @@ int main(int argc, char **argv)
 	    pbase = base;
 
       if (version_flag || verbose_flag) {
-	    printf("Icarus Verilog version " VERSION " ($Name:  $)\n");
-	    printf("Copyright 1998-2003 Stephen Williams\n");
+	    printf("Icarus Verilog version " VERSION " (" VERSION_TAG ")\n\n");
+	    printf("Copyright 1998-2008 Stephen Williams\n");
 	    puts(NOTICE);
 
 	    if (version_flag)
@@ -614,75 +760,82 @@ int main(int argc, char **argv)
 	   how to handle them. */
       fprintf(iconfig_file, "sys_func:%s%csystem.sft\n", base, sep);
 
+	/* If verilog-ams is enabled, then include the va_math module
+	   as well. */
+      if (strcmp(gen_verilog_ams,"verilog-ams") == 0) {
+	    fprintf(iconfig_file, "sys_func:%s%cva_math.sft\n", base, sep);
+	    fprintf(iconfig_file, "module:va_math\n");
+      }
+
       if (mtm != 0) fprintf(iconfig_file, "-T:%s\n", mtm);
       fprintf(iconfig_file, "generation:%s\n", generation);
+      fprintf(iconfig_file, "generation:%s\n", gen_specify);
+      fprintf(iconfig_file, "generation:%s\n", gen_xtypes);
+      fprintf(iconfig_file, "generation:%s\n", gen_io_range_error);
+      fprintf(iconfig_file, "generation:%s\n", gen_verilog_ams);
+      fprintf(iconfig_file, "generation:%s\n", gen_icarus);
       fprintf(iconfig_file, "warnings:%s\n", warning_flags);
       fprintf(iconfig_file, "out:%s\n", opath);
       if (depfile) fprintf(iconfig_file, "depfile:%s\n", depfile);
 
-      if (command_filename) {
+      while ( (command_filename = get_cmd_file()) ) {
 	    int rc;
 
 	    if (( fp = fopen(command_filename, "r")) == NULL ) {
-		  fprintf(stderr, "%s: Can't open %s\n",
-			  argv[0], command_filename);
+		  fprintf(stderr, "%s: cannot open command file %s "
+			  "for reading.\n", argv[0], command_filename);
 		  return 1;
 	    }
 
 	    cfreset(fp, command_filename);
 	    rc = cfparse();
 	    if (rc != 0) {
-		  fprintf(stderr, "%s: error reading command file\n",
-			  command_filename);
+		  fprintf(stderr, "%s: parsing failed in base command "
+		          "file %s.\n", argv[0], command_filename);
 		  return 1;
 	    }
+            free(command_filename);
+      }
+
+      if (depfile) {
+	    fprintf(defines_file, "M:%s\n", depfile);
       }
 
 	/* Finally, process all the remaining words on the command
 	   line as file names. */
       for (idx = optind ;  idx < argc ;  idx += 1)
-	    process_file_name(argv[idx]);
+	    process_file_name(argv[idx], 0);
 
+	/* If the use of a default include directory is not
+	   specifically disabled, then write that directory as the
+	   very last include directory to use... always. */
+      if (gen_std_include) {
+	    fprintf(defines_file, "I:%s%cinclude", base, sep);
+      }
 
       fclose(source_file);
       source_file = 0;
 
+      fclose(defines_file);
+      defines_file = 0;
+
       if (source_count == 0) {
-	    fprintf(stderr, "%s: No input files.\n", argv[0]);
- 	    fprintf(stderr, "%s\n", HELP);
+	    fprintf(stderr, "%s: no source files.\n\n%s\n", argv[0], HELP);
 	    return 1;
       }
 
 
 	/* Start building the preprocess command line. */
 
-      sprintf(tmp, "%s%civlpp %s%s -D__ICARUS__=1 -f%s ", pbase,sep,
+      sprintf(tmp, "%s%civlpp %s%s -F%s -f%s -p%s ", pbase,sep,
 	      verbose_flag?" -v":"",
-	      e_flag?"":" -L", source_path);
+	      e_flag?"":" -L", defines_path, source_path,
+	      compiled_defines_path);
 
       ncmd = strlen(tmp);
       cmd = malloc(ncmd + 1);
       strcpy(cmd, tmp);
 
-      if (inc_list) {
-	    cmd = realloc(cmd, ncmd + strlen(inc_list) + 1);
-	    strcat(cmd, inc_list);
-	    ncmd += strlen(inc_list);
-      }
-
-      if (def_list) {
-	    cmd = realloc(cmd, ncmd + strlen(def_list) + 1);
-	    strcat(cmd, def_list);
-	    ncmd += strlen(def_list);
-      }
-
-      if (depfile) {
-	    cmd = realloc(cmd, ncmd + strlen(depfile) + 5);
-	    strcat(cmd, " -M ");
-	    strcat(cmd, depfile);
-	    ncmd += strlen(depfile) + 4;
-      }
-
 	/* If the -E flag was given on the command line, then all we
 	   do is run the preprocessor and put the output where the
 	   user wants it. */
@@ -701,8 +854,11 @@ int main(int argc, char **argv)
 	    rc = system(cmd);
 	    remove(source_path);
 	    fclose(iconfig_file);
-	    if ( ! getenv("IVERILOG_ICONFIG"))
+	    if ( ! getenv("IVERILOG_ICONFIG")) {
 		  remove(iconfig_path);
+		  remove(defines_path);
+		  remove(compiled_defines_path);
+	    }
 
 	    if (rc != 0) {
 		  if (WIFEXITED(rc)) {
@@ -717,13 +873,13 @@ int main(int argc, char **argv)
 	    return 0;
       }
 
+      fprintf(iconfig_file, "iwidth:%u\n", integer_width);
+
 	/* Write the preprocessor command needed to preprocess a
 	   single file. This may be used to preprocess library
 	   files. */
-      fprintf(iconfig_file, "ivlpp:%s%civlpp -D__ICARUS__ -L %s %s\n",
-	      pbase, sep,
-	      inc_list? inc_list : "",
-	      def_list? def_list : "");
+      fprintf(iconfig_file, "ivlpp:%s%civlpp -L -F%s -P%s\n",
+	      pbase, sep, defines_path, compiled_defines_path);
 
 	/* Done writing to the iconfig file. Close it now. */
       fclose(iconfig_file);
@@ -732,58 +888,3 @@ int main(int argc, char **argv)
 
       return 0;
 }
-
-/*
- * $Log: main.c,v $
- * Revision 1.67  2005/07/14 23:38:44  steve
- *  Display as version 0.9.devel
- *
- * Revision 1.66  2005/06/28 04:25:55  steve
- *  Remove reference to SystemVerilog.
- *
- * Revision 1.65  2004/06/17 14:47:22  steve
- *  Add a .sft file for the system functions.
- *
- * Revision 1.64  2004/03/10 04:51:25  steve
- *  Add support for system function table files.
- *
- * Revision 1.63  2004/02/15 18:03:30  steve
- *  Cleanup of warnings.
- *
- * Revision 1.62  2003/12/12 04:36:48  steve
- *  Fix make check to support -tconf configuration method.
- *
- * Revision 1.61  2003/11/18 06:31:46  steve
- *  Remove the iverilog.conf file.
- *
- * Revision 1.60  2003/11/13 05:55:33  steve
- *  Move the DLL= flag to target config files.
- *
- * Revision 1.59  2003/11/13 04:09:49  steve
- *  Pass flags through the temporary config file.
- *
- * Revision 1.58  2003/11/01 04:21:57  steve
- *  Add support for a target static config file.
- *
- * Revision 1.57  2003/10/26 22:43:42  steve
- *  Improve -V messages,
- *
- * Revision 1.56  2003/09/26 21:25:58  steve
- *  Warnings cleanup.
- *
- * Revision 1.55  2003/09/23 05:57:15  steve
- *  Pass -m flag from driver via iconfig file.
- *
- * Revision 1.54  2003/09/22 01:12:09  steve
- *  Pass more ivl arguments through the iconfig file.
- *
- * Revision 1.53  2003/08/26 16:26:02  steve
- *  ifdef idents correctly.
- *
- * Revision 1.52  2003/02/22 04:55:36  steve
- *  portbind adds p, not i, flag.
- *
- * Revision 1.51  2003/02/22 04:12:49  steve
- *  Add the portbind warning.
- */
-

dup_expr.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2002 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: dup_expr.cc,v 1.20 2005/07/11 16:56:50 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -27,14 +24,17 @@
 
 NetEBComp* NetEBComp::dup_expr() const
 {
-      NetEBComp*result = new NetEBComp(op_, left_->dup_expr(),
-				       right_->dup_expr());
-      return result;
+      NetEBComp*tmp = new NetEBComp(op_, left_->dup_expr(),
+				    right_->dup_expr());
+      assert(tmp);
+      tmp->set_line(*this);
+      return tmp;
 }
 
 NetEConst* NetEConst::dup_expr() const
 {
       NetEConst*tmp = new NetEConst(value_);
+      assert(tmp);
       tmp->set_line(*this);
       return tmp;
 }
@@ -42,6 +42,7 @@ NetEConst* NetEConst::dup_expr() const
 NetEConstParam* NetEConstParam::dup_expr() const
 {
       NetEConstParam*tmp = new NetEConstParam(scope_, name_, value());
+      assert(tmp);
       tmp->set_line(*this);
       return tmp;
 }
@@ -49,6 +50,7 @@ NetEConstParam* NetEConstParam::dup_expr() const
 NetECRealParam* NetECRealParam::dup_expr() const
 {
       NetECRealParam*tmp = new NetECRealParam(scope_, name_, value());
+      assert(tmp);
       tmp->set_line(*this);
       return tmp;
 }
@@ -67,8 +69,12 @@ NetEScope* NetEScope::dup_expr() const
 
 NetESelect* NetESelect::dup_expr() const
 {
-      return new NetESelect(expr_->dup_expr(), base_->dup_expr(),
-			    expr_width());
+      NetESelect*tmp = new NetESelect(expr_->dup_expr(),
+			              base_? base_->dup_expr() : 0,
+			              expr_width());
+      assert(tmp);
+      tmp->set_line(*this);
+      return tmp;
 }
 
 NetESFunc* NetESFunc::dup_expr() const
@@ -82,14 +88,16 @@ NetESFunc* NetESFunc::dup_expr() const
 	    tmp->parm(idx, tmp->parm(idx)->dup_expr());
       }
 
+      tmp->set_line(*this);
       return tmp;
 }
 
 NetESignal* NetESignal::dup_expr() const
 {
-      NetESignal*tmp = new NetESignal(net_);
+      NetESignal*tmp = new NetESignal(net_, word_);
       assert(tmp);
       tmp->expr_width(expr_width());
+      tmp->set_line(*this);
       return tmp;
 }
 
@@ -98,6 +106,8 @@ NetETernary* NetETernary::dup_expr() const
       NetETernary*tmp = new NetETernary(cond_->dup_expr(),
 					true_val_->dup_expr(),
 					false_val_->dup_expr());
+      assert(tmp);
+      tmp->set_line(*this);
       return tmp;
 }
 
@@ -111,9 +121,10 @@ NetEUFunc* NetEUFunc::dup_expr() const
 	    tmp_parms[idx] = parms_[idx]->dup_expr();
       }
 
-      tmp = new NetEUFunc(func_, result_sig_->dup_expr(), tmp_parms);
+      tmp = new NetEUFunc(scope_, func_, result_sig_->dup_expr(), tmp_parms);
 
       assert(tmp);
+      tmp->set_line(*this);
       return tmp;
 }
 
@@ -121,6 +132,7 @@ NetEUnary* NetEUnary::dup_expr() const
 {
       NetEUnary*tmp = new NetEUnary(op_, expr_->dup_expr());
       assert(tmp);
+      tmp->set_line(*this);
       return tmp;
 }
 
@@ -128,76 +140,6 @@ NetEUReduce* NetEUReduce::dup_expr() const
 {
       NetEUReduce*tmp = new NetEUReduce(op_, expr_->dup_expr());
       assert(tmp);
+      tmp->set_line(*this);
       return tmp;
 }
-
-/*
- * $Log: dup_expr.cc,v $
- * Revision 1.20  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.19  2004/12/11 02:31:25  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.18  2004/06/17 16:06:18  steve
- *  Help system function signedness survive elaboration.
- *
- * Revision 1.17  2004/05/31 23:34:36  steve
- *  Rewire/generalize parsing an elaboration of
- *  function return values to allow for better
- *  speed and more type support.
- *
- * Revision 1.16  2003/10/31 02:47:11  steve
- *  NetEUReduce has its own dup_expr method.
- *
- * Revision 1.15  2003/05/30 02:55:32  steve
- *  Support parameters in real expressions and
- *  as real expressions, and fix multiply and
- *  divide with real results.
- *
- * Revision 1.14  2003/04/22 04:48:29  steve
- *  Support event names as expressions elements.
- *
- * Revision 1.13  2003/03/15 18:08:43  steve
- *  Comparison operators do have defined width.
- *
- * Revision 1.12  2003/03/15 04:46:28  steve
- *  Better organize the NetESFunc return type guesses.
- *
- * Revision 1.11  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
- *
- * Revision 1.10  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
- *
- * Revision 1.9  2002/11/09 00:25:27  steve
- *  Add dup_expr for user defined function calls.
- *
- * Revision 1.8  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.7  2002/01/28 00:52:41  steve
- *  Add support for bit select of parameters.
- *  This leads to a NetESelect node and the
- *  vvp code generator to support that.
- *
- * Revision 1.6  2001/11/19 01:54:14  steve
- *  Port close cropping behavior from mcrgb
- *  Move window array reset to libmc.
- *
- * Revision 1.5  2001/07/25 03:10:48  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.4  2000/05/07 18:20:07  steve
- *  Import MCD support from Stephen Tell, and add
- *  system function parameter support to the IVL core.
- *
- * Revision 1.3  2000/05/04 03:37:58  steve
- *  Add infrastructure for system functions, move
- *  $time to that structure and add $random.
- */
-

elab_anet.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: elab_anet.cc,v 1.12 2006/05/01 20:47:58 steve Exp $"
+#ident "$Id: elab_anet.cc,v 1.13 2007/03/22 16:08:14 steve Exp $"
 #endif
 
 # include "config.h"
@@ -84,7 +84,7 @@ NetNet* PEConcat::elaborate_anet(Design*des, NetScope*scope) const
 	   concat operator from least significant to most significant,
 	   which is opposite from how they are given in the list.
 
-	   Allow for a repeat count other then 1 by repeating the
+	   Allow for a repeat count other than 1 by repeating the
 	   connect loop as many times as necessary. */
 
       NetNet*osig = new NetNet(scope, scope->local_symbol(),
@@ -169,6 +169,9 @@ NetNet* PEIdent::elaborate_anet(Design*des, NetScope*scope) const
 
 /*
  * $Log: elab_anet.cc,v $
+ * Revision 1.13  2007/03/22 16:08:14  steve
+ *  Spelling fixes from Larry
+ *
  * Revision 1.12  2006/05/01 20:47:58  steve
  *  More explicit datatype setup.
  *

elab_lval.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Stephen Williams ([email protected])
+ * Copyright (c) 2000-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,24 +16,24 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: elab_lval.cc,v 1.36 2006/06/02 04:48:50 steve Exp $"
-#endif
 
 # include "config.h"
 
 # include  "PExpr.h"
 # include  "netlist.h"
 # include  "netmisc.h"
-
+# include  "compiler.h"
+# include  <cstdlib>
 # include  <iostream>
+# include  <climits>
+# include  "ivl_assert.h"
 
 /*
  * These methods generate a NetAssign_ object for the l-value of the
  * assignment. This is common code for the = and <= statements.
  *
  * What gets generated depends on the structure of the l-value. If the
- * l-value is a simple name (i.e., foo <= <value>) the the NetAssign_
+ * l-value is a simple name (i.e., foo <= <value>) then the NetAssign_
  * is created the width of the foo reg and connected to all the
  * bits.
  *
@@ -72,7 +72,7 @@ NetAssign_* PExpr::elaborate_lval(Design*des,
 {
       NetNet*ll = 0;
       if (ll == 0) {
-	    cerr << get_line() << ": Assignment l-value too complex."
+	    cerr << get_fileline() << ": Assignment l-value too complex."
 		 << endl;
 	    return 0;
       }
@@ -99,7 +99,7 @@ NetAssign_* PEConcat::elaborate_lval(Design*des,
 				     bool is_force) const
 {
       if (repeat_) {
-	    cerr << get_line() << ": error: Repeat concatenations make "
+	    cerr << get_fileline() << ": error: Repeat concatenations make "
 		  "no sense in l-value expressions. I refuse." << endl;
 	    des->errors += 1;
 	    return 0;
@@ -110,7 +110,7 @@ NetAssign_* PEConcat::elaborate_lval(Design*des,
       for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
 
 	    if (parms_[idx] == 0) {
-		  cerr << get_line() << ": error: Empty expressions "
+		  cerr << get_fileline() << ": error: Empty expressions "
 		       << "not allowed in concatenations." << endl;
 		  des->errors += 1;
 		  continue;
@@ -149,84 +149,91 @@ NetAssign_* PEIdent::elaborate_lval(Design*des,
 				    bool is_force) const
 {
       NetNet*       reg = 0;
-      NetMemory*    mem = 0;
       const NetExpr*par = 0;
       NetEvent*     eve = 0;
 
-      symbol_search(des, scope, path_, reg, mem, par, eve);
-
-      if (mem) {
-	    if (is_force) {
-		  cerr << get_line() << ": error: Memories "
-		       << "(" << path_ << " in this case)"
-		       << " are not allowed"
-		       << " as l-values to force statements." << endl;
-		  des->errors += 1;
-		  return 0;
-	    }
-
-	    return elaborate_mem_lval_(des, scope, mem);
-      }
-
+      symbol_search(des, scope, path_, reg, par, eve);
       if (reg == 0) {
-	    cerr << get_line() << ": error: Could not find variable ``"
-		 << path_ << "'' in ``" << scope->name() <<
+	    cerr << get_fileline() << ": error: Could not find variable ``"
+		 << path_ << "'' in ``" << scope_path(scope) <<
 		  "''" << endl;
 
 	    des->errors += 1;
 	    return 0;
       }
 
-      assert(reg);
+      ivl_assert(*this, reg);
 
-      if (sel_ == SEL_PART)
-	    return elaborate_lval_net_part_(des, scope, reg);
+      const name_component_t&name_tail = path_.back();
 
-      if (sel_ == SEL_IDX_UP)
-	    return elaborate_lval_net_idx_up_(des, scope, reg);
+      index_component_t::ctype_t use_sel = index_component_t::SEL_NONE;
+      if (!name_tail.index.empty())
+	    use_sel = name_tail.index.back().sel;
 
-      if (sel_ == SEL_IDX_DO)
-	    return elaborate_lval_net_idx_do_(des, scope, reg);
+	// This is the special case that the l-value is an entire
+	// memory. This is, in fact, an error.
+      if (reg->array_dimensions() > 0 && name_tail.index.empty()) {
+	    cerr << get_fileline() << ": error: Cannot assign to array "
+		 << path_ << ". Did you forget a word index?" << endl;
+	    des->errors += 1;
+	    return 0;
+      }
+
+      if (reg->array_dimensions() > 0)
+	    return elaborate_lval_net_word_(des, scope, reg);
+
+      if (use_sel == index_component_t::SEL_PART) {
+	    NetAssign_*lv = new NetAssign_(reg);
+	    elaborate_lval_net_part_(des, scope, lv);
+	    return lv;
+      }
+
+      if (use_sel == index_component_t::SEL_IDX_UP ||
+          use_sel == index_component_t::SEL_IDX_DO) {
+	    NetAssign_*lv = new NetAssign_(reg);
+	    elaborate_lval_net_idx_(des, scope, lv, use_sel);
+	    return lv;
+      }
 
 	/* Get the signal referenced by the identifier, and make sure
 	   it is a register. Wires are not allows in this context,
 	   unless this is the l-value of a force. */
       if ((reg->type() != NetNet::REG) && !is_force) {
-	    cerr << get_line() << ": error: " << path_ <<
-		  " is not a reg/integer/time in " << scope->name() <<
+	    cerr << get_fileline() << ": error: " << path_ <<
+		  " is not a valid l-value in " << scope_path(scope) <<
 		  "." << endl;
-	    cerr << reg->get_line() << ":      : " << path_ <<
+	    cerr << reg->get_fileline() << ":      : " << path_ <<
 		  " is declared here as " << reg->type() << "." << endl;
 	    des->errors += 1;
 	    return 0;
       }
 
-      assert(msb_ == 0);
-      assert(lsb_ == 0);
       long msb, lsb;
       NetExpr*mux;
 
-      if (! idx_.empty()) {
+      if (use_sel == index_component_t::SEL_BIT) {
+
+	    const index_component_t&index_tail = name_tail.index.back();
+	    ivl_assert(*this, index_tail.msb != 0);
+	    ivl_assert(*this, index_tail.lsb == 0);
 
 	      /* If there is only a single select expression, it is a
 		 bit select. Evaluate the constant value and treat it
 		 as a part select with a bit width of 1. If the
 		 expression it not constant, then return the
 		 expression as a mux. */
-	    assert(idx_.size() == 1);
-	    verinum*v = idx_[0]->eval_const(des, scope);
-	    if (v == 0) {
-		  NetExpr*m = idx_[0]->elaborate_expr(des, scope, -1, false);
-		  assert(m);
-		  msb = 0;
-		  lsb = 0;
-		  mux = m;
+
+	    NetExpr*index_expr = elab_and_eval(des, scope, index_tail.msb, -1);
+
+	    if (NetEConst*index_con = dynamic_cast<NetEConst*> (index_expr)) {
+		  msb = index_con->value().as_long();
+		  lsb = index_con->value().as_long();
+		  mux = 0;
 
 	    } else {
-
-		  msb = v->as_long();
-		  lsb = v->as_long();
-		  mux = 0;
+		  msb = 0;
+		  lsb = 0;
+		  mux = index_expr;
 	    }
 
       } else {
@@ -272,7 +279,7 @@ NetAssign_* PEIdent::elaborate_lval(Design*des,
 	    unsigned wid = moff - loff + 1;
 
 	    if (moff < loff) {
-		  cerr << get_line() << ": error: part select "
+		  cerr << get_fileline() << ": error: part select "
 		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
 		       << " is reversed." << endl;
 		  des->errors += 1;
@@ -285,7 +292,7 @@ NetAssign_* PEIdent::elaborate_lval(Design*des,
 		 variable pins. */
 
 	    if ((wid + loff) > reg->vector_width()) {
-		  cerr << get_line() << ": error: bit/part select "
+		  cerr << get_fileline() << ": error: bit/part select "
 		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
 		       << " is out of range." << endl;
 		  des->errors += 1;
@@ -300,53 +307,89 @@ NetAssign_* PEIdent::elaborate_lval(Design*des,
       return lv;
 }
 
-NetAssign_* PEIdent::elaborate_lval_net_part_(Design*des,
+NetAssign_* PEIdent::elaborate_lval_net_word_(Design*des,
 					      NetScope*scope,
 					      NetNet*reg) const
 {
-      assert(msb_ && lsb_);
+      const name_component_t&name_tail = path_.back();
+      ivl_assert(*this, !name_tail.index.empty());
 
-	/* This handles part selects. In this case, there are
-	   two bit select expressions, and both must be
-	   constant. Evaluate them and pass the results back to
-	   the caller. */
-      NetExpr*lsb_ex = elab_and_eval(des, scope, lsb_, -1);
-      NetEConst*lsb_c = dynamic_cast<NetEConst*>(lsb_ex);
-      if (lsb_c == 0) {
-	    cerr << lsb_->get_line() << ": error: "
-		  "Part select expressions must be constant."
-		 << endl;
-	    cerr << lsb_->get_line() << ":      : This lsb expression "
-		  "violates the rule: " << *lsb_ << endl;
+      const index_component_t&index_head = name_tail.index.front();
+      if (index_head.sel == index_component_t::SEL_PART) {
+	    cerr << get_fileline() << ": error: cannot perform a part "
+	         << "select on array " << reg->name() << "." << endl;
 	    des->errors += 1;
 	    return 0;
       }
 
-      NetExpr*msb_ex = elab_and_eval(des, scope, msb_, -1);
-      NetEConst*msb_c = dynamic_cast<NetEConst*>(msb_ex);
-      if (msb_c == 0) {
-	    cerr << msb_->get_line() << ": error: "
-		  "Part select expressions must be constant."
-		 << endl;
-	    cerr << msb_->get_line() << ":      : This msb expression "
-		  "violates the rule: " << *msb_ << endl;
-	    des->errors += 1;
-	    return 0;
+      ivl_assert(*this, index_head.sel == index_component_t::SEL_BIT);
+      ivl_assert(*this, index_head.msb != 0);
+      ivl_assert(*this, index_head.lsb == 0);
+
+      NetExpr*word = elab_and_eval(des, scope, index_head.msb, -1);
+
+	// If there is a non-zero base to the memory, then build an
+	// expression to calculate the canonical address.
+      if (long base = reg->array_first()) {
+
+	    word = make_add_expr(word, 0-base);
+	    eval_expr(word);
       }
 
-      long msb = msb_c->value().as_long();
-      long lsb = lsb_c->value().as_long();
+      NetAssign_*lv = new NetAssign_(reg);
+      lv->set_word(word);
 
-      delete msb_ex;
-      delete lsb_ex;
+      if (debug_elaborate)
+	    cerr << get_fileline() << ": debug: Set array word=" << *word << endl;
 
-      NetAssign_*lv = 0;
+	// Test for the case that the index is a constant, and is out
+	// of bounds. The "word" expression is the word index already
+	// converted to canonical address, so this just needs to check
+	// that the address is not too big.
+      if (NetEConst*word_const = dynamic_cast<NetEConst*>(word)) {
+	    verinum word_val = word_const->value();
+	    long index = word_val.as_long();
+	    assert (reg->array_count() <= LONG_MAX);
+	    if (index < 0 || index >= (long) reg->array_count()) {
+		  cerr << get_fileline() << ": warning: Constant array index "
+		       << (index + reg->array_first())
+		       << " is out of range for array "
+		       << reg->name() << "." << endl;
+	    }
+      }
+
+	/* An array word may also have part selects applied to them. */
+
+      index_component_t::ctype_t use_sel = index_component_t::SEL_NONE;
+      if (name_tail.index.size() > 1)
+	    use_sel = name_tail.index.back().sel;
+
+      if (use_sel == index_component_t::SEL_PART)
+	    elaborate_lval_net_part_(des, scope, lv);
+
+      if (use_sel == index_component_t::SEL_IDX_UP ||
+          use_sel == index_component_t::SEL_IDX_DO)
+	    elaborate_lval_net_idx_(des, scope, lv, use_sel);
+
+      return lv;
+}
+
+bool PEIdent::elaborate_lval_net_part_(Design*des,
+				       NetScope*scope,
+				       NetAssign_*lv) const
+{
+      long msb, lsb;
+      bool flag = calculate_parts_(des, scope, msb, lsb);
+      if (!flag)
+	    return false;
+
+      NetNet*reg = lv->sig();
+      assert(reg);
 
       if (msb == reg->msb() && lsb == reg->lsb()) {
 
 	      /* No bit select, and part select covers the entire
 		 vector. Simplest case. */
-	    lv = new NetAssign_(reg);
 
       } else {
 
@@ -358,11 +401,11 @@ NetAssign_* PEIdent::elaborate_lval_net_part_(Design*des,
 	    unsigned wid = moff - loff + 1;
 
 	    if (moff < loff) {
-		  cerr << get_line() << ": error: part select "
+		  cerr << get_fileline() << ": error: part select "
 		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
 		       << " is reversed." << endl;
 		  des->errors += 1;
-		  return 0;
+		  return false;
 	    }
 
 	      /* If the part select extends beyond the extreme of the
@@ -371,54 +414,48 @@ NetAssign_* PEIdent::elaborate_lval_net_part_(Design*des,
 		 variable pins. */
 
 	    if ((wid + loff) > reg->vector_width()) {
-		  cerr << get_line() << ": error: bit/part select "
+		  cerr << get_fileline() << ": error: bit/part select "
 		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
 		       << " is out of range." << endl;
 		  des->errors += 1;
-		  return 0;
+		  return false;
 	    }
 
-	    lv = new NetAssign_(reg);
 	    lv->set_part(new NetEConst(verinum(loff)), wid);
       }
 
-      return lv;
+      return true;
 }
 
-NetAssign_* PEIdent::elaborate_lval_net_idx_up_(Design*des,
-						NetScope*scope,
-						NetNet*reg) const
+bool PEIdent::elaborate_lval_net_idx_(Design*des,
+				      NetScope*scope,
+				      NetAssign_*lv,
+				      index_component_t::ctype_t use_sel) const
 {
-      assert(lsb_);
-      assert(msb_);
+      const name_component_t&name_tail = path_.back();;
+      ivl_assert(*this, !name_tail.index.empty());
+
+      const index_component_t&index_tail = name_tail.index.back();
+      ivl_assert(*this, index_tail.msb != 0);
+      ivl_assert(*this, index_tail.lsb != 0);
+
+      NetNet*reg = lv->sig();
+      assert(reg);
 
       if (reg->type() != NetNet::REG) {
-	    cerr << get_line() << ": error: " << path_ <<
-		  " is not a reg/integer/time in " << scope->name() <<
+	    cerr << get_fileline() << ": error: " << path_ <<
+		  " is not a reg/integer/time in " << scope_path(scope) <<
 		  "." << endl;
-	    cerr << reg->get_line() << ":      : " << path_ <<
+	    cerr << reg->get_fileline() << ":      : " << path_ <<
 		  " is declared here as " << reg->type() << "." << endl;
 	    des->errors += 1;
-	    return 0;
+	    return false;
       }
 
-	/* Calculate the width expression (in the lsb_ position)
-	   first. If the expression is not constant, error but guess 1
-	   so we can keep going and find more errors. */
-      NetExpr*wid_ex = elab_and_eval(des, scope, lsb_, -1);
-      NetEConst*wid_c = dynamic_cast<NetEConst*>(wid_ex);
+      unsigned long wid;
+      calculate_up_do_width_(des, scope, wid);
 
-      if (wid_c == 0) {
-	    cerr << get_line() << ": error: Indexed part width must be "
-		 << "constant. Expression in question is..." << endl;
-	    cerr << get_line() << ":      : " << *wid_ex << endl;
-	    des->errors += 1;
-      }
-
-      unsigned wid = wid_c? wid_c->value().as_ulong() : 1;
-      delete wid_ex;
-
-      NetExpr*base = elab_and_eval(des, scope, msb_, -1);
+      NetExpr*base = elab_and_eval(des, scope, index_tail.msb, -1);
 
 	/* Correct the mux for the range of the vector. */
       if (reg->msb() < reg->lsb())
@@ -426,161 +463,23 @@ NetAssign_* PEIdent::elaborate_lval_net_idx_up_(Design*des,
       else if (reg->lsb() != 0)
 	    base = make_add_expr(base, - reg->lsb());
 
-      NetAssign_*lv = new NetAssign_(reg);
+      if (use_sel == index_component_t::SEL_IDX_DO && wid > 1 ) {
+	    base = make_add_expr(base, 1-(long)wid);
+      }
+
+      if (debug_elaborate)
+	    cerr << get_fileline() << ": debug: Set part select width="
+		 << wid << ", base=" << *base << endl;
+
       lv->set_part(base, wid);
 
-      return lv;
-}
-
-NetAssign_* PEIdent::elaborate_lval_net_idx_do_(Design*des,
-						NetScope*scope,
-						NetNet*reg) const
-{
-      assert(lsb_);
-      assert(msb_);
-      cerr << get_line() << ": internal error: don't know how to "
-	    "deal with SEL_IDX_DO in lval?" << endl;
-      des->errors += 1;
-      return 0;
-}
-
-NetAssign_* PEIdent::elaborate_mem_lval_(Design*des, NetScope*scope,
-					NetMemory*mem) const
-{
-      if (idx_.empty()) {
-	    cerr << get_line() << ": error: Assign to memory \""
-		 << mem->name() << "\" requires a word select index."
-		 << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      if (idx_.size() != mem->dimensions()) {
-	    cerr << get_line() << ": error: " << idx_.size()
-		 << " indices do not properly address a "
-		 << mem->dimensions() << "-dimension memory/array."
-		 << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-	// XXXX For now, require exactly 1 index.
-      assert(idx_.size() == 1);
-
-	/* Elaborate the address expression. */
-      NetExpr*ix = elab_and_eval(des, scope, idx_[0], -1);
-      if (ix == 0)
-	    return 0;
-
-      NetAssign_*lv = new NetAssign_(mem);
-      lv->set_bmux(ix);
-
-	/* If there is no extra part select, then we are done. */
-      if (msb_ == 0 && lsb_ == 0) {
-	    lv->set_part(0, mem->width());
-	    return lv;
-      }
-
-      assert(sel_ != SEL_NONE);
-      assert(msb_ && lsb_);
-
-      if (sel_ == SEL_PART) {
-	    NetExpr*le = elab_and_eval(des, scope, lsb_, -1);
-	    NetExpr*me = elab_and_eval(des, scope, msb_, -1);
-
-	    NetEConst*lec = dynamic_cast<NetEConst*>(le);
-	    NetEConst*mec = dynamic_cast<NetEConst*>(me);
-
-	    if (lec == 0 || mec == 0) {
-		  cerr << get_line() << ": error: Part select "
-		       << "expressions must be constant." << endl;
-		  des->errors += 1;
-		  delete le;
-		  delete me;
-		  return lv;
-	    }
-
-	    verinum wedv = mec->value() - lec->value();
-	    unsigned wid = wedv.as_long() + 1;
-
-	    lv->set_part(lec, wid);
-	    return lv;
-      }
-
-      assert(sel_ == SEL_IDX_UP || sel_ == SEL_IDX_DO);
-
-      NetExpr*wid_ex = elab_and_eval(des, scope, lsb_, -1);
-      NetEConst*wid_ec = dynamic_cast<NetEConst*> (wid_ex);
-      if (wid_ec == 0) {
-	    cerr << lsb_->get_line() << ": error: "
-		 << "Second expression of indexed part select "
-		 << "most be constant." << endl;
-	    des->errors += 1;
-	    return lv;
-      }
-
-      unsigned wid = wid_ec->value().as_ulong();
-
-      NetExpr*base_ex = elab_and_eval(des, scope, msb_, -1);
-      if (base_ex == 0) {
-	    return 0;
-      }
-
-      if (sel_ == SEL_IDX_DO && wid > 1) {
-	    base_ex = make_add_expr(base_ex, 1-(long)wid);
-      }
-
-      lv->set_part(base_ex, wid);
-      return lv;
+      return true;
 }
 
 NetAssign_* PENumber::elaborate_lval(Design*des, NetScope*, bool) const
 {
-      cerr << get_line() << ": error: Constant values not allowed "
+      cerr << get_fileline() << ": error: Constant values not allowed "
 	   << "in l-value expressions." << endl;
       des->errors += 1;
       return 0;
 }
-
-/*
- * $Log: elab_lval.cc,v $
- * Revision 1.36  2006/06/02 04:48:50  steve
- *  Make elaborate_expr methods aware of the width that the context
- *  requires of it. In the process, fix sizing of the width of unary
- *  minus is context determined sizes.
- *
- * Revision 1.35  2006/04/16 00:54:04  steve
- *  Cleanup lval part select handling.
- *
- * Revision 1.34  2006/04/16 00:15:43  steve
- *  Fix part selects in l-values.
- *
- * Revision 1.33  2006/02/02 02:43:57  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.32  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.31  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
- *
- *  Generate NetConcat devices for gate outputs that feed into a
- *  vector results. Use this to hande gate arrays. Also let gate
- *  arrays handle vectors of gates when the outputs allow for it.
- *
- * Revision 1.30  2004/12/11 02:31:25  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.29  2004/10/04 01:10:52  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.28  2004/08/28 14:59:44  steve
- *  More detailed error message about bad variable.
- *
- * Revision 1.27  2003/09/19 03:30:05  steve
- *  Fix name search in elab_lval.
- */
-

elab_pexpr.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,21 +16,21 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: elab_pexpr.cc,v 1.24 2006/06/02 04:48:50 steve Exp $"
-#endif
 
 # include "config.h"
 
 # include  "PExpr.h"
 # include  "compiler.h"
 # include  "util.h"
+# include  "netmisc.h"
 
+# include  <cstdlib>
 # include  <iostream>
+# include  "ivl_assert.h"
 
 NetExpr*PExpr::elaborate_pexpr(Design*des, NetScope*sc) const
 {
-      cerr << get_line() << ": error: invalid parameter expression: "
+      cerr << get_fileline() << ": error: invalid parameter expression: "
 	   << *this << endl;
       des->errors += 1;
 
@@ -53,7 +53,7 @@ NetExpr*PEBinary::elaborate_pexpr (Design*des, NetScope*scope) const
 	    return 0;
       }
 
-      NetEBinary*tmp = elaborate_expr_base_(des, lp, rp);
+      NetExpr*tmp = elaborate_expr_base_(des, lp, rp, -2);
       return tmp;
 }
 
@@ -74,10 +74,11 @@ NetEConcat* PEConcat::elaborate_pexpr(Design*des, NetScope*scope) const
       if (repeat_) {
 	    repeat = repeat_->elaborate_pexpr(des, scope);
 	    if (repeat == 0) {
-		  cerr << get_line() << ": error: "
+		  cerr << get_fileline() << ": error: "
 			"concatenation repeat expression cannot be evaluated."
 		       << endl;
 		  des->errors += 1;
+		  return 0;
 	    }
 
 	      /* continue on even if the repeat expression doesn't
@@ -104,11 +105,12 @@ NetEConcat* PEConcat::elaborate_pexpr(Design*des, NetScope*scope) const
 		       the width check for later. */
 
 	    } else if (! ex->has_width()) {
-		  cerr << ex->get_line() << ": error: operand of "
+		  cerr << ex->get_fileline() << ": error: operand of "
 		       << "concatenation has indefinite width: "
 		       << *ex << endl;
 		  des->errors += 1;
-
+		  delete tmp;
+		  return 0;
 	    }
 
 	    tmp->set(idx, ex);
@@ -130,47 +132,75 @@ NetExpr*PEFNumber::elaborate_pexpr(Design*des, NetScope*scope) const
  */
 NetExpr*PEIdent::elaborate_pexpr(Design*des, NetScope*scope) const
 {
-      hname_t path = path_;
-      char*name = path.remove_tail_name();
+      pform_name_t path = path_;
+      name_component_t name_tail = path_.back();
+      path.pop_back();
 
       NetScope*pscope = scope;
-      if (path.peek_name(0))
-	    pscope = des->find_scope(scope, path);
-
-      perm_string perm_name = lex_strings.make(name);
-      delete name;
+      if (path_.size() > 0) {
+	    list<hname_t> tmp = eval_scope_path(des, scope, path);
+	    pscope = des->find_scope(scope, tmp);
+      }
 
       const NetExpr*ex_msb;
       const NetExpr*ex_lsb;
-      const NetExpr*ex = pscope->get_parameter(perm_name, ex_msb, ex_lsb);
+      const NetExpr*ex = 0;
+	// Look up the parameter name in the current scope. If the
+	// name is not found in the pscope, look in containing scopes,
+	// but do not go outside the containing module instance.
+      for (;;) {
+	    ex = pscope->get_parameter(name_tail.name, ex_msb, ex_lsb);
+	    if (ex != 0)
+		  break;
+	    if (pscope->type() == NetScope::MODULE)
+		  break;
+	    pscope = pscope->parent();
+	    ivl_assert(*this, pscope);
+      }
       if (ex == 0) {
-	    cerr << get_line() << ": error: identifier ``" << path_ <<
-		  "'' is not a parameter in " << scope->name() << "." << endl;
+	    cerr << get_fileline() << ": error: identifier ``" << name_tail.name <<
+		  "'' is not a parameter in "<< scope_path(scope)<< "." << endl;
 	    des->errors += 1;
 	    return 0;
       }
 
-      NetExpr*res = new NetEParam(des, pscope, perm_name);
+      NetExpr*res = new NetEParam(des, pscope, name_tail.name);
       res->set_line(*this);
       assert(res);
 
-      if (msb_ && lsb_) {
-	    assert(idx_.empty());
-	    cerr << get_line() << ": sorry: Cannot part select "
-		  "bits of parameters." << endl;
-	    des->errors += 1;
+      index_component_t::ctype_t use_sel = index_component_t::SEL_NONE;
+      if (!name_tail.index.empty())
+	    use_sel = name_tail.index.back().sel;
 
-      } else if (!idx_.empty()) {
-	    assert(msb_==0);
-	    assert(lsb_==0);
-	    assert(idx_.size() == 1);
+      switch (use_sel) {
+	  case index_component_t::SEL_NONE:
+	    break;
+
+	  default:
+	  case index_component_t::SEL_PART:
+	    cerr << get_fileline() << ": sorry: Cannot part select "
+		    "bits of parameters." << endl;
+	    des->errors += 1;
+	    delete res;
+	    return 0;
+
+	  case index_component_t::SEL_BIT:
 
 	      /* We have here a bit select. Insert a NetESelect node
 		 to handle it. */
-	    NetExpr*tmp = idx_[0]->elaborate_pexpr(des, scope);
-	    if (tmp != 0) {
-		  res = new NetESelect(res, tmp, 1);
+	    NetExpr*tmp = name_tail.index.back().msb->elaborate_pexpr(des, scope);
+	    if (tmp == 0) {
+		  delete res;
+		  return 0;
 	    }
+	    if (debug_elaborate)
+		  cerr << get_fileline() << ": debug: "
+		       << "Bit select [" << *tmp << "]"
+		       << " in parameter expression." << endl;
+
+	    res = new NetESelect(res, tmp, 1);
+	    res->set_line(*this);
+	    break;
       }
 
       return res;
@@ -195,10 +225,11 @@ NetETernary* PETernary::elaborate_pexpr(Design*des, NetScope*scope) const
       NetExpr*c = expr_->elaborate_pexpr(des, scope);
       NetExpr*t = tru_->elaborate_pexpr(des, scope);
       NetExpr*f = fal_->elaborate_pexpr(des, scope);
-      if (c == 0) return 0;
-      if (t == 0) return 0;
-      if (f == 0) return 0;
-      return new NetETernary(c, t, f);
+      if (c == 0 || t == 0 || f == 0) return 0;
+
+      NetETernary*tmp = new NetETernary(c, t, f);
+      tmp->set_line(*this);
+      return tmp;
 }
 
 NetExpr*PEUnary::elaborate_pexpr (Design*des, NetScope*scope) const
@@ -216,10 +247,12 @@ NetExpr*PEUnary::elaborate_pexpr (Design*des, NetScope*scope) const
 	    tmp = new NetEUnary(op_, ip);
 	    tmp->set_line(*this);
 	    break;
+
 	  case '~':
 	    tmp = new NetEUBits(op_, ip);
 	    tmp->set_line(*this);
 	    break;
+
 	  case '!': // Logical NOT
 	  case '&': // Reduction AND
 	  case '|': // Reduction OR
@@ -231,101 +264,6 @@ NetExpr*PEUnary::elaborate_pexpr (Design*des, NetScope*scope) const
 	    tmp->set_line(*this);
 	    break;
       }
+
       return tmp;
 }
-
-/*
- * $Log: elab_pexpr.cc,v $
- * Revision 1.24  2006/06/02 04:48:50  steve
- *  Make elaborate_expr methods aware of the width that the context
- *  requires of it. In the process, fix sizing of the width of unary
- *  minus is context determined sizes.
- *
- * Revision 1.23  2006/02/02 02:43:58  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.22  2005/11/27 05:56:20  steve
- *  Handle bit select of parameter with ranges.
- *
- * Revision 1.21  2004/02/20 06:22:56  steve
- *  parameter keys are per_strings.
- *
- * Revision 1.20  2003/05/30 02:55:32  steve
- *  Support parameters in real expressions and
- *  as real expressions, and fix multiply and
- *  divide with real results.
- *
- * Revision 1.19  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.18  2002/12/05 02:14:33  steve
- *  Support bit select in constant expressions.
- *
- * Revision 1.17  2002/11/09 01:40:19  steve
- *  Postpone parameter width check to evaluation.
- *
- * Revision 1.16  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.15  2002/05/06 02:30:27  steve
- *  Allow parameters in concatenation of widths are defined.
- *
- * Revision 1.14  2002/05/05 21:11:50  steve
- *  Put off evaluation of concatenation repeat expresions
- *  until after parameters are defined. This allows parms
- *  to be used in repeat expresions.
- *
- *  Add the builtin $signed system function.
- *
- * Revision 1.13  2002/01/28 00:52:41  steve
- *  Add support for bit select of parameters.
- *  This leads to a NetESelect node and the
- *  vvp code generator to support that.
- *
- * Revision 1.12  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.11  2001/11/07 04:01:59  steve
- *  eval_const uses scope instead of a string path.
- *
- * Revision 1.10  2001/10/07 03:38:08  steve
- *  parameter names do not have defined size.
- *
- * Revision 1.9  2001/07/25 03:10:49  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.8  2001/01/14 23:04:56  steve
- *  Generalize the evaluation of floating point delays, and
- *  get it working with delay assignment statements.
- *
- *  Allow parameters to be referenced by hierarchical name.
- *
- * Revision 1.7  2001/01/02 04:21:13  steve
- *  Support a bunch of unary operators in parameter expressions.
- *
- * Revision 1.6  2000/12/16 19:03:30  steve
- *  Evaluate <= and ?: in parameter expressions (PR#81)
- *
- * Revision 1.5  2000/06/13 05:22:16  steve
- *  Support concatenation in parameter expressions.
- *
- * Revision 1.4  2000/06/01 02:31:39  steve
- *  Parameters can be strings.
- *
- * Revision 1.3  2000/03/12 18:22:11  steve
- *  Binary and unary operators in parameter expressions.
- *
- * Revision 1.2  2000/03/12 04:35:22  steve
- *  Allow parameter identifiers in parameter expressions.
- *
- * Revision 1.1  2000/03/08 04:36:53  steve
- *  Redesign the implementation of scopes and parameters.
- *  I now generate the scopes and notice the parameters
- *  in a separate pass over the pform. Once the scopes
- *  are generated, I can process overrides and evalutate
- *  paremeters before elaboration begins.
- *
- */
-

elab_scope.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,13 +16,11 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: elab_scope.cc,v 1.41 2006/06/02 04:48:50 steve Exp $"
-#endif
 
 # include  "config.h"
 # include  "compiler.h"
 # include  "netmisc.h"
+# include  <cstring>
 # include  <iostream>
 # include  <stdio.h>
 
@@ -46,12 +44,55 @@
 # include  <typeinfo>
 # include  <assert.h>
 
+void Module::elaborate_parm_item_(perm_string name, const param_expr_t&cur,
+				  Design*des, NetScope*scope,
+				  perm_string file, unsigned lineno)
+{
+      PExpr*ex = cur.expr;
+      assert(ex);
+
+      NetExpr*val = ex->elaborate_pexpr(des, scope);
+      if (val == 0) return;
+      NetExpr*msb = 0;
+      NetExpr*lsb = 0;
+      bool signed_flag = cur.signed_flag;
+
+	/* If the parameter declaration includes msb and lsb,
+	   then use them to calculate a width for the
+	   result. Then make sure the constant expression of the
+	   parameter value is coerced to have the correct
+	   and defined width. */
+      if (cur.msb) {
+	    msb = cur.msb ->elaborate_pexpr(des, scope);
+	    assert(msb);
+	    lsb = cur.lsb ->elaborate_pexpr(des, scope);
+      }
+
+      if (signed_flag) {
+	      /* If explicitly signed, then say so. */
+	    val->cast_signed(true);
+      } else if (cur.msb) {
+	      /* If there is a range, then the signedness comes
+		 from the type and not the expression. */
+	    val->cast_signed(signed_flag);
+      } else {
+	      /* otherwise, let the expression describe
+		 itself. */
+	    signed_flag = val->has_sign();
+      }
+
+      val = scope->set_parameter(name, val,
+				 msb, lsb, signed_flag, file, lineno);
+      assert(val);
+      delete val;
+}
+
 bool Module::elaborate_scope(Design*des, NetScope*scope,
 			     const replace_t&replacements) const
 {
       if (debug_scopes) {
-	    cerr << get_line() << ": debug: Elaborate scope "
-		 << scope->name() << "." << endl;
+	    cerr << get_fileline() << ": debug: Elaborate scope "
+		 << scope_path(scope) << "." << endl;
       }
 
 	// Generate all the parameters that this instance of this
@@ -66,7 +107,7 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
 	// place of the elaborated expression.
 
       typedef map<perm_string,param_expr_t>::const_iterator mparm_it_t;
-      typedef map<hname_t,PExpr*>::const_iterator hparm_it_t;
+      typedef map<pform_name_t,PExpr*>::const_iterator pform_parm_it_t;
 
 
 	// This loop scans the parameters in the module, and creates
@@ -79,7 +120,8 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
 	    tmp->set_line(*((*cur).second.expr));
 	    tmp->cast_signed( (*cur).second.signed_flag );
 
-	    scope->set_parameter((*cur).first, tmp, 0, 0, false);
+	    scope->set_parameter((*cur).first, tmp, 0, 0, false,
+	                         (*cur).second.file, (*cur).second.lineno);
       }
 
       for (mparm_it_t cur = localparams.begin()
@@ -90,7 +132,8 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
 	    if ((*cur).second.msb)
 		  tmp->cast_signed( (*cur).second.signed_flag );
 
-	    scope->set_parameter((*cur).first, tmp, 0, 0, false);
+	    scope->set_parameter((*cur).first, tmp, 0, 0, false,
+	                         (*cur).second.file, (*cur).second.lineno);
       }
 
 
@@ -102,42 +145,8 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
       for (mparm_it_t cur = parameters.begin()
 		 ; cur != parameters.end() ;  cur ++) {
 
-	    PExpr*ex = (*cur).second.expr;
-	    assert(ex);
-
-	    NetExpr*val = ex->elaborate_pexpr(des, scope);
-	    NetExpr*msb = 0;
-	    NetExpr*lsb = 0;
-	    bool signed_flag = (*cur).second.signed_flag;
-
-	      /* If the parameter declaration includes msb and lsb,
-		 then use them to calculate a width for the
-		 result. Then make sure the constant expression of the
-		 parameter value is coerced to have the correct
-		 and defined width. */
-	    if ((*cur).second.msb) {
-		  msb = (*cur).second.msb ->elaborate_pexpr(des, scope);
-		  assert(msb);
-		  lsb = (*cur).second.lsb ->elaborate_pexpr(des, scope);
-	    }
-
-	    if (signed_flag) {
-		    /* If explicitly signed, then say so. */
-		  val->cast_signed(true);
-	    } else if ((*cur).second.msb) {
-		    /* If there is a range, then the signedness comes
-		       from the type and not the expression. */
-		  val->cast_signed(signed_flag);
-	    } else {
-		    /* otherwise, let the expression describe
-		       itself. */
-		  signed_flag = val->has_sign();
-	    }
-
-	    val = scope->set_parameter((*cur).first, val,
-				       msb, lsb, signed_flag);
-	    assert(val);
-	    delete val;
+	    elaborate_parm_item_((*cur).first, (*cur).second, des, scope,
+	                         (*cur).second.file, (*cur).second.lineno);
       }
 
 	/* run parameter replacements that were collected from the
@@ -146,48 +155,31 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
 		 ; cur != replacements.end() ;  cur ++) {
 
 	    NetExpr*val = (*cur).second;
+	    if (val == 0) {
+		  cerr << get_fileline() << ": internal error: "
+		       << "Missing expression in parameter replacement for "
+		       << (*cur).first;
+	    }
+	    assert(val);
 	    if (debug_scopes) {
-		  cerr << get_line() << ": debug: "
+		  cerr << get_fileline() << ": debug: "
 		       << "Replace " << (*cur).first
 		       << " with expression " << *val
-		       << " from " << val->get_line() << "." << endl;
+		       << " from " << val->get_fileline() << "." << endl;
 	    }
 	    bool flag = scope->replace_parameter((*cur).first, val);
 	    if (! flag) {
-		  cerr << val->get_line() << ": warning: parameter "
+		  cerr << val->get_fileline() << ": warning: parameter "
 		       << (*cur).first << " not found in "
-		       << scope->name() << "." << endl;
+		       << scope_path(scope) << "." << endl;
 	    }
       }
 
       for (mparm_it_t cur = localparams.begin()
 		 ; cur != localparams.end() ;  cur ++) {
 
-	    PExpr*ex = (*cur).second.expr;
-	    assert(ex);
-
-	    NetExpr*val = ex->elaborate_pexpr(des, scope);
-	    NetExpr*msb = 0;
-	    NetExpr*lsb = 0;
-	    bool signed_flag = false;
-
-	      /* If the parameter declaration includes msb and lsb,
-		 then use them to calculate a width for the
-		 result. Then make sure the constant expression of the
-		 parameter value is coerced to have the correct
-		 and defined width. */
-	    if ((*cur).second.msb) {
-		  msb = (*cur).second.msb ->elaborate_pexpr(des, scope);
-		  assert(msb);
-		  lsb = (*cur).second.lsb ->elaborate_pexpr(des, scope);
-		  signed_flag = (*cur).second.signed_flag;
-	    }
-
-	    val->cast_signed(signed_flag);
-	    val = scope->set_parameter((*cur).first, val,
-				       msb, lsb, signed_flag);
-	    assert(val);
-	    delete val;
+	    elaborate_parm_item_((*cur).first, (*cur).second, des, scope,
+	                         (*cur).second.file, (*cur).second.lineno);
       }
 
 	// Run through the defparams for this module, elaborate the
@@ -200,7 +192,7 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
 	// here because the parameter receiving the assignment may be
 	// in a scope not discovered by this pass.
 
-      for (hparm_it_t cur = defparms.begin()
+      for (pform_parm_it_t cur = defparms.begin()
 		 ; cur != defparms.end() ;  cur ++ ) {
 
 	    PExpr*ex = (*cur).second;
@@ -243,8 +235,17 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
       for (tasks_it_t cur = tasks_.begin()
 		 ; cur != tasks_.end() ;  cur ++ ) {
 
-	    NetScope*task_scope = new NetScope(scope, (*cur).first,
+	    hname_t use_name( (*cur).first );
+	    if (scope->child(use_name)) {
+		  cerr << get_fileline() << ": error: task/scope name "
+		       << use_name << " already used in this context."
+		       << endl;
+		  des->errors += 1;
+		  continue;
+	    }
+	    NetScope*task_scope = new NetScope(scope, use_name,
 					       NetScope::TASK);
+	    task_scope->set_line((*cur).second);
 	    (*cur).second->elaborate_scope(des, task_scope);
       }
 
@@ -258,8 +259,17 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
       for (funcs_it_t cur = funcs_.begin()
 		 ; cur != funcs_.end() ;  cur ++ ) {
 
-	    NetScope*func_scope = new NetScope(scope, (*cur).first,
+	    hname_t use_name( (*cur).first );
+	    if (scope->child(use_name)) {
+		  cerr << get_fileline() << ": error: function/scope name "
+		       << use_name << " already used in this context."
+		       << endl;
+		  des->errors += 1;
+		  continue;
+	    }
+	    NetScope*func_scope = new NetScope(scope, use_name,
 					       NetScope::FUNC);
+	    func_scope->set_line((*cur).second);
 	    (*cur).second->elaborate_scope(des, func_scope);
       }
 
@@ -281,14 +291,14 @@ bool Module::elaborate_scope(Design*des, NetScope*scope,
 
       typedef list<PProcess*>::const_iterator proc_it_t;
 
-      for (proc_it_t cur = behaviors_.begin()
-		 ; cur != behaviors_.end() ;  cur ++ ) {
+      for (proc_it_t cur = behaviors.begin()
+		 ; cur != behaviors.end() ;  cur ++ ) {
 
 	    (*cur) -> statement() -> elaborate_scope(des, scope);
       }
 
 	// Scan through all the named events in this scope. We do not
-	// need anything more then the current scope to do this
+	// need anything more than the current scope to do this
 	// elaboration, so do it now. This allows for normal
 	// elaboration to reference these events.
 
@@ -307,8 +317,23 @@ bool PGenerate::generate_scope(Design*des, NetScope*container)
 	  case GS_LOOP:
 	    return generate_scope_loop_(des, container);
 
+	  case GS_CONDIT:
+	    return generate_scope_condit_(des, container, false);
+
+	  case GS_ELSE:
+	    return generate_scope_condit_(des, container, true);
+
+	  case GS_CASE:
+	    return generate_scope_case_(des, container);
+	    return true;
+
+	  case GS_CASE_ITEM:
+	    cerr << get_fileline() << ": internal error: "
+		 << "Case item outside of a case generate scheme?" << endl;
+	    return false;
+
 	  default:
-	    cerr << get_line() << ": sorry: Generate of this sort"
+	    cerr << get_fileline() << ": sorry: Generate of this sort"
 		 << " is not supported yet!" << endl;
 	    return false;
       }
@@ -319,29 +344,46 @@ bool PGenerate::generate_scope(Design*des, NetScope*container)
  */
 bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
 {
+	// Check that the loop_index variable was declared in a
+	// genvar statement.
+
+	// MISSING CODE!
+
 	// We're going to need a genvar...
       int genvar;
 
 	// The initial value for the genvar does not need (nor can it
 	// use) the genvar itself, so we can evaluate this expression
-	// the same way any other paramter value is evaluated.
+	// the same way any other parameter value is evaluated.
       NetExpr*init_ex = elab_and_eval(des, container, loop_init, -1);
       NetEConst*init = dynamic_cast<NetEConst*> (init_ex);
       if (init == 0) {
-	    cerr << get_line() << ": error: Cannot evaluate genvar"
+	    cerr << get_fileline() << ": error: Cannot evaluate genvar"
 		 << " init expression: " << *loop_init << endl;
 	    des->errors += 1;
 	    return false;
       }
 
+	// Since we will be adding the genvar value as a local parameter
+	// to each instances scope. We need to make sure a parameter does
+	// not already exist.
+      const NetExpr*tmsb;
+      const NetExpr*tlsb;
+      const NetExpr*texpr = container->get_parameter(loop_index, tmsb, tlsb);
+      if (texpr != 0) {
+	    cerr << get_fileline() << ": error: Cannot have a genvar "
+		 << "and parameter with the same name: " << loop_index << endl;
+	    des->errors += 1;
+	    return false;
+      }
+
       genvar = init->value().as_long();
       delete init_ex;
 
-      if (debug_elaborate)
-	    cerr << get_line() << ": debug: genvar init = " << genvar << endl;
-
+      if (debug_scopes)
+	    cerr << get_fileline() << ": debug: genvar init = " << genvar << endl;
       container->genvar_tmp = loop_index;
-      container->genvar_tmp_val = 0;
+      container->genvar_tmp_val = genvar;
       NetExpr*test_ex = elab_and_eval(des, container, loop_test, -1);
       NetEConst*test = dynamic_cast<NetEConst*>(test_ex);
       assert(test);
@@ -351,17 +393,21 @@ bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
 	      // that each instance has a unique name in the
 	      // container. The format of using [] is part of the
 	      // Verilog standard.
-	    char name_buf[128];
-	    snprintf(name_buf, sizeof name_buf,
-		     "%s[%d]", scope_name.str(), genvar);
-	    perm_string use_name = lex_strings.make(name_buf);
-
-	    if (debug_elaborate)
-		  cerr << get_line() << ": debug: "
+	    hname_t use_name (scope_name, genvar);
+	    if (container->child(use_name)) {
+		  cerr << get_fileline() << ": error: block/scope name "
+		       << use_name << " already used in this context."
+		       << endl;
+		  des->errors += 1;
+		  return false;
+	    }
+	    if (debug_scopes)
+		  cerr << get_fileline() << ": debug: "
 		       << "Create generated scope " << use_name << endl;
 
 	    NetScope*scope = new NetScope(container, use_name,
 					  NetScope::GENBLOCK);
+	    scope->set_line(get_file(), get_lineno());
 
 	      // Set in the scope a localparam for the value of the
 	      // genvar within this instance of the generate
@@ -373,17 +419,25 @@ bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
 		  NetEConstParam*gp = new NetEConstParam(scope,
 							 loop_index,
 							 genvar_verinum);
-		  scope->set_localparam(loop_index, gp);
+		    // The file and line information should really come
+		    // from the genvar statement, not the for loop.
+		  scope->set_localparam(loop_index, gp, get_file(),
+		                        get_lineno());
+
+		  if (debug_scopes)
+			cerr << get_fileline() << ": debug: "
+			     << "Create implicit localparam "
+			     << loop_index << " = " << genvar_verinum << endl;
 	    }
 
-	    scope_list_.push_back(scope);
+	    elaborate_subscope_(des, scope);
 
 	      // Calculate the step for the loop variable.
 	    NetExpr*step_ex = elab_and_eval(des, container, loop_step, -1);
 	    NetEConst*step = dynamic_cast<NetEConst*>(step_ex);
 	    assert(step);
-	    if (debug_elaborate)
-		  cerr << get_line() << ": debug: genvar step from "
+	    if (debug_scopes)
+		  cerr << get_fileline() << ": debug: genvar step from "
 		       << genvar << " to " << step->value().as_long() << endl;
 
 	    genvar = step->value().as_long();
@@ -402,10 +456,142 @@ bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
       return true;
 }
 
+bool PGenerate::generate_scope_condit_(Design*des, NetScope*container, bool else_flag)
+{
+      NetExpr*test_ex = elab_and_eval(des, container, loop_test, -1);
+      NetEConst*test = dynamic_cast<NetEConst*> (test_ex);
+      assert(test);
+
+	// If the condition evaluates as false, then do not create the
+	// scope.
+      if ( (test->value().as_long() == 0 && !else_flag)
+	|| (test->value().as_long() != 0 &&  else_flag) ) {
+	    if (debug_scopes)
+		  cerr << get_fileline() << ": debug: Generate condition "
+		       << (else_flag? "(else)" : "(if)")
+		       << " value=" << test->value() << ": skip generation"
+		       << endl;
+	    delete test_ex;
+	    return true;
+      }
+
+      hname_t use_name (scope_name);
+      if (container->child(use_name)) {
+	    cerr << get_fileline() << ": error: block/scope name "
+		 << scope_name << " already used in this context."
+		 << endl;
+	    des->errors += 1;
+	    return false;
+      }
+      if (debug_scopes)
+	    cerr << get_fileline() << ": debug: Generate condition "
+		 << (else_flag? "(else)" : "(if)")
+		 << " value=" << test->value() << ": Generate scope="
+		 << use_name << endl;
+
+      NetScope*scope = new NetScope(container, use_name,
+				    NetScope::GENBLOCK);
+      scope->set_line(get_file(), get_lineno());
+
+      elaborate_subscope_(des, scope);
+
+      return true;
+}
+
+bool PGenerate::generate_scope_case_(Design*des, NetScope*container)
+{
+      NetExpr*case_value_ex = elab_and_eval(des, container, loop_test, -1);
+      NetEConst*case_value_co = dynamic_cast<NetEConst*>(case_value_ex);
+      assert(case_value_co);
+
+	// The name of the scope to generate, whatever that item is.
+      hname_t use_name (scope_name);
+
+      if (debug_scopes)
+	    cerr << get_fileline() << ": debug: Generate case "
+		 << "switch value=" << case_value_co->value() << endl;
+
+      PGenerate*default_item = 0;
+
+      typedef list<PGenerate*>::const_iterator generator_it_t;
+      generator_it_t cur = generates.begin();
+      while (cur != generates.end()) {
+	    PGenerate*item = *cur;
+	    assert( item->scheme_type == PGenerate::GS_CASE_ITEM );
+
+	      // Detect that the item is a default.
+	    if (item->loop_test == 0) {
+		  default_item = item;
+		  cur ++;
+		  continue;
+	    }
+
+	    NetExpr*item_value_ex = elab_and_eval(des, container, item->loop_test, -1);
+	    NetEConst*item_value_co = dynamic_cast<NetEConst*>(item_value_ex);
+	    assert(item_value_co);
+
+	      // If we stumble on the item that matches, then break
+	      // out now.
+	    if (case_value_co->value() == item_value_co->value()) {
+		  delete item_value_co;
+		  break;
+	    }
+
+	    delete item_value_co;
+	    cur ++;
+      }
+
+      delete case_value_co;
+      case_value_co = 0;
+
+      PGenerate*item = (cur == generates.end())? default_item : *cur;
+      if (item == 0) {
+	    cerr << get_fileline() << ": debug: "
+		 << "No generate items found" << endl;
+	    return true;
+      }
+
+      if (debug_scopes)
+	    cerr << get_fileline() << ": debug: "
+		 << "Generate case matches item at "
+		 << item->get_fileline() << endl;
+
+      NetScope*scope = new NetScope(container, use_name,
+				    NetScope::GENBLOCK);
+      scope->set_line(get_file(), get_lineno());
+      item->elaborate_subscope_(des, scope);
+
+      return true;
+}
+
+void PGenerate::elaborate_subscope_(Design*des, NetScope*scope)
+{
+	// Scan the generated scope for nested generate schemes,
+	// and *generate* new scopes, which is slightly different
+	// from simple elaboration.
+
+      typedef list<PGenerate*>::const_iterator generate_it_t;
+      for (generate_it_t cur = generates.begin()
+		 ; cur != generates.end() ; cur ++ ) {
+	    (*cur) -> generate_scope(des, scope);
+      }
+
+	// Scan the generated scope for gates that may create
+	// their own scopes.
+      typedef list<PGate*>::const_iterator pgate_list_it_t;
+      for (pgate_list_it_t cur = gates.begin()
+		 ; cur != gates.end() ;  cur ++) {
+	    (*cur) ->elaborate_scope(des, scope);
+      }
+
+	// Save the scope that we created, for future use.
+      scope_list_.push_back(scope);
+}
+
 void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 {
       if (get_name() == "") {
-	    cerr << get_line() << ": error: Instantiation of module "
+	    cerr << get_fileline() << ": error: Instantiation of module "
 		 << mod->mod_name() << " requires an instance name." << endl;
 	    des->errors += 1;
 	    return;
@@ -418,8 +604,8 @@ void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 	// about to create, and if I find it then somebody beat me to
 	// it.
 
-      if (sc->child(get_name())) {
-	    cerr << get_line() << ": error: Instance/Scope name " <<
+      if (sc->child(hname_t(get_name()))) {
+	    cerr << get_fileline() << ": error: Instance/Scope name " <<
 		  get_name() << " already used in this context." <<
 		  endl;
 	    des->errors += 1;
@@ -437,12 +623,12 @@ void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 	    if (strcmp(mod->mod_name(), scn->module_name()) != 0)
 		  continue;
 
-	    cerr << get_line() << ": error: You cannot instantiate "
+	    cerr << get_fileline() << ": error: You cannot instantiate "
 		 << "module " << mod->mod_name() << " within itself." << endl;
 
-	    cerr << get_line() << ":      : The offending instance is "
-		 << sc->name() << "." << get_name() << " within "
-		 << scn->name() << "." << endl;
+	    cerr << get_fileline() << ":      : The offending instance is "
+		 << scope_path(sc) << "." << get_name() << " within "
+		 << scope_path(scn) << "." << endl;
 
 	    des->errors += 1;
 	    return;
@@ -475,7 +661,7 @@ void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 
       NetScope::scope_vec_t instances (instance_count);
       if (debug_scopes) {
-	    cerr << get_line() << ": debug: Create " << instance_count
+	    cerr << get_fileline() << ": debug: Create " << instance_count
 		 << " instances of " << get_name()
 		 << "." << endl;
       }
@@ -485,29 +671,28 @@ void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 	// instantiation line.
       for (int idx = 0 ;  idx < instance_count ;  idx += 1) {
 
-	    perm_string use_name = get_name();
+	    hname_t use_name (get_name());
 
 	    if (instance_array) {
-		  char name_buf[128];
 		  int instance_idx = idx;
 		  if (instance_low < instance_high)
 			instance_idx = instance_low + idx;
 		  else
 			instance_idx = instance_low - idx;
 
-		  snprintf(name_buf, sizeof name_buf,
-			   "%s[%d]", get_name().str(), instance_idx);
-		  use_name = lex_strings.make(name_buf);
+		  use_name = hname_t(get_name(), instance_idx);
 	    }
 
 	    if (debug_scopes) {
-		  cerr << get_line() << ": debug: Module instance " << use_name
-		       << " becomes child of " << sc->name()
+		  cerr << get_fileline() << ": debug: Module instance " << use_name
+		       << " becomes child of " << scope_path(sc)
 		       << "." << endl;
 	    }
 
 	      // Create the new scope as a MODULE with my name.
 	    NetScope*my_scope = new NetScope(sc, use_name, NetScope::MODULE);
+	    my_scope->set_line(get_file(), mod->get_file(),
+	                       get_lineno(), mod->get_lineno());
 	    my_scope->set_module_name(mod->mod_name());
 	    my_scope->default_nettype(mod->default_nettype);
 
@@ -570,6 +755,10 @@ void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 		       ; cur != replace.end() ;  cur ++ ) {
 
 		  PExpr*tmp = (*cur).second;
+		    // No expression means that the parameter is not
+		    // replaced at all.
+		  if (tmp == 0)
+			continue;
 		  NetExpr*val = tmp->elaborate_pexpr(des, sc);
 		  replace_net[(*cur).first] = val;
 	    }
@@ -585,7 +774,11 @@ void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
 
 	/* Stash the instance array of scopes into the parent
 	   scope. Later elaboration passes will use this vector to
-	   further elaborate the array. */
+	   further elaborate the array.
+
+	   Note that the array is ordered from LSB to MSB. We will use
+	   that fact in the main elaborate to connect things in the
+	   correct order. */
       sc->instance_arrays[get_name()] = instances;
 }
 
@@ -638,10 +831,19 @@ void PBlock::elaborate_scope(Design*des, NetScope*scope) const
 {
       NetScope*my_scope = scope;
 
-      if (name_ != 0) {
-	    my_scope = new NetScope(scope, name_, bl_type_==BL_PAR
+      if (pscope_name() != 0) {
+	    hname_t use_name(pscope_name());
+	    if (scope->child(use_name)) {
+		  cerr << get_fileline() << ": error: block/scope name "
+		       << use_name << " already used in this context."
+		       << endl;
+		  des->errors += 1;
+		  return;
+	    }
+	    my_scope = new NetScope(scope, use_name, bl_type_==BL_PAR
 				    ? NetScope::FORK_JOIN
 				    : NetScope::BEGIN_END);
+	    my_scope->set_line(get_file(), get_lineno());
       }
 
       for (unsigned idx = 0 ;  idx < list_.count() ;  idx += 1)
@@ -744,106 +946,3 @@ void PWhile::elaborate_scope(Design*des, NetScope*scope) const
       if (statement_)
 	    statement_ -> elaborate_scope(des, scope);
 }
-
-
-/*
- * $Log: elab_scope.cc,v $
- * Revision 1.41  2006/06/02 04:48:50  steve
- *  Make elaborate_expr methods aware of the width that the context
- *  requires of it. In the process, fix sizing of the width of unary
- *  minus is context determined sizes.
- *
- * Revision 1.40  2006/04/12 05:05:03  steve
- *  Use elab_and_eval to evaluate genvar expressions.
- *
- * Revision 1.39  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.38  2006/03/30 01:49:07  steve
- *  Fix instance arrays indexed by overridden parameters.
- *
- * Revision 1.37  2006/03/18 22:53:38  steve
- *  Support more parameter syntax.
- *
- * Revision 1.36  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.35  2004/09/10 00:15:17  steve
- *  Missing stdio.h header for warnings.
- *
- * Revision 1.34  2004/09/05 17:44:41  steve
- *  Add support for module instance arrays.
- *
- * Revision 1.33  2004/08/26 04:02:03  steve
- *  Add support for localparam ranges.
- *
- * Revision 1.32  2004/06/13 04:56:54  steve
- *  Add support for the default_nettype directive.
- *
- * Revision 1.31  2004/05/25 19:21:06  steve
- *  More identifier lists use perm_strings.
- *
- * Revision 1.30  2004/02/20 06:22:56  steve
- *  parameter keys are per_strings.
- *
- * Revision 1.29  2004/02/19 07:06:57  steve
- *  LPM, logic and Variables have perm_string names.
- *
- * Revision 1.28  2004/02/18 17:11:55  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.27  2003/09/13 01:01:51  steve
- *  Spelling fixes.
- *
- * Revision 1.26  2003/08/28 04:11:17  steve
- *  Spelling patch.
- *
- * Revision 1.25  2003/06/24 01:38:02  steve
- *  Various warnings fixed.
- *
- * Revision 1.24  2003/06/20 00:53:19  steve
- *  Module attributes from the parser
- *  through to elaborated form.
- *
- * Revision 1.23  2003/06/16 00:34:08  steve
- *  Functions can have sub-scope.
- *
- * Revision 1.22  2003/06/13 19:10:46  steve
- *  Properly manage real variables in subscopes.
- *
- * Revision 1.21  2003/05/30 02:55:32  steve
- *  Support parameters in real expressions and
- *  as real expressions, and fix multiply and
- *  divide with real results.
- *
- * Revision 1.20  2003/03/06 00:28:41  steve
- *  All NetObj objects have lex_string base names.
- *
- * Revision 1.19  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.18  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
- *
- * Revision 1.17  2002/10/19 22:59:49  steve
- *  Redo the parameter vector support to allow
- *  parameter names in range expressions.
- *
- * Revision 1.16  2002/09/01 03:01:48  steve
- *  Properly cast signedness of parameters with ranges.
- *
- * Revision 1.15  2002/08/19 02:39:16  steve
- *  Support parameters with defined ranges.
- *
- * Revision 1.14  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.13  2001/12/30 04:47:57  steve
- *  Properly handle empty target in positionla parameter override.
- *
- * Revision 1.12  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- */
-

emit.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2005 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: emit.cc,v 1.87 2006/06/18 04:15:50 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -32,6 +29,7 @@
 # include  "netlist.h"
 # include  <typeinfo>
 # include  <cassert>
+# include  <cstring>
 
 bool NetNode::emit_node(struct target_t*tgt) const
 {
@@ -51,12 +49,23 @@ bool NetUDP::emit_node(struct target_t*tgt) const
       return true;
 }
 
+bool NetAbs::emit_node(struct target_t*tgt) const
+{
+      tgt->lpm_abs(this);
+      return true;
+}
+
 bool NetAddSub::emit_node(struct target_t*tgt) const
 {
       tgt->lpm_add_sub(this);
       return true;
 }
 
+bool NetArrayDq::emit_node(struct target_t*tgt) const
+{
+      return tgt->lpm_array_dq(this);
+}
+
 bool NetCaseCmp::emit_node(struct target_t*tgt) const
 {
       tgt->net_case_cmp(this);
@@ -125,9 +134,9 @@ bool NetPartSelect::emit_node(struct target_t*tgt) const
       return tgt->part_select(this);
 }
 
-bool NetRamDq::emit_node(struct target_t*tgt) const
+bool NetPow::emit_node(struct target_t*tgt) const
 {
-      tgt->lpm_ram_dq(this);
+      tgt->lpm_pow(this);
       return true;
 }
 
@@ -344,15 +353,19 @@ void NetScope::emit_scope(struct target_t*tgt) const
 		  tgt->signal(cur);
 		  cur = cur->sig_next_;
 	    } while (cur != signals_->sig_next_);
+
+	      /* Run the signals again, but this time to connect the
+	         delay paths. This is done as a second pass because
+	         the paths reference other signals that may be later
+	         in the list. We can do it here becase delay paths are
+	         always connected within the scope. */
+	    cur = signals_->sig_next_;
+	    do {
+		  tgt->signal_paths(cur);
+		  cur = cur->sig_next_;
+	    } while (cur != signals_->sig_next_);
       }
 
-      if (memories_) {
-	    NetMemory*cur = memories_->snext_;
-	    do {
-		  tgt->memory(cur);
-		  cur = cur->snext_;
-	    } while (cur != memories_->snext_);
-      }
 }
 
 bool NetScope::emit_defs(struct target_t*tgt) const
@@ -371,7 +384,9 @@ bool NetScope::emit_defs(struct target_t*tgt) const
 	  case TASK:
 	    tgt->task_def(this);
 	    break;
-	  default:  /* BEGIN_END and FORK_JOIN, do nothing */
+	  default:  /* BEGIN_END and FORK_JOIN, GENERATE... */
+	    for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_)
+		  flag &= cur->emit_defs(tgt);
 	    break;
       }
 
@@ -461,14 +476,9 @@ void NetECRealParam::expr_scan(struct expr_scan_t*tgt) const
       tgt->expr_rparam(this);
 }
 
-void NetEMemory::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_memory(this);
-}
-
 void NetEParam::expr_scan(struct expr_scan_t*tgt) const
 {
-      cerr << get_line() << ":internal error: unexpected NetEParam."
+      cerr << get_fileline() << ":internal error: unexpected NetEParam."
 	   << endl;
 }
 
@@ -525,73 +535,3 @@ int emit(const Design*des, const char*type)
 	   << " not found." << endl;
       return -1;
 }
-
-
-/*
- * $Log: emit.cc,v $
- * Revision 1.87  2006/06/18 04:15:50  steve
- *  Add support for system functions in continuous assignments.
- *
- * Revision 1.86  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.85  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.84  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
- *
- * Revision 1.83  2005/02/08 00:12:36  steve
- *  Add the NetRepeat node, and code generator support.
- *
- * Revision 1.82  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
- *
- * Revision 1.81  2005/01/24 05:28:30  steve
- *  Remove the NetEBitSel and combine all bit/part select
- *  behavior into the NetESelect node and IVL_EX_SELECT
- *  ivl_target expression type.
- *
- * Revision 1.80  2005/01/22 01:06:55  steve
- *  Change case compare from logic to an LPM node.
- *
- * Revision 1.79  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
- *
- *  Generate NetConcat devices for gate outputs that feed into a
- *  vector results. Use this to hande gate arrays. Also let gate
- *  arrays handle vectors of gates when the outputs allow for it.
- *
- * Revision 1.78  2004/12/11 02:31:26  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.77  2004/10/04 01:10:53  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.76  2004/05/31 23:34:37  steve
- *  Rewire/generalize parsing an elaboration of
- *  function return values to allow for better
- *  speed and more type support.
- *
- * Revision 1.75  2003/09/13 01:30:07  steve
- *  Missing case warnings.
- *
- * Revision 1.74  2003/05/30 02:55:32  steve
- *  Support parameters in real expressions and
- *  as real expressions, and fix multiply and
- *  divide with real results.
- *
- * Revision 1.73  2003/04/22 04:48:29  steve
- *  Support event names as expressions elements.
- *
- * Revision 1.72  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
- *
- * Revision 1.71  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
- */
-

eval.cc

@@ -16,12 +16,10 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: eval.cc,v 1.42 2006/05/19 04:07:24 steve Exp $"
-#endif
 
 # include "config.h"
 
+# include  <cstring>
 # include  <iostream>
 
 # include  "PExpr.h"
@@ -29,12 +27,12 @@
 # include  "netmisc.h"
 # include  "compiler.h"
 
-verinum* PExpr::eval_const(const Design*, NetScope*) const
+verinum* PExpr::eval_const(Design*, NetScope*) const
 {
       return 0;
 }
 
-verinum* PEBinary::eval_const(const Design*des, NetScope*scope) const
+verinum* PEBinary::eval_const(Design*des, NetScope*scope) const
 {
       verinum*l = left_->eval_const(des, scope);
       if (l == 0) return 0;
@@ -143,7 +141,7 @@ verinum* PEBinary::eval_const(const Design*des, NetScope*scope) const
       delete r;
       return res;
 }
-verinum* PEConcat::eval_const(const Design*des, NetScope*scope) const
+verinum* PEConcat::eval_const(Design*des, NetScope*scope) const
 {
       verinum*accum = parms_[0]->eval_const(des, scope);
       if (accum == 0)
@@ -170,31 +168,31 @@ verinum* PEConcat::eval_const(const Design*des, NetScope*scope) const
  * Evaluate an identifier as a constant expression. This is only
  * possible if the identifier is that of a parameter.
  */
-verinum* PEIdent::eval_const(const Design*des, NetScope*scope) const
+verinum* PEIdent::eval_const(Design*des, NetScope*scope) const
 {
       assert(scope);
       NetNet*net;
-      NetMemory*mem;
       NetEvent*eve;
       const NetExpr*expr;
 
+      const name_component_t&name_tail = path_.back();
+
 	// Handle the special case that this ident is a genvar
 	// variable name. In that case, the genvar meaning preempts
 	// everything and we just return that value immediately.
       if (scope->genvar_tmp
-	  && strcmp(path_.peek_tail_name(),scope->genvar_tmp) == 0) {
+	  && strcmp(name_tail.name,scope->genvar_tmp) == 0) {
 	    return new verinum(scope->genvar_tmp_val);
       }
 
-      NetScope*found_in = symbol_search(des, scope, path_,
-					net, mem, expr, eve);
+      symbol_search(des, scope, path_, net, expr, eve);
 
       if (expr == 0)
 	    return 0;
 
       const NetEConst*eval = dynamic_cast<const NetEConst*>(expr);
       if (eval == 0) {
-	    cerr << get_line() << ": internal error: Unable to evaluate "
+	    cerr << get_fileline() << ": internal error: Unable to evaluate "
 		 << "constant expression (parameter=" << path_
 		 << "): " << *expr << endl;
 	    return 0;
@@ -202,30 +200,30 @@ verinum* PEIdent::eval_const(const Design*des, NetScope*scope) const
 
       assert(eval);
 
-      if (msb_ || lsb_)
+      if (!name_tail.index.empty())
 	    return 0;
 
 
       return new verinum(eval->value());
 }
 
-verinum* PEFNumber::eval_const(const Design*, NetScope*) const
+verinum* PEFNumber::eval_const(Design*, NetScope*) const
 {
       long val = value_->as_long();
       return new verinum(val);
 }
 
-verinum* PENumber::eval_const(const Design*, NetScope*) const
+verinum* PENumber::eval_const(Design*, NetScope*) const
 {
       return new verinum(value());
 }
 
-verinum* PEString::eval_const(const Design*, NetScope*) const
+verinum* PEString::eval_const(Design*, NetScope*) const
 {
       return new verinum(string(text_));
 }
 
-verinum* PETernary::eval_const(const Design*des, NetScope*scope) const
+verinum* PETernary::eval_const(Design*des, NetScope*scope) const
 {
       verinum*test = expr_->eval_const(des, scope);
       if (test == 0)
@@ -245,7 +243,7 @@ verinum* PETernary::eval_const(const Design*des, NetScope*scope) const
       }
 }
 
-verinum* PEUnary::eval_const(const Design*des, NetScope*scope) const
+verinum* PEUnary::eval_const(Design*des, NetScope*scope) const
 {
       verinum*val = expr_->eval_const(des, scope);
       if (val == 0)
@@ -259,7 +257,7 @@ verinum* PEUnary::eval_const(const Design*des, NetScope*scope) const
 		  /* We need to expand the value a bit if we are
 		     taking the 2's complement so that we are
 		     guaranteed to not overflow. */
-		verinum tmp (0UL, val->len()+1);
+		verinum tmp ((uint64_t)0, val->len()+1);
 		for (unsigned idx = 0 ;  idx < val->len() ;  idx += 1)
 		      tmp.set(idx, val->get(idx));
 
@@ -272,104 +270,3 @@ verinum* PEUnary::eval_const(const Design*des, NetScope*scope) const
 	    delete val;
       return 0;
 }
-
-
-/*
- * $Log: eval.cc,v $
- * Revision 1.42  2006/05/19 04:07:24  steve
- *  eval_const is not strict.
- *
- * Revision 1.41  2006/05/17 16:49:30  steve
- *  Error message if concat expression cannot evaluate.
- *
- * Revision 1.40  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.39  2005/12/07 04:04:23  steve
- *  Allow constant concat expressions.
- *
- * Revision 1.38  2005/11/27 17:01:57  steve
- *  Fix for stubborn compiler.
- *
- * Revision 1.37  2005/11/27 05:56:20  steve
- *  Handle bit select of parameter with ranges.
- *
- * Revision 1.36  2003/06/21 01:21:43  steve
- *  Harmless fixup of warnings.
- *
- * Revision 1.35  2003/04/14 03:40:21  steve
- *  Make some effort to preserve bits while
- *  operating on constant values.
- *
- * Revision 1.34  2003/03/26 06:16:18  steve
- *  Evaluate > and < in constant expressions.
- *
- * Revision 1.33  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
- *
- * Revision 1.32  2002/10/19 22:59:49  steve
- *  Redo the parameter vector support to allow
- *  parameter names in range expressions.
- *
- * Revision 1.31  2002/10/13 05:01:07  steve
- *  More verbose eval_const assert message.
- *
- * Revision 1.30  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.29  2002/06/07 02:57:54  steve
- *  Simply give up on constants with indices.
- *
- * Revision 1.28  2002/06/06 18:57:04  steve
- *  Better error for identifier index eval.
- *
- * Revision 1.27  2002/05/23 03:08:51  steve
- *  Add language support for Verilog-2001 attribute
- *  syntax. Hook this support into existing $attribute
- *  handling, and add number and void value types.
- *
- *  Add to the ivl_target API new functions for access
- *  of complex attributes attached to gates.
- *
- * Revision 1.26  2001/12/29 22:10:10  steve
- *  constant eval of arithmetic with x and z.
- *
- * Revision 1.25  2001/12/29 00:43:55  steve
- *  Evaluate constant right shifts.
- *
- * Revision 1.24  2001/12/03 04:47:15  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.23  2001/11/07 04:01:59  steve
- *  eval_const uses scope instead of a string path.
- *
- * Revision 1.22  2001/11/06 06:11:55  steve
- *  Support more real arithmetic in delay constants.
- *
- * Revision 1.21  2001/07/25 03:10:49  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.20  2001/02/09 02:49:59  steve
- *  Be more clear about scope of failure.
- *
- * Revision 1.19  2001/01/27 05:41:48  steve
- *  Fix sign extension of evaluated constants. (PR#91)
- *
- * Revision 1.18  2001/01/14 23:04:56  steve
- *  Generalize the evaluation of floating point delays, and
- *  get it working with delay assignment statements.
- *
- *  Allow parameters to be referenced by hierarchical name.
- *
- * Revision 1.17  2001/01/04 04:47:51  steve
- *  Add support for << is signal indices.
- *
- * Revision 1.16  2000/12/10 22:01:36  steve
- *  Support decimal constants in behavioral delays.
- *
- * Revision 1.15  2000/09/07 22:38:13  steve
- *  Support unary + and - in constants.
- */
-

eval_attrib.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: eval_attrib.cc,v 1.8 2005/11/27 17:01:57 steve Exp $"
+#ident "$Id: eval_attrib.cc,v 1.9 2007/06/04 19:14:06 steve Exp $"
 #endif
 
 # include  "config.h"
@@ -35,8 +35,7 @@
 
 attrib_list_t* evaluate_attributes(const map<perm_string,PExpr*>&att,
 				   unsigned&natt,
-				   const Design*des,
-				   NetScope*scope)
+				   Design*des, NetScope*scope)
 {
       natt = att.size();
       if (natt == 0)
@@ -74,6 +73,9 @@ attrib_list_t* evaluate_attributes(const map<perm_string,PExpr*>&att,
 
 /*
  * $Log: eval_attrib.cc,v $
+ * Revision 1.9  2007/06/04 19:14:06  steve
+ *  Build errors in picky GCC compilers.
+ *
  * Revision 1.8  2005/11/27 17:01:57  steve
  *  Fix for stubborn compiler.
  *

examples/hello_vpi.c

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: hello_vpi.c,v 1.3 2002/08/12 01:35:01 steve Exp $"
+#ident "$Id: hello_vpi.c,v 1.5 2007/01/17 05:35:48 steve Exp $"
 #endif
 
 /*
@@ -33,7 +33,7 @@
 
 # include  <vpi_user.h>
 
-static int my_hello_calltf(char *xx)
+static PLI_INT32 my_hello_calltf(char *xx)
 {
       vpi_printf("Hello World, from VPI.\n");
       return 0;
@@ -62,6 +62,12 @@ void (*vlog_startup_routines[])() = {
 };
 /*
  * $Log: hello_vpi.c,v $
+ * Revision 1.5  2007/01/17 05:35:48  steve
+ *  Fix typo is hello_vpi.c example.
+ *
+ * Revision 1.4  2006/10/30 22:46:25  steve
+ *  Updates for Cygwin portability (pr1585922)
+ *
  * Revision 1.3  2002/08/12 01:35:01  steve
  *  conditional ident string using autoconfig.
  *

examples/pal_reg.v

@@ -26,7 +26,7 @@
  *   iverilog -tpal -ppart=generic-22v10-plcc -opal_reg.jed pal_reg.v
  *
  * The output file name (passed through the -o<file> switch) can be
- * any file you desire. If the compilation and fittin all succeed, the
+ * any file you desire. If the compilation and fitting all succeed, the
  * output file will be a JEDEC file that you can take to your favorite
  * PROM programmer to program the part.
  *
@@ -45,7 +45,7 @@
  *
  * The output drivers are controlled by a single active low output
  * enable. I used bufif0 devices in this example, but the exact same
- * thing can be achived with a continuous assignment like so:
+ * thing can be achieved with a continuous assignment like so:
  *
  *   assign out = oe? 8'hzz : Q;
  *
@@ -76,7 +76,7 @@ endmodule
  * a PLCC package.
  *
  * Note that this module has no logic in it. It is a convention I use
- * that I put all the functionality in a seperate module (seen above)
+ * that I put all the functionality in a separate module (seen above)
  * and isolate the Icarus Verilog specific $attribute madness into a
  * top-level module. The advantage of this style is that the entire
  * module can be `ifdef'ed out when doing simulation and you don't

examples/show_vcd.vl

@@ -63,7 +63,7 @@
   *
   *  The $dumpvars task tells the simulation what variables to write to
   *  the VCD output. The first parameter is how far to descend while
-  *  scanning a scope, and the remaining paramters are signals or scope
+  *  scanning a scope, and the remaining parameters are signals or scope
   *  names to include in the dump. If a scope name is given, all the
   *  signals within the scope are dumped. If a wire or register name is
   *  given, that signal is included.

examples/sqrt-virtex.v

@@ -16,13 +16,13 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- *   $Id: sqrt-virtex.v,v 1.4 2003/11/25 18:35:31 steve Exp $"
+ *   $Id: sqrt-virtex.v,v 1.5 2007/03/22 16:08:18 steve Exp $"
  */
 
 /*
- * This module is a synthesizeable square-root function. It is also a
+ * This module is a synthesizable square-root function. It is also a
  * detailed example of how to target Xilinx Virtex parts using
- * Icarus Verilog. In fact, for no particular reason other then to
+ * Icarus Verilog. In fact, for no particular reason other than to
  * be excessively specific, I will step through the process of
  * generating a design for a Spartan-II XC2S15-VQ100, and also how to
  * generate a generic library part for larger Virtex designs.
@@ -30,7 +30,7 @@
  * In addition to Icarus Verilog, you will need implementation
  * software from Xilinx. As of this writing, this example was tested
  * with Foundation 4.2i, but it should work the same with ISE and
- * Webpack software.
+ * WebPACK software.
  *
  * This example source contains all the Verilog needed to do
  * everything described below. We use conditional compilation to
@@ -55,7 +55,7 @@
  * "PASSED" and finishes the simulation.
  *
  * When you take a close look at the "main" module below, you will see
- * that it uses Verilog constructs that are not synthesizeable. This
+ * that it uses Verilog constructs that are not synthesizable. This
  * is fine, as we will never try to synthesize it.
  *
  * LIBRARY PARTS
@@ -78,7 +78,7 @@
  * Without any preprocessor directives, the only module is the sqrt32
  * module, so sqrt32 is compiled as the root. The ports of the module
  * are automatically made into ports of the sqrt32.edf netlist, and
- * the contents of the sqrt32 module are connected approprately.
+ * the contents of the sqrt32 module are connected appropriately.
  *
  * COMPLETE CHIP DESIGNS
  *
@@ -129,7 +129,7 @@
  * This command creates from the chip.ngd the file "chip_root.v" that
  * contains Verilog code that simulates the mapped design. This output
  * Verilog has the single root module "chip_root", which came from the
- * name of the root module when we were making hte EDIF file in the
+ * name of the root module when we were making the EDIF file in the
  * first place. The module has ports named just line the ports of the
  * chip_root module below.
  *
@@ -183,7 +183,7 @@
   * where sqrt(y) is the exact square root of y and floor(N) is the
   * largest integer <= N.
   *
-  * For 32bit numbers, this will never run more then 16 iterations,
+  * For 32 bit numbers, this will never run more than 16 iterations,
   * which amounts to 16 clocks.
   */
 

examples/sqrt.vl

@@ -16,7 +16,7 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- *   $Id: sqrt.vl,v 1.4 2004/10/04 01:10:56 steve Exp $"
+ *   $Id: sqrt.vl,v 1.5 2007/03/22 16:08:18 steve Exp $"
  */
 
  /*
@@ -50,7 +50,7 @@
   * where sqrt(y) is the exact square root of y and floor(N) is the
   * largest integer <= N.
   *
-  * For 32bit numbers, this will never run more then 16 iterations,
+  * For 32 bit numbers, this will never run more than 16 iterations,
   * which amounts to 16 clocks.
   */
 

extensions.txt

@@ -59,7 +59,7 @@ types as nets.
 
 - Ports
 
-Module and task ports in standard verilog are restricted to logic
+Module and task ports in standard Verilog are restricted to logic
 types. This extension removes that restriction, allowing any type to
 pass through the port consistent with the continuous assignment
 connectivity that is implied by the type.

functor.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: functor.cc,v 1.35 2005/07/07 16:22:49 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -43,6 +40,10 @@ void functor_t::process(class Design*, class NetProcTop*)
 {
 }
 
+void functor_t::lpm_abs(class Design*, class NetAbs*)
+{
+}
+
 void functor_t::lpm_add_sub(class Design*, class NetAddSub*)
 {
 }
@@ -83,6 +84,10 @@ void functor_t::lpm_mux(class Design*, class NetMux*)
 {
 }
 
+void functor_t::lpm_pow(class Design*, class NetPow*)
+{
+}
+
 void functor_t::sign_extend(class Design*, class NetSignExtend*)
 {
 }
@@ -173,6 +178,11 @@ void NetNode::functor_node(Design*, functor_t*)
 {
 }
 
+void NetAbs::functor_node(Design*des, functor_t*fun)
+{
+      fun->lpm_abs(des, this);
+}
+
 void NetAddSub::functor_node(Design*des, functor_t*fun)
 {
       fun->lpm_add_sub(des, this);
@@ -223,6 +233,11 @@ void NetMux::functor_node(Design*des, functor_t*fun)
       fun->lpm_mux(des, this);
 }
 
+void NetPow::functor_node(Design*des, functor_t*fun)
+{
+      fun->lpm_pow(des, this);
+}
+
 void NetSignExtend::functor_node(Design*des, functor_t*fun)
 {
       fun->sign_extend(des, this);
@@ -291,57 +306,3 @@ int proc_match_t::event_wait(NetEvWait*)
 {
       return 0;
 }
-
-/*
- * $Log: functor.cc,v $
- * Revision 1.35  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.34  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
- *
- * Revision 1.33  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
- *
- * Revision 1.32  2004/10/04 01:10:53  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.31  2002/08/16 05:18:27  steve
- *  Fix intermix of node functors and node delete.
- *
- * Revision 1.30  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.29  2002/08/10 22:07:38  steve
- *  Remove useless error messages.
- *
- * Revision 1.28  2002/06/05 03:44:25  steve
- *  Add support for memory words in l-value of
- *  non-blocking assignments, and remove the special
- *  NetAssignMem_ and NetAssignMemNB classes.
- *
- * Revision 1.27  2002/06/04 05:38:44  steve
- *  Add support for memory words in l-value of
- *  blocking assignments, and remove the special
- *  NetAssignMem class.
- *
- * Revision 1.26  2001/10/19 21:53:24  steve
- *  Support multiple root modules (Philip Blundell)
- *
- * Revision 1.25  2001/07/25 03:10:49  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.24  2000/11/19 20:48:30  steve
- *  Fix cases where signal iteration might die early.
- *
- * Revision 1.23  2000/11/18 04:53:04  steve
- *  Watch out in functor, it may delete the last signal.
- *
- * Revision 1.22  2000/09/17 21:26:15  steve
- *  Add support for modulus (Eric Aardoom)
- *
- * Revision 1.21  2000/08/01 02:48:41  steve
- *  Support <= in synthesis of DFF and ram devices.
- */
-

functor.h

@@ -1,7 +1,7 @@
 #ifndef __functor_H
 #define __functor_H
 /*
- * Copyright (c) 1999-2005 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,9 +18,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: functor.h,v 1.23 2005/07/07 16:22:49 steve Exp $"
-#endif
 
 /*
  * The functor is an object that can be applied to a design to
@@ -51,6 +48,9 @@ struct functor_t {
 	/* This method is called for each process in the design. */
       virtual void process(class Design*des, class NetProcTop*);
 
+	/* This method is called for each structural abs(). */
+      virtual void lpm_abs(class Design*des, class NetAbs*);
+
 	/* This method is called for each structural adder. */
       virtual void lpm_add_sub(class Design*des, class NetAddSub*);
 
@@ -81,6 +81,9 @@ struct functor_t {
 	/* This method is called for each MUX. */
       virtual void lpm_mux(class Design*des, class NetMux*);
 
+	/* This method is called for each power. */
+      virtual void lpm_pow(class Design*des, class NetPow*);
+
 	/* This method is called for each unary reduction gate. */
       virtual void lpm_ureduce(class Design*des, class NetUReduce*);
 
@@ -97,44 +100,4 @@ struct proc_match_t {
       virtual int block(class NetBlock*);
 };
 
-
-/*
- * $Log: functor.h,v $
- * Revision 1.23  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.22  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
- *
- * Revision 1.21  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
- *
- * Revision 1.20  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.19  2002/06/05 03:44:25  steve
- *  Add support for memory words in l-value of
- *  non-blocking assignments, and remove the special
- *  NetAssignMem_ and NetAssignMemNB classes.
- *
- * Revision 1.18  2002/06/04 05:38:44  steve
- *  Add support for memory words in l-value of
- *  blocking assignments, and remove the special
- *  NetAssignMem class.
- *
- * Revision 1.17  2000/09/17 21:26:15  steve
- *  Add support for modulus (Eric Aardoom)
- *
- * Revision 1.16  2000/08/01 02:48:42  steve
- *  Support <= in synthesis of DFF and ram devices.
- *
- * Revision 1.15  2000/07/16 04:56:07  steve
- *  Handle some edge cases during node scans.
- *
- * Revision 1.14  2000/07/15 05:13:44  steve
- *  Detect muxing Vz as a bufufN.
- *
- * Revision 1.13  2000/04/20 00:28:03  steve
- *  Catch some simple identity compareoptimizations.
- */
 #endif

ieee1364-notes.txt

@@ -1,4 +1,7 @@
 
+NOTE: THE CONTENTS OF THIS FILE ARE BEING MOVED TO THE DOCUMENTATION
+WIKI AT http://iverilog.wikia.com. PLEASE ADD NEW ENTRIES THERE.
+
                 Icarus Verilog vs. IEEE1364
                 Copyright 2000 Stephen Williams
 
@@ -249,7 +252,7 @@ exactly the same so far as the compiler is concerned.
 
 Unfortunately, Cadence seems to feel otherwise. In particular, it has
 been reported that although {1'b0, 16} causes an error, {1'b0, 15+1}
-is accepted. Further testing shows that any expression other then a
+is accepted. Further testing shows that any expression other than a
 simple unsized constant is accepted there, even if all the operands of
 all the operators that make up the expression are unsized integers.
 
@@ -498,8 +501,14 @@ of 4-value behavior in the dead zone, and appears more user friendly
 when viewed by reasonable viewers.
 
 
-$Id: ieee1364-notes.txt,v 1.17 2003/07/15 03:49:22 steve Exp $
+$Id: ieee1364-notes.txt,v 1.19 2007/04/18 02:36:13 steve Exp $
 $Log: ieee1364-notes.txt,v $
+Revision 1.19  2007/04/18 02:36:13  steve
+ Put to iverilog wiki for further notes.
+
+Revision 1.18  2007/03/22 16:08:16  steve
+ Spelling fixes from Larry
+
 Revision 1.17  2003/07/15 03:49:22  steve
  Spelling fixes.
 

iverilog-vpi.man

@@ -27,6 +27,15 @@ first source file is named \fIfoo.c\fP, the output becomes
 Include the named library in the link of the VPI module. This allows
 VPI modules to further reference external libraries.
 
+.TP 8
+.B -I\fIdirectory\fP
+Add \fIdirectory\fP to the list of directories that will be search for
+header files.
+
+.TP 8
+.B -D\fIdefine\fP
+Define a macro named \fIdefine\fP.
+
 .TP 8
 .B --name=\fIname\fP
 Normally, the output VPI module will be named after the first source
@@ -39,6 +48,10 @@ This flag causes the program to print the install directory for VPI
 modules, then exit. It is a convenience for makefiles or automated
 plug-in installers.
 
+.TP 8
+.B --cflags, --ldflags and -ldlibs
+These flags provide compile time information.
+
 .SH "PC-ONLY OPTIONS"
 
 The PC port of \fIiverilog-vpi\fP includes two special flags needed to

iverilog-vpi.sh

@@ -17,35 +17,25 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: iverilog-vpi.sh,v 1.15 2006/02/21 02:38:44 steve Exp $"
+#ident "$Id: iverilog-vpi.sh,v 1.17 2007/02/06 05:07:31 steve Exp $"
 
 # These are the variables used for compiling files
-CC=gcc
-CXX=g++
-CFLAGS="@PIC@ -O -I@INCLUDEDIR@"
+CC=@IVCC@
+CXX=@IVCXX@
+CFLAGS="@PIC@ @IVCFLAGS@ -I@INCLUDEDIR@"
 
 # These are used for linking...
-LD=gcc
-LDFLAGS32="@SHARED@ -L@LIBDIR@"
-LDFLAGS64="@SHARED@ -L@LIBDIR64@"
-LDFLAGS="$LDFLAGS64"
+LD=$CC
+LDFLAGS="@SHARED@ -L@LIBDIR@"
 LDLIBS="-lveriuser -lvpi"
 
-INSTDIR64="@VPIDIR1@"
-INSTDIR32="@VPIDIR2@"
-if test x$INSTDIR32 = x
-then
-    INSTDIR32=$INSTDIR64
-fi
-
-INSTDIR="$INSTDIR64"
-
 CCSRC=
 CXSRC=
 OBJ=
 LIB=
 OUT=
 INCOPT=
+DEFS=
 
 # --
 # parse the command line switches. This collects the source files
@@ -69,6 +59,13 @@ do
 	 fi
 	 ;;
 
+    *.cpp) CXSRC="$CXSRC $parm"
+	 LD=$CXX
+         if [ x$OUT = x ]; then
+	    OUT=`basename $parm .cpp`
+	 fi
+	 ;;
+
     *.o) OBJ="$OBJ $parm"
          if [ x$OUT = x ]; then
 	    OUT=`basename $parm .o`
@@ -83,13 +80,10 @@ do
 	 ;;
 
     -I*) INCOPT="$INCOPT $parm"
-	 echo "$parm"
 	 ;;
 
-    -m32) LDFLAGS="-m32 $LDFLAGS32"
-	  CFLAGS="-m32 $CFLAGS"
-	  INSTDIR="$INSTDIR32"
-	  ;;
+    -D*) DEFS="$DEFS $parm"
+	 ;;
 
     --cflags)
 	 echo "$CFLAGS"
@@ -107,7 +101,7 @@ do
 	 ;;
 
     --install-dir)
-	 echo "@LIBDIR@/ivl/$INSTDIR"
+	 echo "@LIBDIR@/ivl"
 	 exit
 	 ;;
     esac
@@ -131,7 +125,7 @@ do
     obj=$base".o"
 
     echo "Compiling $src..."
-    $CC -c -o $obj $CFLAGS $INCOPT $src || compile_errors=`expr $compile_errors + 1`
+    $CC -c -o $obj $DEFS $CFLAGS $INCOPT $src || compile_errors=`expr $compile_errors + 1`
     OBJ="$OBJ $obj"
 done
 
@@ -141,13 +135,13 @@ do
     obj=$base".o"
 
     echo "Compiling $src..."
-    $CXX -c -o $obj $CFLAGS $INCOPT $src || compile_errors=`expr $compile_errors + 1`
+    $CXX -c -o $obj $DEFS $CFLAGS $INCOPT $src || compile_errors=`expr $compile_errors + 1`
     OBJ="$OBJ $obj"
 done
 
 if test $compile_errors -gt 0
 then
-    echo "Some ($compile_errors) files failed to compile."
+    echo "$0: $compile_errors file(s) failed to compile."
     exit $compile_errors
 fi
 

ivl.def

@@ -9,9 +9,11 @@ ivl_design_roots
 ivl_design_time_precision
 
 ivl_const_bits
-ivl_const_pin
-ivl_const_pins
+ivl_const_delay
+ivl_const_real
 ivl_const_signed
+ivl_const_type
+ivl_const_width
 
 ivl_event_any
 ivl_event_basename
@@ -21,14 +23,15 @@ ivl_event_neg
 ivl_event_nneg
 ivl_event_npos
 ivl_event_pos
+ivl_event_scope
 
 ivl_expr_type
 ivl_expr_bits
 ivl_expr_def
 ivl_expr_dvalue
 ivl_expr_event
-ivl_expr_lsi
-ivl_expr_memory
+ivl_expr_file
+ivl_expr_lineno
 ivl_expr_name
 ivl_expr_opcode
 ivl_expr_oper1
@@ -44,21 +47,28 @@ ivl_expr_signed
 ivl_expr_string
 ivl_expr_uvalue
 ivl_expr_value
-ivl_expr_variable
 ivl_expr_width
 
+ivl_file_table_index
+ivl_file_table_item
+ivl_file_table_size
+
 ivl_logic_attr
 ivl_logic_attr_cnt
 ivl_logic_attr_val
-ivl_logic_delay
-ivl_logic_name
 ivl_logic_basename
-ivl_logic_scope
-ivl_logic_type
+ivl_logic_delay
+ivl_logic_drive0
+ivl_logic_drive1
+ivl_logic_name
 ivl_logic_pin
 ivl_logic_pins
+ivl_logic_scope
+ivl_logic_type
 ivl_logic_udp
+ivl_logic_width
 
+ivl_lpm_array
 ivl_lpm_aset_value
 ivl_lpm_async_clr
 ivl_lpm_async_set
@@ -67,11 +77,11 @@ ivl_lpm_basename
 ivl_lpm_clk
 ivl_lpm_data
 ivl_lpm_datab
-ivl_lpm_data2
-ivl_lpm_data2_width
 ivl_lpm_define
+ivl_lpm_delay
 ivl_lpm_enable
-ivl_lpm_memory
+ivl_lpm_file
+ivl_lpm_lineno
 ivl_lpm_name
 ivl_lpm_q
 ivl_lpm_scope
@@ -80,25 +90,17 @@ ivl_lpm_selects
 ivl_lpm_signed
 ivl_lpm_size
 ivl_lpm_sset_value
+ivl_lpm_string
 ivl_lpm_sync_clr
 ivl_lpm_sync_set
 ivl_lpm_type
 ivl_lpm_width
 
 ivl_lval_idx
-ivl_lval_mem
 ivl_lval_mux
 ivl_lval_part_off
-ivl_lval_pin
-ivl_lval_pins
 ivl_lval_sig
-ivl_lval_var
-
-ivl_memory_basename
-ivl_memory_root
-ivl_memory_scope
-ivl_memory_size
-ivl_memory_width
+ivl_lval_width
 
 ivl_nexus_get_private
 ivl_nexus_name
@@ -116,20 +118,32 @@ ivl_nexus_ptr_sig
 
 ivl_parameter_basename
 ivl_parameter_expr
+ivl_parameter_file
+ivl_parameter_lineno
+
+ivl_path_condit
+ivl_path_delay
+ivl_path_is_condit
+ivl_path_scope
+ivl_path_source
+ivl_path_source_negedge
+ivl_path_source_posedge
 
 ivl_scope_attr_cnt
 ivl_scope_attr_val
 ivl_scope_basename
 ivl_scope_children
 ivl_scope_def
+ivl_scope_def_file
+ivl_scope_def_lineno
 ivl_scope_event
 ivl_scope_events
+ivl_scope_file
+ivl_scope_lineno
 ivl_scope_logs
 ivl_scope_log
 ivl_scope_lpms
 ivl_scope_lpm
-ivl_scope_mem
-ivl_scope_mems
 ivl_scope_name
 ivl_scope_param
 ivl_scope_params
@@ -138,26 +152,36 @@ ivl_scope_port
 ivl_scope_ports
 ivl_scope_sigs
 ivl_scope_sig
+ivl_scope_time_precision
 ivl_scope_time_units
 ivl_scope_type
 ivl_scope_tname
-ivl_scope_var
-ivl_scope_vars
 
+ivl_signal_array_base
+ivl_signal_array_count
 ivl_signal_attr
 ivl_signal_attr_cnt
 ivl_signal_attr_val
+ivl_signal_basename
+ivl_signal_data_type
+ivl_signal_dimensions
+ivl_signal_file
 ivl_signal_integer
+ivl_signal_lineno
 ivl_signal_local
 ivl_signal_lsb
 ivl_signal_msb
-ivl_signal_pin
-ivl_signal_pins
+ivl_signal_name
+ivl_signal_nex
+ivl_signal_npath
+ivl_signal_path
 ivl_signal_port
 ivl_signal_signed
 ivl_signal_type
-ivl_signal_name
-ivl_signal_basename
+ivl_signal_width
+
+ivl_path_delay
+ivl_path_source
 
 ivl_process_attr_cnt
 ivl_process_attr_val
@@ -180,13 +204,13 @@ ivl_stmt_cond_true
 ivl_stmt_delay_expr
 ivl_stmt_delay_val
 ivl_stmt_events
+ivl_stmt_file
+ivl_stmt_lineno
 ivl_stmt_lval
 ivl_stmt_lvals
 ivl_stmt_lwidth
 ivl_stmt_name
 ivl_stmt_nevent
-ivl_stmt_nexus
-ivl_stmt_nexus_count
 ivl_stmt_parm
 ivl_stmt_parm_count
 ivl_stmt_rval
@@ -198,6 +222,3 @@ ivl_udp_nin
 ivl_udp_row
 ivl_udp_rows
 ivl_udp_sequ
-
-ivl_variable_name
-ivl_variable_type

ivl_assert.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2007 Stephen Williams (steve@icarus.com)
+ *
+ *    This source code is free software; you can redistribute it
+ *    and/or modify it in source code form under the terms of the GNU
+ *    General Public License as published by the Free Software
+ *    Foundation; either version 2 of the License, or (at your option)
+ *    any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+#ifdef HAVE_CVS_IDENT
+#ident "$Id: ivl_assert.h,v 1.1 2007/01/31 04:21:10 steve Exp $"
+#endif
+
+#ifndef __ivl_assert_h
+#define __ivl_assert_h
+
+# include  <assert.h>
+
+#define ivl_assert(tok, expression)  \
+      do {			    \
+	    if (! (expression))     \
+		  __ivl_assert(#expression, tok, __FILE__, __LINE__);	\
+      } while(0)
+
+#define __ivl_assert(expression, tok, file, line)  \
+      do { \
+	    cerr << (tok).get_fileline() << ": assert: " \
+		 << file << ":" << line \
+		 << ": failed assertion " << (expression) << endl; \
+	    abort(); \
+      } while(0)
+
+
+#endif

ivl_target.h

@@ -1,7 +1,7 @@
 #ifndef __ivl_target_H
 #define __ivl_target_H
 /*
- * Copyright (c) 2000-2004 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,9 +18,8 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: ivl_target.h,v 1.168 2006/06/18 04:15:50 steve Exp $"
-#endif
+
+# include  <inttypes.h>
 
 #ifdef __cplusplus
 #define _BEGIN_DECL extern "C" {
@@ -57,6 +56,10 @@ _BEGIN_DECL
  * The following typedefs list the various cookies that may be passed
  * around.
  *
+ * ivl_array_t
+ *    This object represent an array that can be a memory or a net
+ *    array. (They are the same from the perspective of ivl_target.h.)
+ *
  * ivl_design_t
  *    This object represents the entire elaborated design. Various
  *    global properties and methods are available from this.
@@ -135,6 +138,8 @@ _BEGIN_DECL
  * scope. These names are unique within a scope, but not necessarily
  * throughout the design.
  */
+typedef struct ivl_array_s    *ivl_array_t;
+typedef struct ivl_delaypath_s*ivl_delaypath_t;
 typedef struct ivl_design_s   *ivl_design_t;
 typedef struct ivl_event_s    *ivl_event_t;
 typedef struct ivl_expr_s     *ivl_expr_t;
@@ -150,7 +155,7 @@ typedef struct ivl_parameter_s*ivl_parameter_t;
 typedef struct ivl_process_s  *ivl_process_t;
 typedef struct ivl_scope_s    *ivl_scope_t;
 typedef struct ivl_signal_s   *ivl_signal_t;
-typedef struct ivl_memory_s   *ivl_memory_t;
+typedef struct ivl_memory_s   *ivl_memory_t; /* DEPRECATED */
 typedef struct ivl_statement_s*ivl_statement_t;
 
 /*
@@ -175,7 +180,7 @@ typedef enum ivl_drive_e {
    and incompatibilities to be introduced. */
 typedef enum ivl_expr_type_e {
       IVL_EX_NONE = 0,
-	/* IVL_EX_BITSEL = 1, */
+      IVL_EX_ARRAY = 18,
       IVL_EX_BINARY = 2,
       IVL_EX_CONCAT = 3,
       IVL_EX_EVENT  = 17,
@@ -201,6 +206,7 @@ typedef enum ivl_logic_e {
       IVL_LO_BUFIF0 =  3,
       IVL_LO_BUFIF1 =  4,
       IVL_LO_BUFZ   =  5,
+      IVL_LO_CMOS   = 22,
       IVL_LO_NAND   =  6,
       IVL_LO_NMOS   =  7,
       IVL_LO_NOR    =  8,
@@ -210,6 +216,7 @@ typedef enum ivl_logic_e {
       IVL_LO_OR     = 12,
       IVL_LO_PULLDOWN  = 13,
       IVL_LO_PULLUP = 14,
+      IVL_LO_RCMOS  = 23,
       IVL_LO_RNMOS  = 15,
       IVL_LO_RPMOS  = 16,
       IVL_LO_PMOS   = 17,
@@ -221,7 +228,9 @@ typedef enum ivl_logic_e {
 
 /* This is the type of an LPM object. */
 typedef enum ivl_lpm_type_e {
+      IVL_LPM_ABS    = 32,
       IVL_LPM_ADD    =  0,
+      IVL_LPM_ARRAY  = 30,
       IVL_LPM_CONCAT = 16,
       IVL_LPM_CMP_EEQ= 18, /* Case EQ (===) */
       IVL_LPM_CMP_EQ = 10,
@@ -237,6 +246,7 @@ typedef enum ivl_lpm_type_e {
       IVL_LPM_PART_BI= 28, /* part select: bi-directional (part on 0) */
       IVL_LPM_PART_VP= 15, /* part select: vector to part */
       IVL_LPM_PART_PV= 17, /* part select: part written to vector */
+      IVL_LPM_POW    = 31,
       IVL_LPM_RE_AND = 20,
       IVL_LPM_RE_NAND= 21,
       IVL_LPM_RE_NOR = 22,
@@ -249,10 +259,20 @@ typedef enum ivl_lpm_type_e {
       IVL_LPM_SHIFTR =  7,
       IVL_LPM_SIGN_EXT=27,
       IVL_LPM_SUB    =  8,
-      IVL_LPM_RAM    =  9,
+      /* IVL_LPM_RAM =  9, / obsolete */
       IVL_LPM_UFUNC  = 14
 } ivl_lpm_type_t;
 
+/* The path edge type is the edge type used to select a specific
+   delay. */
+typedef enum ivl_path_edge_e {
+      IVL_PE_01 = 0, IVL_PE_10, IVL_PE_0z,
+      IVL_PE_z1,     IVL_PE_1z, IVL_PE_z0,
+      IVL_PE_0x,     IVL_PE_x1, IVL_PE_1x,
+      IVL_PE_x0,     IVL_PE_xz, IVL_PE_zx,
+      IVL_PE_COUNT
+} ivl_path_edge_t;
+
 /* Processes are initial or always blocks with a statement. This is
    the type of the ivl_process_t object. */
 typedef enum ivl_process_type_e {
@@ -359,6 +379,38 @@ struct ivl_attribute_s {
 };
 typedef const struct ivl_attribute_s*ivl_attribute_t;
 
+/* DELAYPATH
+ * Delaypath objects represent delay paths called out by a specify
+ * block in the Verilog source file. The destination signal references
+ * the path object, which in turn points to the source for the path.
+ *
+ * ivl_path_scope
+ *    This returns the scope of the delay path. This scope corresponds
+ *    to the scope of the specify-block that led to this path.
+ *
+ * ivl_path_source
+ *    This returns the nexus that is the source end of the delay
+ *    path. Transitions on the source are the start of the delay time
+ *    for this path.
+ *
+ * ivl_path_condit
+ *    This returns the nexus that tracks the condition for the
+ *    delay. If the delay path is unconditional, this returns nil.
+ * ivl_path_is_condit
+ *    Is this a conditional structure? Needed for ifnone.
+ *
+ * ivl_path_source_posedge
+ * ivl_path_source_negedge
+ *    These functions return true if the source is edge sensitive.
+ */
+extern ivl_scope_t ivl_path_scope(ivl_delaypath_t obj);
+extern ivl_nexus_t ivl_path_source(ivl_delaypath_t obj);
+extern uint64_t ivl_path_delay(ivl_delaypath_t obj, ivl_path_edge_t pt);
+extern ivl_nexus_t ivl_path_condit(ivl_delaypath_t obj);
+extern int ivl_path_is_condit(ivl_delaypath_t obj);
+
+extern int ivl_path_source_posedge(ivl_delaypath_t obj);
+extern int ivl_path_source_negedge(ivl_delaypath_t obj);
 
 /* DESIGN
  * When handed a design (ivl_design_t) there are a few things that you
@@ -422,7 +474,7 @@ extern ivl_net_const_t ivl_design_const(ivl_design_t, unsigned idx);
  *    The is the type of the node.
  *
  * ivl_const_bits
- *    This returns a pointer to an array of conststant characters,
+ *    This returns a pointer to an array of constant characters,
  *    each byte a '0', '1', 'x' or 'z'. The array is *not* nul
  *    terminated.
  *
@@ -435,6 +487,9 @@ extern ivl_net_const_t ivl_design_const(ivl_design_t, unsigned idx);
  * ivl_const_width
  *    Return the width, in logical bits, of the constant.
  *
+ * ivl_const_delay
+ *    T0 delay for a transition (0, 1 and Z).
+ *
  * SEMANTIC NOTES
  *
  * The const_type of the literal constant must match the
@@ -450,6 +505,7 @@ extern ivl_net_const_t ivl_design_const(ivl_design_t, unsigned idx);
  */
 extern ivl_variable_type_t ivl_const_type(ivl_net_const_t net);
 extern const char* ivl_const_bits(ivl_net_const_t net);
+extern ivl_expr_t  ivl_const_delay(ivl_net_const_t net, unsigned transition);
 extern ivl_nexus_t ivl_const_nex(ivl_net_const_t net);
 extern int         ivl_const_signed(ivl_net_const_t net);
 extern unsigned    ivl_const_width(ivl_net_const_t net);
@@ -548,6 +604,14 @@ extern ivl_nexus_t ivl_event_pos(ivl_event_t net, unsigned idx);
  *
  * SEMANTIC NOTES
  *
+ * - IVL_EX_ARRAY
+ * This expression type is a special case of the IVL_EX_SIGNAL where
+ * the target is an array (ivl_signal_t with an array_count) but there
+ * is no index expression. This is used only in the special situation
+ * where the array is passed to a system task/function. The function
+ * ivl_expr_signal returns the ivl_signal_t of the array object, and
+ * from that all the properties of the array can be determined.
+ *
  * - IVL_EX_BINARY
  *
  * - IVL_EX_SELECT
@@ -557,10 +621,39 @@ extern ivl_nexus_t ivl_event_pos(ivl_event_t net, unsigned idx);
  * is the base of a vector. The compiler has already figured out any
  * conversion from signal units to vector units, so the result of
  * ivl_expr_oper1 should range from 0 to ivl_expr_width().
+ *
+ * - IVL_EX_SIGNAL
+ * This expression references a signal vector. The ivl_expr_signal
+ * function gets a handle for the signal that is referenced. The
+ * signal may be an array (see the ivl_signal_array_count function)
+ * that is addressed by the expression returned by the ivl_expr_oper1
+ * function. This expression returns a *canonical* address. The core
+ * compiler already corrected the expression to account for index
+ * bases.
+ *
+ * The ivl_expr_width function returns the vector width of the signal
+ * word. The ivl_expr_value returns the data type of the word.
+ *
+ * Bit and part selects are not done here. The IVL_EX_SELECT
+ * expression does bit/part selects on the word read from the signal.
+ *
+ * - IVL_EX_STRING
+ * This expression refers to a string constant. The ivl_expr_string
+ * function returns a pointer to the first byte of the string. The
+ * compiler has translated it to a "vvp escaped string" which has
+ * quoting and escapes eliminated. The string may contain octal
+ * escapes (\<oct>) so that the string text returned by
+ * ivl_expr_string will only contain graphical characters. It is up to
+ * the target to change the escaped \NNN to the proper byte value when
+ * using this string. No other escape sequences will appear in the
+ * string. Quote (") and slash (\) characters will be delivered in
+ * \NNN form.
  */
 
 extern ivl_expr_type_t ivl_expr_type(ivl_expr_t net);
 extern ivl_variable_type_t ivl_expr_value(ivl_expr_t net);
+extern const char*ivl_expr_file(ivl_expr_t net);
+extern unsigned ivl_expr_lineno(ivl_expr_t net);
 
   /* IVL_EX_NUMBER */
 extern const char* ivl_expr_bits(ivl_expr_t net);
@@ -601,42 +694,10 @@ extern unsigned long ivl_expr_uvalue(ivl_expr_t net);
   /* any expression */
 extern unsigned    ivl_expr_width(ivl_expr_t net);
 
-/*
- * Memory.
- * Memories are declared in Verilog source as 2 dimensional arrays of
- * reg bits. This means that they are simple arrays of vectors. The
- * vectors in the array are called "words".
- *
- * ivl_memory_name (DEPRECATED)
- *
- * ivl_memory_basename
- *    This returns the base name of the memory object. The base name
- *    does not include the name of the scopes that contains the object.
- *
- * ivl_memory_root
- *    The root of the memory is the value to add to a calculated
- *    address to get to a canonical (0-based) address. This value is
- *    used when external code wishes to access a word. All the
- *    compiled references to the word within the compiled design are
- *    converted to canonical form by the compiler.
- *
- * ivl_memory_size
- * ivl_memory_width
- *    These functions return the dimensions of the memory. The size is
- *    the number of words in the memory, and the width is the number
- *    of bits in each word.
- *
- * ivl_memory_scope
- *    This returns the scope that contains the memory.
- */
+extern const char* ivl_file_table_item(unsigned  idx);
+extern unsigned ivl_file_table_index(const char *);
+extern unsigned ivl_file_table_size(void);
 
-extern const char*ivl_memory_basename(ivl_memory_t net);
-extern int ivl_memory_root(ivl_memory_t net);
-extern ivl_scope_t ivl_memory_scope(ivl_memory_t net);
-extern unsigned ivl_memory_size(ivl_memory_t net);
-extern unsigned ivl_memory_width(ivl_memory_t net);
-
-extern ivl_memory_t ivl_expr_memory(ivl_expr_t net);
 
 /* LOGIC
  * These types and functions support manipulation of logic gates. The
@@ -691,7 +752,7 @@ extern ivl_memory_t ivl_expr_memory(ivl_expr_t net);
  * SEMANTIC NOTES
  * The ivl_logic_width applies to all the pins of a logic device. If a
  * logic device has width, that means that it is actually an array of
- * logic devices tha each process a bit slice of the
+ * logic devices that each process a bit slice of the
  * inputs/output. That implies that the widths of all the inputs and
  * the output must be identical.
  *
@@ -724,7 +785,7 @@ extern ivl_memory_t ivl_expr_memory(ivl_expr_t net);
  * These devices are grouped as logic devices with zero inputs because
  * the outputs have the same characteristics as other logic
  * devices. They are special only in that they have zero inputs, and
- * their drivers typically have strength other then strong.
+ * their drivers typically have strength other than strong.
  *
  * - IVL_LO_UDP
  * User defined primitives (UDPs) are like any other logic devices, in
@@ -799,6 +860,9 @@ extern unsigned    ivl_udp_rows(ivl_udp_t net);
 extern const char* ivl_udp_name(ivl_udp_t net);
 
 
+extern const char* ivl_lpm_file(ivl_lpm_t net);
+extern unsigned ivl_lpm_lineno(ivl_lpm_t net);
+
 /* LPM
  * These functions support access to the properties of LPM
  * devices. LPM devices are a variety of devices that handle more
@@ -812,6 +876,9 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  *    Return the name of the device. The name is the name of the
  *    device with the scope part, and the basename is without the scope.
  *
+ * ivl_lpm_delay
+ *    LPM devices have a delay for each transition (0, 1 and Z).
+ *
  * ivl_lpm_scope
  *    LPM devices exist within a scope. Return the scope that contains
  *    this device.
@@ -867,7 +934,7 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  * The ivl_lpm_q nexus is the output from the concatenation.
  *
  * The ivl_lpm_data function returns the connections for the inputs to
- * the concatentation. The ivl_lpm_size function returns the number of
+ * the concatenation. The ivl_lpm_size function returns the number of
  * inputs help by the device.
  *
  * - Divide (IVL_LPM_DIVIDE)
@@ -883,12 +950,22 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  * inputs. In fact, the compiler doesn't assure that the widths of the
  * inputs add up to the width of the output, but the possibility
  * exists. It is *not* an error for the sum of the input widths to be
- * more then the width of the output, although the possibility of
+ * more than the width of the output, although the possibility of
  * overflow exists at run time.
  *
  * Multiply may be signed. If so, the output should be sign extended
  * to fill in its result.
  *
+ * - Power (IVL_LPM_POW)
+ * The power takes two inputs and generates an output. Unlike other
+ * arithmetic nodes, the width only refers to the output. The inputs
+ * have independent widths, to reflect the arithmetic truth that the
+ * width of a general power is the XXXX of the widths of the
+ * inputs.
+ *
+ * Power may be signed. If so, the output should be sign extended
+ * to fill in its result.
+ *
  * - Part Select (IVL_LPM_PART_VP and IVL_LPM_PART_PV)
  * There are two part select devices, one that extracts a part from a
  * vector, and another that writes a part of a vector. The _VP is
@@ -941,7 +1018,7 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  * The ivl_lpm_data() method returns the inputs of the MUX device. The
  * ivl_lpm_size() method returns the number of data inputs there
  * are. All the data inputs have the same width, the width of the
- * ivl_lpm_q output. The type of the device is devined from the
+ * ivl_lpm_q output. The type of the device is divined from the
  * inputs and the Q. All the types must be exactly the same.
  *
  * - D-FlipFlop (IVL_LPM_FF)
@@ -949,7 +1026,7 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  * single ivl_lpm_data input are the same with, ivl_lpm_width. This
  * device carries a vector like other LPM devices.
  *
- * - Memory port (IVL_LPM_RAM)
+ * - Memory port (IVL_LPM_RAM) (deprecated in favor of IVL_LPM_ARRAY)
  * These are structural ports into a memory device. They represent
  * address/data ports of a memory device that the context can hook to
  * for read or write. Read devices have an ivl_lpm_q output port that
@@ -986,12 +1063,16 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  * input must be signed, and the output will be a vector sign extended
  * to the desired width. The ivl_lpm_width() value is the output
  * width, the input will be whatever it wants to be.
+ *
  * - Shifts (IVL_LPM_SHIFTL/SHIFTR)
  * This node takes two inputs, a vector and a shift distance. The
  * ivl_lpm_data(0) nexus is the vector input, and the ivl_lpm_data(1)
  * the shift distance. The vector input is the same width as the
  * output, but the distance has its own width.
  *
+ * The ivl_lpm_signed() flag means for IVL_LPM_SHIFTR that the right
+ * shift is *signed*. For SHIFTL, then signed-ness is meaningless.
+ *
  * - System function call (IVL_LPM_SFUNC)
  * This device represents a netlist call to a system function. The
  * inputs to the device are passed to a system function, and the
@@ -1011,15 +1092,15 @@ extern const char* ivl_udp_name(ivl_udp_t net);
  * function are connected to the net, as is the output.
  *
  * The function definition is associated with a scope, and the
- * ivl_lpm_define fuction returns the scope that is that definition.
- * See the ivl_scope_* fuctions for how to get at the actual
+ * ivl_lpm_define function returns the scope that is that definition.
+ * See the ivl_scope_* functions for how to get at the actual
  * definition.
  *
  * As with many LPM nodes, the ivl_lpm_q function returns the nexus
  * for the signal function return value. The width of this nexus must
  * exactly match the width of the device from ivl_lpm_width.
  *
- * The ivl_lpm_data function retrives the nexa for all the input
+ * The ivl_lpm_data function retrieves the nexa for all the input
  * ports. The ivl_lpm_size function returns the number of inputs for
  * the device, and the ivl_lpm_data() function index argument selects
  * the port to retrieve. Each port is sized independently.
@@ -1027,6 +1108,7 @@ extern const char* ivl_udp_name(ivl_udp_t net);
 
 extern const char*    ivl_lpm_name(ivl_lpm_t net); /* (Obsolete) */
 extern const char*    ivl_lpm_basename(ivl_lpm_t net);
+extern ivl_expr_t     ivl_lpm_delay(ivl_lpm_t net, unsigned transition);
 extern ivl_scope_t    ivl_lpm_scope(ivl_lpm_t net);
 extern int            ivl_lpm_signed(ivl_lpm_t net);
 extern ivl_lpm_type_t ivl_lpm_type(ivl_lpm_t net);
@@ -1039,34 +1121,33 @@ extern ivl_expr_t  ivl_lpm_aset_value(ivl_lpm_t net);
 extern ivl_nexus_t ivl_lpm_sync_clr(ivl_lpm_t net);
 extern ivl_nexus_t ivl_lpm_sync_set(ivl_lpm_t net);
 extern ivl_expr_t  ivl_lpm_sset_value(ivl_lpm_t net);
+  /* IVL_LPM_ARRAY */
+extern ivl_signal_t ivl_lpm_array(ivl_lpm_t net);
   /* IVL_LPM_PART */
 extern unsigned ivl_lpm_base(ivl_lpm_t net);
-  /* IVL_LPM_FF IVL_LPM_RAM */
+  /* IVL_LPM_FF */
 extern ivl_nexus_t ivl_lpm_clk(ivl_lpm_t net);
   /* IVL_LPM_UFUNC */
 extern ivl_scope_t  ivl_lpm_define(ivl_lpm_t net);
-  /* IVL_LPM_FF IVL_LPM_RAM */
+  /* IVL_LPM_FF */
 extern ivl_nexus_t ivl_lpm_enable(ivl_lpm_t net);
   /* IVL_LPM_ADD IVL_LPM_CONCAT IVL_LPM_FF IVL_LPM_PART IVL_LPM_MULT
-     IVL_LPM_MUX IVL_LPM_RAM IVL_LPM_SHIFTL IVL_LPM_SHIFTR IVL_LPM_SUB
+     IVL_LPM_MUX IVL_LPM_POW IVL_LPM_SHIFTL IVL_LPM_SHIFTR IVL_LPM_SUB
      IVL_LPM_UFUNC */
 extern ivl_nexus_t ivl_lpm_data(ivl_lpm_t net, unsigned idx);
-  /* IVL_LPM_ADD IVL_LPM_MULT IVL_LPM_SUB */
+  /* IVL_LPM_ADD IVL_LPM_MULT IVL_LPM_POW IVL_LPM_SUB */
 extern ivl_nexus_t ivl_lpm_datab(ivl_lpm_t net, unsigned idx);
-  /* IVL_LPM_ADD IVL_LPM_FF IVL_LPM_MULT IVL_LPM_PART IVL_LPM_RAM
+  /* IVL_LPM_ADD IVL_LPM_FF IVL_LPM_MULT IVL_LPM_PART IVL_LPM_POW
      IVL_LPM_SUB IVL_LPM_UFUNC */
 extern ivl_nexus_t ivl_lpm_q(ivl_lpm_t net, unsigned idx);
-  /* IVL_LPM_MUX IVL_LPM_RAM */
+  /* IVL_LPM_MUX */
 extern unsigned ivl_lpm_selects(ivl_lpm_t net);
-  /* IVL_LPM_MUX IVL_LPM_RAM */
+  /* IVL_LPM_MUX */
 extern ivl_nexus_t ivl_lpm_select(ivl_lpm_t net);
   /* IVL_LPM_CONCAT IVL_LPM_MUX IVL_LPM_REPEAT IVL_LPM_UFUNC */
 extern unsigned ivl_lpm_size(ivl_lpm_t net);
   /* IVL_LPM_SFUNC */
 extern const char*ivl_lpm_string(ivl_lpm_t net);
-  /* IVL_LPM_RAM */
-extern ivl_memory_t ivl_lpm_memory(ivl_lpm_t net);
-
 
 /* LVAL
  * The l-values of assignments are concatenation of ivl_lval_t
@@ -1089,7 +1170,7 @@ extern ivl_memory_t ivl_lpm_memory(ivl_lpm_t net);
  *
  *    (Should this be combined with ivl_lval_idx? -Ed)
  *
- * ivl_lval_mem
+ * ivl_lval_mem (deprecated)
  *    If the l-value is a memory, this method returns an
  *    ivl_memory_t that represents that memory. Otherwise, it
  *    returns 0.
@@ -1112,25 +1193,33 @@ extern ivl_memory_t ivl_lpm_memory(ivl_lpm_t net);
  * SEMANTIC NOTES
  * The ivl_lval_width is not necessarily the same as the width of the
  * signal or memory word it represents. It is the width of the vector
- * it receives and assigns. This may be less then the width of the
+ * it receives and assigns. This may be less than the width of the
  * signal (or even 1) if only a part of the l-value signal is to be
  * assigned.
  *
  * The ivl_lval_part_off is the canonical base of a part or
  * bit select.
  *
- * - Memory words
+ * - Memory words (Replace this with Array words below)
  * If the l-value is a memory word, the ivl_lval_mem function returns
  * a non-nil value. The ivl_lval_idx function will return an
  * expression that calculates an address for the memory. The compiler
  * will assure that the ivl_lval_width will exactly match the
  * ivl_memory_width of the memory word.
+ *
+ * - Array words
+ * If the l-value is an array, then ivl_lval_idx function will return
+ * an expression that calculates the address of the array word. If
+ * the referenced signal has more than one word, this expression must
+ * be present. If the signal has exactly one word (it is not an array)
+ * then the ivl_lval_idx expression must *not* be present.
+ *
+ * For array words, the ivl_lval_width is the width of the word.
  */
 
 extern unsigned    ivl_lval_width(ivl_lval_t net);
 extern ivl_expr_t  ivl_lval_mux(ivl_lval_t net); // XXXX Obsolete?
 extern ivl_expr_t  ivl_lval_idx(ivl_lval_t net);
-extern ivl_memory_t ivl_lval_mem(ivl_lval_t net);
 extern ivl_expr_t  ivl_lval_part_off(ivl_lval_t net);
 extern ivl_signal_t ivl_lval_sig(ivl_lval_t net);
 
@@ -1251,11 +1340,18 @@ extern ivl_signal_t ivl_nexus_ptr_sig(ivl_nexus_ptr_t net);
  * ivl_parameter_expr
  *    Return the value of the parameter. This should be a simple
  *    constant expression, an IVL_EX_STRING or IVL_EX_NUMBER.
+ *
+ * ivl_parameter_file
+ * ivl_parameter_lineno
+ *    Returns the file and line where this parameter is define
  */
 extern const char* ivl_parameter_basename(ivl_parameter_t net);
 extern ivl_scope_t ivl_parameter_scope(ivl_parameter_t net);
 extern ivl_expr_t  ivl_parameter_expr(ivl_parameter_t net);
 
+extern const char* ivl_parameter_file(ivl_parameter_t net);
+extern unsigned ivl_parameter_lineno(ivl_parameter_t net);
+
 
 /* SCOPE
  * Scopes of various sort have these properties. Use these methods to
@@ -1290,7 +1386,7 @@ extern ivl_expr_t  ivl_parameter_expr(ivl_parameter_t net);
  * ivl_scope_children
  *    A scope may in turn contain other scopes. This method iterates
  *    through all the child scopes of a given scope. If the function
- *    returns any value other then 0, the iteration stops and the
+ *    returns any value other than 0, the iteration stops and the
  *    method returns that value. Otherwise, iteration continues until
  *    the children run out.
  *
@@ -1299,12 +1395,22 @@ extern ivl_expr_t  ivl_parameter_expr(ivl_parameter_t net);
  *
  * ivl_scope_def
  *    Task definition scopes carry a task definition, in the form of
- *    a statement. This method accesses that definition.
+ *    a statement. This method accesses that definition. The
+ *    ivl_scope_def function must return a statement for scopes that
+ *    are type FUNCTION or TASK, and must return nil otherwise.
+ *
+ * ivl_scope_def_file
+ * ivl_scope_def_lineno
+ *    Returns the file and line where this scope is defined.
  *
  * ivl_scope_event
  * ivl_scope_events
  *    Scopes have 0 or more event objects in them.
  *
+ * ivl_scope_file
+ * ivl_scope_lineno
+ *    Returns the instantiation file and line for this scope.
+ *
  * ivl_scope_var
  * ivl_scope_vars
  *    REMOVED
@@ -1350,6 +1456,11 @@ extern ivl_expr_t  ivl_parameter_expr(ivl_parameter_t net);
  *    anything that can become and ivl_signal_t, include synthetic
  *    signals generated by the compiler.
  *
+ * ivl_scope_time_precision
+ *    Scopes have their own intrinsic time precision, typically from
+ *    the timescale compiler directive. This method returns the
+ *    precision as a signed power of 10 value.
+ *
  * ivl_scope_time_units
  *    Scopes have their own intrinsic time units, typically from the
  *    timescale compiler directive. This method returns the units as a
@@ -1370,15 +1481,17 @@ extern int          ivl_scope_children(ivl_scope_t net,
 				       ivl_scope_f func, void*cd);
 
 extern ivl_statement_t ivl_scope_def(ivl_scope_t net);
+extern const char* ivl_scope_def_file(ivl_scope_t net);
+extern unsigned ivl_scope_def_lineno(ivl_scope_t net);
 
 extern unsigned     ivl_scope_events(ivl_scope_t net);
 extern ivl_event_t  ivl_scope_event(ivl_scope_t net, unsigned idx);
+extern const char* ivl_scope_file(ivl_scope_t net);
+extern unsigned ivl_scope_lineno(ivl_scope_t net);
 extern unsigned     ivl_scope_logs(ivl_scope_t net);
 extern ivl_net_logic_t ivl_scope_log(ivl_scope_t net, unsigned idx);
 extern unsigned     ivl_scope_lpms(ivl_scope_t net);
 extern ivl_lpm_t    ivl_scope_lpm(ivl_scope_t, unsigned idx);
-extern unsigned     ivl_scope_mems(ivl_scope_t net);
-extern ivl_memory_t ivl_scope_mem(ivl_scope_t net, unsigned idx);
 extern const char*  ivl_scope_name(ivl_scope_t net);
 extern const char*  ivl_scope_basename(ivl_scope_t net);
 extern unsigned     ivl_scope_params(ivl_scope_t net);
@@ -1390,6 +1503,7 @@ extern unsigned     ivl_scope_sigs(ivl_scope_t net);
 extern ivl_signal_t ivl_scope_sig(ivl_scope_t net, unsigned idx);
 extern ivl_scope_type_t ivl_scope_type(ivl_scope_t net);
 extern const char*  ivl_scope_tname(ivl_scope_t net);
+extern int          ivl_scope_time_precision(ivl_scope_t net);
 extern int          ivl_scope_time_units(ivl_scope_t net);
 
 
@@ -1402,17 +1516,26 @@ extern int          ivl_scope_time_units(ivl_scope_t net);
  * Signals have a name (obviously) and types. A signal may also be
  * signed or unsigned.
  *
- * ivl_signal_pins (replace these with ivl_signal_nex)
- * ivl_signal_pin
- *    The ivl_signal_pin function returns the nexus connected to the
- *    signal. If the signal is a vector, the idx can be a non-zero
- *    value, and the result is the nexus for the specified bit.
- *
  * ivl_signal_nex
  *    This is the nexus of the signal. This is used for managing
  *    connections to the rest of the net. There is exactly one pin for
- *    a signal. If the signal represents a vector, then the entire
- *    vector is carried through the single output.
+ *    each word of a signal. Each word may in turn be a vector. The
+ *    word address is the zero-based index for the word. It is up to
+ *    the context to translate different bases to the canonical address.
+ *
+ * ivl_signal_array_base
+ * ivl_signal_array_count
+ *    The signal may be arrayed. If so, the array_count is >1. Each
+ *    word of the array has its own nexus. The array_base is the
+ *    address is the Verilog source for the canonical zero word. This
+ *    may be negative, positive or zero.
+ *
+ *    Note that arraying of the signal into words is distinct from the
+ *    vectors. The width of a signal is the width of a WORD.
+ *
+ * ivl_signal_dimensions
+ *    The signal may be an array (of vectors) in which case this
+ *    function returns >0, the number of dimensions of the array.
  *
  * ivl_signal_msb
  * ivl_signal_lsb
@@ -1444,6 +1567,12 @@ extern int          ivl_scope_time_units(ivl_scope_t net);
  *    etc. All the signals connected to a nexus should have the same
  *    data type
  *
+ * ivl_signal_npath
+ * ivl_signal_path
+ *    This function returns the delay path object for the signal. The
+ *    delay path has this signal as the output, the source is attached
+ *    to the delay path itself.
+ *
  * ivl_signal_name (DEPRECATED)
  *    This function returns the fully scoped hierarchical name for the
  *    signal. The name refers to the entire vector that is the signal.
@@ -1465,9 +1594,16 @@ extern int          ivl_scope_time_units(ivl_scope_t net);
  *    the attribute value (a string) associated with a key. This
  *    function returns the attribute value for the given key. If the
  *    key does not exist, the function returns 0.
+ *
+ * ivl_signal_file
+ * ivl_signal_lineno
+ *    Returns the file and line where this signal is defined.
  */
 
-extern ivl_nexus_t ivl_signal_nex(ivl_signal_t net);
+extern ivl_nexus_t ivl_signal_nex(ivl_signal_t net, unsigned word);
+extern int         ivl_signal_array_base(ivl_signal_t net);
+extern unsigned    ivl_signal_array_count(ivl_signal_t net);
+extern unsigned    ivl_signal_dimensions(ivl_signal_t net);
 extern int         ivl_signal_msb(ivl_signal_t net);
 extern int         ivl_signal_lsb(ivl_signal_t net);
 extern unsigned    ivl_signal_width(ivl_signal_t net);
@@ -1475,12 +1611,17 @@ extern ivl_signal_port_t ivl_signal_port(ivl_signal_t net);
 extern int         ivl_signal_signed(ivl_signal_t net);
 extern int         ivl_signal_integer(ivl_signal_t net);
 extern int         ivl_signal_local(ivl_signal_t net);
+extern unsigned    ivl_signal_npath(ivl_signal_t net);
+extern ivl_delaypath_t ivl_signal_path(ivl_signal_t net, unsigned idx);
 extern ivl_signal_type_t ivl_signal_type(ivl_signal_t net);
 extern ivl_variable_type_t ivl_signal_data_type(ivl_signal_t net);
 extern const char* ivl_signal_name(ivl_signal_t net);
 extern const char* ivl_signal_basename(ivl_signal_t net);
 extern const char* ivl_signal_attr(ivl_signal_t net, const char*key);
 
+extern const char* ivl_signal_file(ivl_signal_t net);
+extern unsigned ivl_signal_lineno(ivl_signal_t net);
+
 extern unsigned        ivl_signal_attr_cnt(ivl_signal_t net);
 extern ivl_attribute_t ivl_signal_attr_val(ivl_signal_t net, unsigned idx);
 
@@ -1524,13 +1665,20 @@ extern ivl_attribute_t ivl_process_attr_val(ivl_process_t net, unsigned idx);
  * The ivl_statement_type() function returns the type code for the
  * statement. This is the major type, and implies which of the later
  * functions are applicable to the statement.
+ *
+ * the ivl_statement_file() and _lineno() functions return the source
+ * file and line number of the statement in the Verilog source. This
+ * information is useful for diagnostic information.
  */
 extern ivl_statement_type_t ivl_statement_type(ivl_statement_t net);
 
+extern const char* ivl_stmt_file(ivl_statement_t net);
+extern unsigned ivl_stmt_lineno(ivl_statement_t net);
+
 /*
  * The following functions retrieve specific single values from the
  * statement. These values are the bits of data and parameters that
- * make up the statement. Many of these functions apply to more then
+ * make up the statement. Many of these functions apply to more than
  * one type of statement, so the comment in front of them tells which
  * statement types can be passed to the function.
  *
@@ -1549,7 +1697,7 @@ extern ivl_statement_type_t ivl_statement_type(ivl_statement_t net);
  * ivl_stmt_lval
  * ivl_stmt_lvals
  *    Return the number of l-values for an assignment statement, or
- *    the specific l-value. If there is more then 1 l-value, then the
+ *    the specific l-value. If there is more than 1 l-value, then the
  *    l-values are presumed to be vector values concatenated together
  *    from msb (idx==0) to lsb.
  *
@@ -1596,8 +1744,8 @@ extern ivl_statement_type_t ivl_statement_type(ivl_statement_t net);
  * - IVL_ST_DELAY, IVL_ST_DELAYX
  * These statement types are delay statements. They are a way to
  * attach a delay to a statement. The ivl_stmt_sub_stmt() function
- * gets the statment to be executed after the delay. If this an
- * ivl_ST_DELAY, then the ivl_stmt_delay_val function gets the
+ * gets the statement to be executed after the delay. If this is
+ * IVL_ST_DELAY, then the ivl_stmt_delay_val function gets the
  * constant delay. If this is IVL_ST_DELAYX, then the
  * ivl_stmt_delay_expr gets the expression of the delay. In this case,
  * the expression is not necessarily constant.
@@ -1654,7 +1802,7 @@ extern ivl_statement_t ivl_stmt_cond_true(ivl_statement_t net);
   /* IVL_ST_ASSIGN IVL_ST_ASSIGN_NB IVL_ST_DELAYX */
 extern ivl_expr_t ivl_stmt_delay_expr(ivl_statement_t net);
   /* IVL_ST_DELAY */
-extern unsigned long ivl_stmt_delay_val(ivl_statement_t net);
+extern uint64_t ivl_stmt_delay_val(ivl_statement_t net);
   /* IVL_ST_WAIT IVL_ST_TRIGGER */
 extern unsigned    ivl_stmt_nevent(ivl_statement_t net);
 extern ivl_event_t ivl_stmt_events(ivl_statement_t net, unsigned idx);
@@ -1668,10 +1816,6 @@ extern unsigned ivl_stmt_lvals(ivl_statement_t net);
 extern unsigned ivl_stmt_lwidth(ivl_statement_t net);
   /* IVL_ST_STASK */
 extern const char* ivl_stmt_name(ivl_statement_t net);
-#if 0
-extern ivl_nexus_t ivl_stmt_nexus(ivl_statement_t net, unsigned idx);
-extern unsigned    ivl_stmt_nexus_count(ivl_statement_t net);
-#endif
   /* IVL_ST_STASK */
 extern ivl_expr_t ivl_stmt_parm(ivl_statement_t net, unsigned idx);
   /* IVL_ST_STASK */
@@ -1712,203 +1856,4 @@ typedef int  (*target_design_f)(ivl_design_t des);
 
 _END_DECL
 
-/*
- * $Log: ivl_target.h,v $
- * Revision 1.168  2006/06/18 04:15:50  steve
- *  Add support for system functions in continuous assignments.
- *
- * Revision 1.167  2006/04/16 00:15:43  steve
- *  Fix part selects in l-values.
- *
- * Revision 1.166  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.165  2006/02/02 02:43:58  steve
- *  Allow part selects of memory words in l-values.
- *
- * Revision 1.164  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
- *
- * Revision 1.163  2005/12/22 15:44:29  steve
- *  Document binary expression use.
- *
- * Revision 1.162  2005/11/20 15:58:25  steve
- *  Document the IVL_ST_DELAY statements.
- *
- * Revision 1.161  2005/09/19 21:45:35  steve
- *  Spelling patches from Larry.
- *
- * Revision 1.160  2005/09/01 04:11:37  steve
- *  Generate code to handle real valued muxes.
- *
- * Revision 1.159  2005/08/06 17:58:16  steve
- *  Implement bi-directional part selects.
- *
- * Revision 1.158  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.157  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.156  2005/06/13 22:25:37  steve
- *  Document ivl_logic_delay function.
- *
- * Revision 1.155  2005/05/24 01:44:28  steve
- *  Do sign extension of structuran nets.
- *
- * Revision 1.154  2005/05/08 23:44:08  steve
- *  Add support for variable part select.
- *
- * Revision 1.153  2005/05/07 03:14:00  steve
- *  Clarify internal delays for assignments.
- *
- * Revision 1.152  2005/04/24 23:44:02  steve
- *  Update DFF support to new data flow.
- *
- * Revision 1.151  2005/04/13 06:35:11  steve
- *  Make logic aware of strength.
- *
- * Revision 1.150  2005/04/08 04:52:31  steve
- *  Make clear that memory addresses are cannonical.
- *
- * Revision 1.149  2005/04/06 05:29:08  steve
- *  Rework NetRamDq and IVL_LPM_RAM nodes.
- *
- * Revision 1.148  2005/04/01 06:04:30  steve
- *  Clean up handle of UDPs.
- *
- * Revision 1.147  2005/03/18 02:56:03  steve
- *  Add support for LPM_UFUNC user defined functions.
- *
- * Revision 1.146  2005/03/09 04:53:40  steve
- *  Generate code for new form of memory ports.
- *
- * Revision 1.145  2005/03/05 05:47:42  steve
- *  Handle memory words in l-value concatenations.
- *
- * Revision 1.144  2005/03/03 04:34:42  steve
- *  Rearrange how memories are supported as vvp_vector4 arrays.
- *
- * Revision 1.143  2005/02/19 02:43:38  steve
- *  Support shifts and divide.
- *
- * Revision 1.142  2005/02/14 01:51:39  steve
- *  Handle bit selects in l-values to assignments.
- *
- * Revision 1.141  2005/02/13 01:15:07  steve
- *  Replace supply nets with wires connected to pullup/down supply devices.
- *
- * Revision 1.140  2005/02/12 06:25:40  steve
- *  Restructure NetMux devices to pass vectors.
- *  Generate NetMux devices from ternary expressions,
- *  Reduce NetMux devices to bufif when appropriate.
- *
- * Revision 1.139  2005/02/08 00:12:36  steve
- *  Add the NetRepeat node, and code generator support.
- *
- * Revision 1.138  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
- *
- * Revision 1.137  2005/01/29 18:46:18  steve
- *  Netlist boolean expressions generate gate vectors.
- *
- * Revision 1.136  2005/01/29 16:47:20  steve
- *  Clarify width of nexus.
- *
- * Revision 1.135  2005/01/28 05:39:33  steve
- *  Simplified NetMult and IVL_LPM_MULT.
- *
- * Revision 1.134  2005/01/24 05:28:30  steve
- *  Remove the NetEBitSel and combine all bit/part select
- *  behavior into the NetESelect node and IVL_EX_SELECT
- *  ivl_target expression type.
- *
- * Revision 1.133  2005/01/22 17:36:59  steve
- *  stub dump signed flags of magnitude compare.
- *
- * Revision 1.132  2005/01/22 01:06:55  steve
- *  Change case compare from logic to an LPM node.
- *
- * Revision 1.131  2005/01/09 20:16:01  steve
- *  Use PartSelect/PV and VP to handle part selects through ports.
- *
- * Revision 1.130  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
- *
- *  Generate NetConcat devices for gate outputs that feed into a
- *  vector results. Use this to hande gate arrays. Also let gate
- *  arrays handle vectors of gates when the outputs allow for it.
- *
- * Revision 1.129  2004/12/18 18:56:18  steve
- *  Add ivl_event_scope, and better document ivl_event_X methods.
- *
- * Revision 1.128  2004/12/15 17:10:40  steve
- *  Fixup force statement elaboration.
- *
- * Revision 1.127  2004/12/11 02:31:26  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.126  2004/10/04 01:10:53  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.125  2004/09/25 01:58:12  steve
- *  Some commentary on ivl_logic_pin.
- *
- * Revision 1.124  2003/12/03 02:46:24  steve
- *  Add support for wait on list of named events.
- *
- * Revision 1.123  2003/11/08 20:06:21  steve
- *  Spelling fixes in comments.
- *
- * Revision 1.122  2003/08/22 23:14:26  steve
- *  Preserve variable ranges all the way to the vpi.
- *
- * Revision 1.121  2003/08/15 02:23:52  steve
- *  Add synthesis support for synchronous reset.
- *
- * Revision 1.120  2003/07/30 01:13:28  steve
- *  Add support for triand and trior.
- *
- * Revision 1.119  2003/06/23 01:25:44  steve
- *  Module attributes make it al the way to ivl_target.
- *
- * Revision 1.118  2003/05/14 05:26:41  steve
- *  Support real expressions in case statements.
- *
- * Revision 1.117  2003/04/22 04:48:29  steve
- *  Support event names as expressions elements.
- *
- * Revision 1.116  2003/04/11 05:18:08  steve
- *  Handle signed magnitude compare all the
- *  way through to the vvp code generator.
- *
- * Revision 1.115  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
- *
- * Revision 1.114  2003/03/06 01:24:37  steve
- *  Obsolete the ivl_event_name function.
- *
- * Revision 1.113  2003/03/06 00:28:41  steve
- *  All NetObj objects have lex_string base names.
- *
- * Revision 1.112  2003/02/26 01:29:24  steve
- *  LPM objects store only their base names.
- *
- * Revision 1.111  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.110  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
- *
- * Revision 1.109  2002/12/21 00:55:58  steve
- *  The $time system task returns the integer time
- *  scaled to the local units. Change the internal
- *  implementation of vpiSystemTime the $time functions
- *  to properly account for this. Also add $simtime
- *  to get the simulation time.
- */
 #endif

ivlpp/.cvsignore

@@ -1,6 +1,3 @@
 lexor.c
-parse.c
-parse.h
-parse.output
 Makefile
 ivlpp

ivlpp/Makefile.in

@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.17 2004/10/04 01:10:56 steve Exp $"
+#ident "$Id: Makefile.in,v 1.18 2006/10/30 22:45:37 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -44,36 +44,32 @@ CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
 CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-all: ivlpp
+all: ivlpp@EXEEXT@
 
 clean:
-	rm -f *.o lexor.c parse.c parse.h parse.output ivlpp
+	rm -f *.o lexor.c ivlpp@EXEEXT@
 
 distclean: clean
 	rm -f Makefile
 
-O = main.o lexor.o parse.o
+O = main.o lexor.o
 
-ivlpp: $O
-	$(CC) $(LDFLAGS) $O -o ivlpp @EXTRALIBS@
+ivlpp@EXEEXT@: $O
+	$(CC) $(LDFLAGS) $O -o ivlpp@EXEEXT@ @EXTRALIBS@
 
 lexor.c: lexor.lex
-	flex -s -olexor.c $(srcdir)/lexor.lex
+	flex -olexor.c $(srcdir)/lexor.lex
 
-parse.h parse.c: parse.y
-	bison --verbose -t -d -o parse.c $(srcdir)/parse.y
+install: all installdirs $(libdir)/ivl/ivlpp@EXEEXT@
 
-install: all installdirs $(libdir)/ivl/ivlpp
-
-$(libdir)/ivl/ivlpp: ivlpp
-	$(INSTALL_PROGRAM) ./ivlpp $(libdir)/ivl/ivlpp
+$(libdir)/ivl/ivlpp@EXEEXT@: ivlpp@EXEEXT@
+	$(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ $(libdir)/ivl/ivlpp@EXEEXT@
 
 installdirs: ../mkinstalldirs
 	$(srcdir)/../mkinstalldirs $(libdir)/ivl
 
 uninstall:
-	rm -f $(libdir)/ivl/ivlpp
+	rm -f $(libdir)/ivl/ivlpp@EXEEXT@
 
-lexor.o: lexor.c parse.h globals.h
+lexor.o: lexor.c globals.h
 main.o: main.c globals.h
-parse.o: parse.c

ivlpp/globals.h

@@ -1,7 +1,7 @@
 #ifndef __globals_H
 #define __globals_H
 /*
- * Copyright (c) 1999 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2007 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -18,14 +18,14 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: globals.h,v 1.7 2002/08/12 01:35:02 steve Exp $"
-#endif
 
 # include  <stdio.h>
 
 extern void reset_lexor(FILE*out, char*paths[]);
-extern void define_macro(const char*name, const char*value, int keyword);
+extern void load_precompiled_defines(FILE*src);
+extern void define_macro(const char*name, const char*value, int keyword,
+                         int argc);
+extern void dump_precompiled_defines(FILE*out);
 
 /* These variables contain the include directories to be searched when
    an include directive in encountered. */
@@ -39,31 +39,7 @@ extern unsigned error_count;
 
 extern FILE *depend_file;
 
-/* This is the entry to the parser. */
-extern int yyparse();
+/* This is the entry to the lexer. */
+extern int yylex();
 
-/*
- * $Log: globals.h,v $
- * Revision 1.7  2002/08/12 01:35:02  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.6  2002/04/04 05:26:13  steve
- *  Add dependency generation.
- *
- * Revision 1.5  2000/09/13 22:33:13  steve
- *  undefined macros are null (with warnings.)
- *
- * Revision 1.4  2000/08/20 17:49:04  steve
- *  Clean up warnings and portability issues.
- *
- * Revision 1.3  2000/06/30 15:49:44  steve
- *  Handle errors from parser slightly differently.
- *
- * Revision 1.2  1999/09/05 22:33:18  steve
- *  Take multiple source files on the command line.
- *
- * Revision 1.1  1999/07/03 20:03:47  steve
- *  Add include path and line directives.
- *
- */
 #endif

ivlpp/ivlpp.txt

@@ -19,7 +19,7 @@
 
 THE IVL PREPROCESSOR
 
-The ivlpp command is a verilog preprocessor that handles file
+The ivlpp command is a Verilog preprocessor that handles file
 inclusion and macro substitution. The program runs separate from the
 actual compiler so as to ease the task of the compiler proper, and
 provides a means of preprocessing files off-line.

ivlpp/main.c

@@ -1,5 +1,5 @@
 const char COPYRIGHT[] =
-          "Copyright (c) 1999 Stephen Williams ([email protected])";
+          "Copyright (c) 1999-2008 Stephen Williams ([email protected])";
 /*
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@ const char COPYRIGHT[] =
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: main.c,v 1.20 2004/09/10 00:15:45 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -58,6 +55,9 @@ extern int getopt(int argc, char*argv[], const char*fmt);
 extern int optind;
 extern const char*optarg;
 #endif
+/* Path to the dependency file, if there is one. */
+char *dep_path = NULL;
+
 
 /*
  * Keep in source_list an array of pointers to file names. The array
@@ -89,6 +89,76 @@ int line_direct_flag = 0;
 unsigned error_count = 0;
 FILE *depend_file = NULL;
 
+static int flist_read_flags(const char*path)
+{
+      char line_buf[2048];
+      FILE*fd = fopen(path, "r");
+      if (fd == 0) {
+	    fprintf(stderr, "%s: unable to open for reading.\n", path);
+	    return -1;
+      }
+
+      while (fgets(line_buf, sizeof line_buf, fd) != 0) {
+	      /* Skip leading white space. */
+	    char*cp = line_buf + strspn(line_buf, " \t\r\b\f");
+	      /* Remove trailing white space. */
+	    char*tail = cp + strlen(cp);
+	    while (tail > cp) {
+		  if (! isspace(tail[-1]))
+			break;
+		  tail -= 1;
+		  tail[0] = 0;
+	    }
+
+	      /* Skip empty lines */
+	    if (*cp == 0)
+		  continue;
+	      /* Skip comment lines */
+	    if (cp[0] == '#')
+		  continue;
+
+	      /* The arg points to the argument to the keyword. */
+	    char*arg = strchr(cp, ':');
+	    if (arg) *arg++ = 0;
+
+	    if (strcmp(cp,"D") == 0) {
+		  char*val = strchr(arg, '=');
+		  if (val)
+			*val++ = 0;
+		  else
+			val = "1";
+
+		  define_macro(arg, val, 0, 0);
+
+	    } else if (strcmp(cp,"I") == 0) {
+		  include_dir = realloc(include_dir,
+					(include_cnt+1)*sizeof(char*));
+		  include_dir[include_cnt] = strdup(arg);
+		  include_cnt += 1;
+
+	    } else if (strcmp(cp,"keyword") == 0) {
+		  char*buf = malloc(strlen(arg) + 2);
+		  buf[0] = '`';
+		  strcpy(buf+1, optarg);
+		  define_macro(optarg, buf, 1, 0);
+		  free(buf);
+
+	    } else if (strcmp(cp,"M") == 0) {
+		  if (dep_path) {
+			fprintf(stderr, "duplicate -M flag.\n");
+		  } else {
+			dep_path = strdup(arg);
+		  }
+
+	    } else {
+		  fprintf(stderr, "%s: Invalid keyword %s\n", path, cp);
+	    }
+      }
+
+      fclose(fd);
+      return 0;
+}
+
 /*
  * This function reads from a file a list of file names. Each name
  * starts with the first non-space character, and ends with the last
@@ -127,46 +197,43 @@ int main(int argc, char*argv[])
       const char*flist_path = 0;
       unsigned flag_errors = 0;
       char*out_path = 0;
-      char *dep_path = NULL;
       FILE*out;
+      char*precomp_out_path = 0;
+      FILE*precomp_out = NULL;
 
 	/* Define preprocessor keywords that I plan to just pass. */
-      define_macro("celldefine",          "`celldefine", 1);
-      define_macro("default_nettype",     "`default_nettype", 1);
-      define_macro("delay_mode_distributed", "`delay_mode_distributed", 1);
-      define_macro("delay_mode_unit",     "`delay_mode_unit", 1);
-      define_macro("delay_mode_path",     "`delay_mode_path", 1);
-      define_macro("disable_portfaults",  "`disable_portfaults", 1);
-      define_macro("enable_portfaults",   "`enable_portfaults", 1);
-      define_macro("endcelldefine",       "`endcelldefine", 1);
-      define_macro("endprotect",          "`endprotect", 1);
-      define_macro("nosuppress_faults",   "`nosuppress_faults", 1);
-      define_macro("nounconnected_drive", "`nounconnected_drive", 1);
-      define_macro("protect",             "`protect", 1);
-      define_macro("resetall",            "`resetall", 1);
-      define_macro("suppress_faults",     "`suppress_faults", 1);
-      define_macro("timescale",           "`timescale", 1);
-      define_macro("unconnected_drive",   "`unconnected_drive", 1);
-      define_macro("uselib",              "`uselib", 1);
+      define_macro("celldefine",              "`celldefine", 1, 0);
+      define_macro("default_decay_time",      "`default_decay_time", 1, 0);
+      define_macro("default_nettype",         "`default_nettype", 1, 0);
+      define_macro("default_trireg_strength", "`default_trireg_strength", 1, 0);
+      define_macro("delay_mode_distributed",  "`delay_mode_distributed", 1, 0);
+      define_macro("delay_mode_unit",         "`delay_mode_unit", 1, 0);
+      define_macro("delay_mode_path",         "`delay_mode_path", 1, 0);
+      define_macro("delay_mode_zero",         "`delay_mode_zero", 1, 0);
+      define_macro("disable_portfaults",      "`disable_portfaults", 1, 0);
+      define_macro("enable_portfaults",       "`enable_portfaults", 1, 0);
+      define_macro("endcelldefine",           "`endcelldefine", 1, 0);
+      define_macro("endprotect",              "`endprotect", 1, 0);
+      define_macro("line",                    "`line", 1, 0);
+      define_macro("nosuppress_faults",       "`nosuppress_faults", 1, 0);
+      define_macro("nounconnected_drive",     "`nounconnected_drive", 1, 0);
+      define_macro("protect",                 "`protect", 1, 0);
+      define_macro("resetall",                "`resetall", 1, 0);
+      define_macro("suppress_faults",         "`suppress_faults", 1, 0);
+      define_macro("timescale",               "`timescale", 1, 0);
+      define_macro("unconnected_drive",       "`unconnected_drive", 1, 0);
+      define_macro("uselib",                  "`uselib", 1, 0);
 
-      include_dir = malloc(sizeof(char*));
-      include_dir[0] = strdup(".");
-      include_cnt = 1;
+      include_cnt = 2;
+      include_dir = malloc(include_cnt*sizeof(char*));
+      include_dir[0] = 0;  /* 0 is reserved for the current files path. */
+      include_dir[1] = strdup(".");
 
-      while ((opt = getopt(argc, argv, "D:f:I:K:LM:o:v")) != EOF) switch (opt) {
+      while ((opt=getopt(argc, argv, "F:f:K:Lo:p:P:v")) != EOF) switch (opt) {
 
-	  case 'D': {
-		char*tmp = strdup(optarg);
-		char*val = strchr(tmp, '=');
-		if (val)
-		      *val++ = 0;
-		else
-		      val = "1";
-
-		define_macro(tmp, val, 0);
-		free(tmp);
-		break;
-	  }
+	  case 'F':
+	    flist_read_flags(optarg);
+	    break;
 
 	  case 'f':
 	    if (flist_path) {
@@ -176,18 +243,11 @@ int main(int argc, char*argv[])
 	    flist_path = optarg;
 	    break;
 
-	  case 'I':
-	    include_dir = realloc(include_dir,
-					  (include_cnt+1)*sizeof(char*));
-	    include_dir[include_cnt] = strdup(optarg);
-	    include_cnt += 1;
-	    break;
-
 	  case 'K': {
 		char*buf = malloc(strlen(optarg) + 2);
 		buf[0] = '`';
 		strcpy(buf+1, optarg);
-		define_macro(optarg, buf, 1);
+		define_macro(optarg, buf, 1, 0);
 		free(buf);
 		break;
 	  }
@@ -196,14 +256,6 @@ int main(int argc, char*argv[])
 	    line_direct_flag = 1;
 	    break;
 
-	  case 'M':
-	    if (dep_path) {
-		  fprintf(stderr, "duplicate -M flag.\n");
-	    } else {
-		  dep_path = optarg;
-	    }
-	    break;
-
 	  case 'o':
 	    if (out_path) {
 		  fprintf(stderr, "duplicate -o flag.\n");
@@ -212,6 +264,25 @@ int main(int argc, char*argv[])
 	    }
 	    break;
 
+	  case 'p':
+	    if (precomp_out_path) {
+		  fprintf(stderr, "duplicate -p flag.\n");
+	    } else {
+		  precomp_out_path = optarg;
+	    }
+	    break;
+
+	  case 'P': {
+		FILE*src = fopen(optarg, "rb");
+		if (src == 0) {
+		      perror(optarg);
+		      exit(1);
+		}
+		load_precompiled_defines(src);
+		fclose(src);
+		break;
+	  }
+		
 	  case 'v':
 	    fprintf(stderr, "Icarus Verilog Preprocessor version %s\n",
 		    VERSION);
@@ -225,14 +296,14 @@ int main(int argc, char*argv[])
       }
 
       if (flag_errors) {
-	    fprintf(stderr, "\nUsage: %s [-v][-L][-I<dir>][-D<def>] <file>...\n"
-		    "    -D<def> - Predefine a value.\n"
+	    fprintf(stderr, "\nUsage: %s [-v][-L][-F<fil>][-f<fil>] <file>...\n"
+		    "    -F<fil> - Get defines and includes from file\n"
 		    "    -f<fil> - Read the sources listed in the file\n"
-		    "    -I<dir> - Add an include file search directory\n"
 		    "    -K<def> - Define a keyword macro that I just pass\n"
 		    "    -L      - Emit line number directives\n"
-		    "    -M<fil> - Write dependencies to <fil>\n"
 		    "    -o<fil> - Send the output to <fil>\n"
+		    "    -p<fil> - Write precompiled defines to <fil>\n"
+		    "    -P<fil> - Read precompiled defines from <fil>\n"
 		    "    -v      - Print version information\n",
 		    argv[0]);
 	    return flag_errors;
@@ -263,6 +334,14 @@ int main(int argc, char*argv[])
 	    out = stdout;
       }
 
+      if (precomp_out_path) {
+	    precomp_out = fopen(precomp_out_path, "wb");
+	    if (precomp_out == 0) {
+		  perror(precomp_out_path);
+		  exit(1);
+	    }
+      }
+
       if(dep_path) {
 	      depend_file = fopen(dep_path, "w");
 	      if (depend_file == 0) {
@@ -277,54 +356,18 @@ int main(int argc, char*argv[])
       }
 
 	/* Pass to the lexical analyzer the list of input file, and
-	   start the parser. */
+	   start scanning. */
       reset_lexor(out, source_list);
-      if (yyparse()) return -1;
+      if (yylex()) return -1;
 
       if(depend_file) {
 	      fclose(depend_file);
       }
 
+      if (precomp_out) {
+	    dump_precompiled_defines(precomp_out);
+	    fclose(precomp_out);
+      }
+
       return error_count;
 }
-
-/*
- * $Log: main.c,v $
- * Revision 1.20  2004/09/10 00:15:45  steve
- *  Remove bad casts.
- *
- * Revision 1.19  2004/09/05 21:29:08  steve
- *  Better type safety.
- *
- * Revision 1.18  2004/02/15 18:03:30  steve
- *  Cleanup of warnings.
- *
- * Revision 1.17  2003/09/26 02:08:31  steve
- *  Detect missing endif markers.
- *
- * Revision 1.16  2002/08/12 01:35:02  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.15  2002/04/04 05:26:13  steve
- *  Add dependency generation.
- *
- * Revision 1.14  2001/11/21 02:59:27  steve
- *  Remove diag print.
- *
- * Revision 1.13  2001/11/21 02:20:35  steve
- *  Pass list of file to ivlpp via temporary file.
- *
- * Revision 1.12  2001/09/15 18:27:04  steve
- *  Make configure detect malloc.h
- *
- * Revision 1.11  2001/07/25 03:10:50  steve
- *  Create a config.h.in file to hold all the config
- *  junk, and support gcc 3.0. (Stephan Boettcher)
- *
- * Revision 1.10  2001/06/23 18:41:02  steve
- *  Include stdlib.h
- *
- * Revision 1.9  2001/05/20 18:08:07  steve
- *  local declares if the header is missing.
- */
-

lexor.lex

@@ -1,9 +1,10 @@
 
 %option never-interactive
+%option nounput
 
 %{
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2008 Stephen Williams ([email protected])
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -20,9 +21,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: lexor.lex,v 1.91 2006/05/17 04:15:12 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -36,7 +34,7 @@
 # include  <ctype.h>
 # include  <string.h>
 # include  "lexor_keyword.h"
-
+# include  <list>
 
 # define YY_USER_INIT reset_lexor();
 # define yylval VLlval
@@ -50,29 +48,22 @@
  */
 extern YYLTYPE yylloc;
 
-struct file_name_cell {
-      const char*text;
-      struct file_name_cell*next;
-};
-
-static struct file_name_cell*file_names = 0;
+static char* strdupnew(char const *str)
+{
+       return str ? strcpy(new char [strlen(str)+1], str) : 0;
+}
 
 static const char* set_file_name(char*text)
 {
-      struct file_name_cell*cur = file_names;
-      while (cur) {
-	    if (strcmp(cur->text, text) == 0) {
-		  delete[]text;
-		  return cur->text;
-	    }
+      perm_string path = filename_strings.make(text);
+      delete[]text;
 
-	    cur = cur->next;
-      }
-
-      cur = new struct file_name_cell;
-      cur->text = text;
-      cur->next = file_names;
-      return text;
+	/* Check this file name with the list of library file
+	   names. If there is a match, then turn on the
+	   pform_library_flag. This is how the parser knows that
+	   modules declared in this file are library modules. */
+      pform_library_flag = library_file_map[path];
+      return path;
 }
 
 
@@ -83,6 +74,7 @@ static void line_directive();
 static void line_directive2();
 
 static verinum*make_unsized_binary(const char*txt);
+static verinum*make_undef_highz_dec(const char*txt);
 static verinum*make_unsized_dec(const char*txt);
 static verinum*make_unsized_octal(const char*txt);
 static verinum*make_unsized_hex(const char*txt);
@@ -91,6 +83,8 @@ static int dec_buf_div2(char *buf);
 
 static void process_timescale(const char*txt);
 
+static list<int> keyword_mask_stack;
+
 static int comment_enter;
 %}
 
@@ -101,9 +95,14 @@ static int comment_enter;
 %s UDPTABLE
 %x PPTIMESCALE
 %x PPDEFAULT_NETTYPE
+%x PPBEGIN_KEYWORDS
+%s EDGES
+%x REAL_SCALE
 
 W [ \t\b\f\r]+
 
+S [afpnumkKMGT]
+
 %%
 
 ^"#line"[ ]+\"[^\"]*\"[ ]+[0-9]+.* { line_directive(); }
@@ -134,6 +133,7 @@ W [ \t\b\f\r]+
 "<<<" { return K_LS; /* Note: Functionally, <<< is the same as <<. */}
 ">>"  { return K_RS; }
 ">>>" { return K_RSS; }
+"**" { return K_POW; }
 "<=" { return K_LE; }
 ">=" { return K_GE; }
 "=>" { return K_EG; }
@@ -158,11 +158,12 @@ W [ \t\b\f\r]+
      with "*" and return that. */
 "("{W}*"*"{W}*")" { return '*'; }
 
-
+<EDGES>"]" { BEGIN(0); return yytext[0]; }
 [}{;:\[\],()#=.@&!?<>%|^~+*/-] { return yytext[0]; }
 
 \"            { BEGIN(CSTRING); }
-<CSTRING>\\\" { yymore(); }
+<CSTRING>\\\\ { yymore(); /* Catch \\, which is a \ escaping itself */ }
+<CSTRING>\\\" { yymore(); /* Catch \", which is an escaped quote */ }
 <CSTRING>\n   { BEGIN(0);
                 yylval.text = strdup(yytext);
 		VLerror(yylloc, "Missing close quote of string.");
@@ -200,24 +201,28 @@ W [ \t\b\f\r]+
 <UDPTABLE>[pP]     { return 'p'; }
 <UDPTABLE>[01\?\*\-] { return yytext[0]; }
 
+<EDGES>"01" { return K_edge_descriptor; }
+<EDGES>"0x" { return K_edge_descriptor; }
+<EDGES>"0z" { return K_edge_descriptor; }
+<EDGES>"10" { return K_edge_descriptor; }
+<EDGES>"1x" { return K_edge_descriptor; }
+<EDGES>"1z" { return K_edge_descriptor; }
+<EDGES>"x0" { return K_edge_descriptor; }
+<EDGES>"x1" { return K_edge_descriptor; }
+<EDGES>"z0" { return K_edge_descriptor; }
+<EDGES>"z1" { return K_edge_descriptor; }
+
 [a-zA-Z_][a-zA-Z0-9$_]* {
       int rc = lexor_keyword_code(yytext, yyleng);
       switch (rc) {
 	  case IDENTIFIER:
-	    yylval.text = strdup(yytext);
+	    yylval.text = strdupnew(yytext);
 	    if (strncmp(yylval.text,"PATHPULSE$", 10) == 0)
 		  rc = PATHPULSE_IDENTIFIER;
 	    break;
 
-	  case K_bool:
-	  case K_logic:
-	  case K_wone:
-	    if (! gn_cadence_types_enabled()) {
-		  yylval.text = strdup(yytext);
-		  rc = IDENTIFIER;
-	    } else {
-		  yylval.text = 0;
-	    }
+	  case K_edge:
+	    BEGIN(EDGES);
 	    break;
 
 	  default:
@@ -226,11 +231,11 @@ W [ \t\b\f\r]+
       }
 
       return rc;
- }
+  }
 
 
 \\[^ \t\b\f\r\n]+         {
-      yylval.text = strdup(yytext+1);
+      yylval.text = strdupnew(yytext+1);
       return IDENTIFIER; }
 
 \$([a-zA-Z0-9$_]+)        {
@@ -250,12 +255,14 @@ W [ \t\b\f\r]+
 	    return K_Ssetup;
       if (strcmp(yytext,"$width") == 0)
 	    return K_Swidth;
-      yylval.text = strdup(yytext);
+      yylval.text = strdupnew(yytext);
       return SYSTEM_IDENTIFIER; }
 
 
 \'[sS]?[dD][ \t]*[0-9][0-9_]*  { yylval.number = make_unsized_dec(yytext);
                             return BASED_NUMBER; }
+\'[sS]?[dD][ \t]*[xzXZ?]_* { yylval.number = make_undef_highz_dec(yytext);
+                             return BASED_NUMBER; }
 \'[sS]?[bB][ \t]*[0-1xzXZ_\?]+ { yylval.number = make_unsized_binary(yytext);
                         return BASED_NUMBER; }
 \'[sS]?[oO][ \t]*[0-7xzXZ_\?]+ { yylval.number = make_unsized_octal(yytext);
@@ -265,8 +272,49 @@ W [ \t\b\f\r]+
 
 [0-9][0-9_]* {
       yylval.number = make_unsized_dec(yytext);
+      based_size = yylval.number->as_ulong();
       return DEC_NUMBER; }
 
+  /* These rules handle the scaled real literals from Verilog-AMS. The
+     value is a number with a single letter scale factor. If
+     verilog-ams is not enabled, then reject this rule. If it is
+     enabled, then collect the scale and use it to scale the value. */
+[0-9][0-9_]*\.[0-9][0-9_]*/{S} {
+      if (!gn_verilog_ams_flag) REJECT;
+      BEGIN(REAL_SCALE);
+      yymore();  }
+
+[0-9][0-9_]*/{S} {
+      if (!gn_verilog_ams_flag) REJECT;
+      BEGIN(REAL_SCALE);
+      yymore();  }
+
+<REAL_SCALE>{S} {
+      size_t token_len = strlen(yytext);
+      char*tmp = new char[token_len + 5];
+      int scale = 0;
+      strcpy(tmp, yytext);
+      switch (tmp[token_len-1]) {
+	  case 'a': scale = -18; break; /* atto- */
+	  case 'f': scale = -15; break; /* femto- */
+	  case 'p': scale = -12; break; /* pico- */
+	  case 'n': scale = -9;  break; /* nano- */
+	  case 'u': scale = -6;  break; /* micro- */
+	  case 'm': scale = -3;  break; /* milli- */
+	  case 'k': scale = 3;  break; /* kilo- */
+	  case 'K': scale = 3;  break; /* kilo- */
+	  case 'M': scale = 6;  break; /* mega- */
+	  case 'G': scale = 9;  break; /* giga- */
+	  case 'T': scale = 12; break; /* tera- */
+	  default: assert(0); break;
+      }
+      snprintf(tmp+token_len-1, 5, "e%d", scale);
+      yylval.realtime = new verireal(tmp);
+      delete[]tmp;
+
+      BEGIN(0);
+      return REALTIME;  }
+
 [0-9][0-9_]*\.[0-9][0-9_]*([Ee][+-]?[0-9][0-9_]*)? {
       yylval.realtime = new verireal(yytext);
       return REALTIME; }
@@ -288,21 +336,76 @@ W [ \t\b\f\r]+
   /* These are directives that I do not yet support. I think that IVL
      should handle these, not an external preprocessor. */
 
-^{W}?`celldefine{W}?.*           {  }
+^{W}?`celldefine{W}?.*              {  }
+^{W}?`default_decay_time{W}?.*      {  }
+^{W}?`default_trireg_strength{W}?.* {  }
 ^{W}?`delay_mode_distributed{W}?.*  {  }
-^{W}?`delay_mode_unit{W}?.*      {  }
-^{W}?`delay_mode_path{W}?.*      {  }
-^{W}?`disable_portfaults{W}?.*   {  }
-^{W}?`enable_portfaults{W}?.*    {  }
-^{W}?`endcelldefine{W}?.*        {  }
-`endprotect                      {  }
-^{W}?`nosuppress_faults{W}?.*    {  }
-^{W}?`nounconnected_drive{W}?.*  {  }
-`protect                         {  }
-^{W}?`resetall{W}?.*             {  }
-^{W}?`suppress_faults{W}?.*      {  }
-^{W}?`unconnected_drive{W}?.*    {  }
-^{W}?`uselib{W}?.*               {  }
+^{W}?`delay_mode_unit{W}?.*         {  }
+^{W}?`delay_mode_path{W}?.*         {  }
+^{W}?`delay_mode_zero{W}?.*         {  }
+^{W}?`disable_portfaults{W}?.*      {  }
+^{W}?`enable_portfaults{W}?.*       {  }
+^{W}?`endcelldefine{W}?.*           {  }
+`endprotect                         {  }
+^{W}?`line{W}?.*                    {  }
+^{W}?`nosuppress_faults{W}?.*       {  }
+^{W}?`nounconnected_drive{W}?.*     {  }
+`protect                            {  }
+^{W}?`resetall{W}?.*                {  }
+^{W}?`suppress_faults{W}?.*         {  }
+^{W}?`unconnected_drive{W}?.*       {  }
+^{W}?`uselib{W}?.*                  {  }
+
+^{W}?`begin_keywords{W}? { BEGIN(PPBEGIN_KEYWORDS); }
+
+<PPBEGIN_KEYWORDS>\"[a-zA-Z0-9 -]*\".* {
+      keyword_mask_stack.push_front(lexor_keyword_mask);
+
+      char*word = yytext+1;
+      char*tail = strchr(word, '"');
+      tail[0] = 0;
+      if (strcmp(word,"1364-1995") == 0) {
+	    lexor_keyword_mask = GN_KEYWORDS_1364_1995;
+      } else if (strcmp(word,"1364-2001") == 0) {
+	    lexor_keyword_mask = GN_KEYWORDS_1364_1995
+		                |GN_KEYWORDS_1364_2001
+		                |GN_KEYWORDS_1364_2001_CONFIG;
+      } else if (strcmp(word,"1364-2001-noconfig") == 0) {
+	    lexor_keyword_mask = GN_KEYWORDS_1364_1995
+		                |GN_KEYWORDS_1364_2001;
+      } else if (strcmp(word,"1364-2005") == 0) {
+	    lexor_keyword_mask = GN_KEYWORDS_1364_1995
+		                |GN_KEYWORDS_1364_2001
+		                |GN_KEYWORDS_1364_2001_CONFIG
+		                |GN_KEYWORDS_1364_2005;
+      } else if (strcmp(word,"VAMS-2.3") == 0) {
+	    lexor_keyword_mask = GN_KEYWORDS_1364_1995
+		                |GN_KEYWORDS_1364_2001
+		                |GN_KEYWORDS_1364_2001_CONFIG
+		                |GN_KEYWORDS_1364_2005
+		                |GN_KEYWORDS_VAMS_2_3;
+      } else {
+	    fprintf(stderr, "%s:%d: Ignoring unknown keywords string: %s\n",
+		    yylloc.text, yylloc.first_line, word);
+      }
+      BEGIN(0);
+ }
+
+<PPBEGIN_KEYWORDS>.* {
+      fprintf(stderr, "%s:%d: Malformed keywords specification: %s\n",
+	      yylloc.text, yylloc.first_line, yytext);
+      BEGIN(0);
+ }
+
+^{W}?`end_keywords{W}?.* {
+      if (!keyword_mask_stack.empty()) {
+	    lexor_keyword_mask = keyword_mask_stack.front();
+	    keyword_mask_stack.pop_front();
+      } else {
+	    fprintf(stderr, "%s:%d: Mismatched end_keywords directive\n",
+		    yylloc.text, yylloc.first_line);
+      }
+ }
 
   /* Notice and handle the default_nettype directive. The lexor
      detects the default_nettype keyword, and the second part of the
@@ -329,7 +432,7 @@ W [ \t\b\f\r]+
 	    error_count += 1;
       }
       pform_set_default_nettype(net_type, yylloc.text, yylloc.first_line);
- }
+  }
 <PPDEFAULT_NETTYPE>\n {
       yylloc.first_line += 1;
       BEGIN(0); }
@@ -383,8 +486,9 @@ W [ \t\b\f\r]+
        error_count += 1; }
 
   /* Final catchall. something got lost or mishandled. */
+  /* XXX Should we tell the luser something about the lexical state? */
 
-. {   cerr << yylloc.text << ":" << yylloc.first_line
+<*>.|\n {   cerr << yylloc.text << ":" << yylloc.first_line
 	   << ": error: unmatched character (";
       if (isgraph(yytext[0]))
 	    cerr << yytext[0];
@@ -433,6 +537,9 @@ static verinum*make_unsized_binary(const char*txt)
       for (const char*idx = ptr ;  *idx ;  idx += 1)
 	    if (*idx != '_') size += 1;
 
+      if ((based_size > 0) && (size > based_size)) yywarn(yylloc,
+          "extra digits given for sized binary constant.");
+
       verinum::V*bits = new verinum::V[size];
 
       unsigned idx = size;
@@ -459,7 +566,7 @@ static verinum*make_unsized_binary(const char*txt)
 	    ptr += 1;
       }
 
-      verinum*out = new verinum(bits, size);
+      verinum*out = new verinum(bits, size, false);
       out->has_sign(sign_flag);
       delete[]bits;
       return out;
@@ -488,6 +595,13 @@ static verinum*make_unsized_octal(const char*txt)
       for (const char*idx = ptr ;  *idx ;  idx += 1)
 	    if (*idx != '_') size += 3;
 
+      if (based_size > 0) {
+            int rem = based_size % 3;
+	    if (rem != 0) based_size += 3 - rem;
+	    if (size > based_size) yywarn(yylloc,
+	        "extra digits given for sized octal constant.");
+      }
+
       verinum::V*bits = new verinum::V[size];
 
       unsigned idx = size;
@@ -519,7 +633,7 @@ static verinum*make_unsized_octal(const char*txt)
 	    ptr += 1;
       }
 
-      verinum*out = new verinum(bits, size);
+      verinum*out = new verinum(bits, size, false);
       out->has_sign(sign_flag);
       delete[]bits;
       return out;
@@ -547,6 +661,13 @@ static verinum*make_unsized_hex(const char*txt)
       for (const char*idx = ptr ;  *idx ;  idx += 1)
 	    if (*idx != '_') size += 4;
 
+      if (based_size > 0) {
+            int rem = based_size % 4;
+	    if (rem != 0) based_size += 4 - rem;
+	    if (size > based_size) yywarn(yylloc,
+	        "extra digits given for sized hex constant.");
+      }
+
       verinum::V*bits = new verinum::V[size];
 
       unsigned idx = size;
@@ -589,7 +710,7 @@ static verinum*make_unsized_hex(const char*txt)
 	    ptr += 1;
       }
 
-      verinum*out = new verinum(bits, size);
+      verinum*out = new verinum(bits, size, false);
       out->has_sign(sign_flag);
       delete[]bits;
       return out;
@@ -645,6 +766,53 @@ static int dec_buf_div2(char *buf)
     return partial;
 }
 
+/* Support a single x, z or ? as a decimal constant (from 1364-2005). */
+static verinum* make_undef_highz_dec(const char* ptr)
+{
+      bool signed_flag = false;
+
+      assert(*ptr == '\'');
+      /* The number may have decorations of the form 'sd<code>,
+         possibly with space between the d and the <code>.
+         Also, the 's' is optional, and marks the number as signed. */
+      ptr += 1;
+
+      if (tolower(*ptr) == 's') {
+	  signed_flag = true;
+	  ptr += 1;
+      }
+
+      assert(tolower(*ptr) == 'd');
+      ptr += 1;
+
+      while (*ptr && ((*ptr == ' ') || (*ptr == '\t')))
+	  ptr += 1;
+
+	/* Process the code. */
+      verinum::V* bits = new verinum::V[1];
+      switch (*ptr) {
+	  case 'x':
+	  case 'X':
+	    bits[0] = verinum::Vx;
+	    break;
+	  case 'z':
+	  case 'Z':
+	  case '?':
+	    bits[0] = verinum::Vz;
+	    break;
+	  default:
+	    assert(0);
+      }
+      ptr += 1;
+      while (*ptr == '_') ptr += 1;
+      assert(*ptr == 0);
+
+      verinum*out = new verinum(bits, 1, false);
+      out->has_sign(signed_flag);
+      delete[]bits;
+      return out;
+}
+
 /*
  * Making a decimal number is much easier then the other base numbers
  * because there are no z or x values to worry about. It is much
@@ -727,6 +895,10 @@ static verinum*make_unsized_dec(const char*ptr)
 	    assert(size <= tmp_size);
       }
 
+        /* Since we never have the real number of bits that a decimal
+           number represents we do not check for extra bits. */
+//      if (based_size > 0) { }
+
       verinum*res = new verinum(bits, size, false);
       res->has_sign(signed_flag);
 
@@ -900,11 +1072,6 @@ void reset_lexor()
       yyrestart(vl_input);
       yylloc.first_line = 1;
 
-	/* Start the file_names list. From here on, as I get a file
-	   name, I will add it to this list. Only add the name if it
-	   is not already in the list. */
-      file_names = new struct file_name_cell;
-      file_names->text = strdup(vl_file.c_str());
-      file_names->next = 0;
-      yylloc.text = file_names->text;
+	/* Announce the first file name. */
+      yylloc.text = set_file_name(strdupnew(vl_file.c_str()));
 }

lexor_keyword.gperf

@@ -6,127 +6,156 @@
 #include "parse.h"
 #include <string.h>
 #include "lexor_keyword.h"
+#include "compiler.h"
 
 %}
-struct lexor_keyword { const char*name; int tokenType; };
+struct lexor_keyword { const char*name; int mask; int tokenType; };
 %%
-always,		K_always
-and,		K_and
-assign,		K_assign
-begin,		K_begin
-bool,		K_bool
-buf,		K_buf
-bufif0,		K_bufif0
-bufif1,		K_bufif1
-case,		K_case
-casex,		K_casex
-casez,		K_casez
-cmos,		K_cmos
-deassign,	K_deassign
-default,	K_default
-defparam,	K_defparam
-disable,	K_disable
-edge,		K_edge
-else,		K_else
-end,		K_end
-endcase,	K_endcase
-endfunction,	K_endfunction
-endgenerate,	K_endgenerate
-endmodule,	K_endmodule
-endprimitive,	K_endprimitive
-endspecify,	K_endspecify
-endtable,	K_endtable
-endtask,	K_endtask
-event,		K_event
-for,		K_for
-force,		K_force
-forever,	K_forever
-fork,		K_fork
-function,	K_function
-generate,	K_generate
-genvar,		K_genvar
-highz0,		K_highz0
-highz1,		K_highz1
-if,		K_if
-ifnone,		K_ifnone
-initial,	K_initial
-inout,		K_inout
-input,		K_input
-integer,	K_integer
-join,		K_join
-large,		K_large
-localparam,	K_localparam
-logic,		K_logic
-macromodule,	K_macromodule
-medium,		K_medium
-module,		K_module
-nand,		K_nand
-negedge,	K_negedge
-nmos,		K_nmos
-nor,		K_nor
-not,		K_not
-notif0,		K_notif0
-notif1,		K_notif1
-or,		K_or
-output,		K_output
-parameter,	K_parameter
-pmos,		K_pmos
-posedge,	K_posedge
-primitive,	K_primitive
-pull0,		K_pull0
-pull1,		K_pull1
-pulldown,	K_pulldown
-pullup,		K_pullup
-rcmos,		K_rcmos
-real,		K_real
-realtime,	K_realtime
-reg,		K_reg
-release,	K_release
-repeat,		K_repeat
-rnmos,		K_rnmos
-rpmos,		K_rpmos
-rtran,		K_rtran
-rtranif0,	K_rtranif0
-rtranif1,	K_rtranif1
-scalared,	K_scalared
-signed,		K_signed
-small,		K_small
-specify,	K_specify
-specparam,	K_specparam
-strong0,	K_strong0
-strong1,	K_strong1
-supply0,	K_supply0
-supply1,	K_supply1
-table,		K_table
-task,		K_task
-time,		K_time
-tran,		K_tran
-tranif0,	K_tranif0
-tranif1,	K_tranif1
-tri,		K_tri
-tri0,		K_tri0
-tri1,		K_tri1
-triand,		K_triand
-trior,		K_trior
-trireg,		K_trireg
-vectored,	K_vectored
-wait,		K_wait
-wand,		K_wand
-weak0,		K_weak0
-weak1,		K_weak1
-while,		K_while
-wire,		K_wire
-wone,		K_wone
-wor,		K_wor
-xnor,		K_xnor
-xor,		K_xor
+abs,		GN_KEYWORDS_VAMS_2_3,	K_abs
+acos,		GN_KEYWORDS_VAMS_2_3,	K_acos
+acosh,		GN_KEYWORDS_VAMS_2_3,	K_acosh
+always,		GN_KEYWORDS_1364_1995,	K_always
+and,		GN_KEYWORDS_1364_1995,	K_and
+asin,		GN_KEYWORDS_VAMS_2_3,	K_asin
+asinh,		GN_KEYWORDS_VAMS_2_3,	K_asinh
+assign,		GN_KEYWORDS_1364_1995,	K_assign
+atan,		GN_KEYWORDS_VAMS_2_3,	K_atan
+atan2,		GN_KEYWORDS_VAMS_2_3,	K_atan2
+atanh,		GN_KEYWORDS_VAMS_2_3,	K_atanh
+begin,		GN_KEYWORDS_1364_1995,	K_begin
+bool,		GN_KEYWORDS_ICARUS,	K_bool
+buf,		GN_KEYWORDS_1364_1995,	K_buf
+bufif0,		GN_KEYWORDS_1364_1995,	K_bufif0
+bufif1,		GN_KEYWORDS_1364_1995,	K_bufif1
+case,		GN_KEYWORDS_1364_1995,	K_case
+casex,		GN_KEYWORDS_1364_1995,	K_casex
+casez,		GN_KEYWORDS_1364_1995,	K_casez
+ceil,		GN_KEYWORDS_VAMS_2_3,	K_ceil
+cmos,		GN_KEYWORDS_1364_1995,	K_cmos
+cos,		GN_KEYWORDS_VAMS_2_3,	K_cos
+cosh,		GN_KEYWORDS_VAMS_2_3,	K_cosh
+deassign,	GN_KEYWORDS_1364_1995,	K_deassign
+default,	GN_KEYWORDS_1364_1995,	K_default
+defparam,	GN_KEYWORDS_1364_1995,	K_defparam
+disable,	GN_KEYWORDS_1364_1995,	K_disable
+edge,		GN_KEYWORDS_1364_1995,	K_edge
+else,		GN_KEYWORDS_1364_1995,	K_else
+end,		GN_KEYWORDS_1364_1995,	K_end
+endcase,	GN_KEYWORDS_1364_1995,	K_endcase
+endfunction,	GN_KEYWORDS_1364_1995,	K_endfunction
+endgenerate,	GN_KEYWORDS_1364_1995,	K_endgenerate
+endmodule,	GN_KEYWORDS_1364_1995,	K_endmodule
+endprimitive,	GN_KEYWORDS_1364_1995,	K_endprimitive
+endspecify,	GN_KEYWORDS_1364_1995,	K_endspecify
+endtable,	GN_KEYWORDS_1364_1995,	K_endtable
+endtask,	GN_KEYWORDS_1364_1995,	K_endtask
+event,		GN_KEYWORDS_1364_1995,	K_event
+exp,		GN_KEYWORDS_VAMS_2_3,	K_exp
+floor,		GN_KEYWORDS_VAMS_2_3,	K_floor
+for,		GN_KEYWORDS_1364_1995,	K_for
+force,		GN_KEYWORDS_1364_1995,	K_force
+forever,	GN_KEYWORDS_1364_1995,	K_forever
+fork,		GN_KEYWORDS_1364_1995,	K_fork
+function,	GN_KEYWORDS_1364_1995,	K_function
+generate,	GN_KEYWORDS_1364_2001,	K_generate
+genvar,		GN_KEYWORDS_1364_2001,	K_genvar
+highz0,		GN_KEYWORDS_1364_1995,	K_highz0
+highz1,		GN_KEYWORDS_1364_1995,	K_highz1
+hypot,		GN_KEYWORDS_VAMS_2_3,	K_hypot
+if,		GN_KEYWORDS_1364_1995,	K_if
+ifnone,		GN_KEYWORDS_1364_1995,	K_ifnone
+initial,	GN_KEYWORDS_1364_1995,	K_initial
+inout,		GN_KEYWORDS_1364_1995,	K_inout
+input,		GN_KEYWORDS_1364_1995,	K_input
+integer,	GN_KEYWORDS_1364_1995,	K_integer
+join,		GN_KEYWORDS_1364_1995,	K_join
+large,		GN_KEYWORDS_1364_1995,	K_large
+ln,		GN_KEYWORDS_VAMS_2_3,	K_ln
+localparam,	GN_KEYWORDS_1364_2001,	K_localparam
+log,		GN_KEYWORDS_VAMS_2_3,	K_log
+logic,		GN_KEYWORDS_ICARUS,	K_logic
+macromodule,	GN_KEYWORDS_1364_1995,	K_macromodule
+max,		GN_KEYWORDS_VAMS_2_3,	K_max
+medium,		GN_KEYWORDS_1364_1995,	K_medium
+min,		GN_KEYWORDS_VAMS_2_3,	K_min
+module,		GN_KEYWORDS_1364_1995,	K_module
+nand,		GN_KEYWORDS_1364_1995,	K_nand
+negedge,	GN_KEYWORDS_1364_1995,	K_negedge
+nmos,		GN_KEYWORDS_1364_1995,	K_nmos
+nor,		GN_KEYWORDS_1364_1995,	K_nor
+not,		GN_KEYWORDS_1364_1995,	K_not
+notif0,		GN_KEYWORDS_1364_1995,	K_notif0
+notif1,		GN_KEYWORDS_1364_1995,	K_notif1
+or,		GN_KEYWORDS_1364_1995,	K_or
+output,		GN_KEYWORDS_1364_1995,	K_output
+parameter,	GN_KEYWORDS_1364_1995,	K_parameter
+pmos,		GN_KEYWORDS_1364_1995,	K_pmos
+posedge,	GN_KEYWORDS_1364_1995,	K_posedge
+pow,		GN_KEYWORDS_VAMS_2_3,	K_pow
+primitive,	GN_KEYWORDS_1364_1995,	K_primitive
+pull0,		GN_KEYWORDS_1364_1995,	K_pull0
+pull1,		GN_KEYWORDS_1364_1995,	K_pull1
+pulldown,	GN_KEYWORDS_1364_1995,	K_pulldown
+pullup,		GN_KEYWORDS_1364_1995,	K_pullup
+rcmos,		GN_KEYWORDS_1364_1995,	K_rcmos
+real,		GN_KEYWORDS_1364_1995,	K_real
+realtime,	GN_KEYWORDS_1364_1995,	K_realtime
+reg,		GN_KEYWORDS_1364_1995,	K_reg
+release,	GN_KEYWORDS_1364_1995,	K_release
+repeat,		GN_KEYWORDS_1364_1995,	K_repeat
+rnmos,		GN_KEYWORDS_1364_1995,	K_rnmos
+rpmos,		GN_KEYWORDS_1364_1995,	K_rpmos
+rtran,		GN_KEYWORDS_1364_1995,	K_rtran
+rtranif0,	GN_KEYWORDS_1364_1995,	K_rtranif0
+rtranif1,	GN_KEYWORDS_1364_1995,	K_rtranif1
+scalared,	GN_KEYWORDS_1364_1995,	K_scalared
+signed,		GN_KEYWORDS_1364_2001,	K_signed
+sin,		GN_KEYWORDS_VAMS_2_3,	K_sin
+sinh,		GN_KEYWORDS_VAMS_2_3,	K_sinh
+small,		GN_KEYWORDS_1364_1995,	K_small
+specify,	GN_KEYWORDS_1364_1995,	K_specify
+specparam,	GN_KEYWORDS_1364_1995,	K_specparam
+sqrt,		GN_KEYWORDS_VAMS_2_3,	K_sqrt
+strong0,	GN_KEYWORDS_1364_1995,	K_strong0
+strong1,	GN_KEYWORDS_1364_1995,	K_strong1
+supply0,	GN_KEYWORDS_1364_1995,	K_supply0
+supply1,	GN_KEYWORDS_1364_1995,	K_supply1
+table,		GN_KEYWORDS_1364_1995,	K_table
+tan,		GN_KEYWORDS_VAMS_2_3,	K_tan
+tanh,		GN_KEYWORDS_VAMS_2_3,	K_tanh
+task,		GN_KEYWORDS_1364_1995,	K_task
+time,		GN_KEYWORDS_1364_1995,	K_time
+tran,		GN_KEYWORDS_1364_1995,	K_tran
+tranif0,	GN_KEYWORDS_1364_1995,	K_tranif0
+tranif1,	GN_KEYWORDS_1364_1995,	K_tranif1
+tri,		GN_KEYWORDS_1364_1995,	K_tri
+tri0,		GN_KEYWORDS_1364_1995,	K_tri0
+tri1,		GN_KEYWORDS_1364_1995,	K_tri1
+triand,		GN_KEYWORDS_1364_1995,	K_triand
+trior,		GN_KEYWORDS_1364_1995,	K_trior
+trireg,		GN_KEYWORDS_1364_1995,	K_trireg
+vectored,	GN_KEYWORDS_1364_1995,	K_vectored
+wait,		GN_KEYWORDS_1364_1995,	K_wait
+wand,		GN_KEYWORDS_1364_1995,	K_wand
+weak0,		GN_KEYWORDS_1364_1995,	K_weak0
+weak1,		GN_KEYWORDS_1364_1995,	K_weak1
+while,		GN_KEYWORDS_1364_1995,	K_while
+wire,		GN_KEYWORDS_1364_1995,	K_wire
+wone,		GN_KEYWORDS_1364_1995,	K_wone
+wor,		GN_KEYWORDS_1364_1995,	K_wor
+xnor,		GN_KEYWORDS_1364_1995,	K_xnor
+xor,		GN_KEYWORDS_1364_1995,	K_xor
 %%
 
+int lexor_keyword_mask = 0;
+
 int lexor_keyword_code(const char*str, unsigned nstr)
 {
       const struct lexor_keyword*rc = check_identifier(str, nstr);
       if (rc == 0)
 	  return IDENTIFIER;
+      else if ((rc->mask & lexor_keyword_mask) == 0)
+          return IDENTIFIER;
       else
 	  return rc->tokenType;
 }

libveriuser/Makefile.in

@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.34 2004/10/04 01:10:07 steve Exp $"
+#ident "$Id: Makefile.in,v 1.36 2007/02/06 05:07:32 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -30,7 +30,6 @@ VPATH = $(srcdir)
 
 bindir = @bindir@
 libdir = @libdir@
-libdir64 = @libdir64@
 includedir = $(prefix)/include
 
 CC = @CC@
@@ -41,7 +40,6 @@ INSTALL_DATA = @INSTALL_DATA@
 CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
 CFLAGS = -Wall @CFLAGS@
 LDFLAGS = @LDFLAGS@
-STRIP = @STRIP@
 RANLIB = @RANLIB@
 
 A = a_close.o a_compare_handles.o a_configure.o a_fetch_argc.o \
@@ -59,12 +57,6 @@ getlongp.o getp.o getsimtime.o io_print.o math.o mc_scan_plusargs.o \
 nodeinfo.o nump.o putlongp.o putp.o spname.o typep.o workarea.o \
 veriusertfs.o priv.o $A
 
-ifeq (@enable_vvp32@,yes)
-ALL32 = all32
-INSTALL32 = install32
-UNINSTALL32 = uninstall32
-endif
-
 all: dep libveriuser.a $(ALL32)
 
 check: all
@@ -92,42 +84,17 @@ clean:
 	rm -rf *.o dep libveriuser.a libveriuser.o bin32
 
 distclean: clean
-	rm -f Makefile config.status config.log config.cache
+	rm -f Makefile config.status config.log config.cache config.h
 
-install:: all installdirs $(libdir64)/libveriuser.a $(INSTALL32)
+install:: all installdirs $(libdir)/libveriuser.a $(INSTALL32)
 
-$(libdir64)/libveriuser.a: ./libveriuser.a
-	$(INSTALL_DATA) ./libveriuser.a $(libdir64)/libveriuser.a
+$(libdir)/libveriuser.a: ./libveriuser.a
+	$(INSTALL_DATA) ./libveriuser.a $(libdir)/libveriuser.a
 
 installdirs: mkinstalldirs
-	$(srcdir)/mkinstalldirs $(includedir) $(libdir64)
+	$(srcdir)/mkinstalldirs $(includedir) $(libdir)
 
 uninstall::
-	rm -f $(libdir64)/libveriuser.a
-
-ifeq (@enable_vvp32@,yes)
-all32: bin32 bin32/libveriuser.a
-
-bin32:
-	mkdir bin32
-
-bin32/%.o: %.c
-	$(CC) -m32 $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@
-
-bin32/libveriuser.o: $(addprefix bin32/,$O)
-	$(LD) -melf_i386 -r -o $@ $(addprefix bin32/,$O)
-
-bin32/libveriuser.a: bin32/libveriuser.o
-	rm -f $@
-	ar cvq $@ bin32/libveriuser.o
-	$(RANLIB) $@
-
-install32: $(libdir)/libveriuser.a
-
-$(libdir)/libveriuser.a: bin32/libveriuser.a
-	$(INSTALL_DATA) bin32/libveriuser.a $(libdir)/libveriuser.a
-
--include $(patsubst bin32/%.o, bin32/%.d, $(addprefix bin32/,$O))
-endif
+	rm -f $(libdir)/libveriuser.a
 
 -include $(patsubst %.o, dep/%.d, $O)

libveriuser/a_fetch_value.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2003-2008 Stephen Williams (steve@icarus.com)
  *
  *    This source code is free software; you can redistribute it
  *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,6 @@
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: a_fetch_value.c,v 1.5 2003/06/17 16:55:07 steve Exp $"
-#endif
 
 # include  <acc_user.h>
 # include  <vpi_user.h>
@@ -104,7 +101,8 @@ static char* fetch_strength_value(handle obj)
       val.format = vpiStrengthVal;
       vpi_get_value(obj, &val);
 
-      vpip_format_strength(str, &val);
+      /* Should this iterate over the bits? It now matches the old code. */
+      vpip_format_strength(str, &val, 0);
 
       if (pli_trace) {
 	    fprintf(pli_trace, "acc_fetch_value(<%s>, \"%%v\") --> %s\n",
@@ -125,30 +123,3 @@ char* acc_fetch_value(handle obj, const char*fmt, s_acc_value*value)
       vpi_printf("XXXX acc_fetch_value(..., \"%s\", ...)\n", fmt);
       return "<acc_fetch_value>";
 }
-
-
-/*
- * $Log: a_fetch_value.c,v $
- * Revision 1.5  2003/06/17 16:55:07  steve
- *  1) setlinebuf() for vpi_trace
- *  2) Addes error checks for trace file opens
- *  3) removes now extraneous flushes
- *  4) fixes acc_next() bug
- *
- * Revision 1.4  2003/05/18 00:16:35  steve
- *  Add PLI_TRACE tracing of PLI1 modules.
- *
- *  Add tf_isetdelay and friends, and add
- *  callback return values for acc_vcl support.
- *
- * Revision 1.3  2003/04/24 02:02:37  steve
- *  Clean up some simple warnings.
- *
- * Revision 1.2  2003/04/20 02:49:07  steve
- *  acc_fetch_value support for %v format.
- *
- * Revision 1.1  2003/04/12 18:57:14  steve
- *  More acc_ function stubs.
- *
- */
-

libveriuser/a_next.c

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: a_next.c,v 1.3 2003/06/17 16:55:07 steve Exp $"
+#ident "$Id: a_next.c,v 1.4 2006/10/30 22:45:37 steve Exp $"
 #endif
 
 #include  <stdio.h>
@@ -34,7 +34,7 @@ handle acc_next(PLI_INT32 *type, handle scope, handle prev)
 
       /* trace */
       if (pli_trace) {
-	    int *ip;
+	    PLI_INT32 *ip;
 	    fprintf(pli_trace, "acc_next(%p <", type);
 	    for (ip = type; *ip; ip++) {
 		  fprintf(pli_trace, "%s%d", ip != type ? "," : "", *ip);
@@ -52,7 +52,7 @@ handle acc_next(PLI_INT32 *type, handle scope, handle prev)
 
       /*
        * The acc_next_* functions need to be reentrant, so we need to
-       * rescan all the items upto the previous one, then return
+       * rescan all the items up to the previous one, then return
        * the next one.
       */
       iter = vpi_iterate(vpiScope, scope);	// ICARUS extension
@@ -94,6 +94,9 @@ handle acc_next_scope(handle scope, handle prev)
 
 /*
  * $Log: a_next.c,v $
+ * Revision 1.4  2006/10/30 22:45:37  steve
+ *  Updates for Cygwin portability (pr1585922)
+ *
  * Revision 1.3  2003/06/17 16:55:07  steve
  *  1) setlinebuf() for vpi_trace
  *  2) Addes error checks for trace file opens

libveriuser/configure.in

@@ -1,6 +1,8 @@
 AC_INIT(Makefile.in)
 AC_CONFIG_HEADER(config.h)
 
+AC_CANONICAL_HOST
+
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_RANLIB
@@ -8,10 +10,6 @@ AC_PROG_RANLIB
 AC_EXEEXT
 AX_CPP_IDENT
 
-# vvp32 is by default disabled
-#enable_vvp32=no
-AC_SUBST(enable_vvp32)
-
 AC_CHECK_HEADERS(malloc.h)
 
 AC_CHECK_SIZEOF(unsigned long long)
@@ -21,20 +19,10 @@ AC_CHECK_SIZEOF(unsigned)
 # may modify CPPFLAGS and CFLAGS
 AX_CPP_PRECOMP
 
-# Compiler option for position independent code, needed whan making shared objects.
+# Compiler option for position independent code, needed when making shared objects.
 AX_C_PICFLAG
 
 AC_SUBST(EXEEXT)
 AC_SUBST(EXTRALIBS)
 
-# If not otherwise specified, set the libdir64 variable
-# to the same as libdir.
-AC_MSG_CHECKING(for libdir64 path)
-if test x${libdir64} = x
-then
-	libdir64="${libdir}"
-fi
-AC_SUBST(libdir64)
-AC_MSG_RESULT(${libdir64})
-
 AC_OUTPUT(Makefile)

libveriuser/finish.c

@@ -29,13 +29,13 @@
  */
 int tf_dofinish(void)
 {
-      vpi_sim_control(vpiFinish, 0);
+      vpi_control(vpiFinish, 0);
       return 0;
 }
 
 int tf_dostop(void)
 {
-      vpi_sim_control(vpiStop, 0);
+      vpi_control(vpiStop, 0);
       return 0;
 }
 

libveriuser/getcstringp.c

@@ -24,7 +24,7 @@
 #include  <acc_user.h>
 
 /*
- * tf_getinstance implemented using equvalent acc_ routing
+ * tf_getinstance implemented using equivalent acc_ routing
  */
 char *tf_getcstringp(int n)
 {

libveriuser/priv.h

@@ -32,7 +32,7 @@
 extern char* __acc_newstring(const char*txt);
 
 /*
- * Trace file for loggint ACC and TF calls.
+ * Trace file for logging ACC and TF calls.
  */
 FILE* pli_trace;
 

libveriuser/typep.c

@@ -49,6 +49,9 @@ PLI_INT32 tf_typep(PLI_INT32 narg)
 		case vpiStringConst:
 		  rtn = TF_STRING;
 		  break;
+		case vpiRealConst:
+		  rtn = TF_READONLYREAL;
+		  break;
 		default:
 		  rtn = TF_READONLY;
 		  break;
@@ -61,6 +64,10 @@ PLI_INT32 tf_typep(PLI_INT32 narg)
 	    rtn = TF_READWRITE;
 	    break;
 
+	  case vpiRealVar:
+	    rtn = TF_READWRITEREAL;
+	    break;
+
 	  default:
 	    rtn = TF_READONLY;
 	    break;
@@ -69,16 +76,3 @@ PLI_INT32 tf_typep(PLI_INT32 narg)
       vpi_free_object(argv);
       return rtn;
 }
-
-/*
- * $Log: typep.c,v $
- * Revision 1.2  2003/03/13 05:07:46  steve
- *  Declaration warnings.
- *
- * Revision 1.1  2002/12/19 21:37:04  steve
- *  Add tf_message, tf_get/setworkarea, and
- *  ty_typep functions, along with defines
- *  related to these functions.
- *
- */
-

libveriuser/veriusertfs.c

@@ -18,12 +18,12 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: veriusertfs.c,v 1.15 2004/09/10 23:13:05 steve Exp $"
+#ident "$Id: veriusertfs.c,v 1.17 2007/05/08 22:01:26 steve Exp $"
 #endif
 
 /*
  * Contains the routines required to implement veriusertfs routines
- * via VPI. This is extremly ugly, so don't look after eating dinner.
+ * via VPI. This is extremely ugly, so don't look after eating dinner.
  */
 
 # include <string.h>
@@ -44,9 +44,9 @@ typedef struct t_pli_data {
       int	paramvc;	/* parameter number for misctf */
 } s_pli_data, *p_pli_data;
 
-static int compiletf(char *);
-static int calltf(char *);
-static int callback(p_cb_data);
+static PLI_INT32 compiletf(char *);
+static PLI_INT32 calltf(char *);
+static PLI_INT32 callback(p_cb_data);
 
 /*
  * Register veriusertfs routines/wrappers. Iterate over the tfcell
@@ -58,7 +58,7 @@ void veriusertfs_register_table(p_tfcell vtable)
       p_tfcell tf;
       s_vpi_systf_data tf_data;
       p_pli_data data;
-      char trace_buf[1024];
+      static char trace_buf[1024];
 
       if (!pli_trace && (path = getenv("PLI_TRACE"))) {
 	    if (strcmp(path,"-") == 0)
@@ -69,8 +69,8 @@ void veriusertfs_register_table(p_tfcell vtable)
 			perror(path);
 			exit(1);
 		  }
-		  setvbuf(pli_trace, trace_buf, _IOLBF, sizeof(trace_buf));
 	    }
+	    setvbuf(pli_trace, trace_buf, _IOLBF, sizeof(trace_buf));
       }
 
       for (tf = vtable; tf; tf++) {
@@ -98,6 +98,11 @@ void veriusertfs_register_table(p_tfcell vtable)
 		  tf_data.type = vpiSysTask;
 		  break;
 		case userfunction:
+		  tf_data.sysfunctype = vpiIntFunc;
+		  tf_data.type = vpiSysFunc;
+		  break;
+		case userrealfunction:
+		  tf_data.sysfunctype = vpiRealFunc;
 		  tf_data.type = vpiSysFunc;
 		  break;
 		default:
@@ -109,7 +114,7 @@ void veriusertfs_register_table(p_tfcell vtable)
 	    tf_data.tfname = tf->tfname;
 	    tf_data.compiletf = compiletf;
 	    tf_data.calltf = calltf;
-	    tf_data.sizetf = tf->sizetf;
+	    tf_data.sizetf = (PLI_INT32 (*)(PLI_BYTE8 *))tf->sizetf;
 	    tf_data.user_data = (char *)data;
 
 	    if (pli_trace) {
@@ -139,7 +144,7 @@ void veriusertfs_register_table(p_tfcell vtable)
  * This function calls the veriusertfs checktf and sets up all the
  * callbacks misctf requires.
  */
-static int compiletf(char *data)
+static PLI_INT32 compiletf(char *data)
 {
       p_pli_data pli;
       p_tfcell tf;
@@ -221,7 +226,7 @@ static int compiletf(char *data)
 /*
  * This function is the wrapper for the veriusertfs calltf routine.
  */
-static int calltf(char *data)
+static PLI_INT32 calltf(char *data)
 {
       int rc = 0;
       p_pli_data pli;
@@ -249,13 +254,13 @@ static int calltf(char *data)
  */
 extern int async_misctf_enable;
 
-static int callback(p_cb_data data)
+static PLI_INT32 callback(p_cb_data data)
 {
       p_pli_data pli;
       p_tfcell tf;
       int reason;
       int paramvc = 0;
-      int rc;
+      PLI_INT32 rc;
 
 	/* not enabled */
       if (data->reason == cbValueChange && !async_misctf_enable)
@@ -387,65 +392,4 @@ PLI_INT32 tf_setrealdelay(double dly)
 {
       return tf_isetrealdelay(dly, tf_getinstance());
 }
-/*
- * $Log: veriusertfs.c,v $
- * Revision 1.15  2004/09/10 23:13:05  steve
- *  Compile cleanup of C code.
- *
- * Revision 1.14  2003/06/25 04:04:19  steve
- *  Fix mingw portability problems.
- *
- * Revision 1.13  2003/06/17 22:09:45  steve
- *  Better trace of PLI1 registration.
- *
- * Revision 1.12  2003/06/17 16:55:08  steve
- *  1) setlinebuf() for vpi_trace
- *  2) Addes error checks for trace file opens
- *  3) removes now extraneous flushes
- *  4) fixes acc_next() bug
- *
- * Revision 1.11  2003/06/04 01:56:20  steve
- * 1) Adds configure logic to clean up compiler warnings
- * 2) adds acc_compare_handle, acc_fetch_range, acc_next_scope and
- *    tf_isetrealdelay, acc_handle_scope
- * 3) makes acc_next reentrant
- * 4) adds basic vpiWire type support
- * 5) fills in some acc_object_of_type() and acc_fetch_{full}type()
- * 6) add vpiLeftRange/RigthRange to signals
- *
- * Revision 1.10  2003/05/30 04:05:32  steve
- *  Add tf_rosynchronize and friends.
- *
- * Revision 1.9  2003/05/28 02:42:43  steve
- *  compiler warnings.
- *
- * Revision 1.8  2003/05/18 00:16:35  steve
- *  Add PLI_TRACE tracing of PLI1 modules.
- *
- *  Add tf_isetdelay and friends, and add
- *  callback return values for acc_vcl support.
- *
- * Revision 1.7  2003/04/23 15:01:29  steve
- *  Add tf_synchronize and tf_multiply_long.
- *
- * Revision 1.6  2003/02/16 02:23:14  steve
- *  Change the IV veriusertfs_register to accept table pointers.
- *
- * Revision 1.5  2002/08/12 01:35:02  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.4  2002/06/04 01:42:58  steve
- *  Add misctf support to libveriuser
- *
- * Revision 1.3  2002/06/03 00:08:42  steve
- *  Better typing for veriusertfs table.
- *
- * Revision 1.2  2002/05/31 18:21:39  steve
- *  Check for and don't dereference null pointers,
- *  Avoid copy of static objects.
- *  (mruff)
- *
- * Revision 1.1  2002/05/30 02:37:26  steve
- *  Add the veriusertf_register funciton.
- *
- */
+

link_const.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: link_const.cc,v 1.17 2004/10/04 01:10:53 steve Exp $"
+#ident "$Id: link_const.cc,v 1.18 2007/04/14 03:10:51 steve Exp $"
 #endif
 
 # include "config.h"
@@ -132,6 +132,8 @@ verinum::V Nexus::driven_value() const
 
 	    } else if ((sig = dynamic_cast<const NetNet*>(cur->get_obj()))) {
 
+		    // If we find an attached SUPPLY0/1, the we know
+		    // from that what the driven value is. Stop now.
 		  if (sig->type() == NetNet::SUPPLY0) {
 			driven_ = V0;
 			return verinum::V0;
@@ -140,6 +142,16 @@ verinum::V Nexus::driven_value() const
 			driven_ = V1;
 			return verinum::V1;
 		  }
+
+		    // If we find an attached TRI0/1, then this is a
+		    // good guess for the driven value, but keep
+		    // looking for something better.
+		  if (sig->type() == NetNet::TRI0) {
+			val = verinum::V0;
+		  }
+		  if (sig->type() == NetNet::TRI1) {
+			val = verinum::V1;
+		  }
 	    }
       }
 
@@ -164,6 +176,9 @@ verinum::V Nexus::driven_value() const
 
 /*
  * $Log: link_const.cc,v $
+ * Revision 1.18  2007/04/14 03:10:51  steve
+ *  Properly account for tri0 connected to otherwise open mux input.
+ *
  * Revision 1.17  2004/10/04 01:10:53  steve
  *  Clean up spurious trailing white space.
  *

load_module.cc

@@ -26,6 +26,8 @@
 # include  "compiler.h"
 # include  <iostream>
 # include  <map>
+# include  <cstdlib>
+# include  <cstring>
 # include  <string>
 # include  <sys/types.h>
 # include  <dirent.h>

main.cc

@@ -1,6 +1,6 @@
 
 const char COPYRIGHT[] =
-          "Copyright (c) 1998-2005 Stephen Williams ([email protected])";
+          "Copyright (c) 1998-2008 Stephen Williams ([email protected])";
 
 /*
  *    This source code is free software; you can redistribute it
@@ -18,9 +18,6 @@ const char COPYRIGHT[] =
  *    along with this program; if not, write to the Free Software
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
-#ifdef HAVE_CVS_IDENT
-#ident "$Id: main.cc,v 1.92 2005/07/14 23:38:43 steve Exp $"
-#endif
 
 # include "config.h"
 
@@ -44,6 +41,7 @@ const char NOTICE[] =
 # include  <iostream>
 # include  <fstream>
 # include  <queue>
+# include  <cstring>
 # include  <list>
 # include  <map>
 # include  <unistd.h>
@@ -84,15 +82,20 @@ const char*target = "null";
 /*
  * These are the language support control flags. These support which
  * language features (the generation) to support. The generation_flag
- * is a major moce, and the gn_* flags control specifc sub-features.
+ * is a major mode, and the gn_* flags control specific sub-features.
  */
 generation_t generation_flag = GN_DEFAULT;
+bool gn_icarus_misc_flag = true;
 bool gn_cadence_types_flag = true;
+bool gn_specify_blocks_flag = true;
+bool gn_io_range_error_flag = true;
+bool gn_verilog_ams_flag = false;
 
 map<string,const char*> flags;
 char*vpi_module_list = 0;
 
 map<perm_string,unsigned> missing_modules;
+map<perm_string,bool> library_file_map;
 
 list<const char*> library_suff;
 
@@ -109,6 +112,7 @@ FILE *depend_file = NULL;
 bool warn_implicit  = false;
 bool warn_timescale = false;
 bool warn_portbinding = false;
+bool warn_inf_loop = false;
 
 bool error_implicit = false;
 
@@ -124,12 +128,16 @@ bool debug_synth2 = false;
  */
 bool verbose_flag = false;
 
+unsigned integer_width = 32;
+
 /*
  * Keep a heap of identifier strings that I encounter. This is a more
  * efficient way to allocate those strings.
  */
 StringHeapLex lex_strings;
 
+StringHeapLex filename_strings;
+
 /*
  * In library searches, Windows file names are never case sensitive.
  */
@@ -139,6 +147,11 @@ const bool CASE_SENSITIVE = false;
 const bool CASE_SENSITIVE = true;
 #endif
 
+/*
+ * Are we doing synthesis?
+ */
+bool synthesis = false;
+
 extern void cprop(Design*des);
 extern void synth(Design*des);
 extern void synth2(Design*des);
@@ -186,17 +199,57 @@ const char *net_func_to_name(const net_func func)
 
 static void process_generation_flag(const char*gen)
 {
-      if (strcmp(gen,"1") == 0)
+      if (strcmp(gen,"1") == 0) { // FIXME: Deprecated for 1995
 	    generation_flag = GN_VER1995;
 
-      else if (strcmp(gen,"2") == 0)
+      } else if (strcmp(gen,"2") == 0) { // FIXME: Deprecated for 2001
 	    generation_flag = GN_VER2001;
 
-      else if (strcmp(gen,"2x") == 0)
-	    generation_flag = GN_VER2001X;
+      } else if (strcmp(gen,"2x") == 0) { // FIXME: Deprecated for 2001
+	    generation_flag = GN_VER2001;
+	    gn_icarus_misc_flag = true;
 
-      else
-	    generation_flag = GN_DEFAULT;
+      } else if (strcmp(gen,"1995") == 0) {
+	    generation_flag = GN_VER1995;
+
+      } else if (strcmp(gen,"2001") == 0) {
+	    generation_flag = GN_VER2001;
+
+      } else if (strcmp(gen,"2005") == 0) {
+	    generation_flag = GN_VER2005;
+
+      } else if (strcmp(gen,"icarus-misc") == 0) {
+	    gn_icarus_misc_flag = true;
+
+      } else if (strcmp(gen,"no-icarus-misc") == 0) {
+	    gn_icarus_misc_flag = false;
+
+      } else if (strcmp(gen,"xtypes") == 0) {
+	    gn_cadence_types_flag = true;
+
+      } else if (strcmp(gen,"no-xtypes") == 0) {
+	    gn_cadence_types_flag = false;
+
+      } else if (strcmp(gen,"specify") == 0) {
+	    gn_specify_blocks_flag = true;
+ 
+      } else if (strcmp(gen,"no-specify") == 0) {
+	    gn_specify_blocks_flag = false;
+ 
+      } else if (strcmp(gen,"verilog-ams") == 0) {
+	    gn_verilog_ams_flag = true;
+ 
+      } else if (strcmp(gen,"no-verilog-ams") == 0) {
+	    gn_verilog_ams_flag = false;
+ 
+      } else if (strcmp(gen,"io-range-error") == 0) {
+	    gn_io_range_error_flag = true;
+
+      } else if (strcmp(gen,"no-io-range-error") == 0) {
+	    gn_io_range_error_flag = false;
+
+      } else {
+      }
 }
 
 static void parm_to_flagmap(const string&flag)
@@ -257,13 +310,22 @@ static void parm_to_flagmap(const string&flag)
  *    functor:<name>
  *        Append a named functor to the processing path.
  *
- *    generation:<1|2|3.0>
+ *    generation:<1|2|2x|xtypes|no-xtypes|specify|no-specify>
  *        This is the generation flag
  *
  *    ivlpp:<preprocessor command>
  *        This specifies the ivlpp command line used to process
  *        library modules as I read them in.
  *
+ *    iwidth:<bits>
+ *        This specifies the width of integer variables. (that is,
+ *        variables declared using the "integer" keyword.)
+ *
+ *    library_file:<path>
+ *        This marks that a source file with the given path is a
+ *        library. Any modules in that file are marked as library
+ *        modules.
+ *
  *    module:<name>
  *        Load a VPI module.
  *
@@ -316,9 +378,9 @@ static void read_iconfig_file(const char*ipath)
 		  basedir = strdup(cp);
 
 	    } else if (strcmp(buf, "debug") == 0) {
-		  if (strcmp(cp, "scope") == 0) {
+		  if (strcmp(cp, "scopes") == 0) {
 			debug_scopes = true;
-			cerr << "debug: Enable scope debug" << endl;
+			cerr << "debug: Enable scopes debug" << endl;
 		  } else if (strcmp(cp,"eval_tree") == 0) {
 			debug_eval_tree = true;
 			cerr << "debug: Enable eval_tree debug" << endl;
@@ -339,6 +401,9 @@ static void read_iconfig_file(const char*ipath)
 		  parm_to_flagmap(parm);
 
 	    } else if (strcmp(buf,"functor") == 0) {
+		if (strncmp(cp, "synth", 5) == 0) {
+		      synthesis = true;  // We are doing synthesis.
+		}
 		net_func tmp = name_to_net_func(cp);
 		if (tmp == 0) {
 		      cerr << "No such design transform function ``"
@@ -354,6 +419,13 @@ static void read_iconfig_file(const char*ipath)
 	    } else if (strcmp(buf, "ivlpp") == 0) {
 		  ivlpp_string = strdup(cp);
 
+	    } else if (strcmp(buf, "iwidth") == 0) {
+		  integer_width = strtoul(cp,0,10);
+
+	    } else if (strcmp(buf, "library_file") == 0) {
+		  perm_string path = filename_strings.make(cp);
+		  library_file_map[path] = true;
+
 	    } else if (strcmp(buf,"module") == 0) {
 		  if (vpi_module_list == 0) {
 			vpi_module_list = strdup(cp);
@@ -384,6 +456,9 @@ static void read_iconfig_file(const char*ipath)
 		      case 'i':
 			warn_implicit = true;
 			break;
+		      case 'l':
+			warn_inf_loop = true;
+			break;
 		      case 'p':
 			warn_portbinding = true;
 			break;
@@ -541,6 +616,29 @@ int main(int argc, char*argv[])
 	      }
       }
 
+      lexor_keyword_mask = 0;
+      switch (generation_flag) {
+        case GN_VER1995:
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_1995;
+	  break;
+        case GN_VER2001:
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_1995;
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_2001;
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_2001_CONFIG;
+	  break;
+        case GN_VER2005:
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_1995;
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_2001;
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_2001_CONFIG;
+	  lexor_keyword_mask |= GN_KEYWORDS_1364_2005;
+	  break;
+      }
+
+      if (gn_cadence_types_flag)
+	    lexor_keyword_mask |= GN_KEYWORDS_ICARUS;
+
+      if (gn_verilog_ams_flag)
+	    lexor_keyword_mask |= GN_KEYWORDS_VAMS_2_3;
 
       if (verbose_flag) {
 	    if (times_flag)
@@ -554,11 +652,29 @@ int main(int argc, char*argv[])
 		case GN_VER2001:
 		  cout << "IEEE1364-2001";
 		  break;
-		case GN_VER2001X:
-		  cout << "IEEE1364-2001+Extensions";
+		case GN_VER2005:
+		  cout << "IEEE1364-2005";
 		  break;
 	    }
 
+	    if (gn_verilog_ams_flag)
+		  cout << ",verilog-ams";
+
+	    if (gn_specify_blocks_flag)
+		  cout << ",specify";
+	    else
+		  cout << ",no-specify";
+
+	    if (gn_cadence_types_flag)
+		  cout << ",xtypes";
+	    else
+		  cout << ",no-xtypes";
+
+	    if (gn_icarus_misc_flag)
+		  cout << ",icarus-misc";
+	    else
+		  cout << ",no-icarus-misc";
+
 	    cout << endl << "PARSING INPUT" << endl;
       }
 
@@ -611,11 +727,20 @@ int main(int argc, char*argv[])
 	    for (mod = pform_modules.begin()
 		       ; mod != pform_modules.end()
 		       ; mod++) {
-		  if (mentioned_p[(*mod).second->mod_name()] == false) {
-			if (verbose_flag)
-			      cout << " " << (*mod).second->mod_name();
-			roots.push_back((*mod).second->mod_name());
-		  }
+
+		    /* Don't choose library modules. */
+		  if ((*mod).second->library_flag)
+			continue;
+
+		    /* Don't choose modules instantiated in other
+		       modules. */
+		  if (mentioned_p[(*mod).second->mod_name()])
+			continue;
+
+		    /* What's left might as well be chosen as a root. */
+		  if (verbose_flag)
+			cout << " " << (*mod).second->mod_name();
+		  roots.push_back((*mod).second->mod_name());
 	    }
 	    if (verbose_flag)
 		  cout << endl;
@@ -659,7 +784,7 @@ int main(int argc, char*argv[])
 
       des->set_flags(flags);
 
-	/* Done iwth all the pform data. Delete the modules. */
+	/* Done with all the pform data. Delete the modules. */
       for (map<perm_string,Module*>::iterator idx = pform_modules.begin()
 		 ; idx != pform_modules.end() ; idx ++) {
 
@@ -761,94 +886,3 @@ int main(int argc, char*argv[])
 
       return des? des->errors : 1;
 }
-
-/*
- * $Log: main.cc,v $
- * Revision 1.92  2005/07/14 23:38:43  steve
- *  Display as version 0.9.devel
- *
- * Revision 1.91  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.90  2005/06/28 04:25:55  steve
- *  Remove reference to SystemVerilog.
- *
- * Revision 1.89  2005/04/24 23:44:02  steve
- *  Update DFF support to new data flow.
- *
- * Revision 1.88  2005/01/22 01:06:55  steve
- *  Change case compare from logic to an LPM node.
- *
- * Revision 1.87  2004/12/11 02:31:26  steve
- *  Rework of internals to carry vectors through nexus instead
- *  of single bits. Make the ivl, tgt-vvp and vvp initial changes
- *  down this path.
- *
- * Revision 1.86  2004/10/04 01:10:53  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.85  2004/09/25 01:58:44  steve
- *  Add a debug_elaborate flag
- *
- * Revision 1.84  2004/09/10 23:51:42  steve
- *  Fix the evaluation of constant ternary expressions.
- *
- * Revision 1.83  2004/09/05 17:44:42  steve
- *  Add support for module instance arrays.
- *
- * Revision 1.82  2004/03/10 04:51:24  steve
- *  Add support for system function table files.
- *
- * Revision 1.81  2004/02/18 17:11:56  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.80  2004/02/15 00:19:29  steve
- *  Report elaboration errors without crashing.
- *
- * Revision 1.79  2003/11/26 01:37:14  steve
- *  Properly initialize vpi_module_list with system.
- *
- * Revision 1.78  2003/11/13 05:55:33  steve
- *  Move the DLL= flag to target config files.
- *
- * Revision 1.77  2003/11/13 04:09:49  steve
- *  Pass flags through the temporary config file.
- *
- * Revision 1.76  2003/11/13 03:10:38  steve
- *  ivl -F and -t flags are onpassed throught the -C file.
- *
- * Revision 1.75  2003/11/10 20:59:03  steve
- *  Design::get_flag returns const char* instead of string.
- *
- * Revision 1.74  2003/11/01 04:22:30  steve
- *  Accept functors in the config file.
- *
- * Revision 1.73  2003/10/26 22:43:42  steve
- *  Improve -V messages,
- *
- * Revision 1.72  2003/09/26 02:17:14  steve
- *  Delete pform when done with it.
- *
- * Revision 1.71  2003/09/25 00:25:14  steve
- *  Summary list of missing modules.
- *
- * Revision 1.70  2003/09/23 05:57:36  steve
- *  Pass -m flag from driver via iconfig file.
- *
- * Revision 1.69  2003/09/22 01:12:08  steve
- *  Pass more ivl arguments through the iconfig file.
- *
- * Revision 1.68  2003/06/20 00:53:19  steve
- *  Module attributes from the parser
- *  through to elaborated form.
- *
- * Revision 1.67  2003/04/24 05:25:27  steve
- *  Dump design even on errors.
- *
- * Revision 1.66  2003/03/01 06:25:30  steve
- *  Add the lex_strings string handler, and put
- *  scope names and system task/function names
- *  into this table. Also, permallocate event
- *  names from the beginning.
- */
-

mingw.txt

@@ -2,7 +2,7 @@
 
 MINGW PORT OF ICARUS VERILOG
 
-    Copyright 2003 Stephen Williams  <[email protected]>
+    Copyright 2006 Stephen Williams  <[email protected]>
 
 
 Icarus Verilog source can be compiled with the mingw C/C++ compilers
@@ -12,13 +12,13 @@ or without Cygwin, so this is the preferred Windows distribution form.
 The configure scripts automatically detect that the compilers in use
 are the mingw compilers and will configure the Makefiles appropriately.
 
-However, the mingw tools do not include all the other tools around the
-compiler, including the shell interpreter for the configure script,
-bison, flex, gperf, etc. Therefore, you still need Cygwin to compile
-Icarus Verilog, even if you don't need the Cygwin compilers. There are
-also a few precompiled library prerequisites that you need.
+The mingw patch doesn't contain tools beyond the compiler, but there
+is the "msys" package that the makers of Mingw publish that has enough
+extra tools to get most everything else working. There are a few extra
+packages needed beyond mingw and msys, and the following instructions
+explain how to get them and install them.
 
-* Some Preliminary Comments
+* Some Preliminary Comments  -- PLEASE READ ME --
 
 The Windows port of Icarus Verilog is the most difficult of all the
 ports. The Windows system off the shelf is completely stripped, devoid
@@ -26,7 +26,15 @@ of any support for software development. Everything needed to compile
 Icarus Verilog must be collected from various sources and stitched
 together by hand. Normal human beings with a basic understanding of
 software development can do this, but some patience (and access to the
-Internet) is required. You may choose to print these instructions.
+Internet) is required. You may choose to print these instructions. FOR
+BEST RESULTS, FOLLOW THESE INSTRUCTIONS CAREFULLY.
+
+NOTE that if you have Cygwin installed, it is best to not use a cygwin
+window to do the build, as the Cygwin tools will intermix with the
+mingw tools such that it is hard to be sure you are using the right
+compiler. Thus, it is recommended that these steps be *not* done in a
+Cygwin window. Use an MSYS window instead, and be careful that your
+msys/mingw tools are not masked by paths that point to Cygwin binaries.
 
 I have no plans to intentionally support MSVC++ compilation. Don't ask.
 
@@ -36,13 +44,17 @@ This is a brief list of prerequisite packages, along with the URL
 where each can be found. In most cases, the specific version is not
 critical, but these are the versions I use.
 
-     Cygwin                     <http://cygwin.com>
-     Mingw32-2.0.0              <http://www.mingw.org>
+     msys-1.0			<http://www.mingw/org>
+     msysDTK-1.0		<http://www.mingw.org>
+     Mingw32-5.x		<http://www.mingw.org>
+        ... including the sub-packages binutils, gcc-core and gcc-g++
+	if you are given the option.
      readline-4.2-20010727.zip  <http://mingwrep.sourceforge.net>
-     bzip2-1.0.2-bin.zip        <http://gnuwin32.sourceforge.net>
-     zlib-1.1.4-bin.zip         <http://gnuwin32.sourceforge.net>
-     bzip2-1.0.2-lib.zip        <http://gnuwin32.sourceforge.net>
-     zlib-1.1.4-lib.zip         <http://gnuwin32.sourceforge.net>
+     bzip2-1.0.3		<http://gnuwin32.sourceforge.net>
+     zlib-1.2.3			<http://gnuwin32.sourceforge.net>
+     gperf-3.0.1		<http://gnuwin32.sourceforge.net>
+     bison-2.1			<http://gnuwin32.sourceforge.net>
+     flex-2.5.4a		<http://gnuwin32.sourceforge.net>
 
 The above table lists the packages required. It is convenient to
 install them in the above order. Many of these packages are also
@@ -55,59 +67,38 @@ installation of Icarus Verilog is complete. These are only needed to
 build the compiler. The Mingw32 package can be used to compile VPI
 modules if you choose.
 
-* Install Cygwin
+* Install MSYS and msysDTK
 
-So, step 1 is "Download and Install Cygwin." See the web page
-http://www.cygwin.com for instructions and the files to do
-this. Cygwin *is* a kool package, and is worth having anyhow. There is
-a convenient setup program that you download first. You execute the
-setup program, and that prompts you to select the package you want.
+The msys package is available from the mingw download site. This is
+not the compiler but a collection of *nix tools ported to Windows and
+wrapped in a convenient installer. The msys package is all the various
+basic tools (shells, file utils, etc) and the msysDTK is extra
+developer tools other than the compiler.
 
-You need in particular the Cygwin base, bison (see notes) flex, make
-and gperf. If you are compiling from CVS, you also need cvs, rcs and
-automake packages. You will also need tar and gunzip, but these are
-hard to not install. I recommend installing the "which" package as
-well. Beyond the basics, be sure to install these Cygwin packages:
+Download the msys-1.x.x.exe and msysdtc-1.x.x.exe binaries. These are
+self-installing packages. Install msys first, and then msysDTC. Most
+likely, you want to install them in c:/msys. (The msysDTK is installed
+in the same location, as it is an add-on.)
 
-      bison        (*not* 1.875. See Notes.)
-      flex
-      ghostscript  (makes the documentation)
-      gperf
-      gzip
-      make
-      strip
-      tar          (tar and gunzip for unpacking the source)
-      unzip        (For unpacking zip compressed packages.)
-      which
+This install should be easy and reliable.
 
-    NOTES:
-      bison-1.875 is broken, it generates invalid C/C++ code. You
-      don't want that version for anything you do. If you have that
-      version (use "bison -V" to check the version) then use the
-      Cygwin setup program to get a different version. I've downgraded
-      to 1.75 and couldn't be happier. In fact, a whole host of insane
-      bison bugs can be avoided that way.
-
-      There is a mingw32 runtime package included in the Cygwin
-      distribution. You do *not* need that, as you will be getting
-      everything from the mingw32 distribution itself.
-
-Other then the install of mingw32, most of the remaining steps are
-best done in a Cygwin window. When you installed Cygwin, a start menu
-entry was created to allow you to start up the Cygwin window. I'll use
-the string "$ " to represent a command prompt in this window, because
-that is the usual bash prompt.
+The installation will leave an "msys" icon on your desktop and in the
+mingw sub-menu of your Start menu. This icon brings up a shell window
+(a command line) that has paths all set up for executing msys and
+mingw commands. This is what you will want to use while executing
+commands below.
 
 * Install Mingw32
 
 The obvious step 2, then, is install the mingw compilers. These can be
-found at the web page <http://www.mingw.org>. The Mingw-2.x.x version
-comes prepackaged in a convenient, Windows style, installer. I
-recommend you download this package instead of picking and choosing
-bits.
+found at the web page <http://www.mingw.org>. The Mingw-5.x.x package
+is a convenient remote installer. Download this program and run
+it. The installer will ask which components you want to install. You
+need only the base C compiler and the C++ compiler. (You may install
+other languages if you wish.)
 
 When I install Mingw32 (using the installer) I typically set a
-destination directory of d:\mingw-2.0.0 or the like. You will be using
+destination directory of d:\mingw or the like. You will be using
 that path later.
 
     NOTES:
@@ -115,6 +106,10 @@ that path later.
       need Mingw32, even if you are using a precompiled binary. VPI
       modules only require Mingw32, and none of the other libraries.
 
+Finally, as part of installing the mingw32 compilers, remember to add
+the mingw/bin directory to your path. You will need that to be able to
+find the compilers later.
+
 * Install Mingw32 Packages
 
 There is a collection of precompiled libraries and add-on packages
@@ -123,86 +118,94 @@ with simplified Windows installers, but they are pretty easy to
 install by hand. Icarus Verilog uses the readline-4.2 package from
 that collection.
 
-Since I installed Mingw32 in d:\mingw-2.0.0, I also created a
-Mingw-packages directory called d:\mingw-packages. The install, then,
+Since I installed Mingw32 in c:\mingw, I also created a
+Mingw-packages directory called c:\mingw-packages. The install, then,
 is as easy as this:
 
-  <cygwin shell>
-    $ cd d:/mingw-packages
+  <msys shell>
+    $ cd c:/mingw-packages
     $ unzip readline-4.2-20010727.zip
         [lots of inflating...]
 
+There is no need to adjust your execution path for this package as we
+are only using a library out of here. However, do remember the
+directory name, as you will need it later.
+
 Done. On to the next packages.
 
 * Install GnuWin32 Packages
 
 The GnuWin32 project is a collections of open source programs and
 libraries ported to Windows. These also work well with the Mingw
-compiler, and in fact Icarus Verilog uses a few libraries from this
+compiler, and in fact Icarus Verilog uses a few pieces from this
 collection.
 
 You will need these gnuwin32 packages to compile Icarus Verilog:
 
   <http://gnuwin32.sourceforge.net>
-    bzip2-1.0.2-lib.zip
-    bzip2-1.0.2-bin.zip
-    zlib-1.1.4-lib.zip
-    zlib-1.1.4-bin.zip
+    bzip2-1.0.3.exe
+    zlib-1.2.3.exe
+    gperf-3.0.1.exe
+    bison-2.1.exe
+    flex-2.5.4a.exe
 
 I suggest creating a common directory for holding all your gnuwin32
-packages. I use D:\gnuwin32.
+packages. I use C:\gnuwin32. The download page at the gnuwin32 site
+has a "setup" link for each of these packages. Click the setup to
+download the installer for each of the desired programs, then execute
+the downloaded .exe files to invoke the installer. Install into the
+c:\gunwin32 directory.
 
-After downloading these packages, put the .zip files in your gnuwin32
-directory and install them like so:
+   NOTES:
+      You need the binaries and the developer files, but you do not
+      need the source to these packages. The installer gives you the
+      choice.
 
-  <cygwin shell>
-    $ cd d:/gnuwin32
-    $ unzip bzip2-1.0.2-bin.zip
-       [lots of inflating...]
-    $ unzip bzip2-1.0.2-lib.zip
-       [lots of inflating...]
-    $ unzip zlib-1.1.4-bin.zip
-       [lots of inflating...]
-    $ unzip zlib-1.1.4-lib.zip
-       [lots of inflating...]
-
-Done.
+After you are done installing the gnuwin32 tools, you should add the
+c:\gnuwin32\bin directory (assuming you installed in c:\gnuwin32) to
+your Windows path. The msys shell will pick up your Windows path.
 
 * Unpack Icarus Verilog source
 
 Unpack the compressed tar file (.tar.gz) of the source with a command
 like this:
 
-	$ gunzip -d verilog-20030303.tar.gz | tar xvf -
+	$ gunzip -d verilog-xxxxxxxx.tar.gz | tar xvf -
 
-This will create a directory "verilog-20030303" that contains all the
+This will create a directory "verilog-xxxxxxxx" that contains all the
 source for Icarus Verilog. Descend into that directory, as that is
 where we will work from now on.
 
-	$ cd verilog-20030303
+	$ cd verilog-xxxxxxxx
 
-    NOTE:
+    NOTES:
       The exact name of the file will vary according to the
       snapshot. The 20030303 name is only an example.
 
-* Select the mingw compilers
+      Unpack the source into a directory that has no spaces. The
+      makefiles included in the source get confused by white space in
+      directory names.
 
-In your cygwin window, if you type "which c++" you might get the
-response path "/usr/bin/c++" which is the cygwin compiler. This is not
-the one we want to use, however. Tell the shell where the mingw
-compilers are by setting the search path like so:
+* Preconfigure Icarus Verilog (Not normally needed)
 
-	$ PATH=/cygdrive/d/mingw-2.0.0/bin:$PATH
+Under certain cases, you may need to "preconfigure" the Icarus Verilog
+source tree. You should only need to do this if you are getting the
+Icarus Verilog source tree from CVS, or you are using an existing
+source tree that you've patched to cause configure.in files to change.
 
-This assumes that you installed mingw in D:\mingw-2.0.0. The actual
-programs are in the bin directory under the root. After this command,
-check that you are now getting the right compilers with this "which"
-command:
+    NOTE: If you are building from a fresh, bundled source tree that
+      you downloaded from an FTP site, then SKIP THIS STEP. Go on to
+      the "Configure Icarus Verilog" step below.
 
-	$ which c++
-	/cygdrive/d/mingw-2.0.0/bin/c++
+First, remove any autom4te.cache directories that may exist in your
+source tree. These can make a mess of autoconf runs. Then, generate
+configure scripts with this command:
 
-Good!
+        $ sh autoconf.sh
+
+This script will run the "autoconf" command (part of the msysDTK) to
+generate all the necessary "configure" scripts. This will take a few
+minutes. This should go smoothly.
 
 * Configure Icarus Verilog
 
@@ -215,10 +218,10 @@ without white space.
 Now, configure the source to make the makefiles and configuration
 details. Run these commands:
 
-	$ CPPFLAGS="-Id:/gnuwin32/include -Id:/mingw-packages/include"
-	$ LDFLAGS="-Ld:/gnuwin32/lib -Ld:/mingw-packages/include"
+	$ CPPFLAGS="-Ic:/gnuwin32/include -Ic:/mingw-packages/include"
+	$ LDFLAGS="-Lc:/gnuwin32/lib -Lc:/mingw-packages/lib"
 	$ export CPPFLAGS LDFLAGS
-	$ ./configure --prefix=d:/iverilog
+	$ ./configure --prefix=c:/iverilog
 
     NOTES:
       The CPPFLAGS and LDFLAGS variables tell configure where
@@ -267,10 +270,10 @@ directory you chose) and away you go.
 You may find that you need to put some of the prerequisite DLLs into
 the d:\iverilog\bin directory. These include:
 
-      d:\mingw-2.0.0\bin\mingw10.dll
-      d:\mingw-packages\bin\libreadline.dll
-      d:\gnuwin32\bin\bzip2.dll
-      d:\gnuwin32\bin\zlib.dll
+      c:\mingw\bin\mingw10.dll
+      c:\mingw-packages\bin\libreadline.dll
+      c:\gnuwin32\bin\bzip2.dll
+      c:\gnuwin32\bin\zlib.dll
 
 If you already have these in your Windows path (i.e. your system32
 directory) then you do not need to copy them into the iverilog
@@ -279,14 +282,14 @@ files.
 
 * Running Icarus Verilog
 
-Finally, put the D:\iverilog\bin directory in your Windows path, and
+Finally, put the C:\iverilog\bin directory in your Windows path, and
 you should be able to run the iverilog and vvp commands to your
 heart's content.
 
 Currently, the iverilog.exe uses the path to itself to locate the
 libraries and modules associated with itself. In other words, if you
-execute the D:\iverilog\bin\iverilog.exe program, it will locate its
-subparts in the D:\iverilog directory and subdirectories below
+execute the C:\iverilog\bin\iverilog.exe program, it will locate its
+subparts in the C:\iverilog directory and subdirectories below
 that. This means you can move the Icarus Verilog installation by
 simply moving the root directory and all its contents.
 

net_assign.cc

@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: net_assign.cc,v 1.21 2006/02/02 02:43:58 steve Exp $"
+#ident "$Id: net_assign.cc,v 1.22 2007/01/16 05:44:15 steve Exp $"
 #endif
 
 # include "config.h"
@@ -39,20 +39,13 @@ unsigned count_lval_width(const NetAssign_*idx)
 }
 
 NetAssign_::NetAssign_(NetNet*s)
-: sig_(s), mem_(0), bmux_(0), base_(0)
+: sig_(s), word_(0), base_(0)
 {
       lwid_ = sig_->vector_width();
       sig_->incr_lref();
       more = 0;
 }
 
-NetAssign_::NetAssign_(NetMemory*s)
-: sig_(0), mem_(s), bmux_(0), base_(0)
-{
-      lwid_ = mem_->width();
-      more = 0;
-}
-
 NetAssign_::~NetAssign_()
 {
       if (sig_) {
@@ -62,23 +55,23 @@ NetAssign_::~NetAssign_()
       }
 
       assert( more == 0 );
-      if (bmux_) delete bmux_;
+      if (word_) delete word_;
 }
 
-void NetAssign_::set_bmux(NetExpr*r)
+void NetAssign_::set_word(NetExpr*r)
 {
-      assert(bmux_ == 0);
-      bmux_ = r;
+      assert(word_ == 0);
+      word_ = r;
 }
 
-NetExpr* NetAssign_::bmux()
+NetExpr* NetAssign_::word()
 {
-      return bmux_;
+      return word_;
 }
 
-const NetExpr* NetAssign_::bmux() const
+const NetExpr* NetAssign_::word() const
 {
-      return bmux_;
+      return word_;
 }
 
 const NetExpr* NetAssign_::get_base() const
@@ -88,17 +81,13 @@ const NetExpr* NetAssign_::get_base() const
 
 unsigned NetAssign_::lwidth() const
 {
-      if (mem_)  return lwid_;
-      else if (bmux_) return 1;
-      else return lwid_;
+      return lwid_;
 }
 
 perm_string NetAssign_::name() const
 {
       if (sig_) {
 	    return sig_->name();
-      } else if (mem_) {
-	    return mem_->name();
       } else {
 	    return perm_string::literal("");
       }
@@ -109,11 +98,6 @@ NetNet* NetAssign_::sig() const
       return sig_;
 }
 
-NetMemory* NetAssign_::mem() const
-{
-      return mem_;
-}
-
 void NetAssign_::set_part(NetExpr*base, unsigned wid)
 {
       base_ = base;
@@ -275,6 +259,12 @@ NetRelease::~NetRelease()
 
 /*
  * $Log: net_assign.cc,v $
+ * Revision 1.22  2007/01/16 05:44:15  steve
+ *  Major rework of array handling. Memories are replaced with the
+ *  more general concept of arrays. The NetMemory and NetEMemory
+ *  classes are removed from the ivl core program, and the IVL_LPM_RAM
+ *  lpm type is removed from the ivl_target API.
+ *
  * Revision 1.21  2006/02/02 02:43:58  steve
  *  Allow part selects of memory words in l-values.
  *