Installation fixes for Debian.

.cvsignore

@@ -1,26 +1,12 @@
-lexor_keyword.cc
 parse.h
 parse.cc
 parse.cc.output
-parse.output
-syn-rules.cc
-syn-rules.cc.output
-syn-rules.output
 lexor.cc
-iverilog-vpi
-iverilog-vpi.pdf
-iverilog-vpi.ps
 ivl
-ivl.exp
 dep
 configure
 Makefile
-check
-check.cc
+verilog
 config.status
 config.log
 config.cache
-autom4te.cache
-config.h
-_pli_types.h
-dosify

Attrib.cc

@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2000 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: Attrib.cc,v 1.6 2004/02/20 18:53:33 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  "Attrib.h"
-# include  <assert.h>
-
-Attrib::Attrib()
-{
-      nlist_ = 0;
-      list_ = 0;
-}
-
-Attrib::~Attrib()
-{
-      delete[] list_;
-}
-
-
-const verinum& Attrib::attribute(perm_string key) const
-{
-      for (unsigned idx = 0 ;  idx < nlist_ ;  idx += 1) {
-
-	    if (key == list_[idx].key)
-		  return list_[idx].val;
-      }
-
-      static const verinum null;
-      return null;
-}
-
-void Attrib::attribute(perm_string key, const verinum&value)
-{
-      unsigned idx;
-
-      for (idx = 0 ; idx < nlist_ ;  idx += 1) {
-	    if (key == list_[idx].key) {
-		  list_[idx].val = value;
-		  return;
-	    }
-      }
-
-      struct cell_*tmp = new struct cell_[nlist_+1];
-      for (idx = 0 ;  idx < nlist_ ;  idx += 1)
-	    tmp[idx] = list_[idx];
-
-      tmp[nlist_].key = key;
-      tmp[nlist_].val = value;
-
-      nlist_ += 1;
-      delete[]list_;
-      list_ = tmp;
-}
-
-bool Attrib::has_compat_attributes(const Attrib&that) const
-{
-      unsigned idx;
-
-      for (idx = 0 ;  idx < that.nlist_ ;  idx += 1) {
-
-	    verinum tmp = attribute(that.list_[idx].key);
-	    if (tmp != that.list_[idx].val)
-		  return false;
-      }
-
-      return true;
-}
-
-unsigned Attrib::attr_cnt() const
-{
-      return nlist_;
-}
-
-perm_string Attrib::attr_key(unsigned idx) const
-{
-      assert(idx < nlist_);
-      return list_[idx].key;
-}
-
-const verinum& Attrib::attr_value(unsigned idx) const
-{
-      assert(idx < nlist_);
-      return list_[idx].val;
-}
-
-
-/*
- * $Log: Attrib.cc,v $
- * Revision 1.6  2004/02/20 18:53:33  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.5  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.4  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.3  2002/05/23 03:08:50  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.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/12/04 17:37:03  steve
- *  Add Attrib class for holding NetObj attributes.
- *
- */
-

Attrib.h

@@ -1,90 +0,0 @@
-#ifndef __Attrib_H
-#define __Attrib_H
-/*
- * Copyright (c) 2000 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: Attrib.h,v 1.5 2004/02/20 18:53:33 steve Exp $"
-#endif
-
-# include  "StringHeap.h"
-# include  "verinum.h"
-
-/*
- * This class keeps a map of key/value pairs. The map can be set from
- * an STL map, or by setting individual mappings.
- */
-class Attrib {
-
-    public:
-      Attrib();
-      ~Attrib();
-
-      const verinum&attribute(perm_string key) const;
-      void attribute(perm_string key, const verinum&value);
-      bool has_compat_attributes(const Attrib&that) const;
-
-
-	/* Provide a means of iterating over the entries in the map. */
-      unsigned       attr_cnt() const;
-      perm_string    attr_key(unsigned idx) const;
-      const verinum& attr_value(unsigned idx) const;
-
-
-    private:
-      struct cell_ {
-	    perm_string  key;
-	    verinum val;
-      };
-
-      unsigned nlist_;
-      struct cell_*list_;
-
-    private: // not implemented
-      Attrib(const Attrib&);
-      Attrib& operator= (const Attrib&);
-};
-
-/*
- * $Log: Attrib.h,v $
- * Revision 1.5  2004/02/20 18:53:33  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.4  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.3  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.2  2002/05/23 03:08:50  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.1  2000/12/04 17:37:03  steve
- *  Add Attrib class for holding NetObj attributes.
- *
- */
-#endif

BUGS.txt

@@ -16,7 +16,7 @@ compilation tools you are using. Specifically, I need to know:
 	- Operating system and processor type,
 	- Compiler w/ version,
 	- Library version, and
-	- anything else you think relevant.
+	- anything else you think relevent.
 
 Be aware that I do not have at my disposal a porting lab. I have the
 alpha on my desk, and the Linux/Intel box with a logic analyzer and
@@ -110,24 +110,6 @@ 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
 make it all nice and legal.
 
-RESEARCHING EXISTING/PAST BUGS, AND FILING REPORTS
-
-The URL <http://www.icarus.com/cgi-bin/ivl-bugs> is the main bug
-tracking system. Once you believe you have found a bug, you may browse
-the bugs database for existing bugs that may be related to yours. You
-might find that your bug has already been fixed in a later release or
-snapshot. If that's the case, then you are set.
-
-The bug database supports basic keyword searches, and you can
-optionally limit your search to active bugs, or fixed bugs. You may
-also browse the bug database, just to get an idea what is still
-broken. You may for example find a related bug that explains your
-symptom.
-
-The root page of the bug report database describes how to submit your
-completed bug report. You may submit it via the web form, or via
-e-mail.
-
 HOW TO SEND PATCHES
 
 Bug reports with patches are very welcome, especially if they are
@@ -148,7 +130,7 @@ patch is for, I will ask for clarification before applying it.)
 
 COPYRIGHT ISSUES
 
-Icarus Verilog is Copyright (c) 1998-2003 Stephen Williams except
+Icarus Verilog is Copyright (c) 1998-1999 Stephen Williams except
 where otherwise noted. Minor patches are covered as derivative works
 (or editorial comment or whatever the appropriate legal term is) and
 folded into the rest of ivl. However, if a submission can reasonably
@@ -159,15 +141,8 @@ then falls under the "otherwise noted" category.
 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.2 1999/08/06 04:05:28 steve Exp $
 $Log: BUGS.txt,v $
-Revision 1.4  2003/02/19 04:36:31  steve
- Notes on hte bug database.
-
-Revision 1.3  2003/01/30 16:23:07  steve
- Spelling fixes.
-
 Revision 1.2  1999/08/06 04:05:28  steve
  Handle scope of parameters.
 

HName.cc

@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2001 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: HName.cc,v 1.5 2002/11/02 03:27:52 steve Exp $"
-#endif
-
-# include  "config.h"
-# include  "HName.h"
-# include  <iostream>
-# include  <string.h>
-# include  <stdlib.h>
-#ifdef HAVE_MALLOC_H
-# include  <malloc.h>
-#endif
-
-hname_t::hname_t()
-{
-      item_ = 0;
-      count_ = 0;
-}
-
-hname_t::hname_t(const char*text)
-{
-      item_ = strdup(text);
-      count_ = 1;
-}
-
-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;
-      }
-}
-
-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
-{
-      return count_;
-}
-
-void hname_t::append(const char*text)
-{
-      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;
-      }
-}
-
-void hname_t::prepend(const char*text)
-{
-      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];
-      }
-}
-
-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)
-	    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 (lc || rc)
-	    return false;
-
-	// Must be ==
-      return true;
-}
-
-ostream& operator<< (ostream&out, const hname_t&that)
-{
-      switch (that.count_) {
-	  case 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;
-      }
-}
-
-/*
- * $Log: HName.cc,v $
- * Revision 1.5  2002/11/02 03:27:52  steve
- *  Allow named events to be referenced by
- *  hierarchical names.
- *
- * Revision 1.4  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.3  2002/01/05 04:36:06  steve
- *  include malloc.h only when available.
- *
- * Revision 1.2  2001/12/18 04:52:45  steve
- *  Include config.h for namespace declaration.
- *
- * Revision 1.1  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- */
-

HName.h

@@ -1,101 +0,0 @@
-#ifndef __HName_H
-#define __HName_H
-/*
- * Copyright (c) 2001 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: HName.h,v 1.4 2002/11/02 03:27:51 steve Exp $"
-#endif
-
-# include  <iostream>
-#ifdef __GNUC__
-#if __GNUC__ > 2
-using namespace std;
-#endif
-#endif
-
-/*
- * This class represents a Verilog hierarchical name. A hierarchical
- * name is an ordered list of simple names.
- */
-
-class hname_t {
-
-    public:
-      hname_t ();
-      explicit hname_t (const char*text);
-      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);
-
-	// 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);
-
-	// 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&);
-
-    private:
-      union {
-	    char**array_;
-	    char* item_;
-      };
-      unsigned count_;
-
-    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&);
-
-/*
- * $Log: HName.h,v $
- * Revision 1.4  2002/11/02 03:27:51  steve
- *  Allow named events to be referenced by
- *  hierarchical names.
- *
- * Revision 1.3  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.2  2002/06/14 03:25:51  steve
- *  Compiler portability.
- *
- * Revision 1.1  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- */
-#endif

LineInfo.cc

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2000 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: LineInfo.cc,v 1.4 2003/01/17 05:49:03 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  "LineInfo.h"
-# include  <sstream>
-
-LineInfo::LineInfo()
-: file_(0), lineno_(0)
-{
-}
-
-LineInfo::~LineInfo()
-{
-}
-
-string LineInfo::get_line() const
-{
-      ostringstream buf;
-      buf << (file_? file_ : "") << ":" << lineno_;
-
-      string res = buf.str();
-      return res;
-}
-
-void LineInfo::set_line(const LineInfo&that)
-{
-      file_ = that.file_;
-      lineno_ = that.lineno_;
-}
-
-void LineInfo::set_file(const char*f)
-{
-      file_ = f;
-}
-
-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,58 +18,59 @@
  *    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 $"
+#if !defined(WINNT)
+#ident "$Id: LineInfo.h,v 1.3 1999/02/15 02:06:15 steve Exp $"
 #endif
 
+# include  <cstdio>
 # include  <string>
 
-using namespace std;
-
-/*
- * This class holds line information for an internal object.
- *
- * Note that the file names are C-style strings that are allocated by
- * the lexor (which parses the line directives) and are never
- * deallocated. We can therefore safely store the pointer and never
- * delete the string, even if LineInfo objects are destroyed.
- */
-
 class LineInfo {
     public:
-      LineInfo();
-      ~LineInfo();
+      LineInfo() : lineno_(0) { }
 
-      string get_line() const;
+      string get_line() const
+	    { char buf[8];
+	      sprintf(buf, "%u", lineno_);
+	      return file_ + ":" + buf;
+	    }
 
-      void set_line(const LineInfo&that);
+      void set_line(const LineInfo&that)
+	    { file_ = that.file_;
+	      lineno_ = that.lineno_;
+	    }
 
-      void set_file(const char*f);
-      void set_lineno(unsigned n);
+      void set_file(const string&f) { file_ = f; }
+      void set_lineno(unsigned n) { lineno_ = n; }
 
     private:
-      const char* file_;
+      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.
+ *
+ * Revision 1.2  1999/02/01 00:26:48  steve
+ *  Carry some line info to the netlist,
+ *  Dump line numbers for processes.
+ *  Elaborate prints errors about port vector
+ *  width mismatch
+ *  Emit better handles null statements.
+ *
+ * Revision 1.1  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.
+ *
  */
 #endif

Makefile.in

@@ -3,7 +3,9 @@
 #    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.
+#    any later version. In order to redistribute the software in
+#    binary form, you will need a Picture Elements Binary Software
+#    License.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,268 +18,126 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.179 2006/10/30 22:45:36 steve Exp $"
+#ident "$Id: Makefile.in,v 1.24.2.1 1999/12/03 17:43:49 steve Exp $"
 #
 #
 SHELL = /bin/sh
 
-# This version string is only used in the version message printed
-# by the compiler. It reflects the assigned version number for the
-# product as a whole. Most components also print the CVS Name: token
-# in order to get a more automatic version stamp as well.
-VERSION = 0.9.devel
+VERSION = 0.0
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 
-SUBDIRS = @subdirs@
-
 VPATH = $(srcdir)
 
-bindir = @bindir@
-libdir = @libdir@
-includedir = @includedir@
+bindir = $(exec_prefix)/bin
+libdir = $(exec_prefix)/lib
 mandir = @mandir@
-
-libdir64 = @libdir64@
-
-dllib=@DLLIB@
-strip_dynamic=@strip_dynamic@
+includedir = $(prefix)/include
 
 CC = @CC@
 CXX = @CXX@
 INSTALL = @INSTALL@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 STRIP = @STRIP@
-LEX = @LEX@
-YACC = @YACC@
 
-CPPFLAGS = @ident_support@ @DEFS@ -I. -I$(srcdir) @CPPFLAGS@
-CXXFLAGS = -Wall @CXXFLAGS@
-PICFLAGS = @PICFLAG@
-LDFLAGS = @rdynamic@ @LDFLAGS@
+CPPFLAGS = @CPPFLAGS@ @DEFS@
+CXXFLAGS = @CXXFLAGS@ -I$(srcdir)
+LDFLAGS = @LDFLAGS@
 
-all: dep ivl@EXEEXT@
-	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-	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)
-all: dep dosify.exe
-dosify.exe: dosify.c
-	$(CC) -o dosify.exe dosify.c
-endif
-
-# This rule rules the compiler in the trivial hello.vl program to make
-# sure the basics were compiled properly.
-check: all
-	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) check); done
-	test -r check.conf || cp $(srcdir)/check.conf .
-	driver/iverilog -B. -BPivlpp -tcheck -ocheck.vvp $(srcdir)/examples/hello.vl
-	vvp/vvp -M- -M./vpi ./check.vvp | grep 'Hello, World'
+all: ivl verilog
+	cd vpi ; $(MAKE) all
+	cd vvm ; $(MAKE) all
+	cd ivlpp ; $(MAKE) all
 
 clean:
-	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-	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
-	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc*
-	rm -rf dep ivl@EXEEXT@
+	rm -f *.o parse.cc parse.cc.output parse.h dep/*.d lexor.cc verilog
+	cd vpi ; $(MAKE) clean
+	cd vvm ; $(MAKE) clean
+	cd ivlpp ; $(MAKE) clean
 
 distclean: clean
-	for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
-	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
+	rm -f vpi/Makefile
+	rm -f vvm/Makefile
+	rm -f ivlpp/Makefile
+	rm -f config.status config.cache config.log
+	rm -f Makefile
 
-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
+TT = t-null.o t-verilog.o t-vvm.o t-xnf.o
+FF = nobufz.o propinit.o sigfold.o xnfio.o xnfsyn.o
 
-O = main.o async.o design_dump.o dup_expr.o elaborate.o elab_expr.o \
-elab_lval.o elab_net.o elab_pexpr.o elab_scope.o \
-elab_sig.o emit.o eval.o eval_attrib.o \
-eval_tree.o expr_synth.o functor.o lexor.o lexor_keyword.o link_const.o \
-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 \
+O = main.o cprop.o design_dump.o elaborate.o elab_expr.o emit.o eval.o \
+eval_tree.o functor.o \
+lexor.o lexor_keyword.o mangle.o netlist.o pad_to_width.o \
 parse.o parse_misc.o pform.o pform_dump.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 PSpec.o \
-PTask.o PUdp.o PFunction.o PWire.o Statement.o StringHeap.o \
+set_width.o \
+verinum.o verireal.o target.o targets.o Module.o PDelays.o PExpr.o PGate.o \
+PTask.o PFunction.o PWire.o Statement.o \
 $(FF) $(TT)
 
-Makefile: Makefile.in config.h.in config.status
+Makefile: Makefile.in config.status
 	./config.status
 
+# Make the actual verilog program from the script template. This
+# simply invloves editing the substitution strings in the script into
+# the configured copy.
+tmp1 = bindir
+tmp2 = libdir
+tmp3 = includedir
+tmp4 = CXX
+verilog: $(srcdir)/verilog.sh
+	sed -e 's;@$(tmp1)@;@bindir@;' \
+	    -e 's;@$(tmp2)@;@libdir@;' \
+	    -e 's;@$(tmp3)@;@includedir@;' \
+	    -e 's;@$(tmp4)@;@CXX@;' < $< > $@
 
-ifeq (@WIN32@,yes)
-# Under Windows (mingw) I need to make the ivl.exe in two steps.
-# 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
-	$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
-	dlltool --dllname ivl@EXEEXT@ --def ivl.def \
-		--output-lib libivl.a --output-exp ivl.exp
-	$(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
-else
-ivl@EXEEXT@: $O
-	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib)
+ivl: $O
+	$(CXX) $(CXXFLAGS) -o ivl $O
 
-endif
-
-ifeq (@MINGW32@,yes)
-SUBDIRS += driver-vpi
-else
-all: dep iverilog-vpi
-
-iverilog-vpi: iverilog-vpi.sh
-	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
-	    -e 's;@INCLUDEDIR@;@includedir@;' \
-	    -e 's;@LIBDIR64@;@libdir64@;' \
-	    -e 's;@VPIDIR1@;@vpidir1@;' -e 's;@VPIDIR2@;@vpidir2@;' \
-	    -e 's;@LIBDIR@;@libdir@;' $< > $@
-	chmod +x $@
-endif
-
-dep:
-	mkdir dep
-
-%.o: %.cc
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
+%.o dep/%.d: %.cc
+	@[ -d dep ] || mkdir dep
+	$(CXX) $(CXXFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep/$*.d
 
 
-lexor.o: lexor.cc parse.h
+lexor.o dep/lexor.d: lexor.cc parse.h
 
-parse.o: parse.cc
+parse.o dep/parse.d: parse.cc
 
-parse.cc parse.h: $(srcdir)/parse.y
-	$(YACC) --verbose -t -p VL -d -o parse.cc $(srcdir)/parse.y
-	mv parse.cc.h parse.h 2>/dev/null || mv parse.hh parse.h
-
-syn-rules.cc: $(srcdir)/syn-rules.y
-	$(YACC) --verbose -p syn_ -o syn-rules.cc $(srcdir)/syn-rules.y
+parse.h parse.cc: $(srcdir)/parse.y
+	bison --verbose -t -p VL -d $(srcdir)/parse.y -o parse.cc
+	mv parse.cc.h parse.h
 
 lexor.cc: $(srcdir)/lexor.lex
-	$(LEX) -PVL -s -olexor.cc $(srcdir)/lexor.lex
+	flex -PVL -s -olexor.cc $(srcdir)/lexor.lex
 
-lexor_keyword.o: lexor_keyword.cc parse.h
+install: all installdirs $(bindir)/verilog $(libdir)/ivl/ivl $(mandir)/man1/verilog.1
+	cd vpi ; $(MAKE) install
+	cd vvm ; $(MAKE) install
+	cd ivlpp ; $(MAKE) install
 
-lexor_keyword.cc: lexor_keyword.gperf
-	gperf -o -i 7 -C -k 1-3,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
+$(bindir)/verilog: ./verilog
+	$(INSTALL_PROGRAM) ./verilog $(bindir)/verilog
 
-iverilog-vpi.ps: $(srcdir)/iverilog-vpi.man
-	man -t $(srcdir)/iverilog-vpi.man > iverilog-vpi.ps
+$(libdir)/ivl/ivl: ivl
+	$(INSTALL_PROGRAM) ./ivl $(libdir)/ivl/ivl
+	$(STRIP) $(libdir)/ivl/ivl
 
-iverilog-vpi.pdf: iverilog-vpi.ps
-	ps2pdf iverilog-vpi.ps iverilog-vpi.pdf
-
-ifeq (@WIN32@,yes)
-INSTALL_DOC = $(prefix)/iverilog-vpi.pdf $(mandir)/man1/iverilog-vpi.1
-INSTALL_DOCDIR = $(mandir)/man1
-all: dep iverilog-vpi.pdf
-else
-INSTALL_DOC = $(mandir)/man1/iverilog-vpi.1
-INSTALL_DOCDIR = $(mandir)/man1
-endif
-
-ifeq (@MINGW32@,yes)
-WIN32_INSTALL = $(prefix)/hello.vl $(prefix)/sqrt.vl $(prefix)/sqrt-virtex.v $(prefix)/QUICK_START.txt
-else
-WIN32_INSTALL = $(bindir)/iverilog-vpi
-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)
-	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
-
-$(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@
-	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl/ivl@EXEEXT@
-	$(STRIP) $(strip_dynamic) $(libdir)/ivl/ivl@EXEEXT@
-
-$(libdir)/ivl/xnf-s.conf: $(srcdir)/xnf-s.conf
-	$(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl/xnf-s.conf
-
-$(libdir)/ivl/xnf.conf: $(srcdir)/xnf.conf
-	$(INSTALL_DATA) $(srcdir)/xnf.conf $(libdir)/ivl/xnf.conf
-
-$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
-	$(INSTALL_DATA) $(srcdir)/ivl_target.h $(includedir)/ivl_target.h
-
-$(includedir)/_pli_types.h: _pli_types.h
-	$(INSTALL_DATA) $< $(includedir)/_pli_types.h
-
-$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
-	$(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h
-
-$(includedir)/acc_user.h: $(srcdir)/acc_user.h
-	$(INSTALL_DATA) $(srcdir)/acc_user.h $(includedir)/acc_user.h
-
-$(includedir)/veriuser.h: $(srcdir)/veriuser.h
-	$(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h
-
-$(mandir)/man1/iverilog-vpi.1: $(srcdir)/iverilog-vpi.man
-	$(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi.1
-
-$(prefix)/iverilog-vpi.pdf: iverilog-vpi.pdf
-	$(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi.pdf
-
-# In windows installations, put a few examples and the quick_start
-# into the destination directory.
-ifeq (@MINGW32@,yes)
-$(prefix)/hello.vl: $(srcdir)/examples/hello.vl
-	./dosify.exe $(srcdir)/examples/hello.vl tmp.vl
-	mv tmp.vl $(prefix)/hello.vl
-
-$(prefix)/sqrt.vl: $(srcdir)/examples/sqrt.vl
-	./dosify.exe $(srcdir)/examples/sqrt.vl tmp.vl
-	mv tmp.vl $(prefix)/sqrt.vl
-
-$(prefix)/sqrt-virtex.v: $(srcdir)/examples/sqrt-virtex.v
-	./dosify.exe $(srcdir)/examples/sqrt-virtex.v tmp.vl
-	mv tmp.vl $(prefix)/sqrt-virtex.v
-
-$(prefix)/QUICK_START.txt: $(srcdir)/QUICK_START.txt
-	./dosify.exe $(srcdir)/QUICK_START.txt tmp.txt
-	mv tmp.txt $(prefix)/QUICK_START.txt
-endif
+$(mandir)/man1/verilog.1: $(srcdir)/verilog.1
+	$(INSTALL_DATA) $(srcdir)/verilog.1 $(mandir)/man1/verilog.1
 
 installdirs: mkinstalldirs
-	$(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl \
-	    $(mandir) $(mandir)/man1
+	$(srcdir)/mkinstalldirs $(bindir) $(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 verilog iverilog-vpi gverilog@EXEEXT@; \
-	    do rm -f $(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
+	rm -f $(bindir)/ivl
+	rm -f $(bindir)/verilog
+	rm -f $(mandir)/man1/verilog.1
+	cd vpi ; $(MAKE) uninstall
+	cd vvm ; $(MAKE) uninstall
+	cd ivlpp ; $(MAKE) uninstall
 
 
 -include $(patsubst %.o, dep/%.d, $O)
--include $(patsubst %.o, dep/%.d, vpithunk.o)

Module.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998 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,26 +16,26 @@
  *    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 $"
+#if !defined(WINNT)
+#ident "$Id: Module.cc,v 1.7 1999/09/17 02:06:25 steve Exp $"
 #endif
 
-# include "config.h"
-
 # include  "Module.h"
-# include  "PGate.h"
 # include  "PWire.h"
-# include  <assert.h>
 
-/* n is a permallocated string. */
-Module::Module(perm_string n)
-: name_(n)
-{
-      default_nettype = NetNet::NONE;
-}
-
-Module::~Module()
+Module::Module(const string&name, const svector<Module::port_t*>*pp)
+: name_(name)
 {
+      if (pp) {
+	    ports_ = *pp;
+	    for (unsigned idx = 0 ;  idx < ports_.count() ;  idx += 1) {
+		  port_t*cur = ports_[idx];
+		  if (cur == 0)
+			continue;
+		  for (unsigned jdx = 0 ;  jdx < cur->wires.count() ; jdx += 1)
+			add_wire(cur->wires[jdx]);
+	    }
+      }
 }
 
 void Module::add_gate(PGate*gate)
@@ -43,24 +43,19 @@ void Module::add_gate(PGate*gate)
       gates_.push_back(gate);
 }
 
-void Module::add_task(perm_string name, PTask*task)
+void Module::add_task(const string&name, PTask*task)
 {
       tasks_[name] = task;
 }
 
-void Module::add_function(perm_string name, PFunction *func)
+void Module::add_function(const string &name, PFunction *func)
 {
       funcs_[name] = func;
 }
 
-PWire* Module::add_wire(PWire*wire)
+void Module::add_wire(PWire*wire)
 {
-      PWire*&ep = wires_[wire->path()];
-      if (ep) return ep;
-
-      assert(ep == 0);
-      ep = wire;
-      return wire;
+      wires_.push_back(wire);
 }
 
 void Module::add_behavior(PProcess*b)
@@ -70,144 +65,42 @@ void Module::add_behavior(PProcess*b)
 
 unsigned Module::port_count() const
 {
-      return ports.count();
+      return ports_.count();
 }
 
-/*
- * Return the array of PEIdent object that are at this port of the
- * module. If the port is internally unconnected, return an empty
- * array.
- */
-const svector<PEIdent*>& Module::get_port(unsigned idx) const
+const svector<PWire*>& Module::get_port(unsigned idx) const
 {
-      assert(idx < ports.count());
-      static svector<PEIdent*> zero;
-
-      if (ports[idx])
-	    return ports[idx]->expr;
-      else
-	    return zero;
+      assert(idx < ports_.count());
+      return ports_[idx]->wires;
 }
 
-unsigned Module::find_port(const char*name) const
+unsigned Module::find_port(const string&name) const
 {
       assert(name != "");
-      for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
-	    if (ports[idx] == 0) {
-		    /* It is possible to have undeclared ports. These
-		       are ports that are skipped in the declaration,
-		       for example like so: module foo(x ,, y); The
-		       port between x and y is unnamed and thus
-		       inaccessible to binding by name. */
-		  continue;
-	    }
-	    assert(ports[idx]);
-	    if (ports[idx]->name == name)
+      for (unsigned idx = 0 ;  idx < ports_.count() ;  idx += 1)
+	    if (ports_[idx]->name == name)
 		  return idx;
-      }
 
-      return ports.count();
+      return ports_.count();
 }
 
 
-PWire* Module::get_wire(const hname_t&name) const
+PWire* Module::get_wire(const string&name)
 {
-      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()
-		 ; cur != gates_.end()
+      for (list<PWire*>::iterator cur = wires_.begin()
+		 ; cur != wires_.end()
 		 ; cur ++ ) {
 
-	    if ((*cur)->get_name() == name)
+	    if ((*cur)->name() == name)
 		  return *cur;
       }
 
       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.
  *

Module.h

@@ -1,7 +1,7 @@
 #ifndef __Module_H
 #define __Module_H
 /*
- * Copyright (c) 1998-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1998 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,24 +18,16 @@
  *    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.41 2006/09/23 04:57:19 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: Module.h,v 1.10 1999/11/27 19:07:57 steve Exp $"
 #endif
 
 # include  <list>
 # include  <map>
 # include  "svector.h"
-# include  "StringHeap.h"
-# include  "HName.h"
-# include  "named.h"
-# include  "LineInfo.h"
-# include  "netlist.h"
-class PEvent;
+# include  <string>
 class PExpr;
-class PEIdent;
 class PGate;
-class PGenerate;
-class PSpecPath;
 class PTask;
 class PFunction;
 class PWire;
@@ -49,7 +41,7 @@ class NetScope;
  * therefore the handle for grasping the described circuit.
  */
 
-class Module : public LineInfo {
+class Module {
 
 	/* The module ports are in general a vector of port_t
 	   objects. Each port has a name and an ordered list of
@@ -58,41 +50,20 @@ class Module : public LineInfo {
 	   the port. */
     public:
       struct port_t {
-	    perm_string name;
-	    svector<PEIdent*> expr;
+	    string name;
+	    svector<PWire*>wires;
+
+	    port_t(int c=0) : wires(c) { }
       };
 
     public:
-	/* The name passed here is the module name, not the instance
-	   name. This make must be a permallocated string. */
-      explicit Module(perm_string name);
-      ~Module();
+      explicit Module(const string&name, const svector<port_t*>*);
 
-      NetNet::Type default_nettype;
 
 	/* The module has parameters that are evaluated when the
 	   module is elaborated. During parsing, I put the parameters
 	   into this map. */
-      struct param_expr_t {
-	    PExpr*expr;
-	    PExpr*msb;
-	    PExpr*lsb;
-	    bool signed_flag;
-      };
-      map<perm_string,param_expr_t>parameters;
-      map<perm_string,param_expr_t>localparams;
-
-
-	/* specparams are simpler then other params, in that they have
-	   no type information. They are merely constant
-	   expressions. */
-      map<perm_string,PExpr*>specparams;
-
-	/* The module also has defparam assignments which don't create
-	   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<string,PExpr*>parameters;
 
         /* Parameters may be overridden at instantiation time;
            the overrides do not contain explicit parameter names,
@@ -100,73 +71,40 @@ class Module : public LineInfo {
            appear in the instantiated module.  Therefore a
            list of names in module-order is needed to pass from
            a parameter-index to its name. */
-      list<perm_string> param_names;
+      list<string> param_names;
 
-	/* This is an array of port descriptors, which is in turn a
-	   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
-	   set by the `timescale directive. */
-      int time_unit, time_precision;
-
-	/* The module has a list of genvars that may be used in
-	   various generate schemes. */
-      list<perm_string> 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;
-
-      list<PSpecPath*> specify_paths;
-
-      perm_string mod_name() const { return name_; }
+      const string&get_name() const { return 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_wire(PWire*wire);
       void add_behavior(PProcess*behave);
-      void add_task(perm_string name, PTask*def);
-      void add_function(perm_string name, PFunction*def);
+      void add_task(const string&name, PTask*def);
+      void add_function(const string&name, PFunction*def);
 
       unsigned port_count() const;
-      const svector<PEIdent*>& get_port(unsigned idx) const;
-      unsigned find_port(const char*name) const;
+      const svector<PWire*>& get_port(unsigned idx) const;
+      unsigned find_port(const string&) 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);
+      PWire* get_wire(const string&name);
 
-      const map<hname_t,PWire*>& get_wires() const;
-      const list<PGate*>& get_gates() const;
-      const list<PProcess*>& get_behaviors() const;
+      const list<PWire*>& get_wires() const { return wires_; }
+      const list<PGate*>& get_gates() const { return gates_; }
+      const list<PProcess*>& get_behaviors() const { return behaviors_; }
 
       void dump(ostream&out) const;
-      bool elaborate(Design*, NetScope*scope) const;
-
-      typedef map<perm_string,NetExpr*> replace_t;
-      bool elaborate_scope(Design*, NetScope*scope, const replace_t&rep) const;
-
-      bool elaborate_sig(Design*, NetScope*scope) const;
+      bool elaborate(Design*, NetScope*scope, svector<PExpr*>*overrides_) const;
 
     private:
-      perm_string name_;
+      const string name_;
 
-      map<hname_t,PWire*> wires_;
+      svector<port_t*> ports_;
+      list<PWire*> wires_;
       list<PGate*> gates_;
       list<PProcess*> behaviors_;
-      map<perm_string,PTask*> tasks_;
-      map<perm_string,PFunction*> funcs_;
+      map<string,PTask*> tasks_;
+      map<string,PFunction*> funcs_;
 
     private: // Not implemented
       Module(const Module&);
@@ -176,16 +114,47 @@ class Module : public LineInfo {
 
 /*
  * $Log: Module.h,v $
- * Revision 1.41  2006/09/23 04:57:19  steve
- *  Basic support for specify timing.
+ * Revision 1.10  1999/11/27 19:07:57  steve
+ *  Support the creation of scopes.
  *
- * Revision 1.40  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
+ * Revision 1.9  1999/08/23 16:48:39  steve
+ *  Parameter overrides support from Peter Monta
+ *  AND and XOR support wide expressions.
  *
- * Revision 1.39  2006/03/30 01:49:07  steve
- *  Fix instance arrays indexed by overridden parameters.
+ * Revision 1.8  1999/08/04 02:13:02  steve
+ *  Elaborate module ports that are concatenations of
+ *  module signals.
+ *
+ * Revision 1.7  1999/08/03 04:14:49  steve
+ *  Parse into pform arbitrarily complex module
+ *  port declarations.
+ *
+ * Revision 1.6  1999/07/31 19:14:47  steve
+ *  Add functions up to elaboration (Ed Carter)
+ *
+ * Revision 1.5  1999/07/03 02:12:51  steve
+ *  Elaborate user defined tasks.
+ *
+ * Revision 1.4  1999/06/15 03:44:53  steve
+ *  Get rid of the STL vector template.
+ *
+ * Revision 1.3  1999/02/21 17:01:57  steve
+ *  Add support for module parameters.
+ *
+ * Revision 1.2  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.1  1998/11/03 23:28:52  steve
+ *  Introduce verilog to CVS.
  *
- * Revision 1.38  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
  */
 #endif

PDelays.cc

@@ -16,31 +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: PDelays.cc,v 1.15 2006/07/08 21:48:46 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PDelays.cc,v 1.1 1999/09/04 19:11:46 steve Exp $"
 #endif
 
-# include "config.h"
-
-# include  <iostream>
-
 # include  "PDelays.h"
 # include  "PExpr.h"
 # include  "verinum.h"
 
 PDelays::PDelays()
 {
-      delete_flag_ = true;
       for (unsigned idx = 0 ;  idx < 3 ;  idx += 1)
 	    delay_[idx] = 0;
 }
 
 PDelays::~PDelays()
 {
-      if (delete_flag_) {
-	    for (unsigned idx = 0 ;  idx < 3 ;  idx += 1)
-		  delete delay_[idx];
-      }
+      for (unsigned idx = 0 ;  idx < 3 ;  idx += 1)
+	    delete delay_[idx];
 }
 
 void PDelays::set_delay(PExpr*del)
@@ -48,107 +41,41 @@ void PDelays::set_delay(PExpr*del)
       assert(del);
       assert(delay_[0] == 0);
       delay_[0] = del;
-      delete_flag_ = true;
 }
 
 
-void PDelays::set_delays(const svector<PExpr*>*del, bool df)
+void PDelays::set_delays(const svector<PExpr*>*del)
 {
       assert(del);
       assert(del->count() <= 3);
       for (unsigned idx = 0 ;  idx < del->count() ;  idx += 1)
 	    delay_[idx] = (*del)[idx];
-
-      delete_flag_ = df;
 }
 
-static NetExpr*calculate_val(Design*des, NetScope*scope, const PExpr*expr)
+void PDelays::eval_delays(Design*des, const string&path,
+			unsigned long&rise_time,
+			unsigned long&fall_time,
+			unsigned long&decay_time) const
 {
-
-      NetExpr*dex = expr->elaborate_expr(des, scope, -1, false);
-      if (NetExpr*tmp = dex->eval_tree()) {
-	    delete dex;
-	    dex = tmp;
-      }
-
-	/* If the delay expression is a real constant or vector
-	   constant, then evaluate it, scale it to the local time
-	   units, and return an adjusted value. */
-
-      if (NetECReal*tmp = dynamic_cast<NetECReal*>(dex)) {
-	    verireal fn = tmp->value();
-
-	    int shift = scope->time_unit() - des->get_precision();
-	    long delay = fn.as_long(shift);
-	    if (delay < 0)
-		  delay = 0;
-
-	    delete tmp;
-	    NetEConst*tmp2 = new NetEConst(verinum(delay));
-	    tmp2->set_line(*expr);
-	    return tmp2;
-      }
-
-
-      if (NetEConst*tmp = dynamic_cast<NetEConst*>(dex)) {
-	    verinum fn = tmp->value();
-
-	    unsigned long delay =
-		  des->scale_to_precision(fn.as_ulong(), scope);
-
-	    delete tmp;
-	    NetEConst*tmp2 = new NetEConst(verinum(delay));
-	    tmp2->set_line(*expr);
-	    return tmp2;
-      }
-
-	/* Oops, cannot evaluate down to a constant. */
-      return dex;
-}
-
-static NetExpr* make_delay_nets(Design*des, NetExpr*expr)
-{
-      if (dynamic_cast<NetESignal*> (expr))
-	    return expr;
-
-      if (dynamic_cast<NetEConst*> (expr))
-	    return expr;
-
-      NetNet*sig = expr->synthesize(des);
-      if (sig == 0) {
-	    cerr << expr->get_line() << ": error: Expression " << *expr
-		 << " is not suitable for delay expression." << endl;
-	    return 0;
-      }
-
-      expr = new NetESignal(sig);
-      return expr;
-}
-
-void PDelays::eval_delays(Design*des, NetScope*scope,
-			  NetExpr*&rise_time,
-			  NetExpr*&fall_time,
-			  NetExpr*&decay_time,
-			  bool as_nets_flag) const
-{
-      assert(scope);
-
+      verinum*dv;
 
       if (delay_[0]) {
-	    rise_time = calculate_val(des, scope, delay_[0]);
-	    if (as_nets_flag)
-		  rise_time = make_delay_nets(des, rise_time);
+	    dv = delay_[0]->eval_const(des, path);
+	    assert(dv);
+	    rise_time = dv->as_ulong();
+	    delete dv;
 
 	    if (delay_[1]) {
-		  fall_time = calculate_val(des, scope, delay_[1]);
-		  if (as_nets_flag)
-			fall_time = make_delay_nets(des, fall_time);
+		  dv = delay_[1]->eval_const(des, path);
+		  assert(dv);
+		  fall_time = dv->as_ulong();
+		  delete dv;
 
 		  if (delay_[2]) {
-			decay_time = calculate_val(des, scope, delay_[2]);
-		  if (as_nets_flag)
-			decay_time = make_delay_nets(des, decay_time);
-
+			dv = delay_[2]->eval_const(des, path);
+			assert(dv);
+			decay_time = dv->as_ulong();
+			delete dv;
 		  } else {
 			if (rise_time < fall_time)
 			      decay_time = rise_time;
@@ -169,58 +96,6 @@ void PDelays::eval_delays(Design*des, NetScope*scope,
 
 /*
  * $Log: PDelays.cc,v $
- * Revision 1.15  2006/07/08 21:48:46  steve
- *  Handle real valued literals in net contexts.
- *
- * 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.
  *

PDelays.h

@@ -1,7 +1,7 @@
 #ifndef __PDelays_H
 #define __PDelays_H
 /*
- * Copyright (c) 1999-2002 Stephen Williams ([email protected])
+ * Copyright (c) 1999 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,24 +18,15 @@
  *    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.h,v 1.9 2006/01/03 05:22:14 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PDelays.h,v 1.1 1999/09/04 19:11:46 steve Exp $"
 #endif
 
 # include  "svector.h"
 # include  <string>
-# include  <iostream>
-
-#ifdef __GNUC__
-#if __GNUC__ > 2
-using namespace std;
-#endif
-#endif
-
 class Design;
-class NetScope;
-class NetExpr;
 class PExpr;
+class ostream;
 
 /*
  * Various PForm objects can carry delays. These delays include rise,
@@ -47,23 +38,18 @@ class PDelays {
       PDelays();
       ~PDelays();
 
-	/* Set the delay expressions. If the delete_flag is true, then
-	   this object takes ownership of the expressions, and will
-	   delete it in the destructor. */
       void set_delay(PExpr*);
-      void set_delays(const svector<PExpr*>*del, bool delete_flag=true);
+      void set_delays(const svector<PExpr*>*del);
 
-      void eval_delays(Design*des, NetScope*scope,
-		       NetExpr*&rise_time,
-		       NetExpr*&fall_time,
-		       NetExpr*&decay_time,
-		       bool as_nets_flag =false) const;
+      void eval_delays(Design*des, const string&path,
+		       unsigned long&rise_time,
+		       unsigned long&fall_time,
+		       unsigned long&decay_time) const;
 
       void dump_delays(ostream&out) const;
 
     private:
       PExpr* delay_[3];
-      bool delete_flag_;
 
     private: // not implemented
       PDelays(const PDelays&);
@@ -74,30 +60,6 @@ ostream& operator << (ostream&o, const PDelays&);
 
 /*
  * $Log: PDelays.h,v $
- * Revision 1.9  2006/01/03 05:22:14  steve
- *  Handle complex net node delays.
- *
- * Revision 1.8  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
- *
- * Revision 1.7  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.6  2002/06/14 03:25:51  steve
- *  Compiler portability.
- *
- * Revision 1.5  2001/12/29 20:19:31  steve
- *  Do not delete delay expressions of UDP instances.
- *
- * Revision 1.4  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
- *
- * Revision 1.3  2001/01/16 02:44:17  steve
- *  Use the iosfwd header if available.
- *
- * 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.
  *

PEvent.cc

@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2004 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: PEvent.cc,v 1.5 2004/02/19 06:57:10 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  "PEvent.h"
-
-PEvent::PEvent(perm_string n)
-: name_(n)
-{
-}
-
-PEvent::~PEvent()
-{
-}
-
-perm_string  PEvent::name() const
-{
-      return name_;
-}
-
-/*
- * $Log: PEvent.cc,v $
- * Revision 1.5  2004/02/19 06:57:10  steve
- *  Memory and Event names use perm_string.
- *
- * Revision 1.4  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.
- *
- * 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/04/01 19:31:57  steve
- *  Named events as far as the pform.
- *
- */
-

PEvent.h

@@ -1,91 +0,0 @@
-#ifndef __PEvent_H
-#define __PEvent_H
-/*
- * Copyright (c) 2000-2004 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: PEvent.h,v 1.9 2004/02/19 06:57:10 steve Exp $"
-#endif
-
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  <string>
-
-class Design;
-class NetScope;
-
-/*
- * The PEvent class represents event objects. These are things that
- * are declared in Verilog as ``event foo;'' The name passed to the
- * constructor is the "foo" part of the declaration.
- */
-class PEvent : public LineInfo {
-
-    public:
-	// The name is a perm-allocated string. It is the simple name
-	// of the event, without any scope.
-      explicit PEvent(perm_string name);
-      ~PEvent();
-
-      perm_string name() const;
-
-      void elaborate_scope(Design*des, NetScope*scope) const;
-
-    private:
-      perm_string name_;
-
-    private: // not implemented
-      PEvent(const PEvent&);
-      PEvent& operator= (const PEvent&);
-};
-
-/*
- * $Log: PEvent.h,v $
- * Revision 1.9  2004/02/19 06:57:10  steve
- *  Memory and Event names use perm_string.
- *
- * Revision 1.8  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.
- *
- * Revision 1.7  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.6  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.5  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.4  2001/01/16 02:44:18  steve
- *  Use the iosfwd header if available.
- *
- * Revision 1.3  2000/04/09 17:44:30  steve
- *  Catch event declarations during scope elaborate.
- *
- * Revision 1.2  2000/04/04 03:20:15  steve
- *  Simulate named event trigger and waits.
- *
- * Revision 1.1  2000/04/01 19:31:57  steve
- *  Named events as far as the pform.
- *
- */
-#endif

PExpr.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-1999 Stephen Williams <[email protected]>
+ * Copyright (c) 1998 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,22 +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: PExpr.cc,v 1.38 2006/10/30 05:44:49 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PExpr.cc,v 1.11 1999/10/31 04:11:27 steve Exp $"
 #endif
 
-# include "config.h"
-
-# include  <iostream>
-
 # include  "PExpr.h"
 # include  "Module.h"
 # include  <typeinfo>
 
-PExpr::PExpr()
-{
-}
-
 PExpr::~PExpr()
 {
 }
@@ -46,60 +38,30 @@ bool PExpr::is_constant(Module*) const
       return false;
 }
 
-NetNet* PExpr::elaborate_lnet(Design*des, NetScope*, bool) const
+NetNet* PExpr::elaborate_net(Design*des, const string&path, unsigned,
+			     unsigned long,
+			     unsigned long,
+			     unsigned long) const
 {
-      cerr << get_line() << ": error: expression not valid in assign l-value: "
-	   << *this << endl;
+      cerr << "Don't know how to elaborate `" << *this
+	   << "' as gates." << endl;
       return 0;
 }
 
-NetNet* PExpr::elaborate_bi_net(Design*des, NetScope*) const
+NetNet* PExpr::elaborate_lnet(Design*des, const string&path) const
 {
-      cerr << get_line() << ": error: "
-	   << "expression not valid as argument to inout port: "
+      cerr << get_line() << ": expression not valid in assign l-value: "
 	   << *this << endl;
       return 0;
 }
 
-PEBinary::PEBinary(char op, PExpr*l, PExpr*r)
-: op_(op), left_(l), right_(r)
-{
-}
-
-PEBinary::~PEBinary()
-{
-}
-
 bool PEBinary::is_constant(Module*mod) const
 {
       return left_->is_constant(mod) && right_->is_constant(mod);
 }
 
-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 hname_t&n, const svector<PExpr *> &parms)
-: path_(n), parms_(parms)
-{
-}
-
-PECallFunction::PECallFunction(const hname_t&n)
-: path_(n)
+PECallFunction::PECallFunction(const string &n, const svector<PExpr *> &parms) 
+: name_(n), parms_(parms)
 {
 }
 
@@ -107,11 +69,6 @@ PECallFunction::~PECallFunction()
 {
 }
 
-PEConcat::PEConcat(const svector<PExpr*>&p, PExpr*r)
-: parms_(p), repeat_(r)
-{
-}
-
 bool PEConcat::is_constant(Module *mod) const
 {
       bool constant = repeat_? repeat_->is_constant(mod) : true;
@@ -126,100 +83,14 @@ PEConcat::~PEConcat()
       delete repeat_;
 }
 
-PEEvent::PEEvent(PEEvent::edge_t t, PExpr*e)
-: type_(t), expr_(e)
-{
-}
-
-PEEvent::~PEEvent()
-{
-}
-
-PEEvent::edge_t PEEvent::type() const
-{
-      return type_;
-}
-
-PExpr* PEEvent::expr() const
-{
-      return expr_;
-}
-
-PEFNumber::PEFNumber(verireal*v)
-: value_(v)
-{
-}
-
-PEFNumber::~PEFNumber()
-{
-      delete value_;
-}
-
-const verireal& PEFNumber::value() const
-{
-      return *value_;
-}
-
-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 hname_t& PEIdent::path() const
-{
-      return path_;
-}
-
 /*
- * An identifier can be in a constant expression if (and only if) it is
+ * An identifier can be in a constant expresion if (and only if) it is
  * a parameter.
  */
 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));
-
-      { map<perm_string,Module::param_expr_t>::const_iterator cur;
-        cur = mod->parameters.find(tmp);
-	if (cur != mod->parameters.end()) return true;
-      }
-
-      { map<perm_string,Module::param_expr_t>::const_iterator cur;
-        cur = mod->localparams.find(tmp);
-	if (cur != mod->localparams.end()) return true;
-      }
-
-      return false;
-}
-
-PENumber::PENumber(verinum*vp)
-: value_(vp)
-{
-      assert(vp);
-}
-
-PENumber::~PENumber()
-{
-      delete value_;
-}
-
-const verinum& PENumber::value() const
-{
-      return *value_;
+      map<string,PExpr*>::const_iterator cur = mod->parameters.find(text_);
+      return cur != mod->parameters.end();
 }
 
 bool PENumber::is_the_same(const PExpr*that) const
@@ -236,21 +107,6 @@ bool PENumber::is_constant(Module*) const
       return true;
 }
 
-PEString::PEString(char*s)
-: text_(s)
-{
-}
-
-PEString::~PEString()
-{
-      delete[]text_;
-}
-
-string PEString::value() const
-{
-      return text_;
-}
-
 bool PEString::is_constant(Module*) const
 {
       return true;
@@ -265,131 +121,13 @@ PETernary::~PETernary()
 {
 }
 
-bool PETernary::is_constant(Module*m) const
+bool PETernary::is_constant(Module*) const
 {
-      return expr_->is_constant(m)
-	    && tru_->is_constant(m)
-	    && fal_->is_constant(m);
-}
-
-PEUnary::PEUnary(char op, PExpr*ex)
-: op_(op), expr_(ex)
-{
-}
-
-PEUnary::~PEUnary()
-{
-}
-
-bool PEUnary::is_constant(Module*m) const
-{
-      return expr_->is_constant(m);
+      return false;
 }
 
 /*
  * $Log: PExpr.cc,v $
- * Revision 1.38  2006/10/30 05:44:49  steve
- *  Expression widths with unsized literals are pseudo-infinite width.
- *
- * 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

PExpr.h

@@ -1,7 +1,7 @@
 #ifndef __PExpr_H
 #define __PExpr_H
 /*
- * Copyright (c) 1998-2000 Stephen Williams <[email protected]>
+ * Copyright (c) 1998-1999 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,21 +18,20 @@
  *    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.87 2007/01/16 05:44:14 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PExpr.h,v 1.25 1999/11/21 00:13:08 steve Exp $"
 #endif
 
 # include  <string>
-# include  <vector>
 # include  "netlist.h"
 # include  "verinum.h"
+# include  "verireal.h"
 # include  "LineInfo.h"
 
 class Design;
 class Module;
 class NetNet;
 class NetExpr;
-class NetScope;
 
 /*
  * The PExpr class hierarchy supports the description of
@@ -44,87 +43,30 @@ class NetScope;
  */
 
 class PExpr : public LineInfo {
-
     public:
-      PExpr();
       virtual ~PExpr();
 
       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;
-
-	// 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.
-      virtual NetExpr*elaborate_expr(Design*des, NetScope*scope,
-				     int expr_width, bool sys_task_arg) const;
-
-	// Elaborate expressions that are the r-value of parameter
-	// assignments. This elaboration follows the restrictions of
-	// constant expressions and supports later overriding and
-	// evaluation of parameters.
-      virtual NetExpr*elaborate_pexpr(Design*des, NetScope*sc) const;
+	// Procedural elaboration of the expression.
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
 
 	// This method elaborate the expression as gates, for use in a
 	// continuous assign or other wholly structural context.
-      virtual NetNet* elaborate_net(Design*des, NetScope*scope,
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned lwidth,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0 =Link::STRONG,
-				    Link::strength_t drive1 =Link::STRONG)
-	    const;
+				    unsigned long rise,
+				    unsigned long fall,
+				    unsigned long decay) const;
 
 	// 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;
-
-	// This is similar to elaborate_lnet, except that the
-	// expression is evaluated to be bi-directional. This is
-	// useful for arguments to inout ports of module instances and
-	// ports of tran primitives.
-      virtual NetNet* elaborate_bi_net(Design*des, NetScope*scope) const;
-
-	// 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
-	// statement
-      virtual NetAssign_* elaborate_lval(Design*des,
-					 NetScope*scope,
-					 bool is_force) const;
+      virtual NetNet* elaborate_lnet(Design*des, const string&path) const;
 
 	// 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(const Design*des, const string&path) const;
 
 	// This method returns true if that expression is the same as
 	// this expression. This method is used for comparing
@@ -134,12 +76,9 @@ class PExpr : public LineInfo {
 	// Return true if this expression is a valid constant
 	// expression. the Module pointer is needed to find parameter
 	// identifiers and any other module specific interpretations
-	// of expressions.
+	// of expresions.
       virtual bool is_constant(Module*) const;
 
-    private: // not implemented
-      PExpr(const PExpr&);
-      PExpr& operator= (const PExpr&);
 };
 
 ostream& operator << (ostream&, const PExpr&);
@@ -147,260 +86,104 @@ ostream& operator << (ostream&, const PExpr&);
 class PEConcat : public PExpr {
 
     public:
-      PEConcat(const svector<PExpr*>&p, PExpr*r =0);
+      PEConcat(const svector<PExpr*>&p, PExpr*r =0)
+      : parms_(p), repeat_(r) { }
       ~PEConcat();
 
-      virtual verinum* eval_const(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 NetNet* elaborate_bi_net(Design*des, NetScope*scope) const;
-      virtual NetNet* elaborate_net(Design*des, NetScope*scope,
+      virtual NetNet* elaborate_lnet(Design*des, const string&path) const;
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned width,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      virtual NetExpr*elaborate_expr(Design*des, NetScope*,
-				     int expr_width, bool sys_task_arg) const;
-      virtual NetEConcat*elaborate_pexpr(Design*des, NetScope*) const;
-      virtual NetAssign_* elaborate_lval(Design*des,
-					 NetScope*scope,
-					 bool is_force) const;
+				    unsigned long rise,
+				    unsigned long fall,
+				    unsigned long decay) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
       virtual bool is_constant(Module*) const;
 
-    private:
-      NetNet* elaborate_lnet_common_(Design*des, NetScope*scope,
-				     bool implicit_net_ok,
-				     bool bidirectional_flag) const;
     private:
       svector<PExpr*>parms_;
       PExpr*repeat_;
 };
 
-/*
- * Event expressions are expressions that can be combined with the
- * event "or" operator. These include "posedge foo" and similar, and
- * also include named events. "edge" events are associated with an
- * expression, whereas named events simply have a name, which
- * represents an event variable.
- */
 class PEEvent : public PExpr {
 
     public:
-      enum edge_t {ANYEDGE, POSEDGE, NEGEDGE, POSITIVE};
+      PEEvent(NetNEvent::Type t, PExpr*e)
+      : type_(t), expr_(e)
+      { }
 
-	// Use this constructor to create events based on edges or levels.
-      PEEvent(edge_t t, PExpr*e);
-
-      ~PEEvent();
-
-      edge_t type() const;
-      PExpr* expr() const;
+      NetNEvent::Type type() const { return type_; }
+      PExpr*          expr() const { return expr_; }
 
       virtual void dump(ostream&) const;
 
     private:
-      edge_t type_;
-      PExpr *expr_;
-};
-
-/*
- * This holds a floating point constant in the source.
- */
-class PEFNumber : public PExpr {
-
-    public:
-      explicit PEFNumber(verireal*vp);
-      ~PEFNumber();
-
-      const verireal& value() const;
-
-	/* 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;
-
-	/* A PEFNumber is a constant, so this returns true. */
-      virtual bool is_constant(Module*) const;
-
-      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 NetNet* elaborate_net(Design*des, NetScope*scope,
-				    unsigned lwidth,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-
-      virtual void dump(ostream&) const;
-
-    private:
-      verireal*value_;
+      NetNEvent::Type type_;
+      PExpr*expr_;
 };
 
 class PEIdent : public PExpr {
 
     public:
-      explicit PEIdent(const hname_t&s);
-      ~PEIdent();
+      explicit PEIdent(const string&s)
+      : text_(s), msb_(0), lsb_(0), idx_(0) { }
 
       virtual void dump(ostream&) const;
-      virtual unsigned test_width(Design*des, NetScope*scope,
-				  unsigned min, unsigned lval,
-				  bool&unsized_flag) 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_bi_net(Design*des, NetScope*scope) const;
-
-	// Identifiers are also allowed as procedural assignment l-values.
-      virtual NetAssign_* elaborate_lval(Design*des,
-					 NetScope*scope,
-					 bool is_force) const;
+      virtual NetNet* elaborate_lnet(Design*des, const string&path) const;
 
 	// Structural r-values are OK.
-      virtual NetNet* elaborate_net(Design*des, NetScope*scope,
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned lwidth,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
+				    unsigned long rise,
+				    unsigned long fall,
+				    unsigned long decay) const;
 
-      virtual NetExpr*elaborate_expr(Design*des, NetScope*,
-				     int expr_width, bool sys_task_arg) const;
-      virtual NetExpr*elaborate_pexpr(Design*des, NetScope*sc) const;
-
-	// Elaborate the PEIdent as a port to a module. This method
-	// only applies to Ident expressions.
-      NetNet* elaborate_port(Design*des, NetScope*sc) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
 
       virtual bool is_constant(Module*) const;
-      verinum* eval_const(const Design*des, NetScope*sc) const;
+      verinum* eval_const(const Design*des, const string&path) const;
 
-      const hname_t& path() const;
+	// XXXX
+      string name() const { return text_; }
 
     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_up_(Design*, NetScope*, NetAssign_*) const;
-      bool elaborate_lval_net_idx_do_(Design*, NetScope*, NetAssign_*) const;
-
-    private:
-      NetExpr*elaborate_expr_param(Design*des,
-				   NetScope*scope,
-				   const NetExpr*par,
-				   NetScope*found,
-				   const NetExpr*par_msb,
-				   const NetExpr*par_lsb) const;
-      NetExpr*elaborate_expr_net(Design*des,
-				 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,
-				   NetESignal*net,
-				   NetScope*found) const;
-      NetExpr*elaborate_expr_net_idx_up_(Design*des,
-				   NetScope*scope,
-				   NetESignal*net,
-				   NetScope*found) const;
-      NetExpr*elaborate_expr_net_idx_do_(Design*des,
-				   NetScope*scope,
-				   NetESignal*net,
-				   NetScope*found) const;
-      NetExpr*elaborate_expr_net_bit_(Design*des,
-				   NetScope*scope,
-				   NetESignal*net,
-				   NetScope*found) const;
-      hname_t path_;
+      string text_;
 
     public:
-	// Use these to support part-select operators.
+	// Use these to support bit- and part-select operators.
       PExpr*msb_;
       PExpr*lsb_;
 
-      enum { SEL_NONE, SEL_PART, SEL_IDX_UP, SEL_IDX_DO } sel_;
-
-	// 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_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;
-
-      NetNet* elaborate_net_bitmux_(Design*des, NetScope*scope,
-				    NetNet*sig,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-
-    private:
-      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;
+	// If this is a reference to a memory, this is the index
+	// expression.
+      PExpr*idx_;
 
+      NetNet* elaborate_net_ram_(Design*des, const string&path,
+				 NetMemory*mem, unsigned lwidth,
+				 unsigned long rise,
+				 unsigned long fall,
+				 unsigned long decay) const;
 };
 
 class PENumber : public PExpr {
 
     public:
-      explicit PENumber(verinum*vp);
-      ~PENumber();
+      explicit PENumber(verinum*vp)
+      : value_(vp) { assert(vp); }
+      ~PENumber() { delete value_; }
 
-      const verinum& value() const;
+      const verinum& value() const { return *value_; }
 
       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,
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned lwidth,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      virtual NetEConst*elaborate_expr(Design*des, NetScope*,
-				       int expr_width, bool) const;
-      virtual NetExpr*elaborate_pexpr(Design*des, NetScope*sc) const;
-      virtual NetAssign_* elaborate_lval(Design*des,
-					 NetScope*scope,
-					 bool is_force) const;
-
-      virtual verinum* eval_const(const Design*des, NetScope*sc) const;
+				    unsigned long rise,
+				    unsigned long fall,
+				    unsigned long decay) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
+      virtual verinum* eval_const(const Design*des, const string&path) const;
 
       virtual bool is_the_same(const PExpr*that) const;
       virtual bool is_constant(Module*) const;
@@ -409,65 +192,35 @@ class PENumber : public PExpr {
       verinum*const value_;
 };
 
-/*
- * This represents a string constant in an expression.
- *
- * The s parameter to the PEString constructor is a C string that this
- * class instance will take for its own. The caller should not delete
- * the string, the destructor will do it.
- */
 class PEString : public PExpr {
 
     public:
-      explicit PEString(char*s);
-      ~PEString();
+      explicit PEString(const string&s)
+      : text_(s) { }
 
-      string value() const;
+      string value() const { return text_; }
       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,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      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;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
 
       virtual bool is_constant(Module*) const;
 
     private:
-      char*text_;
+      const string text_;
 };
 
 class PEUnary : public PExpr {
 
     public:
-      explicit PEUnary(char op, PExpr*ex);
-      ~PEUnary();
+      explicit PEUnary(char op, PExpr*ex)
+      : op_(op), expr_(ex) { }
 
       virtual void dump(ostream&out) const;
-
-      virtual NetNet* elaborate_net(Design*des, NetScope*scope,
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned width,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      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 bool is_constant(Module*) const;
+				    unsigned long rise,
+				    unsigned long fall,
+				    unsigned long decay) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
 
     private:
       char op_;
@@ -477,106 +230,40 @@ class PEUnary : public PExpr {
 class PEBinary : public PExpr {
 
     public:
-      explicit PEBinary(char op, PExpr*l, PExpr*r);
-      ~PEBinary();
+      explicit PEBinary(char op, PExpr*l, PExpr*r)
+      : op_(op), left_(l), right_(r) { }
 
       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 NetNet* elaborate_net(Design*des, NetScope*scope,
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned width,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      virtual NetEBinary*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;
+				    unsigned long rise,
+				    unsigned long fall,
+				    unsigned long decay) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
+      virtual verinum* eval_const(const Design*des, const string&path) const;
 
-    protected:
+    private:
       char op_;
       PExpr*left_;
       PExpr*right_;
 
-      NetEBinary*elaborate_expr_base_(Design*, NetExpr*lp, NetExpr*rp, int use_wid) const;
-      NetEBinary*elaborate_eval_expr_base_(Design*, NetExpr*lp, NetExpr*rp, int use_wid) const;
-
-    private:
-      NetNet* elaborate_net_add_(Design*des, NetScope*scope,
+      NetNet* elaborate_net_add_(Design*des, const string&path,
 				 unsigned lwidth,
-				 const NetExpr* rise,
-				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-      NetNet* elaborate_net_bit_(Design*des, NetScope*scope,
+				 unsigned long rise,
+				 unsigned long fall,
+				 unsigned long decay) const;
+      NetNet* elaborate_net_cmp_(Design*des, const string&path,
 				 unsigned lwidth,
-				 const NetExpr* rise,
-				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-      NetNet* elaborate_net_cmp_(Design*des, NetScope*scope,
-				 unsigned lwidth,
-				 const NetExpr* rise,
-				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-      NetNet* elaborate_net_div_(Design*des, NetScope*scope,
-				 unsigned lwidth,
-				 const NetExpr* rise,
-				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-      NetNet* elaborate_net_mod_(Design*des, NetScope*scope,
-				 unsigned lwidth,
-				 const NetExpr* rise,
-				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-      NetNet* elaborate_net_log_(Design*des, NetScope*scope,
-				 unsigned lwidth,
-				 const NetExpr* rise,
-				 const NetExpr* fall,
-				 const NetExpr* decay) const;
-      NetNet* elaborate_net_mul_(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 long rise,
+				 unsigned long fall,
+				 unsigned long decay) const;
+      NetNet* elaborate_net_shift_(Design*des, const string&path,
 				   unsigned lwidth,
-				   const NetExpr* rise,
-				   const NetExpr* fall,
-				   const NetExpr* decay) const;
-};
-
-/*
- * Here are a few specilized 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;
-
-      NetEBinary* 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;
+				   unsigned long rise,
+				   unsigned long fall,
+				   unsigned long decay) const;
 };
 
 /*
@@ -592,21 +279,13 @@ 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 NetNet* elaborate_net(Design*des, NetScope*scope,
+      virtual NetNet* elaborate_net(Design*des, const string&path,
 				    unsigned width,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      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;
+				    unsigned long rise =0,
+				    unsigned long fall =0,
+				    unsigned long decay =0) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
+      virtual verinum* eval_const(const Design*des, const string&path) const;
 
     private:
       PExpr*expr_;
@@ -615,186 +294,124 @@ class PETernary : public PExpr {
 };
 
 /*
- * This class represents a parsed call to a function, including calls
- * to system functions. The parameters in the parms list are the
- * expressions that are passed as input to the ports of the function.
+ * This class represents a parsed call to a function.
  */
 class PECallFunction : public PExpr {
     public:
-      explicit PECallFunction(const hname_t&n, const svector<PExpr *> &parms);
-      explicit PECallFunction(const hname_t&n);
+      explicit PECallFunction(const string &n, const svector<PExpr *> &parms);
       ~PECallFunction();
 
       virtual void dump(ostream &) const;
-
-      virtual NetNet* elaborate_net(Design*des, NetScope*scope,
-				    unsigned width,
-				    const NetExpr* rise,
-				    const NetExpr* fall,
-				    const NetExpr* decay,
-				    Link::strength_t drive0,
-				    Link::strength_t drive1) const;
-      virtual NetExpr*elaborate_expr(Design*des, NetScope*scope,
-				     int expr_wid, bool sys_task_arg) const;
+      virtual NetExpr*elaborate_expr(Design*des, const string&path) const;
 
     private:
-      hname_t path_;
+      string name_;
       svector<PExpr *> parms_;
 
-      bool check_call_matches_definition_(Design*des, NetScope*dscope) const;
-
-      NetExpr* elaborate_sfunc_(Design*des, NetScope*scope) const;
-      NetNet* elaborate_net_sfunc_(Design*des, NetScope*scope,
-				   unsigned width,
-				   const NetExpr* rise,
-				   const NetExpr* fall,
-				   const NetExpr* decay,
-				   Link::strength_t drive0,
-				   Link::strength_t drive1) const;
+      NetESFunc* elaborate_sfunc_(Design*des, const string&path) const;
 };
 
 /*
  * $Log: PExpr.h,v $
- * Revision 1.87  2007/01/16 05:44:14  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.25  1999/11/21 00:13:08  steve
+ *  Support memories in continuous assignments.
  *
- * Revision 1.86  2006/11/10 04:54:26  steve
- *  Add test_width methods for PETernary and PEString.
+ * Revision 1.24  1999/11/14 20:24:28  steve
+ *  Add support for the LPM_CLSHIFT device.
  *
- * Revision 1.85  2006/11/04 06:19:24  steve
- *  Remove last bits of relax_width methods, and use test_width
- *  to calculate the width of an r-value expression that may
- *  contain unsized numbers.
+ * Revision 1.23  1999/11/05 21:45:19  steve
+ *  Fix NetConst being set to zero width, and clean
+ *  up elaborate_set_cmp_ for NetEBinary.
  *
- * Revision 1.84  2006/10/30 05:44:49  steve
- *  Expression widths with unsized literals are pseudo-infinite width.
+ * Revision 1.22  1999/10/31 20:08:24  steve
+ *  Include subtraction in LPM_ADD_SUB device.
  *
- * Revision 1.83  2006/06/18 04:15:50  steve
- *  Add support for system functions in continuous assignments.
+ * Revision 1.21  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.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.20  1999/09/25 02:57:29  steve
+ *  Parse system function calls.
  *
- * Revision 1.81  2006/04/28 04:28:35  steve
- *  Allow concatenations as arguments to inout ports.
+ * Revision 1.19  1999/09/15 04:17:52  steve
+ *  separate assign lval elaboration for error checking.
  *
- * Revision 1.80  2006/04/16 00:54:04  steve
- *  Cleanup lval part select handling.
+ * Revision 1.18  1999/08/31 22:38:29  steve
+ *  Elaborate and emit to vvm procedural functions.
  *
- * Revision 1.79  2006/04/16 00:15:43  steve
- *  Fix part selects in l-values.
+ * Revision 1.17  1999/08/01 21:18:55  steve
+ *  elaborate rise/fall/decay for continuous assign.
  *
- * Revision 1.78  2006/03/25 02:36:26  steve
- *  Get rid of excess PESTring:: prefix within class declaration.
+ * Revision 1.16  1999/07/31 19:14:47  steve
+ *  Add functions up to elaboration (Ed Carter)
  *
- * Revision 1.77  2006/02/02 02:43:57  steve
- *  Allow part selects of memory words in l-values.
+ * Revision 1.15  1999/07/22 02:05:20  steve
+ *  is_constant method for PEConcat.
  *
- * Revision 1.76  2006/01/02 05:33:19  steve
- *  Node delays can be more general expressions in structural contexts.
+ * Revision 1.14  1999/07/17 19:50:59  steve
+ *  netlist support for ternary operator.
  *
- * Revision 1.75  2005/12/07 04:04:23  steve
- *  Allow constant concat expressions.
+ * Revision 1.13  1999/06/16 03:13:29  steve
+ *  More syntax parse with sorry stubs.
  *
- * Revision 1.74  2005/11/27 17:01:56  steve
- *  Fix for stubborn compiler.
+ * Revision 1.12  1999/06/15 02:50:02  steve
+ *  Add lexical support for real numbers.
  *
- * Revision 1.73  2005/11/27 05:56:20  steve
- *  Handle bit select of parameter with ranges.
+ * Revision 1.11  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.72  2005/11/10 13:28:11  steve
- *  Reorganize signal part select handling, and add support for
- *  indexed part selects.
+ * Revision 1.10  1999/06/09 03:00:05  steve
+ *  Add support for procedural concatenation expression.
  *
- *  Expand expression constant propagation to eliminate extra
- *  sums in certain cases.
+ * Revision 1.9  1999/05/16 05:08:42  steve
+ *  Redo constant expression detection to happen
+ *  after parsing.
  *
- * Revision 1.71  2005/10/04 04:09:25  steve
- *  Add support for indexed select attached to parameters.
+ *  Parse more operators and expressions.
  *
- * Revision 1.70  2005/08/06 17:58:16  steve
- *  Implement bi-directional part selects.
+ * Revision 1.8  1999/05/10 00:16:57  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.
  *
- * Revision 1.69  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
+ *  Parse task declarations, integer types.
  *
- * Revision 1.68  2005/01/09 20:16:00  steve
- *  Use PartSelect/PV and VP to handle part selects through ports.
+ * Revision 1.7  1999/05/01 02:57:52  steve
+ *  Handle much more complex event expressions.
  *
- * Revision 1.67  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
+ * Revision 1.6  1999/04/29 02:16:26  steve
+ *  Parse OR of event expressions.
  *
- *  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.5  1999/04/19 01:59:36  steve
+ *  Add memories to the parse and elaboration phases.
  *
- * Revision 1.66  2004/10/04 01:10:51  steve
- *  Clean up spurious trailing white space.
+ * Revision 1.4  1998/11/11 00:01:51  steve
+ *  Check net ranges in declarations.
  *
- * Revision 1.65  2003/02/08 19:49:21  steve
- *  Calculate delay statement delays using elaborated
- *  expressions instead of pre-elaborated expression
- *  trees.
+ * Revision 1.3  1998/11/09 18:55:33  steve
+ *  Add procedural while loops,
+ *  Parse procedural for loops,
+ *  Add procedural wait statements,
+ *  Add constant nodes,
+ *  Add XNOR logic gate,
+ *  Make vvm output look a bit prettier.
  *
- *  Remove the eval_pexpr methods from PExpr.
+ * Revision 1.2  1998/11/07 17:05:05  steve
+ *  Handle procedural conditional, and some
+ *  of the conditional expressions.
  *
- * Revision 1.64  2003/01/30 16:23:07  steve
- *  Spelling fixes.
+ *  Elaborate signals and identifiers differently,
+ *  allowing the netlist to hold signal information.
  *
- * Revision 1.63  2002/11/09 19:20:48  steve
- *  Port expressions for output ports are lnets, not nets.
+ * Revision 1.1  1998/11/03 23:28:54  steve
+ *  Introduce verilog to CVS.
  *
- * 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

@@ -16,62 +16,29 @@
  *    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 $"
+#if !defined(WINNT)
+#ident "$Id: PFunction.cc,v 1.2 1999/08/25 22:22:41 steve Exp $"
 #endif
 
-# include "config.h"
-
 #include "PTask.h"
 
-PFunction::PFunction(perm_string name)
-: name_(name), ports_(0), statement_(0)
+PFunction::PFunction(svector<PWire*>*p, Statement*s)
+: out_(0), ports_(p), statement_(s)
 {
-      return_type_.type = PTF_NONE;
 }
 
 PFunction::~PFunction()
 {
 }
 
-void PFunction::set_ports(svector<PWire *>*p)
+void PFunction::set_output(PWire*o)
 {
-      assert(ports_ == 0);
-      ports_ = p;
-}
-
-void PFunction::set_statement(Statement*s)
-{
-      assert(s != 0);
-      assert(statement_ == 0);
-      statement_ = s;
-}
-
-void PFunction::set_return(PTaskFuncArg t)
-{
-      return_type_ = t;
+      assert(out_ == 0);
+      out_ = o;
 }
 
 /*
  * $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 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,72 +16,40 @@
  *    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 $"
+#if !defined(WINNT)
+#ident "$Id: PGate.cc,v 1.5 1999/09/14 01:50:35 steve Exp $"
 #endif
 
-# include "config.h"
-
 # include  "PGate.h"
 # include  "PExpr.h"
 # include  "verinum.h"
 # include  <assert.h>
 
-PGate::PGate(perm_string name,
+PGate::PGate(const string&name,
 	     svector<PExpr*>*pins,
 	     const svector<PExpr*>*del)
 : name_(name), pins_(pins)
 {
       if (del) delay_.set_delays(del);
-      str0_ = STRONG;
-      str1_ = STRONG;
 }
 
-PGate::PGate(perm_string name,
+PGate::PGate(const string&name,
 	     svector<PExpr*>*pins,
 	     PExpr*del)
 : name_(name), pins_(pins)
 {
       if (del) delay_.set_delay(del);
-      str0_ = STRONG;
-      str1_ = STRONG;
 }
 
-PGate::PGate(perm_string name, svector<PExpr*>*pins)
+PGate::PGate(const string&name, svector<PExpr*>*pins)
 : name_(name), pins_(pins)
 {
-      str0_ = STRONG;
-      str1_ = STRONG;
 }
 
 PGate::~PGate()
 {
 }
 
-PGate::strength_t PGate::strength0() const
-{
-      return str0_;
-}
-
-void PGate::strength0(PGate::strength_t s)
-{
-      str0_ = s;
-}
-
-PGate::strength_t PGate::strength1() const
-{
-      return str1_;
-}
-
-void PGate::strength1(PGate::strength_t s)
-{
-      str1_ = s;
-}
-
-void PGate::elaborate_scope(Design*, NetScope*) const
-{
-}
-
 /*
  * This method is used during elaboration to calculate the
  * rise/fall/decay times for the gate. These values were set in pform
@@ -90,79 +58,22 @@ void PGate::elaborate_scope(Design*, NetScope*) const
  * parameters. This method understands how to handle the different
  * numbers of expressions.
  */
-
-void PGate::eval_delays(Design*des, NetScope*scope,
-			NetExpr*&rise_expr,
-			NetExpr*&fall_expr,
-			NetExpr*&decay_expr,
-			bool as_net_flag) const
-{
-      delay_.eval_delays(des, scope,
-			 rise_expr, fall_expr, decay_expr,
-			 as_net_flag);
-}
-
-void PGate::eval_delays(Design*des, NetScope*scope,
+void PGate::eval_delays(Design*des, const string&path,
 			unsigned long&rise_time,
 			unsigned long&fall_time,
 			unsigned long&decay_time) const
 {
-      NetExpr*rise_expr, *fall_expr, *decay_expr;
-      delay_.eval_delays(des, scope, rise_expr, fall_expr, decay_expr);
-
-      if (rise_expr == 0) {
-	    rise_time = 0;
-	    fall_time = 0;
-	    decay_time = 0;
-      }
-
-      if (NetEConst*tmp = dynamic_cast<NetEConst*> (rise_expr)) {
-	    rise_time = tmp->value().as_ulong();
-
-      } else {
-	    cerr << get_line() << ": error: Delay expressions must be "
-		 << "constant here." << endl;
-	    cerr << get_line() << ":      : Cannot calculate "
-		 << *rise_expr << endl;
-	    des->errors += 1;
-	    rise_time = 0;
-      }
-
-      if (NetEConst*tmp = dynamic_cast<NetEConst*> (fall_expr)) {
-	    fall_time = tmp->value().as_ulong();
-
-      } else {
-	    if (fall_expr != rise_expr) {
-		  cerr << get_line() << ": error: Delay expressions must be "
-		       << "constant here." << endl;
-		  cerr << get_line() << ":      : Cannot calculate "
-		       << *rise_expr << endl;
-	    }
-	    des->errors += 1;
-	    fall_time = 0;
-      }
-
-      if (NetEConst*tmp = dynamic_cast<NetEConst*> (decay_expr)) {
-	    decay_time = tmp->value().as_ulong();
-
-      } else {
-	    cerr << get_line() << ": error: Delay expressions must be "
-		 << "constant here." << endl;
-	    cerr << get_line() << ":      : Cannot calculate "
-		 << *rise_expr << endl;
-	    des->errors += 1;
-	    decay_time = 0;
-      }
+      delay_.eval_delays(des, path, rise_time, fall_time, decay_time);
 }
 
 PGAssign::PGAssign(svector<PExpr*>*pins)
-: PGate(perm_string(), pins)
+: PGate("", pins)
 {
       assert(pins->count() == 2);
 }
 
 PGAssign::PGAssign(svector<PExpr*>*pins, svector<PExpr*>*dels)
-: PGate(perm_string(), pins, dels)
+: PGate("", pins, dels)
 {
       assert(pins->count() == 2);
 }
@@ -171,14 +82,14 @@ PGAssign::~PGAssign()
 {
 }
 
-PGBuiltin::PGBuiltin(Type t, perm_string name,
+PGBuiltin::PGBuiltin(Type t, const string&name,
 		     svector<PExpr*>*pins,
 		     svector<PExpr*>*del)
 : PGate(name, pins, del), type_(t), msb_(0), lsb_(0)
 {
 }
 
-PGBuiltin::PGBuiltin(Type t, perm_string name,
+PGBuiltin::PGBuiltin(Type t, const string&name,
 		     svector<PExpr*>*pins,
 		     PExpr*del)
 : PGate(name, pins, del), type_(t), msb_(0), lsb_(0)
@@ -199,99 +110,8 @@ void PGBuiltin::set_range(PExpr*msb, PExpr*lsb)
       lsb_ = lsb;
 }
 
-PGModule::PGModule(perm_string type, perm_string name, svector<PExpr*>*pins)
-: PGate(name, pins), overrides_(0), pins_(0),
-  npins_(0), parms_(0), nparms_(0), msb_(0), lsb_(0)
-{
-      type_ = type;
-}
-
-PGModule::PGModule(perm_string type, perm_string name,
-		   named<PExpr*>*pins, unsigned npins)
-: PGate(name, 0), overrides_(0), pins_(pins),
-  npins_(npins), parms_(0), nparms_(0), msb_(0), lsb_(0)
-{
-      type_ = type;
-}
-
-PGModule::~PGModule()
-{
-}
-
-void PGModule::set_parameters(svector<PExpr*>*o)
-{
-      assert(overrides_ == 0);
-      overrides_ = o;
-}
-
-void PGModule::set_parameters(named<PExpr*>*pa, unsigned npa)
-{
-      assert(parms_ == 0);
-      assert(overrides_ == 0);
-      parms_ = pa;
-      nparms_ = npa;
-}
-
-void PGModule::set_range(PExpr*msb, PExpr*lsb)
-{
-      assert(msb_ == 0);
-      assert(lsb_ == 0);
-
-      msb_ = msb;
-      lsb_ = lsb;
-}
-
-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.
  *

PGate.h

@@ -1,7 +1,7 @@
 #ifndef __PGate_H
 #define __PGate_H
 /*
- * Copyright (c) 1998-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1998-1999 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,21 +18,16 @@
  *    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.h,v 1.32 2006/04/10 00:37:42 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PGate.h,v 1.10 1999/09/04 19:11:46 steve Exp $"
 #endif
 
 # include  "svector.h"
-# include  "StringHeap.h"
-# include  "named.h"
 # include  "LineInfo.h"
 # include  "PDelays.h"
-# include  <map>
-# include  <string>
 class PExpr;
 class PUdp;
 class Design;
-class NetScope;
 class Module;
 
 /*
@@ -43,75 +38,44 @@ class Module;
  * This pins of a gate are connected to expressions. The elaboration
  * step will need to convert expressions to a network of gates in
  * order to elaborate expression inputs, but that can easily be done.
- *
- * The PGate base class also carries the strength0 and strength1
- * strengths for those gates where the driver[s] can be described by a
- * single strength pair. There is a strength of the 0 drive, and a
- * strength of the 1 drive.
  */
 class PGate : public LineInfo {
-
+      
     public:
-      enum strength_t { HIGHZ, WEAK, PULL, STRONG, SUPPLY };
-
-      explicit PGate(perm_string name, svector<PExpr*>*pins,
+      explicit PGate(const string&name, svector<PExpr*>*pins,
 		     const svector<PExpr*>*del);
 
-      explicit PGate(perm_string name, svector<PExpr*>*pins,
+      explicit PGate(const string&name, svector<PExpr*>*pins,
 		     PExpr*del);
 
-      explicit PGate(perm_string name, svector<PExpr*>*pins);
+      explicit PGate(const string&name, svector<PExpr*>*pins);
 
       virtual ~PGate();
 
-      perm_string get_name() const { return name_; }
+      const string& get_name() const { return name_; }
 
-	// This method evaluates the delays all the way to an
-	// integer. If the delay is non-constant, then set the times
-	// to 0, print an error message and mark an error to the
-	// design.
-      void eval_delays(Design*des, NetScope*scope,
+      void eval_delays(Design*des, const string&path,
 		       unsigned long&rise_time,
 		       unsigned long&fall_time,
 		       unsigned long&decay_time) const;
 
-	// This evaluates the delays as far as possible, but returns
-	// an expression, and do not signal errors.
-      void eval_delays(Design*des, NetScope*scope,
-		       NetExpr*&rise_time,
-		       NetExpr*&fall_time,
-		       NetExpr*&decay_time,
-		       bool as_net_flag =false) const;
-
       unsigned pin_count() const { return pins_? pins_->count() : 0; }
       const PExpr*pin(unsigned idx) const { return (*pins_)[idx]; }
 
-      strength_t strength0() const;
-      strength_t strength1() const;
-
-      void strength0(strength_t);
-      void strength1(strength_t);
-
-      map<perm_string,PExpr*> attributes;
-
-      virtual void dump(ostream&out, unsigned ind =4) const;
-      virtual void elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*sc) const;
-      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
+      virtual void dump(ostream&out) const;
+      virtual void elaborate(Design*des, const string&path) const;
 
     protected:
-      const svector<PExpr*>& get_pins() const { return *pins_; }
+      const svector<PExpr*>* get_pins() const { return pins_; }
 
       void dump_pins(ostream&out) const;
       void dump_delays(ostream&out) const;
 
     private:
-      perm_string name_;
+      const string name_;
       PDelays delay_;
       svector<PExpr*>*pins_;
 
-      strength_t str0_, str1_;
-
     private: // not implemented
       PGate(const PGate&);
       PGate& operator= (const PGate&);
@@ -128,8 +92,8 @@ class PGAssign  : public PGate {
       explicit PGAssign(svector<PExpr*>*pins, svector<PExpr*>*dels);
       ~PGAssign();
 
-      void dump(ostream&out, unsigned ind =4) const;
-      virtual void elaborate(Design*des, NetScope*scope) const;
+      void dump(ostream&out) const;
+      virtual void elaborate(Design*des, const string&path) const;
 
     private:
 };
@@ -154,10 +118,10 @@ class PGBuiltin  : public PGate {
 		  TRANIF1, RTRANIF0, RTRANIF1 };
 
     public:
-      explicit PGBuiltin(Type t, perm_string name,
+      explicit PGBuiltin(Type t, const string&name,
 			 svector<PExpr*>*pins,
 			 svector<PExpr*>*del);
-      explicit PGBuiltin(Type t, perm_string name,
+      explicit PGBuiltin(Type t, const string&name,
 			 svector<PExpr*>*pins,
 			 PExpr*del);
       ~PGBuiltin();
@@ -165,8 +129,8 @@ class PGBuiltin  : public PGate {
       Type type() const { return type_; }
       void set_range(PExpr*msb, PExpr*lsb);
 
-      virtual void dump(ostream&out, unsigned ind =4) const;
-      virtual void elaborate(Design*, NetScope*scope) const;
+      virtual void dump(ostream&out) const;
+      virtual void elaborate(Design*, const string&path) const;
 
     private:
       Type type_;
@@ -184,136 +148,38 @@ class PGBuiltin  : public PGate {
 class PGModule  : public PGate {
 
     public:
-	// The name is the *instance* name of the gate.
-
 	// If the binding of ports is by position, this constructor
 	// builds everything all at once.
-      explicit PGModule(perm_string type, perm_string name,
-			svector<PExpr*>*pins);
+      explicit PGModule(const string&type, const string&name,
+			svector<PExpr*>*overrides, svector<PExpr*>*pins)
+      : PGate(name, pins), type_(type), overrides_(overrides), pins_(0), npins_(0) { }
 
 	// If the binding of ports is by name, this constructor takes
 	// the bindings and stores them for later elaboration.
-      explicit PGModule(perm_string type, perm_string name,
-			named<PExpr*>*pins, unsigned npins);
+      struct bind_t {
+	    string name;
+	    PExpr* parm;
+      };
+      explicit PGModule(const string&type, const string&name,
+			svector<PExpr*>*overrides, bind_t*pins, unsigned npins)
+      : PGate(name, 0), type_(type), overrides_(overrides), pins_(pins), npins_(npins) { }
 
 
-      ~PGModule();
-
-	// Parameter overrides can come as an ordered list, or a set
-	// of named expressions.
-      void set_parameters(svector<PExpr*>*o);
-      void set_parameters(named<PExpr*>*pa, unsigned npa);
-
-	// Modules can be instantiated in ranges. The parser uses this
-	// method to pass the range to the pform.
-      void set_range(PExpr*msb, PExpr*lsb);
-
-      virtual void dump(ostream&out, unsigned ind =4) const;
-      virtual void elaborate(Design*, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*sc) const;
-      virtual bool elaborate_sig(Design*des, NetScope*scope) const;
-
-	// This returns the module name of this module. It is a
-	// permallocated string.
-      perm_string get_type();
+      virtual void dump(ostream&out) const;
+      virtual void elaborate(Design*, const string&path) const;
 
     private:
-      perm_string type_;
+      string type_;
       svector<PExpr*>*overrides_;
-      named<PExpr*>*pins_;
+      bind_t*pins_;
       unsigned npins_;
 
-	// These members support parameter override by name
-      named<PExpr*>*parms_;
-      unsigned nparms_;
-
-	// Arrays of modules are give if these are set.
-      PExpr*msb_;
-      PExpr*lsb_;
-
-      void elaborate_mod_(Design*, Module*mod, NetScope*scope) const;
-      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;
+      void elaborate_mod_(Design*, Module*mod, const string&path) const;
+      void elaborate_udp_(Design*, PUdp  *udp, const string&path) 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.
  *

PGenerate.cc

@@ -1,57 +0,0 @@
-/*
- * 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: PGenerate.cc,v 1.1 2006/04/10 02:40:18 steve Exp $"
-#endif
-
-# include  "PGenerate.h"
-# include  "PWire.h"
-
-PGenerate::PGenerate(unsigned id)
-: id_number(id)
-{
-}
-
-PGenerate::~PGenerate()
-{
-}
-
-PWire* PGenerate::add_wire(PWire*wire)
-{
-      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);
-      if (obj == wires.end())
-	    return 0;
-      else
-	    return (*obj).second;
-}
-
-void PGenerate::add_gate(PGate*gate)
-{
-      gates.push_back(gate);
-}

PGenerate.h

@@ -1,92 +0,0 @@
-#ifndef __PGenerate_H
-#define __PGenerate_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: PGenerate.h,v 1.1 2006/04/10 02:40:18 steve Exp $"
-#endif
-
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  "HName.h"
-# include  <list>
-# include  <map>
-
-class Design;
-class NetScope;
-class PExpr;
-class PGate;
-class PWire;
-
-/*
- * This represents a generate scheme.
- */
-class PGenerate : public LineInfo {
-
-    public:
-      PGenerate(unsigned id_number);
-      ~PGenerate();
-
-	// Generate schemes have an ID number, for when the scope is
-	// implicit.
-      const unsigned id_number;
-      perm_string scope_name;
-
-      enum scheme_t {GS_NONE, GS_LOOP, GS_CONDIT};
-      scheme_t scheme_type;
-
-	// generate loops have an index variable and three
-	// expressions: for (index = <init>; <test>; index=<step>)
-      perm_string loop_index;
-      PExpr*loop_init;
-      PExpr*loop_test;
-      PExpr*loop_step;
-
-      map<hname_t,PWire*>wires;
-      PWire* add_wire(PWire*);
-      PWire* get_wire(const hname_t&name) const;
-
-      list<PGate*> gates;
-      void add_gate(PGate*);
-
-	// 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;
-
-      void dump(ostream&out) const;
-
-    private:
-      bool generate_scope_loop_(Design*des, NetScope*container);
-
-	// These are the scopes created by generate_scope.
-      list<NetScope*>scope_list_;
-	// internal function called on each scope generated by this scheme.
-      bool elaborate_sig_(Design*des, NetScope*scope) const;
-      bool elaborate_(Design*des, NetScope*scope) const;
-
-    private: // not implemented
-      PGenerate(const PGenerate&);
-      PGenerate& operator= (const PGenerate&);
-};
-
-#endif

PSpec.h

@@ -1,48 +0,0 @@
-#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.1 2006/09/23 04:57:19 steve Exp $"
-#endif
-
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  <vector>
-
-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:
-	// 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;
-
-      std::vector<class PExpr*>delays;
-};
-
-#endif

PTask.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: PTask.cc,v 1.7 2002/08/12 01:34:58 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PTask.cc,v 1.2 1999/07/24 02:11:19 steve Exp $"
 #endif
 
-# include "config.h"
-
 # include  "PTask.h"
 
-PTask::PTask()
-: ports_(0), statement_(0)
+PTask::PTask(svector<PWire*>*p, Statement*s)
+: ports_(p), statement_(s)
 {
 }
 
@@ -33,37 +31,8 @@ PTask::~PTask()
 {
 }
 
-void PTask::set_ports(svector<PWire*>*p)
-{
-      assert(ports_ == 0);
-      ports_ = p;
-}
-
-void PTask::set_statement(Statement*s)
-{
-      assert(statement_ == 0);
-      statement_ = s;
-}
-
-
 /*
  * $Log: PTask.cc,v $
- * Revision 1.7  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * 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/04/19 03:04:47  steve
- *  Spurious assert of empty statemnt.
- *
- * 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/07/24 02:11:19  steve
  *  Elaborate task input ports.
  *

PTask.h

@@ -1,7 +1,7 @@
 #ifndef __PTask_H
 #define __PTask_H
 /*
- * Copyright (c) 1999-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1999 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,33 +18,16 @@
  *    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 $"
+#if !defined(WINNT)
+#ident "$Id: PTask.h,v 1.6 1999/09/30 21:28:34 steve Exp $"
 #endif
 
 # include  "LineInfo.h"
 # include  "svector.h"
-# include  "StringHeap.h"
 # include  <string>
 class Design;
-class NetScope;
 class PWire;
 class Statement;
-class PExpr;
-
-enum PTaskFuncEnum {
-      PTF_NONE,
-      PTF_REG,
-      PTF_INTEGER,
-      PTF_REAL,
-      PTF_REALTIME,
-      PTF_TIME
-};
-
-struct PTaskFuncArg {
-      PTaskFuncEnum type;
-      svector<PExpr*>*range;
-};
 
 /*
  * The PTask holds the parsed definitions of a task.
@@ -52,23 +35,11 @@ struct PTaskFuncArg {
 class PTask  : public LineInfo {
 
     public:
-      explicit PTask();
+      explicit PTask(svector<PWire*>*p, Statement*s);
       ~PTask();
 
-      void set_ports(svector<PWire *>*p);
-      void set_statement(Statement *s);
-
-	// Tasks introduce scope, to need to be handled during the
-	// scope elaboration pass. The scope passed is my scope,
-	// created by the containing scope. I fill it in with stuff if
-	// I need to.
-      void elaborate_scope(Design*des, NetScope*scope) const;
-
-	// Bind the ports to the regs that are the ports.
-      void elaborate_sig(Design*des, NetScope*scope) const;
-
-	// Elaborate the statement to finish off the task definition.
-      void elaborate(Design*des, NetScope*scope) const;
+      void elaborate_1(Design*des, const string&path) const;
+      void elaborate_2(Design*des, const string&path) const;
 
       void dump(ostream&, unsigned) const;
 
@@ -85,69 +56,29 @@ class PTask  : public LineInfo {
  * The function is similar to a task (in this context) but there is a
  * single output port and a set of input ports. The output port is the
  * function return value.
- *
- * The output value is not elaborated until elaborate_sig.
  */
 class PFunction : public LineInfo {
 
     public:
-      explicit PFunction(perm_string name);
+      explicit PFunction(svector<PWire *>*p, Statement *s);
       ~PFunction();
 
-      void set_ports(svector<PWire *>*p);
-      void set_statement(Statement *s);
-      void set_return(PTaskFuncArg t);
+      void set_output(PWire*);
 
-      void elaborate_scope(Design*des, NetScope*scope) const;
-
-	/* elaborate the ports and return value. */
-      void elaborate_sig(Design *des, NetScope*) const;
-
-	/* Elaborate the behavioral statement. */
-      void elaborate(Design *des, NetScope*) const;
+	/* Functions are elaborated in 2 passes. */
+      void elaborate_1(Design *des, const string &path) const;
+      void elaborate_2(Design *des, const string &path) const;
 
       void dump(ostream&, unsigned) const;
 
     private:
-      perm_string name_;
-      PTaskFuncArg return_type_;
+      PWire*out_;
       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.

PUdp.cc

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2003-2004 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: PUdp.cc,v 1.3 2004/03/08 00:47:44 steve Exp $"
-#endif
-
-# include  "PUdp.h"
-
-PUdp::PUdp(perm_string n, unsigned nports)
-: ports(nports), sequential(false), initial(verinum::Vx), name_(n)
-{
-}
-
-unsigned PUdp::find_port(const char*name)
-{
-      for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
-
-	    if (ports[idx] == name)
-		  return idx;
-      }
-
-      return ports.count();
-}
-
-/*
- * $Log: PUdp.cc,v $
- * Revision 1.3  2004/03/08 00:47:44  steve
- *  primitive ports can bind bi name.
- *
- * Revision 1.2  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.1  2003/07/15 05:07:13  steve
- *  Move PUdp constructor into compiled file.
- *
- */
-

PUdp.h

@@ -1,7 +1,7 @@
 #ifndef __PUdp_H
 #define __PUdp_H
 /*
- * Copyright (c) 1998-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1998 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,22 +18,25 @@
  *    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: PUdp.h,v 1.12 2004/03/08 00:47:44 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PUdp.h,v 1.3 1999/06/15 03:44:53 steve Exp $"
 #endif
 
 # include  <map>
-# include  "StringHeap.h"
 # include  "svector.h"
+# include  <string>
 # include  "verinum.h"
 
-class PExpr;
+svector<string>::svector<string>(unsigned size)
+: nitems_(size), items_(new string[size])
+{
+}
 
 /*
  * This class represents a parsed UDP. This is a much simpler object
  * then a module or macromodule.
  *
- *   - all ports are scalar,
+ *   - all ports are scaler,
  *   - pin 0 (the first port) is always output,
  *     and the remaining pins are input.
  *
@@ -48,16 +51,15 @@ class PExpr;
  * the current output.
  *
  * If the UDP is sequential, the "initial" member is taken to be the
- * initial value assigned in the source, or 'x' if none is given.
+ * intial value assigned in the source, or 'x' if none is given.
  */
 class PUdp {
 
     public:
-      explicit PUdp(perm_string n, unsigned nports);
+      explicit PUdp(const string&n, unsigned nports)
+      : ports(nports), sequential(false), initial(verinum::Vx), name_(n) { }
 
       svector<string>ports;
-      unsigned find_port(const char*name);
-
       bool sequential;
 
       svector<string>tinput;
@@ -66,12 +68,12 @@ class PUdp {
 
       verinum::V initial;
 
-      map<string,PExpr*> attributes;
+      map<string,string> attributes;
 
       void dump(ostream&out) const;
 
-      perm_string name_;
     private:
+      const string name_;
 
     private: // Not implemented
       PUdp(const PUdp&);
@@ -80,38 +82,6 @@ class PUdp {
 
 /*
  * $Log: PUdp.h,v $
- * Revision 1.12  2004/03/08 00:47:44  steve
- *  primitive ports can bind bi name.
- *
- * Revision 1.11  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.10  2003/07/15 05:07:13  steve
- *  Move PUdp constructor into compiled file.
- *
- * Revision 1.9  2003/07/15 03:49:22  steve
- *  Spelling fixes.
- *
- * Revision 1.8  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.7  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.6  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.5  2001/04/22 23:09:45  steve
- *  More UDP consolidation from Stephan Boettcher.
- *
- * Revision 1.4  2000/02/23 02:56:53  steve
- *  Macintosh compilers do not support ident.
- *
  * Revision 1.3  1999/06/15 03:44:53  steve
  *  Get rid of the STL vector template.
  *

PWire.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005 Stephen Williams ([email protected])
+ * Copyright (c) 1999 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,42 +16,16 @@
  *    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.12 2007/01/16 05:44:14 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PWire.cc,v 1.2 1999/09/10 05:02:09 steve Exp $"
 #endif
 
-# include "config.h"
 # include  "PWire.h"
 # include  <assert.h>
 
-PWire::PWire(const hname_t&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)
+PWire::PWire(const string&n, NetNet::Type t, NetNet::PortType pt)
+: name_(n), type_(t), port_type_(pt), 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)
-{
-      if (t == NetNet::INTEGER) {
-	    type_ = NetNet::REG;
-	    signed_ = true;
-	    isint_ = true;
-      }
 }
 
 NetNet::Type PWire::get_wire_type() const
@@ -59,11 +33,6 @@ NetNet::Type PWire::get_wire_type() const
       return type_;
 }
 
-const hname_t& PWire::path() const
-{
-      return hname_;
-}
-
 bool PWire::set_wire_type(NetNet::Type t)
 {
       assert(t != NetNet::IMPLICIT);
@@ -74,13 +43,11 @@ bool PWire::set_wire_type(NetNet::Type t)
 	    return true;
 	  case NetNet::IMPLICIT_REG:
 	    if (t == NetNet::REG) { type_ = t; return true; }
+	    if (t == NetNet::INTEGER) {type_ = t; return true; }
 	    return false;
 	  case NetNet::REG:
-	    if (t == NetNet::INTEGER) {
-		  isint_ = true;
-		  return true;
-	    }
 	    if (t == NetNet::REG) return true;
+	    if (t == NetNet::INTEGER) {type_ = t; return true; }
 	    return false;
 	  default:
 	    if (type_ != t)
@@ -116,34 +83,6 @@ 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_ != dt)
-		  return false;
-	    else
-		  return true;
-
-      assert(data_type_ == IVL_VT_NO_TYPE);
-      data_type_ = dt;
-      return true;
-}
-
-void PWire::set_signed(bool flag)
-{
-      signed_ = flag;
-}
-
-bool PWire::get_signed() const
-{
-      return signed_;
-}
-
-bool PWire::get_isint() const
-{
-      return isint_;
-}
-
 void PWire::set_range(PExpr*m, PExpr*l)
 {
       msb_ = svector<PExpr*>(msb_,m);
@@ -154,48 +93,13 @@ void PWire::set_memory_idx(PExpr*ldx, PExpr*rdx)
 {
       assert(lidx_ == 0);
       assert(ridx_ == 0);
+      assert((type_ == NetNet::REG) || (type_ == NetNet::INTEGER));
       lidx_ = ldx;
       ridx_ = rdx;
 }
 
 /*
  * $Log: PWire.cc,v $
- * Revision 1.12  2007/01/16 05:44:14  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.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.
  *

PWire.h

@@ -1,7 +1,7 @@
 #ifndef __PWire_H
 #define __PWire_H
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998 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,48 +18,30 @@
  *    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.h,v 1.19 2006/04/10 00:37:42 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: PWire.h,v 1.6 1999/11/27 19:07:57 steve Exp $"
 #endif
 
 # include  "netlist.h"
 # include  "LineInfo.h"
-# include  <map>
+# include <map>
 # include  "svector.h"
-
-#ifdef HAVE_IOSFWD
-# include  <iosfwd>
-#else
 class ostream;
-#endif
-
 class PExpr;
 class Design;
 
 /*
  * Wires include nets, registers and ports. A net or register becomes
- * a port by declaration, so ports are not separate. The module
+ * a port by declaration, so ports are not seperate. 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.
  */
 class PWire : public LineInfo {
 
     public:
-      PWire(const hname_t&hname,
-	    NetNet::Type t,
-	    NetNet::PortType pt,
-	    ivl_variable_type_t dt);
-      PWire(char*name,
-	    NetNet::Type t,
-	    NetNet::PortType pt,
-	    ivl_variable_type_t dt);
+      PWire(const string&n, NetNet::Type t, NetNet::PortType pt);
 
-	// Return a hierarchical name.
-      const hname_t&path() const;
+
+      const string&name() const { return name_; }
 
       NetNet::Type get_wire_type() const;
       bool set_wire_type(NetNet::Type);
@@ -67,31 +49,21 @@ class PWire : public LineInfo {
       NetNet::PortType get_port_type() const;
       bool set_port_type(NetNet::PortType);
 
-      void set_signed(bool flag);
-      bool get_signed() const;
-      bool get_isint() const;
-
-      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_memory_idx(PExpr*ldx, PExpr*rdx);
 
-      map<perm_string,PExpr*> attributes;
+      map<string,string> attributes;
 
 	// Write myself to the specified stream.
-      void dump(ostream&out, unsigned ind=4) const;
+      void dump(ostream&out) const;
 
-      void elaborate_sig(Design*, NetScope*scope) const;
+      void elaborate(Design*, NetScope*scope) const;
 
     private:
-      hname_t hname_;
+      string name_;
       NetNet::Type type_;
       NetNet::PortType port_type_;
-      ivl_variable_type_t data_type_;
-      bool signed_;
-      bool isint_;		// original type of integer
 
 	// These members hold expressions for the bit width of the
 	// wire. If they do not exist, the wire is 1 bit wide.
@@ -110,53 +82,6 @@ class PWire : public LineInfo {
 
 /*
  * $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.
  *

QUICK_START.txt

@@ -1,83 +0,0 @@
-
-* Getting Started with Icarus Verilog
-
-Icarus Verilog is a Verilog compiler. It is suitable for use as a
-simulator, and, to some degree, synthesizer. Icarus Verilog runs under
-Linux and a variety of UNIX systems, as well as Windows as a command
-line tool, so the instructions are generally applicable to all
-environments. Note that this is only a quick start. For more detailed
-documentation, see the manual page for the iverilog command.
-
-
-* Hello, World!
-
-The first thing you want to do as a user is learn how to compile and
-execute even the most trivial design. For the purposes of simulation,
-we use as our example *the* most trivial simulation:
-
-  module main;
-
-  initial
-    begin
-      $display("Hello, World");
-      $finish ;
-    end
-
-  endmodule
-
-By a text editor (or copy hello.vl from the Icarus Verilog examples
-directory) arrange for this program to be in a text file, "hello.vl".
-Next, compile this program with a command like this:
-
-	% iverilog -o hello hello.vl
-
-The results of this compile are placed into the file "hello", as the
-"-o" flag tells the compiler where to place the compiled result. Next,
-execute the compiled program like so:
-
-	% vvp hello
-	Hello, World
-
-And there it is, the program has been executed. So what happened? The
-first step, the "iverilog" command, read and interpreted the source
-file, then generated a compiled result. The compiled form may be
-selected by command line switches, but the default form is the VVP
-format, which is actually run by the "vvp" command.
-
-The "iverilog" and "vvp" commands are the only commands that users
-use to invoke Icarus Verilog. What the compiler actually does is
-controlled by command line switches. In our little example, we asked
-the compiler to compile the source program to the default vvp form,
-which is in turn executed by the vvp program.
-
-
-* Windows Install
-
-The easiest way to install under Windows is to get a precompiled
-installer for the version you wish to install. Icarus Verilog is
-distributed for Windows users as a self-installing .exe. Just execute
-the installer and follow the instructions. During the install, take
-note of the directory where the program is installed: for example,
-C:\iverilog is a good place to install.
-
-Once the binary is installed, you need to add the bin directory to
-your execution path. The executables you need are in C:\iverilog\bin,
-where the "C:\iverilog" part is actually the root of where you
-installed the package. The programs are in the bin subdirectory. Put
-this directory in your PATH environment variable, and the above
-commands become accessible to you at the command line prompt, or even
-in batch files.
-
-
-* Linux Install
-
-Under Linux, the install is even easier. For RedHat and Mandrake based
-systems, there is the appropriate RPM file. Just install the package
-with the "rpm -U <file>" command. Debian users should get Icarus
-Verilog packages from the main Debian software site.
-
-
-* Install From Source
-
-In this case, see README.txt and other documentation that comes with
-the source.

README.txt

@@ -1,27 +1,23 @@
-		THE ICARUS VERILOG COMPILATION SYSTEM
-		Copyright 2000-2004 Stephen Williams
+		THE ICARUS VERILOG COMPILATION SYSTEM 
+			   September 18, 1999		
 
 
 1.0 What is ICARUS Verilog?
 
-Icarus Verilog is intended to compile ALL of the Verilog HDL as
-described in the IEEE-1364 standard. Of course, it's not quite there
-yet. It does currently handle a mix of structural and behavioral
-constructs. For a view of the current state of Icarus Verilog, see its
-home page at <http://www.icarus.com/eda/verilog>.
+Icarus Verilog is intended to compile ALL of the Verilog HDL as described
+in the IEEE-1364 standard. Of course, it's not quite there yet. It does
+currently handle a mix of structural and behavioral constructs. For a
+view of the current state of Icarus Verilog, see its home page at
+<http://www.icarus.com/eda/verilog>.
+ 
+IVL is not aimed at being a simulator in the traditional sense, but a
+compiler that generates code employed by back-end tools. These back-
+end tools currently include a simulator written in C++ called VVM 
+and an XNF (Xilinx Netlist Format) generator. See "vvm.txt" and
+"xnf.txt" for further details on these back-end processors. In the
+future, backends are expected for EDIF/LPM, structural Verilog, etc.
 
-Icarus Verilog is not aimed at being a simulator in the traditional
-sense, but a compiler that generates code employed by back-end
-tools. These back-end tools currently include a simulator engine
-called VVP, an XNF (Xilinx Netlist Format) generator and an EDIF FPGA
-netlist generator. In the future, backends are expected for EDIF/LPM,
-structural Verilog, VHDL, etc.
-
-    For instructions on how to run Icarus Verilog,
-    see the ``iverilog'' man page.
-
-
-2.0 Building/Installing Icarus Verilog From Source
+2.0 Building/Installing IVL From Source
 
 If you are starting from source, the build process is designed to be
 as simple as practical. Someone basically familiar with the target
@@ -29,51 +25,22 @@ system and C/C++ compilation should be able to build the source
 distribution with little effort. Some actual programming skills are
 not required, but helpful in case of problems.
 
-If you are building for Windows, see the mingw.txt file.
-
 2.1 Compile Time Prerequisites
 
 You need the following software to compile Icarus Verilog from source
 on a UNIX-like system:
 
 	- GNU Make
-	  The Makefiles use some GNU extensions, so a basic POSIX
+	  The Makefiles use some GNU extensions to, so a basic POSIX
 	  make will not work. Linux systems typically come with a
-	  satisfactory make. BSD based systems (i.e., NetBSD, FreeBSD)
-	  typically have GNU make as the gmake program.
+	  satisfactory make.
 
 	- ISO C++ Compiler
-	  The ivl and ivlpp programs are written in C++ and make use
-	  of templates and some of the standard C++ library. egcs and
-	  recent gcc compilers with the associated libstdc++ are known
-	  to work. MSVC++ 5 and 6 are known to definitely *not* work.
+	  The ivl program is written in C++ and makes use of templates
+	  and some of the standard C++ library. egcs compilers with
+	  the associated libstdc++ are known to work.
 
-	- bison and flex
-
-	- gperf 2.7
-	  The lexical analyzer doesn't recognize keywords directly,
-	  but instead matches symbols and looks them up in a hash
-	  table in order to get the proper lexical code. The gperf
-	  program generates the lookup table.
-
-	  A version problem with this program is the most common cause
-	  of difficulty. See the Icarus Verilog FAQ.
-
-	- readline 4.2
-	  On Linux systems, this usually means the readline-devel
-	  rpm. In any case, it is the development headers of readline
-	  that are needed.
-
-	- termcap
-	  The readline library in turn uses termcap.
-
-If you are building from CVS, you will also need software to generate
-the configure scripts.
-
-	- autoconf 2.53
-	  This generates configure scripts from configure.in. The 2.53
-	  or later versions are known to work, autoconf 2.13 is
-	  reported to *not* work.
+	- bison
 
 2.2 Compilation
 
@@ -84,71 +51,16 @@ with the commands:
   ./configure
   make
 
-Normally, this command automatically figures out everything it needs
-to know. It generally works pretty well. There are a few flags to the
-configure script that modify its behavior:
-
-	--without-ipal
-	    This turns off support for Icarus PAL, whether ipal
-	    libraries are installed or not.
-
-	--prefix=<root>
-	    The default is /usr/local, which causes the tool suite to
-	    be compiled for install in /usr/local/bin,
-	    /usr/local/share/ivl, etc.
-
-	    I recommend that if you are configuring for precompiled
-	    binaries, use --prefix=/usr.  On Solaris systems, it is
-	    common to use --prefix=/opt.  You can configure for a non-root
-	    install with --prefix=$HOME.
-
-	--enable-vvp32 (experimental)
-	    If compiling on AMD64 systems, this enables the
-	    compilation of 32bit compatible vvp (vvp32) and the vpi
-	    modules that match.
-
-2.2.1 Special AMD64 Instructions
-
-(The Icarus Verilog RPM for x86_64 is build using these instructions.)
-
-If you are building for Linux/AMD64 (a.k.a x86_64) then to get the
-most out of your install, first make sure you have both 64bit and
-32bit development libraries installed. Then configure with this
-somewhat more complicated command:
-
-  ./configure libdir64='$(prefix)/lib64' vpidir1=vpi64 vpidir2=. --enable-vvp32
-
-This reflects the convention on AMD64 systems that 64bit libraries go
-into lib64 directories. The "--enable-vvp32" also turns on 32bit
-compatibility files. A 32bit version of vvp (vvp32) will be created,
-as well as 32bit versions of the development libraries and bundled VPI
-libraries.
-
-2.3 (Optional) Testing
-
-To run a simple test before installation, execute
-
-  make check
-
-The commands printed by this run might help you in running Icarus
-Verilog on your own Verilog sources before the package is installed
-by root.
-
-2.4 Installation
+2.3 Installation
 
 Now install the files in an appropriate place. (The makefiles by
 default install in /usr/local unless you specify a different prefix
-with the --prefix=<path> flag to the configure command.) You may need
-to do this as root to gain access to installation directories.
+with the --prefix=<path> flag to the configure command.) Do this as
+root.
 
   make install
 
-2.5 Uninstallation
-
-The generated Makefiles also include the uninstall target. This should
-remove all the files that ``make install'' creates.
-
-3.0 How Icarus Verilog Works
+3.0 How IVL Works
 
 This tool includes a parser which reads in Verilog (plus extensions)
 and generates an internal netlist. The netlist is passed to various
@@ -167,15 +79,15 @@ only sees a single input file. See ivlpp/ivlpp.txt for details.
 
 3.2 Parse
 
-The Verilog compiler starts by parsing the Verilog source file. The
-output of the parse is a list of Module objects in "pform". The pform
+The verilog compiler starts by parsing the verilog source file. The
+output of the parse in a list of Module objects in PFORM. The pform
 (see pform.h) is mostly a direct reflection of the compilation
 step. There may be dangling references, and it is not yet clear which
 module is the root.
 
-One can see a human readable version of the final pform by using the
-``-P <path>'' flag to the compiler. This will cause iverilog to dump
-the pform into the file named <path>.
+One can see a human readable version of the final PFORM by using the
+``-P <path>'' flag to the compiler. This will cause ivl to dump the
+PFORM into the file named <path>.
 
 3.3 Elaboration
 
@@ -183,73 +95,110 @@ This phase takes the pform and generates a netlist. The driver selects
 (by user request or lucky guess) the root module to elaborate,
 resolves references and expands the instantiations to form the design
 netlist. (See netlist.txt.) Final semantic checks are performed during
-elaboration, and some simple optimizations are performed. The netlist
-includes all the behavioral descriptions, as well as gates and wires.
+elaboration, and some simple optimizations are performed.
 
 The elaborate() function performs the elaboration.
 
 One can see a human readable version of the final, elaborated and
 optimized netlist by using the ``-N <path>'' flag to the compiler. If
-elaboration succeeds, the final netlist (i.e., after optimizations but
+elaboration succeeds, the final netlist (i.e. after optimizations but
 before code generation) will be dumped into the file named <path>.
 
-Elaboration is actually performed in two steps: scopes and parameters
-first, followed by the structural and behavioral elaboration.
-
-3.3.1 Scope Elaboration
-
-This pass scans through the pform looking for scopes and parameters. A
-tree of NetScope objects is built up and placed in the Design object,
-with the root module represented by the root NetScope object. The
-elab_scope.cc and elab_pexpr.cc files contain most of the code for
-handling this phase.
-
-The tail of the elaborate_scope behavior (after the pform is
-traversed) includes a scan of the NetScope tree to locate defparam
-assignments that were collected during scope elaboration. This is when
-the defparam overrides are applied to the parameters.
-
-3.3.2 Netlist Elaboration
-
-After the scopes and parameters are generated and the NetScope tree
-fully formed, the elaboration runs through the pform again, this time
-generating the structural and behavioral netlist. Parameters are
-elaborated and evaluated by now so all the constants of code
-generation are now known locally, so the netlist can be generated by
-simply passing through the pform.
-
 3.4 Optimization
 
 This is actually a collection of processing steps that perform
 optimizations that do not depend on the target technology. Examples of
-some useful transformations are
+some useful transformations would be,
 
-	- eliminate null effect circuitry
+	- eliminate null effect circuitry,
 	- combinational reduction
-	- constant propagation
+	- Constant propagation
 
-The actual functions performed are specified on the ivl command line by
-the -F flags (see below).
+The actual functions performed are specified on the command line by
+the -F flags (See below).
 
 3.5 Code Generation
 
 This step takes the design netlist and uses it to drive the code
-generator (see target.h). This may require transforming the
+generator. (See target.h.) This may require transforming the
 design to suit the technology.
 
 The emit() method of the Design class performs this step. It runs
 through the design elements, calling target functions as need arises
 to generate actual output.
 
-The user selects the target code generator with the -t flag on the
+The target code generator to used is given by the -t flag on the
 command line.
 
-3.6 ATTRIBUTES
+4.0 Running Verilog
 
-    NOTE: The $attribute syntax will soon be deprecated in favor of the
-    Verilog-2001 attribute syntax, which is cleaner and standardized.
+The preferred way to invoke the compiler with the verilog(1)
+command. This program invokes the preprocessor (ivlpp) and the
+compiler (ivl) with the proper command line options to get the job
+done in a friendly way. See the verilog(1) man page for usage details.
 
-The parser accepts, as an extension to Verilog, the $attribute module
+4.1 Running IVL Directly
+
+The ivl command is the compiler driver, that invokes the parser,
+optimization functions and the code generator.
+
+Usage: ivl <options>... file
+       ivl -h
+
+-F <name>
+	Use this flag to request an optimization function be applied
+	to the netlist before it is sent to the target output
+	stage. Any number of -F options may be given, to specify a
+	variety of processing steps. The steps will be applied in
+	order, with the output of one uses as the input to the next.
+
+	The function is specified by name. Use the "ivl -h" command to
+	get a list of configured function names.
+
+-f <assign>
+	Use this flag to set a parameter value. The format of the
+	assignment is <key>=<value> where key is any string up to the
+	first '=', and <value> is the rest of the option. If the '='
+	is omitted, then the key is assigned the empty string.
+
+	The useful keys are defined by the functions and the target in
+	use. These assignments are specifically useful for passing
+	target specific information to the target back-end, or
+	options/parameters to optimization functions, if any are defined.
+
+-N <file>
+	Dump the elaborated netlist to the named file. The netlist is
+	the folly elaborated netlist, after all the function modules
+	are applied and right before the output generator is
+	called. This is an aid for debugging the compiler, and the
+	output generator in particular.
+
+-o <file>
+	Normally, the generated result is sent to standard
+	output. Use the -o flag to specify an output file for the
+	generated result.
+
+-P <file>
+	Write the PForm of the parsed input to the specified file.
+	The pform is the compiler's understanding of the input after
+	parsing and before elaboration. This is an aid for debugging
+	the compiler.
+
+-s <module>
+	Normally, ivl will elaborate the only module in the source
+	file. If there are multiple modules, use this option to select
+	the module to be used as the top-level module.
+
+-t <name>
+	Select the output format for the compiled result. Use the
+	"ivl -h" command to get a list of configured targets.
+
+-v
+	Print version and copyright information for ivl.
+
+ATTRIBUTES
+
+The parser accepts as an extension to Verilog the $attribute module
 item. The syntax of the $attribute item is:
 
 	$attribute (<identifier>, <key>, <value>);
@@ -272,32 +221,21 @@ names a primitive earlier in the compilation unit and the statement is
 placed in global scope, instead of within a module. The semicolon is
 not part of a type attribute.
 
+Currently, type attributes are only supported for UDP types.
+
 Note that attributes are also occasionally used for communication
 between processing steps. Processing steps that are aware of others
 may place attributes on netlist objects to communicate information to
 later steps.
 
-Icarus Verilog also accepts the Verilog 2001 syntax for
-attributes. They have the same general meaning as with the $attribute
-syntax, but they are attached to objects by position instead of by
-name. Also, the key is a Verilog identifier instead of a string.
-
-4.0 Running iverilog
-
-The preferred way to invoke the compiler is with the iverilog(1)
-command. This program invokes the preprocessor (ivlpp) and the
-compiler (ivl) with the proper command line options to get the job
-done in a friendly way. See the iverilog(1) man page for usage details.
-
-
 4.1 EXAMPLES
 
 Example: Compiling "hello.vl"
 
 ------------------------ hello.vl ----------------------------
 module main();
-
-initial
+ 
+initial 
   begin
     $display("Hi there");
     $finish ;
@@ -307,190 +245,115 @@ endmodule
 
 --------------------------------------------------------------
 
-Ensure that "iverilog" is on your search path, and the vpi library
+Insure that "verilog" is on your search path, and the vpi library 
 is available.
 
-To compile the program:
+For csh - 
 
-  iverilog hello.vl
+  setenv PATH /usr/local/bin:$PATH
+  setenv VPI_MODULE_PATH /usr/local/lib/ivl
+
+  verilog hello.vl
 
 (The above presumes that /usr/local/include and /usr/local/lib are
 part of the compiler search path, which is usually the case for gcc.)
 
-To run the program:
+To run the program
 
-  ./a.out
+  ./hello
 
-You can use the "-o" switch to name the output command to be generated
-by the compiler. See the iverilog(1) man page.
 
 5.0 Unsupported Constructs
 
-Icarus Verilog is in development - as such it still only supports a
-(growing) subset of Verilog.  Below is a description of some of the
-currently unsupported Verilog features. This list is not exhaustive,
-and does not account for errors in the compiler. See the Icarus
-Verilog web page for the current state of support for Verilog, and in
-particular, browse the bug report database for reported unsupported
-constructs.
+IVL is in development - as such it still only supports a (growing) subset
+of verilog.  Below is a description of some of the currently unsupported
+verilog features. This list is not exhaustive, and does not account
+for errors in the compiler. See the Icarus Verilog web page for the
+current state of support for Verilog.
 
-  - System functions are supported, but the return value is a little
-    tricky. See SYSTEM FUNCTION TABLE FILES in the iverilog man page.
+  - Min/Typ/Max expressions: Example:  a = (1 : 6 : 14);
 
-  - Specify blocks are parsed but ignored in general.
+  - Memories work, but only in procedural code.
 
-  - trireg is not supported. tri0 and tri1 are supported.
+            reg [1:0] b [2:0], bar;
+	    wire [1:0] foo;
+            always foo = b[i]; // sorry
+	    always @(i) bar = b[i]; // OK
 
-  - tran primitives, i.e. tran, tranif1, tranif0, rtran, rtranif1
-    and rtranif0 are not supported.
+  - `timescale directive
 
-  - Net delays, of the form "wire #N foo;" do not work. Delays in
-    every other context do work properly, including the V2001 form
-    "wire #5 foo = bar;"
+  - force/release/assign/deassign procedural assignments not
+    supported.
 
-  - Event controls inside non-blocking assignments are not supported.
-    i.e.: a <= @(posedge clk) b;
+  - block disable not supported, i.e.:
 
-  - Macro arguments are not supported. `define macros are supported,
-    but they cannot take arguments.
+            begin : foo
+	        [...]
+		disable foo; // sorry
+		[...]
+	    end
 
-5.1 Nonstandard Constructs or Behaviors
+  - fork/join is not supported in vvm runtime
 
-Icarus Verilog includes some features that are not part of the
-IEEE1364 standard, but have well defined meaning, and also sometimes
-gives nonstandard (but extended) meanings to some features of the
-language that are defined. See the "extensions.txt" documentation for
-more details.
+  - Structural shift operators are in general not supported.
+    Procedural expressions are OK. Constant expressions are OK.
 
-    $is_signed(<expr>)
-	This system function returns 1 if the expression contained is
-	signed, or 0 otherwise. This is mostly of use for compiler
-	regression tests.
+            assign foo = a << b; // sorry
+	    always @(a or b) foo = a << b; // OK
+	    parameter foo = a << b; // OK
 
-    $sizeof(<expr>)
-    $bits(<expr>)
-	The $bits system function returns the size in bits of the
-	expression that is its argument. The result of this
-	function is undefined if the argument doesn't have a
-	self-determined size.
+  - Functions in structural contexts are not supported.
 
-	The $sizeof function is deprecated in favor of $bits, which is
-	the same thing, but included in the SystemVerilog definition.
+            assign foo = user_function(a,b); // sorry
+	    always @(a or b) foo = user_function(a,b); // OK
 
-    $simtime
-	The $simtime system function returns as a 64bit value the
-	simulation time, unscaled by the time units of local
-	scope. This is different from the $time and $stime functions
-	which return the scaled times. This function is added for
-	regression testing of the compiler and run time, but can be
-	used by applications who really want the simulation time.
+  - multiplicative operators (*, /, %) are not supported.
 
-	Note that the simulation time can be confusing if there are
-	lots of different `timescales within a design. It is not in
-	general possible to predict what the simulation precision will
-	turn out to be.
+            assign foo = a * b; // sorry
+            always @(a or b) foo = a * b; // sorry
 
-    $mti_random()
-    $mti_dist_uniform
-	These functions are similar to the IEEE1364 standard $random
-	functions, but they use the Mersenne Twister (MT19937)
-	algorithm. This is considered an excellent random number
-	generator, but does not generate the same sequence as the
-	standardized $random.
+  - event data type is not supported.
 
-    Builtin system functions
+  - real data type not supported.
 
-	Certain of the system functions have well defined meanings, so
-	can theoretically be evaluated at compile time, instead of
-	using runtime VPI code. Doing so means that VPI cannot
-	override the definitions of functions handled in this
-	manner. On the other hand, this makes them synthesizable, and
-	also allows for more aggressive constant propagation. The
-	functions handled in this manner are:
+  - system functions are not supported. (User defined functions are
+    supported, and system tasks are supported.)
 
-		$bits
-		$signed
-		$sizeof
-		$unsigned
+            assign foo = $some_function(a,b); // sorry
+	    always @(a or b) foo = $some_function(a,b); // sorry
 
-	Implementations of these system functions in VPI modules will
-	be ignored.
+  - non-constant delay expressions, i.e.:
 
-    Preprocessing Library Modules
+            reg [7:0] del;
+	    always #(reg) $display($time,,"del = %d", del); // sorry
 
-	Icarus Verilog does preprocess modules that are loaded from
-	libraries via the -y mechanism. However, the only macros
-	defined during compilation of that file are those that it
-	defines itself (or includes) or that are defined on the
-	command line or command file.
+  - drive strengths are parsed, bug ignored.
 
-	Specifically, macros defined in the non-library source files
-	are not remembered when the library module is loaded. This is
-	intentional. If it were otherwise, then compilation results
-	might vary depending on the order that libraries are loaded,
-	and that is too unpredictable.
+Specify blocks are parsed but ignored in general.
 
-	It is said that some commercial compilers do allow macro
-	definitions to span library modules. That's just plain weird.
-
-    Width in %t Time Formats
-
-	Standard Verilog does not allow width fields in the %t formats
-	of display strings. For example, this is illegal:
-
-		$display("Time is %0t", %time);
-
-	Standard Verilog instead relies on the $timeformat to
-	completely specify the format.
-
-	Icarus Verilog allows the programmer to specify the field
-	width. The "%t" format in Icarus Verilog works exactly as it
-	does in standard Verilog. However, if the programmer chooses
-	to specify a minimum width (i.e., "%5t"), then for that display
-	Icarus Verilog will override the $timeformat minimum width and
-	use the explicit minimum width.
-
-    vpiScope iterator on vpiScope objects.
-
-	In the VPI, the normal way to iterate over vpiScope objects
-	contained within a vpiScope object, is the vpiInternalScope
-	iterator. Icarus Verilog adds support for the vpiScope
-	iterator of a vpiScope object, that iterates over *everything*
-	the is contained in the current scope. This is useful in cases
-	where one wants to iterate over all the objects in a scope
-	without iterating over all the contained types explicitly.
-
-    time 0 race resolution.
-
-	Combinational logic is routinely modeled using always
-	blocks. However, this can lead to race conditions if the
-	inputs to the combinational block are initialized in initial
-	statements. Icarus Verilog slightly modifies time 0 scheduling
-	by arranging for always statements with ANYEDGE sensitivity
-	lists to be scheduled before any other threads. This causes
-	combinational always blocks to be triggered when the values in
-	the sensitivity list are initialized by initial threads.
-
-    Nets with Types
-
-	Icarus Verilog support an extension syntax that allows nets
-	and regs to be explicitly typed. The currently supported types
-	are logic, bool and real. This implies that "logic" and "bool"
-	are new keywords. Typical syntax is:
-
-	wire real foo = 1.0;
-	reg logic bar, bat;
-
-	... and so forth. The syntax can be turned off by using the
-	-g2 flag to iverilog, and turned on explicitly with the -g2x
-	flag to iverilog.
 
 6.0 CREDITS
 
-Except where otherwise noted, Icarus Verilog, ivl and ivlpp are
-Copyright Stephen Williams. The proper notices are in the head of each
-file. However, I have early on received aid in the form of fixes,
-Verilog guidance, and especially testing from many people. Testers in
-particular include a larger community of people interested in a GPL
-Verilog for Linux.
+Except where otherwise noted, ivl and ivlpp are Copyright Stephen
+Williams. The proper notices are in the head of each file. However,
+I have received aid in the form of fixes, Verilog guidance, and
+especially testing from many people, including (in alphabetical order):
 
+	Eric Aardoom <[email protected]>
+	Ed Carter <[email protected]>
+	Larry Doolittle <[email protected]>
+	Guy Hutchison <[email protected]>
+	Ales Hvezda <[email protected]>
+        James Lee <[email protected]>
+	Peter Monta <[email protected]>
+	Daniel H. Nelsen <[email protected]>
+	Stefan Petersen <[email protected]>
+	Jason Schonberg <[email protected]>
+	Stuart Sutherland <[email protected]>
+	Stephen Tell <[email protected]>
+        Stefan Theide <[email protected]>
+	Steve Wilson <[email protected]>
+
+and others. Testers in particular include a larger community of people
+interested in a GPL Verilog for Linux. Special thanks to Steve Wilson
+for collecting and organizing the test suite code for all those testers.

Statement.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-1999 Stephen Williams ([email protected])
+ * Copyright (c) 1998 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,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: Statement.cc,v 1.29 2004/02/18 17:11:54 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: Statement.cc,v 1.16 1999/09/29 18:36:02 steve Exp $"
 #endif
 
-# include "config.h"
-
 # include  "Statement.h"
 # include  "PExpr.h"
 
@@ -32,19 +30,17 @@ Statement::~Statement()
 PAssign_::PAssign_(PExpr*lval, PExpr*ex)
 : event_(0), lval_(lval), rval_(ex)
 {
-      delay_ = 0;
 }
 
 PAssign_::PAssign_(PExpr*lval, PExpr*de, PExpr*ex)
 : event_(0), lval_(lval), rval_(ex)
 {
-      delay_ = de;
+      if (de) delay_.set_delay(de);
 }
 
 PAssign_::PAssign_(PExpr*lval, PEventStatement*ev, PExpr*ex)
 : event_(ev), lval_(lval), rval_(ex)
 {
-      delay_ = 0;
 }
 
 PAssign_::~PAssign_()
@@ -86,7 +82,7 @@ PAssignNB::~PAssignNB()
 {
 }
 
-PBlock::PBlock(perm_string n, BL_TYPE t, const svector<Statement*>&st)
+PBlock::PBlock(const string&n, BL_TYPE t, const svector<Statement*>&st)
 : name_(n), bl_type_(t), list_(st)
 {
 }
@@ -107,20 +103,11 @@ PBlock::~PBlock()
 	    delete list_[idx];
 }
 
-PCallTask::PCallTask(const hname_t&n, const svector<PExpr*>&p)
-: path_(n), parms_(p)
+PCallTask::PCallTask(const string&n, const svector<PExpr*>&p)
+: name_(n), parms_(p)
 {
 }
 
-PCallTask::~PCallTask()
-{
-}
-
-const hname_t& PCallTask::path() const
-{
-      return path_;
-}
-
 PCase::PCase(NetCase::TYPE t, PExpr*ex, svector<PCase::Item*>*l)
 : type_(t), expr_(ex), items_(l)
 {
@@ -135,22 +122,6 @@ PCase::~PCase()
       delete[]items_;
 }
 
-PCAssign::PCAssign(PExpr*l, PExpr*r)
-: lval_(l), expr_(r)
-{
-}
-
-PCAssign::~PCAssign()
-{
-      delete lval_;
-      delete expr_;
-}
-
-PCondit::PCondit(PExpr*ex, Statement*i, Statement*e)
-: expr_(ex), if_(i), else_(e)
-{
-}
-
 PCondit::~PCondit()
 {
       delete expr_;
@@ -158,74 +129,6 @@ PCondit::~PCondit()
       delete else_;
 }
 
-PDeassign::PDeassign(PExpr*l)
-: lval_(l)
-{
-}
-
-PDeassign::~PDeassign()
-{
-      delete lval_;
-}
-
-
-PDelayStatement::PDelayStatement(PExpr*d, Statement*st)
-: delay_(d), statement_(st)
-{
-}
-
-PDelayStatement::~PDelayStatement()
-{
-}
-
-PDisable::PDisable(const hname_t&sc)
-: scope_(sc)
-{
-}
-
-PDisable::~PDisable()
-{
-}
-
-PEventStatement::PEventStatement(const svector<PEEvent*>&ee)
-: expr_(ee), statement_(0)
-{
-      assert(expr_.count() > 0);
-}
-
-
-PEventStatement::PEventStatement(PEEvent*ee)
-: expr_(1), statement_(0)
-{
-      expr_[0] = ee;
-}
-
-PEventStatement::PEventStatement(void)
-: statement_(0)
-{
-}
-
-PEventStatement::~PEventStatement()
-{
-	// delete the events and the statement?
-}
-
-void PEventStatement::set_statement(Statement*st)
-{
-      statement_ = st;
-}
-
-PForce::PForce(PExpr*l, PExpr*r)
-: lval_(l), expr_(r)
-{
-}
-
-PForce::~PForce()
-{
-      delete lval_;
-      delete expr_;
-}
-
 PForever::PForever(Statement*s)
 : statement_(s)
 {
@@ -236,32 +139,11 @@ PForever::~PForever()
       delete statement_;
 }
 
-PForStatement::PForStatement(PExpr*n1, PExpr*e1, PExpr*cond,
-			     PExpr*n2, PExpr*e2, Statement*st)
-: name1_(n1), expr1_(e1), cond_(cond), name2_(n2), expr2_(e2),
-  statement_(st)
-{
-}
-
-PForStatement::~PForStatement()
-{
-}
-
 PProcess::~PProcess()
 {
       delete statement_;
 }
 
-PRelease::PRelease(PExpr*l)
-: lval_(l)
-{
-}
-
-PRelease::~PRelease()
-{
-      delete lval_;
-}
-
 PRepeat::PRepeat(PExpr*e, Statement*s)
 : expr_(e), statement_(s)
 {
@@ -273,20 +155,6 @@ PRepeat::~PRepeat()
       delete statement_;
 }
 
-PTrigger::PTrigger(const hname_t&e)
-: event_(e)
-{
-}
-
-PTrigger::~PTrigger()
-{
-}
-
-PWhile::PWhile(PExpr*e1, Statement*st)
-: cond_(e1), statement_(st)
-{
-}
-
 PWhile::~PWhile()
 {
       delete cond_;
@@ -295,31 +163,77 @@ PWhile::~PWhile()
 
 /*
  * $Log: Statement.cc,v $
- * Revision 1.29  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
+ * Revision 1.16  1999/09/29 18:36:02  steve
+ *  Full case support
  *
- * Revision 1.28  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
+ * Revision 1.15  1999/09/22 02:00:48  steve
+ *  assignment with blocking event delay.
  *
- * Revision 1.27  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.14  1999/09/04 19:11:46  steve
+ *  Add support for delayed non-blocking assignments.
  *
- * Revision 1.26  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.13  1999/09/02 01:59:27  steve
+ *  Parse non-blocking assignment delays.
  *
- * Revision 1.25  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
+ * Revision 1.12  1999/07/12 00:59:36  steve
+ *  procedural blocking assignment delays.
  *
- * Revision 1.24  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
+ * Revision 1.11  1999/06/24 04:24:18  steve
+ *  Handle expression widths for EEE and NEE operators,
+ *  add named blocks and scope handling,
+ *  add registers declared in named blocks.
+ *
+ * Revision 1.10  1999/06/19 21:06:16  steve
+ *  Elaborate and supprort to vvm the forever
+ *  and repeat statements.
+ *
+ * Revision 1.9  1999/06/15 05:38:39  steve
+ *  Support case expression lists.
+ *
+ * Revision 1.8  1999/06/13 23:51:16  steve
+ *  l-value part select for procedural assignments.
+ *
+ * Revision 1.7  1999/06/06 20:45:38  steve
+ *  Add parse and elaboration of non-blocking assignments,
+ *  Replace list<PCase::Item*> with an svector version,
+ *  Add integer support.
+ *
+ * Revision 1.6  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.5  1999/02/03 04:20:11  steve
+ *  Parse and elaborate the Verilog CASE statement.
+ *
+ * Revision 1.4  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.3  1998/11/11 03:13:04  steve
+ *  Handle while loops.
+ *
+ * Revision 1.2  1998/11/07 17:05:05  steve
+ *  Handle procedural conditional, and some
+ *  of the conditional expressions.
+ *
+ *  Elaborate signals and identifiers differently,
+ *  allowing the netlist to hold signal information.
+ *
+ * Revision 1.1  1998/11/03 23:28:55  steve
+ *  Introduce verilog to CVS.
  *
- * Revision 1.23  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)
  */
 

Statement.h

@@ -1,7 +1,7 @@
 #ifndef __Statement_H
 #define __Statement_H
 /*
- * Copyright (c) 1998-2000 Stephen Williams ([email protected])
+ * Copyright (c) 1998 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,26 +18,18 @@
  *    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 $"
+#if !defined(WINNT)
+#ident "$Id: Statement.h,v 1.20 1999/09/29 18:36:02 steve Exp $"
 #endif
 
 # include  <string>
 # include  "svector.h"
-# include  "StringHeap.h"
 # include  "PDelays.h"
 # include  "PExpr.h"
-# include  "HName.h"
 # include  "LineInfo.h"
 class PExpr;
 class Statement;
 class PEventStatement;
-class Design;
-class NetAssign_;
-class NetCAssign;
-class NetDeassign;
-class NetForce;
-class NetScope;
 
 /*
  * The PProcess is the root of a behavioral process. Each process gets
@@ -58,8 +50,6 @@ class PProcess : public LineInfo {
       Type type() const { return type_; }
       Statement*statement() { return statement_; }
 
-      map<perm_string,PExpr*> attributes;
-
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -79,8 +69,7 @@ class Statement : public LineInfo {
       virtual ~Statement() =0;
 
       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 NetProc* elaborate(Design*des, const string&path) const;
 };
 
 /*
@@ -99,9 +88,11 @@ class PAssign_  : public Statement {
       const PExpr* rval() const  { return rval_; }
 
     protected:
-      NetAssign_* elaborate_lval(Design*, NetScope*scope) const;
+      NetNet*elaborate_lval(Design*, const string&path,
+			    unsigned&lsb, unsigned&msb,
+			    NetExpr*&mux) const;
 
-      PExpr* delay_;
+      PDelays delay_;
       PEventStatement*event_;
 
     private:
@@ -118,9 +109,11 @@ class PAssign  : public PAssign_ {
       ~PAssign();
 
       virtual void dump(ostream&out, unsigned ind) const;
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
 
     private:
+      NetProc*assign_to_memory_(class NetMemory*, PExpr*,
+				Design*des, const string&path) const;
 };
 
 class PAssignNB  : public PAssign_ {
@@ -131,11 +124,11 @@ class PAssignNB  : public PAssign_ {
       ~PAssignNB();
 
       virtual void dump(ostream&out, unsigned ind) const;
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
 
     private:
       NetProc*assign_to_memory_(class NetMemory*, PExpr*,
-				Design*des, NetScope*scope) const;
+				Design*des, const string&path) const;
 };
 
 /*
@@ -150,20 +143,21 @@ class PBlock  : public Statement {
     public:
       enum BL_TYPE { BL_SEQ, BL_PAR };
 
-      explicit PBlock(perm_string n, BL_TYPE t, const svector<Statement*>&st);
+      explicit PBlock(const string&n, BL_TYPE t, const svector<Statement*>&st);
       explicit PBlock(BL_TYPE t, const svector<Statement*>&st);
       explicit PBlock(BL_TYPE t);
       ~PBlock();
 
       BL_TYPE bl_type() const { return bl_type_; }
 
+	//unsigned size() const { return list_.count(); }
+	//const Statement*stat(unsigned idx) const { return list_[idx]; }
 
       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 NetProc* elaborate(Design*des, const string&path) const;
 
     private:
-      perm_string name_;
+      string name_;
       const BL_TYPE bl_type_;
       svector<Statement*>list_;
 };
@@ -171,10 +165,9 @@ class PBlock  : public Statement {
 class PCallTask  : public Statement {
 
     public:
-      explicit PCallTask(const hname_t&n, const svector<PExpr*>&parms);
-      ~PCallTask();
+      explicit PCallTask(const string&n, const svector<PExpr*>&parms);
 
-      const hname_t& path() const;
+      string name() const { return name_; }
 
       unsigned nparms() const { return parms_.count(); }
 
@@ -189,13 +182,13 @@ class PCallTask  : public Statement {
 	    }
 
       virtual void dump(ostream&out, unsigned ind) const;
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
 
     private:
-      NetProc* elaborate_sys(Design*des, NetScope*scope) const;
-      NetProc* elaborate_usr(Design*des, NetScope*scope) const;
+      NetProc* elaborate_sys(Design*des, const string&path) const;
+      NetProc* elaborate_usr(Design*des, const string&path) const;
 
-      hname_t path_;
+      const string name_;
       svector<PExpr*> parms_;
 };
 
@@ -210,8 +203,7 @@ class PCase  : public Statement {
       PCase(NetCase::TYPE, PExpr*ex, svector<Item*>*);
       ~PCase();
 
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -225,28 +217,14 @@ class PCase  : public Statement {
       PCase& operator= (const PCase&);
 };
 
-class PCAssign  : public Statement {
-
-    public:
-      explicit PCAssign(PExpr*l, PExpr*r);
-      ~PCAssign();
-
-      virtual NetCAssign* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*lval_;
-      PExpr*expr_;
-};
-
 class PCondit  : public Statement {
 
     public:
-      PCondit(PExpr*ex, Statement*i, Statement*e);
+      PCondit(PExpr*ex, Statement*i, Statement*e)
+      : expr_(ex), if_(i), else_(e) { }
       ~PCondit();
 
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -259,108 +237,50 @@ class PCondit  : public Statement {
       PCondit& operator= (const PCondit&);
 };
 
-class PDeassign  : public Statement {
-
-    public:
-      explicit PDeassign(PExpr*l);
-      ~PDeassign();
-
-      virtual NetDeassign* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*lval_;
-};
-
 class PDelayStatement  : public Statement {
 
     public:
-      PDelayStatement(PExpr*d, Statement*st);
-      ~PDelayStatement();
+      PDelayStatement(PExpr*d, Statement*st)
+      : delay_(d), 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 NetProc* elaborate(Design*des, const string&path) const;
 
     private:
       PExpr*delay_;
       Statement*statement_;
 };
 
-
-/*
- * This represents the parsing of a disable <scope> statement.
- */
-class PDisable  : public Statement {
-
-    public:
-      explicit PDisable(const hname_t&sc);
-      ~PDisable();
-
-      virtual void dump(ostream&out, unsigned ind) const;
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-
-    private:
-      hname_t scope_;
-};
-
-/*
- * The event statement represents the event delay in behavioral
- * code. It comes from such things as:
- *
- *      @name <statement>;
- *      @(expr) <statement>;
- *      @* <statement>;
- */
 class PEventStatement  : public Statement {
 
     public:
 
-      explicit PEventStatement(const svector<PEEvent*>&ee);
-      explicit PEventStatement(PEEvent*ee);
-	// Make an @* statement.
-      explicit PEventStatement(void);
+      PEventStatement(const svector<PEEvent*>&ee)
+      : expr_(ee), statement_(0) { }
 
-      ~PEventStatement();
+      PEventStatement(PEEvent*ee)
+      : expr_(1), statement_(0) { expr_[0] = ee; }
 
-      void set_statement(Statement*st);
+      void set_statement(Statement*st) { 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 NetProc* elaborate(Design*des, const string&path) const;
 
 	// This method is used to elaborate, but attach a previously
 	// elaborated statement to the event.
-      NetProc* elaborate_st(Design*des, NetScope*scope, NetProc*st) const;
-
-      NetProc* elaborate_wait(Design*des, NetScope*scope, NetProc*st) const;
+      NetProc* elaborate_st(Design*des, const string&path, NetProc*st) const;
 
     private:
       svector<PEEvent*>expr_;
       Statement*statement_;
 };
 
-class PForce  : public Statement {
-
-    public:
-      explicit PForce(PExpr*l, PExpr*r);
-      ~PForce();
-
-      virtual NetForce* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*lval_;
-      PExpr*expr_;
-};
-
 class PForever : public Statement {
     public:
       explicit PForever(Statement*s);
       ~PForever();
 
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -371,11 +291,12 @@ class PForStatement  : public Statement {
 
     public:
       PForStatement(PExpr*n1, PExpr*e1, PExpr*cond,
-		    PExpr*n2, PExpr*e2, Statement*st);
-      ~PForStatement();
+		    PExpr*n2, PExpr*e2, Statement*st)
+      : name1_(n1), expr1_(e1), cond_(cond), name2_(n2), expr2_(e2),
+	statement_(st)
+      { }
 
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -394,7 +315,6 @@ class PNoop  : public Statement {
 
     public:
       PNoop() { }
-      ~PNoop() { }
 };
 
 class PRepeat : public Statement {
@@ -402,8 +322,7 @@ class PRepeat : public Statement {
       explicit PRepeat(PExpr*expr, Statement*s);
       ~PRepeat();
 
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -411,44 +330,14 @@ class PRepeat : public Statement {
       Statement*statement_;
 };
 
-class PRelease  : public Statement {
-
-    public:
-      explicit PRelease(PExpr*l);
-      ~PRelease();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*lval_;
-};
-
-/*
- * The PTrigger statement sends a trigger to a named event. Take the
- * name here.
- */
-class PTrigger  : public Statement {
-
-    public:
-      explicit PTrigger(const hname_t&ev);
-      ~PTrigger();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      hname_t event_;
-};
-
 class PWhile  : public Statement {
 
     public:
-      PWhile(PExpr*e1, Statement*st);
+      PWhile(PExpr*e1, Statement*st)
+      : cond_(e1), statement_(st) { }
       ~PWhile();
 
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
+      virtual NetProc* elaborate(Design*des, const string&path) const;
       virtual void dump(ostream&out, unsigned ind) const;
 
     private:
@@ -458,84 +347,94 @@ class PWhile  : public Statement {
 
 /*
  * $Log: Statement.h,v $
- * Revision 1.42  2005/12/05 21:21:18  steve
- *  Fixes for stubborn compilers.
+ * Revision 1.20  1999/09/29 18:36:02  steve
+ *  Full case support
  *
- * 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.19  1999/09/22 02:00:48  steve
+ *  assignment with blocking event delay.
  *
- * Revision 1.40  2004/02/20 18:53:33  steve
- *  Addtrbute keys are perm_strings.
+ * Revision 1.18  1999/09/15 01:55:06  steve
+ *  Elaborate non-blocking assignment to memories.
  *
- * Revision 1.39  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
+ * Revision 1.17  1999/09/04 19:11:46  steve
+ *  Add support for delayed non-blocking assignments.
  *
- * Revision 1.38  2003/05/19 02:50:58  steve
- *  Implement the wait statement behaviorally instead of as nets.
+ * Revision 1.16  1999/09/02 01:59:27  steve
+ *  Parse non-blocking assignment delays.
  *
- * Revision 1.37  2003/01/30 16:23:07  steve
- *  Spelling fixes.
+ * Revision 1.15  1999/07/12 00:59:36  steve
+ *  procedural blocking assignment delays.
  *
- * Revision 1.36  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
+ * Revision 1.14  1999/07/03 02:12:51  steve
+ *  Elaborate user defined tasks.
  *
- * 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.13  1999/06/24 04:24:18  steve
+ *  Handle expression widths for EEE and NEE operators,
+ *  add named blocks and scope handling,
+ *  add registers declared in named blocks.
  *
- * 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.
+ * Revision 1.12  1999/06/19 21:06:16  steve
+ *  Elaborate and supprort to vvm the forever
+ *  and repeat statements.
  *
- *  Divide signal reference counts between rval
- *  and lval references.
+ * Revision 1.11  1999/06/15 05:38:39  steve
+ *  Support case expression lists.
  *
- * 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.10  1999/06/13 23:51:16  steve
+ *  l-value part select for procedural assignments.
  *
- * 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.9  1999/06/06 20:45:38  steve
+ *  Add parse and elaboration of non-blocking assignments,
+ *  Replace list<PCase::Item*> with an svector version,
+ *  Add integer support.
  *
- * 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.8  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.
  *
- * Revision 1.30  2001/11/22 06:20:59  steve
- *  Use NetScope instead of string for scope path.
+ *  Parse task declarations, integer types.
  *
- * Revision 1.29  2000/09/09 15:21:26  steve
- *  move lval elaboration to PExpr virtual methods.
+ * Revision 1.7  1999/04/29 02:16:26  steve
+ *  Parse OR of event expressions.
  *
- * Revision 1.28  2000/09/03 17:58:35  steve
- *  Change elaborate_lval to return NetAssign_ objects.
+ * Revision 1.6  1999/02/03 04:20:11  steve
+ *  Parse and elaborate the Verilog CASE statement.
  *
- * Revision 1.27  2000/07/26 05:08:07  steve
- *  Parse disable statements to pform.
+ * Revision 1.5  1999/01/25 05:45:56  steve
+ *  Add the LineInfo class to carry the source file
+ *  location of things. PGate, Statement and PProcess.
  *
- * Revision 1.26  2000/05/11 23:37:26  steve
- *  Add support for procedural continuous assignment.
+ *  elaborate handles module parameter mismatches,
+ *  missing or incorrect lvalues for procedural
+ *  assignment, and errors are propogated to the
+ *  top of the elaboration call tree.
  *
- * Revision 1.25  2000/04/22 04:20:19  steve
- *  Add support for force assignment.
+ *  Attach line numbers to processes, gates and
+ *  assignment statements.
  *
- * Revision 1.24  2000/04/12 04:23:57  steve
- *  Named events really should be expressed with PEIdent
- *  objects in the pform,
+ * Revision 1.4  1998/11/11 03:13:04  steve
+ *  Handle while loops.
  *
- *  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.
+ * Revision 1.3  1998/11/09 18:55:33  steve
+ *  Add procedural while loops,
+ *  Parse procedural for loops,
+ *  Add procedural wait statements,
+ *  Add constant nodes,
+ *  Add XNOR logic gate,
+ *  Make vvm output look a bit prettier.
+ *
+ * Revision 1.2  1998/11/07 17:05:05  steve
+ *  Handle procedural conditional, and some
+ *  of the conditional expressions.
+ *
+ *  Elaborate signals and identifiers differently,
+ *  allowing the netlist to hold signal information.
+ *
+ * Revision 1.1  1998/11/03 23:28:56  steve
+ *  Introduce verilog to CVS.
  *
- *  Do not generate NetPEvent or NetNEvent objects in
- *  elaboration. NetEvent, NetEvWait and NetEvProbe
- *  take over those functions in the netlist.
  */
 #endif

StringHeap.cc

@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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: StringHeap.cc,v 1.6 2004/02/18 17:11:54 steve Exp $"
-#endif
-
-# include  "StringHeap.h"
-#ifdef HAVE_MALLOC_H
-# include  <malloc.h>
-#endif
-# include  <stdlib.h>
-# include  <string.h>
-# include  <assert.h>
-
-StringHeap::StringHeap()
-{
-      cell_base_ = 0;
-      cell_ptr_ = HEAPCELL;
-      cell_count_ = 0;
-}
-
-StringHeap::~StringHeap()
-{
-	// This is a planned memory leak. The string heap is intended
-	// to hold permanently-allocated strings.
-}
-
-const char* StringHeap::add(const char*text)
-{
-      unsigned len = strlen(text);
-      assert((len+1) <= HEAPCELL);
-
-      unsigned rem = HEAPCELL - cell_ptr_;
-      if (rem < (len+1)) {
-	    cell_base_ = (char*)malloc(HEAPCELL);
-	    cell_ptr_ = 0;
-	    cell_count_ += 1;
-	    assert(cell_base_ != 0);
-      }
-
-      char*res = cell_base_ + cell_ptr_;
-      memcpy(res, text, len);
-      cell_ptr_ += len;
-      cell_base_[cell_ptr_++] = 0;
-
-      assert(cell_ptr_ <= HEAPCELL);
-
-      return res;
-}
-
-perm_string StringHeap::make(const char*text)
-{
-      return perm_string(add(text));
-}
-
-
-StringHeapLex::StringHeapLex()
-{
-      hit_count_ = 0;
-      add_count_ = 0;
-
-      for (unsigned idx = 0 ;  idx < HASH_SIZE ;  idx += 1)
-	    hash_table_[idx] = 0;
-}
-
-StringHeapLex::~StringHeapLex()
-{
-}
-
-unsigned StringHeapLex::add_hit_count() const
-{
-      return hit_count_;
-}
-
-unsigned StringHeapLex::add_count() const
-{
-      return add_count_;
-}
-
-static unsigned hash_string(const char*text)
-{
-      unsigned h = 0;
-
-      while (*text) {
-	    h = (h << 4) ^ (h >> 28) ^ *text;
-	    text += 1;
-      }
-      return h;
-}
-
-const char* StringHeapLex::add(const char*text)
-{
-      unsigned hash_value = hash_string(text) % HASH_SIZE;
-
-	/* If we easily find the string in the hash table, then return
-	   that and be done. */
-      if (hash_table_[hash_value]
-	  && (strcmp(hash_table_[hash_value], text) == 0)) {
-	    hit_count_ += 1;
-	    return hash_table_[hash_value];
-      }
-
-	/* The existing hash entry is not a match. Replace it with the
-	   newly allocated value, and return the new pointer as the
-	   result to the add. */
-      const char*res = StringHeap::add(text);
-      hash_table_[hash_value] = res;
-      add_count_ += 1;
-
-      return res;
-}
-
-perm_string StringHeapLex::make(const char*text)
-{
-      return perm_string(add(text));
-}
-
-perm_string StringHeapLex::make(const string&text)
-{
-      return perm_string(add(text.c_str()));
-}
-
-bool operator == (perm_string a, const char*b)
-{
-      if (a.str() == b)
-	    return true;
-
-      if (! (a.str() && b))
-	    return false;
-
-      if (strcmp(a.str(), b) == 0)
-	    return true;
-
-      return false;
-}
-
-bool operator == (perm_string a, perm_string b)
-{
-      return a == b.str();
-}
-
-bool operator != (perm_string a, const char*b)
-{
-      return ! (a == b);
-}
-
-bool operator != (perm_string a, perm_string b)
-{
-      return ! (a == b);
-}
-
-bool operator < (perm_string a, perm_string b)
-{
-      if (b.str() && !a.str())
-	    return true;
-
-      if (b.str() == a.str())
-	    return false;
-
-      if (strcmp(a.str(), b.str()) < 0)
-	    return true;
-
-      return false;
-}
-
-/*
- * $Log: StringHeap.cc,v $
- * Revision 1.6  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.5  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.
- *
- * Revision 1.4  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.3  2003/01/16 21:44:46  steve
- *  Keep some debugging status.
- *
- * Revision 1.2  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.1  2002/08/04 19:13:16  steve
- *  dll uses StringHeap for named items.
- *
- */
-

StringHeap.h

@@ -1,147 +0,0 @@
-#ifndef __StringHeap_H
-#define __StringHeap_H
-/*
- * Copyright (c) 2002-2004 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: StringHeap.h,v 1.6 2005/06/14 19:13:43 steve Exp $"
-#endif
-
-# include  "config.h"
-# include  <string>
-
-using namespace std;
-
-class perm_string {
-
-    public:
-      perm_string() : text_(0) { }
-      perm_string(const perm_string&that) : text_(that.text_) { }
-      ~perm_string() { }
-
-      perm_string& operator = (const perm_string&that)
-      { text_ = that.text_; return *this; }
-
-      const char*str() const { return text_; }
-      operator const char* () const { return str(); }
-
-	// This is an escape for making perm_string objects out of
-	// literals. For example, per_string::literal("Label"); Please
-	// do *not* cheat and pass arbitrary const char* items here.
-      static perm_string literal(const char*t) { return perm_string(t); }
-
-    private:
-      friend class StringHeap;
-      friend class StringHeapLex;
-      perm_string(const char*t) : text_(t) { };
-
-    private:
-      const char*text_;
-};
-
-extern bool operator == (perm_string a, perm_string b);
-extern bool operator == (perm_string a, const char* b);
-extern bool operator != (perm_string a, perm_string b);
-extern bool operator != (perm_string a, const char* b);
-extern bool operator >  (perm_string a, perm_string b);
-extern bool operator <  (perm_string a, perm_string b);
-extern bool operator >= (perm_string a, perm_string b);
-extern bool operator <= (perm_string a, perm_string b);
-
-/*
- * The string heap is a way to permanently allocate strings
- * efficiently. They only take up the space of the string characters
- * and the terminating nul, there is no malloc overhead.
- */
-class StringHeap {
-
-    public:
-      StringHeap();
-      ~StringHeap();
-
-      const char*add(const char*);
-      perm_string make(const char*);
-
-    private:
-      enum { HEAPCELL = 0x10000 };
-
-      char*cell_base_;
-      unsigned cell_ptr_;
-      unsigned cell_count_;
-
-    private: // not implemented
-      StringHeap(const StringHeap&);
-      StringHeap& operator= (const StringHeap&);
-};
-
-/*
- * A lexical string heap is a string heap that makes an effort to
- * return the same pointer for identical strings. This saves further
- * space by not allocating duplicate strings, so in a system with lots
- * of identifiers, this can theoretically save more space.
- */
-class StringHeapLex  : private StringHeap {
-
-    public:
-      StringHeapLex();
-      ~StringHeapLex();
-
-      const char*add(const char*);
-      perm_string make(const char*);
-      perm_string make(const string&);
-
-      unsigned add_count() const;
-      unsigned add_hit_count() const;
-
-    private:
-      enum { HASH_SIZE = 4096 };
-      const char*hash_table_[HASH_SIZE];
-
-      unsigned add_count_;
-      unsigned hit_count_;
-
-    private: // not implemented
-      StringHeapLex(const StringHeapLex&);
-      StringHeapLex& operator= (const StringHeapLex&);
-};
-
-/*
- * $Log: StringHeap.h,v $
- * Revision 1.6  2005/06/14 19:13:43  steve
- *  gcc3/4 compile errors.
- *
- * Revision 1.5  2004/02/18 17:11:54  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.4  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.
- *
- * Revision 1.3  2003/01/16 21:44:46  steve
- *  Keep some debugging status.
- *
- * Revision 1.2  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.1  2002/08/04 19:13:16  steve
- *  dll uses StringHeap for named items.
- *
- */
-#endif

_pli_types.h.in

@@ -1,126 +0,0 @@
-#ifndef PLI_TYPES
-#define PLI_TYPES
-/*
- * Copyright (c) 2003 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: _pli_types.h.in,v 1.7 2003/11/12 02:38:44 steve Exp $"
-#endif
-
-# undef HAVE_INTTYPES_H
-
-#ifdef HAVE_INTTYPES_H
-
-/*
- * If the host environment has the stdint.h header file,
- * then use that to size our PLI types.
- */
-#ifndef __STDC_FORMAT_MACROS
-# define __STDC_FORMAT_MACROS
-#endif
-
-# include  <inttypes.h>
-typedef uint64_t PLI_UINT64;
-typedef int64_t  PLI_INT64;
-typedef uint32_t PLI_UINT32;
-typedef int32_t  PLI_INT32;
-
-typedef signed short   PLI_INT16;
-typedef unsigned short PLI_UINT16;
-typedef signed char    PLI_BYTE8;
-typedef unsigned char  PLI_UBYTE8;
-
-# define PLI_UINT64_FMT PRIu64
-
-#else
-
-/*
- * If we do not have the c99 stdint.h header file, then use
- * configure detection to guess the pli types ourselves.
- */
-
-# define SIZEOF_UNSIGNED_LONG_LONG 8
-# define SIZEOF_UNSIGNED_LONG 8
-# define SIZEOF_UNSIGNED 4
-
-#if SIZEOF_UNSIGNED >= 8
-typedef unsigned PLI_UINT64;
-typedef int      PLI_INT64;
-# define PLI_UINT64_FMT "u"
-#else
-# if SIZEOF_UNSIGNED_LONG >= 8
-typedef unsigned long PLI_UINT64;
-typedef          long PLI_INT64;
-#  define PLI_UINT64_FMT "lu"
-# else
-#  if SIZEOF_UNSIGNED_LONG_LONG > SIZEOF_UNSIGNED_LONG
-typedef unsigned long long PLI_UINT64;
-typedef          long long PLI_INT64;
-#   define PLI_UINT64_FMT "llu"
-#  else
-typedef unsigned long PLI_UINT64;
-typedef          long PLI_INT64;
-#   define PLI_UINT64_FMT "lu"
-#  endif
-# endif
-#endif
-
-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 unsigned char  PLI_UBYTE8;
-#endif
-
-/*
- * $Log: _pli_types.h.in,v $
- * Revision 1.7  2003/11/12 02:38:44  steve
- *  Clean up manual definitions of PLI_UINT64_FMT.
- *
- * Revision 1.6  2003/11/08 20:06:21  steve
- *  Spelling fixes in comments.
- *
- * Revision 1.5  2003/10/29 03:28:27  steve
- *  Add the PLU_UINT64_FMT string for formatting output.
- *
- * Revision 1.4  2003/10/29 03:23:12  steve
- *  Portably handle time format of VCD prints.
- *
- * Revision 1.3  2003/10/02 21:30:06  steve
- *  Use configured TIME_FMT in vcd dump printf.
- *
- * Revision 1.2  2003/10/02 19:33:44  steve
- *  Put libraries in libdir64.
- *
- * Revision 1.1  2003/09/30 01:33:13  steve
- *  Add PLI_UINT64 to _pli_types.h.
- *
- * Revision 1.2  2003/05/26 04:39:16  steve
- *  Typo type name.
- *
- * Revision 1.1  2003/02/17 06:39:47  steve
- *  Add at least minimal implementations for several
- *  acc_ functions. Add support for standard ACC
- *  string handling.
- *
- *  Add the _pli_types.h header file to carry the
- *  IEEE1364-2001 standard PLI type declarations.
- *
- */
-#endif

acc_user.h

@@ -1,354 +0,0 @@
-#ifndef __acc_user_H
-#define __acc_user_H
-/*
- * Copyright (c) 2002 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: acc_user.h,v 1.20 2003/12/17 15:45:07 steve Exp $"
-#endif
-
-/*
- * This header file contains the definitions and declarations needed
- * by an Icarus Verilog user using acc_ routines.
- *
- * NOTE: Icarus Verilog does not support acc_ routines. This is just a
- * stub. The functions that are implemented here are actually
- * implemented using VPI routines.
- */
-
-
-#ifdef __cplusplus
-# define EXTERN_C_START extern "C" {
-# define EXTERN_C_END }
-#else
-# define EXTERN_C_START
-# define EXTERN_C_END
-# define bool int
-#endif
-
-EXTERN_C_START
-
-# include  "_pli_types.h"
-
-/*
- * This is a declaration of the "handle" type that is compatible with
- * the vpiHandle from vpi_user.h. The libveriuser library implements
- * the acc handle type as a vpiHandle, to prevent useless indirection.
- */
-typedef struct __vpiHandle *handle;
-
-/* OBJECT TYPES */
-#define accModule    20
-#define accScope     21
-#define accNet       25
-#define accReg       30
-#define accIntegerParam   200
-#define accRealParam 202
-#define accStringParam 204
-#define accParameter   220
-#define accTopModule      224
-#define accModuleInstance 226
-#define accWire        260
-#define accNamedEvent  280
-#define accIntegerVar  281
-#define accRealVar   282
-#define accTimeVar   283
-#define accIntVar    accIntegerVar
-#define accScalar    300
-#define accVector    302
-#define accUnknown   412
-#define accConstant  600
-
-/* type VALUES FOR t_setval_delay STRUCTURE */
-#define accNoDelay  0
-#define accInertialDelay 1
-#define accTransportDelay 2
-#define accPureTransportDelay 3
-#define accForceFlag 4
-#define accReleaseFlag 5
-
-/* type VALUES FOR t_setval_value STRUCTURE */
-#define accBinStrVal 1
-#define accOctStrVal 2
-#define accDecStrVal 3
-#define accHexStrVal 4
-#define accScalarVal 5
-#define accIntVal 6
-#define accRealVal 7
-#define accStringVal 8
-#define accVectorVal 9
-
-/* Scalar values */
-#define acc0 0
-#define acc1 1
-#define accX 2
-#define accZ 3
-
-/* type VALUES FOR t_acc_time STRUCTURE */
-#define accTime 1
-#define accSimTime 2
-#define accRealTime 3
-
-/* reason codes */
-#define logic_value_change     1
-#define strength_value_change  2
-#define real_value_change      3
-#define vector_value_change    4
-#define event_value_change     5
-#define integer_value_change   6
-#define time_value_change      7
-#define sregister_value_change 8
-#define vregister_value_change 9
-#define realtime_value_change 10
-
-/* VCL strength values */
-#define vclSupply  7
-#define vclStrong  6
-#define vclPull    5
-#define vclLarge   4
-#define vclWeak    3
-#define vclMedium  2
-#define vclSmall   1
-#define vclHighZ   0
-
-/* Constants used by acc_vcl_add */
-#define vcl_verilog_logic 2
-#define VCL_VERILOG_LOGIC vcl_verilog_logic
-#define vcl_verilog_strength 3
-#define VCL_VERILOG_STRENGTH vcl_verilog_strength
-
-typedef struct t_acc_time {
-      int type;
-      int low, high;
-      double real;
-} s_acc_time, *p_acc_time;
-
-typedef struct t_setval_delay {
-      s_acc_time time;
-      int model;
-} s_setval_delay, *p_setval_delay;
-
-typedef struct t_acc_vecval {
-      int aval;
-      int bval;
-} s_acc_vecval, *p_acc_vecval;
-
-typedef struct t_setval_value {
-      int format;
-      union {
-	    char*str;
-	    int scalar;
-	    int integer;
-	    double real;
-	    p_acc_vecval vector;
-      } value;
-} s_setval_value, *p_setval_value, s_acc_value, *p_acc_value;
-
-typedef struct t_strengths {
-      PLI_UBYTE8 logic_value;
-      PLI_UBYTE8 strength1;
-      PLI_UBYTE8 strength2;
-} s_strengths, *p_strengths;
-
-typedef struct t_vc_record {
-      PLI_INT32 vc_reason;
-      PLI_INT32 vc_hightime;
-      PLI_INT32 vc_lowtime;
-      void*     user_data;
-      union {
-	    PLI_UBYTE8 logic_value;
-	    double real_value;
-	    handle vector_handle;
-	    s_strengths strengths_s;
-      } out_value;
-} s_vc_record, *p_vc_record;
-
-
-typedef struct t_location {
-      PLI_INT32 line_no;
-      const char*filename;
-} s_location, *p_location;
-
-extern int acc_error_flag;
-
-extern int acc_initialize(void);
-
-extern void acc_close(void);
-
-/*
- * This is the acc_configure command, and the config_param
- * codes that are accepted.
- */
-extern int   acc_configure(PLI_INT32 config_param, const char*value);
-#define accEnableArgs          6
-#define accDevelopmentVersion 11
-
-extern int   acc_fetch_argc(void);
-extern char**acc_fetch_argv(void);
-
-extern PLI_INT32 acc_fetch_direction(handle obj);
-/* XXXX FIXME: Values returned by acc_fetch_direction */
-# define accInout 2
-
-extern char* acc_fetch_fullname(handle obj);
-
-extern int   acc_fetch_location(p_location loc, handle obj);
-
-extern char* acc_fetch_name(handle obj);
-extern char* acc_fetch_defname(handle obj);
-
-extern double acc_fetch_paramval(handle obj);
-
-extern double    acc_fetch_tfarg(PLI_INT32);
-extern double    acc_fetch_itfarg(PLI_INT32, handle);
-extern PLI_INT32 acc_fetch_tfarg_int(PLI_INT32);
-extern PLI_INT32 acc_fetch_itfarg_int(PLI_INT32, handle);
-extern char*     acc_fetch_tfarg_str(PLI_INT32);
-extern char*     acc_fetch_itfarg_str(PLI_INT32, handle);
-
-typedef struct t_timescale_info {
-      PLI_INT16 unit;
-      PLI_INT16 precision;
-} s_timescale_info, *p_timescale_info;
-extern void acc_fetch_timescale_info(handle obj, p_timescale_info info);
-
-extern PLI_INT32 acc_fetch_size(handle obj);
-
-extern PLI_INT32 acc_fetch_type(handle obj);
-extern PLI_INT32 acc_fetch_fulltype(handle obj);
-extern PLI_INT32 acc_fetch_range(handle object, int *msb, int *lsb);
-extern char*     acc_fetch_type_str(PLI_INT32 type);
-
-extern char* acc_fetch_value(handle obj, const char*fmt, s_acc_value*value);
-
-extern handle acc_handle_by_name(const char*name, handle scope);
-extern handle acc_handle_hiconn(handle port_ref_handle);
-extern handle acc_handle_object(const char*name);
-extern handle acc_handle_parent(handle obj);
-extern handle acc_handle_scope(handle obj);
-extern handle acc_handle_simulated_net(handle net);
-
-extern handle acc_handle_tfarg(int n);
-extern handle acc_handle_tfinst(void);
-
-extern PLI_INT32 acc_compare_handles(handle, handle);
-
-extern handle acc_next(PLI_INT32 *, handle, handle);
-extern handle acc_next_bit(handle ref, handle bit);
-extern handle acc_next_port(handle ref, handle bit);
-extern handle acc_next_scope(handle, handle);
-extern handle acc_next_topmod(handle prev_topmod);
-
-extern int acc_object_in_typelist(handle object, PLI_INT32*typelist);
-extern int acc_object_of_type(handle object, PLI_INT32 type);
-
-extern char*acc_product_version(void);
-
-extern char*acc_set_scope(handle ref, ...);
-
-extern int acc_set_value(handle obj, p_setval_value value,
-			 p_setval_delay delay);
-
-extern void acc_vcl_add(handle obj, PLI_INT32(*consumer)(p_vc_record),
-			void*data, PLI_INT32 vcl_flag);
-extern  void acc_vcl_delete(handle obj, PLI_INT32(*consumer)(p_vc_record),
-			    void*data, PLI_INT32 vcl_flag);
-
-extern char* acc_version(void);
-
-EXTERN_C_END
-
-/*
- * $Log: acc_user.h,v $
- * Revision 1.20  2003/12/17 15:45:07  steve
- *  Add acc_set_scope function.
- *
- * Revision 1.19  2003/10/10 02:57:45  steve
- *  Some PLI1 stubs.
- *
- * Revision 1.18  2003/06/13 19:23:41  steve
- *  Add a bunch more PLI1 routines.
- *
- * Revision 1.17  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.16  2003/05/30 04:18:31  steve
- *  Add acc_next function.
- *
- * Revision 1.15  2003/05/29 02:35:41  steve
- *  acc_fetch_type supports module.
- *
- * Revision 1.14  2003/05/29 02:21:45  steve
- *  Implement acc_fetch_defname and its infrastructure in vvp.
- *
- * Revision 1.13  2003/05/24 03:02:04  steve
- *  Add implementation of acc_handle_by_name.
- *
- * Revision 1.12  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.11  2003/04/24 18:57:05  steve
- *  Add acc_fetch_fulltype function.
- *
- * Revision 1.10  2003/04/20 02:48:39  steve
- *  Support value change callbacks.
- *
- * Revision 1.9  2003/04/12 18:57:13  steve
- *  More acc_ function stubs.
- *
- * Revision 1.8  2003/03/13 04:35:09  steve
- *  Add a bunch of new acc_ and tf_ functions.
- *
- * Revision 1.7  2003/02/17 06:39:47  steve
- *  Add at least minimal implementations for several
- *  acc_ functions. Add support for standard ACC
- *  string handling.
- *
- *  Add the _pli_types.h header file to carry the
- *  IEEE1364-2001 standard PLI type declarations.
- *
- * Revision 1.6  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.5  2002/06/11 15:19:12  steve
- *  Add acc_fetch_argc/argv/version (mruff)
- *
- * Revision 1.4  2002/06/07 02:58:58  steve
- *  Add a bunch of acc/tf functions. (mruff)
- *
- * Revision 1.3  2002/06/02 19:03:29  steve
- *  Add acc_handle_tfarg and acc_next_topmode
- *
- * Revision 1.2  2002/05/30 02:06:05  steve
- *  Implement acc_product_version.
- *
- * Revision 1.1  2002/05/23 03:46:42  steve
- *  Add the acc_user.h header file.
- *
- */
-
-#endif

aclocal.m4

@@ -1,207 +0,0 @@
-# AX_CPP_IDENT
-# ------------
-# Check if the C compiler supports #ident
-# Define and substitute ident_support if so.
-#
-# It would be simpler and more consistent with the rest of the autoconf
-# structure to AC_DEFINE(HAVE_CPP_IDENT) instead of
-# ident_support='-DHAVE_CVS_IDENT=1' and AC_SUBST(ident_support), but that
-# change would require all C files in the icarus top level directory to
-# put #include <config.h> before the #ifdef HAVE_CVS_IDENT (and change
-# HAVE_CVS_IDENT to HAVE_CPP_IDENT).   That would also remove all special
-# ident_support handling from the Makefile.  Manyana.
-#
-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 $"
-],[while (0) {}],
-[AS_VAR_SET(ax_cv_cpp_ident, yes)],
-[AS_VAR_SET(ax_cv_cpp_ident, no)])])
-if test $ax_cv_cpp_ident = yes; then
-  ident_support='-DHAVE_CVS_IDENT=1'
-fi
-AC_SUBST(ident_support)
-])# AC_CPP_IDENT
-
-
-# _AX_C_UNDERSCORES_MATCH_IFELSE(PATTERN, ACTION-IF-MATCH, ACTION-IF-NOMATCH)
-# ------------------------------
-# Sub-macro for AX_C_UNDERSCORES_LEADING and AX_C_UNDERSCORES_TRAILING.
-# Unwarranted assumptions:
-#   - the object file produced by AC_COMPILE_IFELSE is called "conftest.$ac_objext"
-#   - the nm(1) utility is available, and its name is "nm".
-AC_DEFUN([_AX_C_UNDERSCORES_MATCH_IF],
-[AC_COMPILE_IFELSE([void underscore(void){}],
-[AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
-[AC_MSG_ERROR([underscore test crashed])]
-)])
-
-
-# AX_C_UNDERSCORES_LEADING
-# ---------------------------------
-# Check if symbol names in object files produced by C compiler have
-# leading underscores. Define NEED_LU if so.
-AC_DEFUN([AX_C_UNDERSCORES_LEADING],
-[AC_CACHE_CHECK([for leading underscores], ax_cv_c_underscores_leading,
-[_AX_C_UNDERSCORES_MATCH_IF([_underscore],
-[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)
-fi
-])# AX_C_UNDERSCORES_LEADING
-
-
-# AX_C_UNDERSCORES_TRAILING
-# ---------------------------------
-# Check if symbol names in object files produced by C compiler have
-# trailing underscores.  Define NEED_TU if so.
-AC_DEFUN([AX_C_UNDERSCORES_TRAILING],
-[AC_CACHE_CHECK([for trailing underscores], ax_cv_c_underscores_trailing,
-[_AX_C_UNDERSCORES_MATCH_IF([underscore_],
-[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)
-fi
-])# AX_C_UNDERSCORES_TRAILING
-
-# AX_WIN32
-# --------
-# Combined check for several flavors of Microsoft Windows so
-# their "issues" can be dealt with
-AC_DEFUN([AX_WIN32],
-[AC_CYGWIN
-AC_MINGW32
-WIN32=no
-AC_MSG_CHECKING([for Microsoft Windows])
-if test "$CYGWIN" = "yes" -o "$MINGW32" = "yes"
-then
-    WIN32=yes
-fi
-AC_SUBST(MINGW32)
-AC_SUBST(WIN32)
-AC_MSG_RESULT($WIN32)
-])# AX_WIN32
-
-# AX_LD_EXTRALIBS
-# ---------------
-# mingw needs to link with libiberty.a, but cygwin alone can't tolerate it
-AC_DEFUN([AX_LD_EXTRALIBS],
-[AC_MSG_CHECKING([for extra libs needed])
-EXTRALIBS=
-case "${host}" in
-     *-*-cygwin* )
-        if test "$MINGW32" = "yes"; then
-            EXTRALIBS="-liberty"
-        fi
-        ;;
-esac
-AC_SUBST(EXTRALIBS)
-AC_MSG_RESULT($EXTRALIBS)
-])# AX_LD_EXTRALIBS
-
-# AX_LD_SHAREDLIB_OPTS
-# --------------------
-# linker options when building a shared library
-AC_DEFUN([AX_LD_SHAREDLIB_OPTS],
-[AC_MSG_CHECKING([for shared library link flag])
-shared=-shared
-case "${host}" in
-     *-*-cygwin*)
-        shared="-shared -Wl,--enable-auto-image-base"
-        ;;
-
-     *-*-hpux*)
-        shared="-b"
-        ;;
-
-     *-*-darwin1.[0123])
-        shared="-bundle -undefined suppress"
-        ;;
-
-     *-*-darwin*)
-        shared="-bundle -undefined suppress -flat_namespace"
-        ;;
-esac
-AC_SUBST(shared)
-AC_MSG_RESULT($shared)
-])# AX_LD_SHAREDLIB_OPTS
-
-# AX_C_PICFLAG
-# ------------
-# The -fPIC flag is used to tell the compiler to make position
-# independent code. It is needed when making shared objects.
-AC_DEFUN([AX_C_PICFLAG],
-[AC_MSG_CHECKING([for flag to make position independent code])
-PICFLAG=-fPIC
-case "${host}" in
-
-     *-*-cygwin*)
-        PICFLAG=
-        ;;
-
-     *-*-hpux*)
-        PICFLAG=+z
-        ;;
-
-esac
-AC_SUBST(PICFLAG)
-AC_MSG_RESULT($PICFLAG)
-])# AX_C_PICFLAG
-
-# AX_LD_RDYNAMIC
-# --------------
-# The -rdynamic flag is used by iverilog when compiling the target,
-# to know how to export symbols of the main program to loadable modules
-# that are brought in by -ldl
-AC_DEFUN([AX_LD_RDYNAMIC],
-[AC_MSG_CHECKING([for -rdynamic compiler flag])
-rdynamic=-rdynamic
-case "${host}" in
-
-    *-*-netbsd*)
-        rdynamic="-Wl,--export-dynamic"
-        ;;
-
-    *-*-openbsd*)
-        rdynamic="-Wl,--export-dynamic"
-        ;;
-
-    *-*-solaris*)
-        rdynamic=""
-        ;;
-
-    *-*-cygwin*)
-        rdynamic=""
-        ;;
-
-    *-*-hpux*)
-        rdynamic="-E"
-        ;;
-
-    *-*-darwin*)
-        rdynamic="-Wl,-all_load"
-        strip_dynamic="-SX"
-        ;;
-
-esac
-AC_SUBST(rdynamic)
-AC_MSG_RESULT($rdynamic)
-AC_SUBST(strip_dynamic)
-# since we didn't tell them we're "checking", no good place to tell the answer
-# AC_MSG_RESULT($strip_dynamic)
-])# AX_LD_RDYNAMIC
-
-# AX_CPP_PRECOMP
-# --------------
-AC_DEFUN([AX_CPP_PRECOMP],
-[# Darwin requires -no-cpp-precomp
-case "${host}" in
-    *-*-darwin*)
-        CPPFLAGS="-no-cpp-precomp $CPPFLAGS"
-        CFLAGS="-no-cpp-precomp $CFLAGS"
-        ;;
-esac
-])# AX_CPP_PRECOMP

async.cc

@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2002 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: async.cc,v 1.7 2004/01/18 23:26:54 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  "functor.h"
-# include  "netlist.h"
-# include  <assert.h>
-
-bool NetAssign::is_asynchronous()
-{
-      return true;
-}
-
-bool NetCondit::is_asynchronous()
-{
-      return false;
-}
-
-/*
- * NetEvWait statements come from statements of the form @(...) in the
- * Verilog source. These event waits are considered asynchronous if
- * all of the events in the list are ANYEDGE, and all the inputs to
- * the statement are included in the sensitivity list. If any of the
- * events are posedge or negedge, the statement is synchronous
- * (i.e. an edge-triggered flip-flop) and if any of the inputs are
- * unaccounted for in the sensitivity list then the statement is a
- * latch.
- */
-bool NetEvWait::is_asynchronous()
-{
-	/* The "sense" set contains the set of Nexa that are in the
-	   sensitivity list. We also require that the events are all
-	   level sensitive, but the nex_async_ method takes care of
-	   that test. */
-      NexusSet*sense = new NexusSet;
-      for (unsigned idx = 0 ;  idx < nevents_ ;  idx += 1) {
-	    NexusSet*tmp = event(idx)->nex_async_();
-	    if (tmp == 0) {
-		  delete sense;
-		  return false;
-	    }
-
-	    sense->add(*tmp);
-	    delete tmp;
-      }
-
-      NexusSet*inputs = statement_->nex_input();
-
-      if (! sense->contains(*inputs)) {
-	    delete sense;
-	    delete inputs;
-	    return false;
-      }
-
-      delete sense;
-      delete inputs;
-
-	/* If it passes all the other tests, then this statement is
-	   asynchronous. */
-      return true;
-}
-
-bool NetProc::is_asynchronous()
-{
-      return false;
-}
-
-bool NetProcTop::is_asynchronous()
-{
-      if (type_ == NetProcTop::KINITIAL)
-	    return false;
-
-      return statement_->is_asynchronous();
-}
-
-/*
- * $Log: async.cc,v $
- * Revision 1.7  2004/01/18 23:26:54  steve
- *  The is_combinational function really need not recurse.
- *
- * Revision 1.6  2003/12/20 00:33:39  steve
- *  More thorough check that NetEvWait is asynchronous.
- *
- * Revision 1.5  2003/09/04 20:28:05  steve
- *  Support time0 resolution of combinational threads.
- *
- * Revision 1.4  2002/08/18 22:07:16  steve
- *  Detect temporaries in sequential block synthesis.
- *
- * Revision 1.3  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.2  2002/07/04 00:24:16  steve
- *  initial statements are not asynchronous.
- *
- * Revision 1.1  2002/06/30 02:21:31  steve
- *  Add structure for asynchronous logic synthesis.
- *
- */
-

attributes.txt

@@ -1,85 +0,0 @@
-
-ATTRIBUTE NAMING CONVENTIONS
-
-Attributes that are specific to Icarus Verilog, and are intended to be
-of use to programmers, start with the prefix "ivl_".
-
-Attributes with the "_ivl_" prefix are set aside for internal
-use. They may be generated internally by the compiler. They need not
-be documented here.
-
-ATTRIBUTES TO CONTROL SYNTHESIS
-
-The following is a summary of Verilog attributes that Icarus Verilog
-understands within Verilog source files to control synthesis
-behavior. This section documents generic synthesis attributes. For
-target specific attributes, see target specific documentation.
-
-These attributes only effect the behavior of the synthesizer. For
-example, the ivl_combinational will not generate an error message
-if the Verilog is being compiled for simulation. (It may generate a
-warning.)
-
-
-* Attributes for "always" and "initial" statements
-
-(* ivl_combinational *)
-
-    This attribute tells the compiler that the statement models
-    combinational logic. If the compiler finds that it cannot make
-    combinational logic out of a marked always statement, it will
-    report an error.
-
-    This attribute can be used to prevent accidentally inferring
-    latches or flip-flops where the user intended combinational
-    logic.
-
-(* ivl_synthesis_on *)
-
-    This attribute tells the compiler that the marked always statement
-    is synthesizable. The compiler will attempt to synthesize the
-    code in the marked "always" statement. If it cannot in any way
-    synthesize it, then it will report an error.
-
-(* ivl_synthesis_off *)
-
-    If this value is attached to an "always" statement, then the
-    compiler will *not* synthesize the "always" statement. This can be
-    used, for example, to mark embedded test bench code.
-
-
-* Attributes for modules
-
-(* ivl_synthesis_cell *)
-
-    If this value is attached to a module during synthesis, that
-    module will be considered a target architecture primitive, and
-    its interior will not be synthesized further.  The module can
-    therefore hold a model for simulation purposes.
-
-
-* Attributes for signals (wire/reg/integer/tri/etc.)
-
-(* PAD = "<pad assignment list>" *)
-
-    If this attribute is attached to a signal that happens to be a
-    root module port, then targets that support it will use the string
-    value as a list of pin assignments for the port/signal. The format
-    is a comma separated list of location tokens, with the format of
-    the token itself defined by the back-end tools in use.
-
-* Other Attributes
-
-[ none defined yet ]
-
-
-MISC
-
-(* _ivl_schedule_push *)
-
-    If this attribute is attached to a thread object (always or
-    initial statement) then the vvp code generator will generate code
-    that causes the scheduler to push this thread at compile time. The
-    compiler may internally add this attribute to always statements if
-    it detects that it is combinational. This helps resolve time-0
-    races.

autoconf.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-#
-# This shell script exists to run autoconf on source distributions
-# that are pulled from CVS. The configure scripts are not included
-# in CVS, and there are several configure.in files, so it is easiest
-# to just run this script to autoconf wherever needed.
-#
-echo "Autoconf in root..."
-autoconf -f
-
-for dir in vpip vpi vvp tgt-vvp tgt-fpga tgt-stub libveriuser cadpli
-do
-    echo "Autoconf in $dir..."
-    ( cd ./$dir ; autoconf -f --include=.. )
-done
-
-echo "Precompiling lexor_keyword.gperf"
-gperf -o -i 7 -C -k 1-3,\$ -L ANSI-C -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc

cadpli/.cvsignore

@@ -1,7 +0,0 @@
-Makefile
-cadpli.vpl
-dep
-configure
-config.log
-config.status
-autom4te.cache

cadpli/Makefile.in

@@ -1,107 +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: Makefile.in,v 1.12 2006/02/15 18:42:42 steve Exp $"
-#
-#
-SHELL = /bin/sh
-
-VERSION = 0.0
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-srcdir = @srcdir@
-
-VPATH = $(srcdir)
-
-bindir = @bindir@
-libdir = @libdir@
-includedir = $(prefix)/include
-
-vpidir = @libdir@/ivl/@vpidir1@
-
-strip_dynamic=@strip_dynamic@
-
-CC = @CC@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-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.
-check: all
-
-dep:
-	mkdir dep
-
-%.o: %.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $<
-	mv $*.d dep
-
-O = cadpli.o
-
-SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
-ifeq (@WIN32@,yes)
-    SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
-endif
-
-cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
-	$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
-
-clean:
-	rm -rf *.o dep cadpli.vpl bin32
-
-distclean: clean
-	rm -f Makefile config.status config.log config.cache
-
-install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32)
-
-$(vpidir)/cadpli.vpl: ./cadpli.vpl
-	$(INSTALL_PROGRAM) ./cadpli.vpl $(vpidir)/cadpli.vpl
-
-installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(vpidir)
-
-uninstall: $(UNINSTALL32)
-	rm -f $(vpidir)/cadpli.vpl
-
-uninstall32:
-
-ifeq (@enable_vvp32@,yes)
-include $(srcdir)/enable_vvp32.mk
-endif
-
--include $(patsubst %.o, dep/%.d, $O)

cadpli/cadpli.c

@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2003 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: cadpli.c,v 1.7 2004/09/10 00:15:45 steve Exp $"
-#endif
-
-# include  <vpi_user.h>
-# include  <veriuser.h>
-# include  <stdlib.h>
-#ifdef HAVE_MALLOC_H
-# include  <malloc.h>
-#endif
-# include  <string.h>
-# include  <assert.h>
-# include  "ivl_dlfcn.h"
-
-typedef void* (*funcvp)(void);
-
-static void thunker_register(void)
-{
-      struct t_vpi_vlog_info vlog_info;
-      void*mod;
-      void*boot;
-      struct t_tfcell*tf;
-      int idx;
-
-      vpi_get_vlog_info(&vlog_info);
-
-      for (idx = 0 ;  idx < vlog_info.argc ;  idx += 1) {
-	    char*module, *cp, *bp;
-	    if (strncmp("-cadpli=", vlog_info.argv[idx], 8) != 0)
-		  continue;
-
-	    cp = vlog_info.argv[idx] + 8;
-	    assert(cp);
-
-	    bp = strchr(cp, ':');
-	    assert(bp);
-
-	    module = malloc(bp-cp+1);
-	    strncpy(module, cp, bp-cp);
-	    module[bp-cp] = 0;
-
-	    mod = ivl_dlopen(module);
-	    if (mod == 0) {
-		  vpi_printf("%s link: %s\n", vlog_info.argv[idx], dlerror());
-		  free(module);
-		  continue;
-	    }
-
-	    bp += 1;
-	    boot = ivl_dlsym(mod, bp);
-	    if (boot == 0) {
-		  vpi_printf("%s: Symbol %s not found.\n",
-			     vlog_info.argv[idx], bp);
-		  free(module);
-		  continue;
-	    }
-
-	    free(module);
-	    assert(boot);
-
-	    tf = (*((funcvp)boot))();
-	    assert(tf);
-
-	    veriusertfs_register_table(tf);
-      }
-}
-
-void (*vlog_startup_routines[])() = {
-      thunker_register,
-      0
-};
-
-
-/*
- * $Log: cadpli.c,v $
- * Revision 1.7  2004/09/10 00:15:45  steve
- *  Remove bad casts.
- *
- * Revision 1.6  2004/09/05 21:19:51  steve
- *  Better type safety.
- *
- * Revision 1.5  2003/08/26 16:26:02  steve
- *  ifdef idents correctly.
- *
- * Revision 1.4  2003/04/30 01:28:06  steve
- *  Remove veriusertfs stuf.
- *
- * Revision 1.3  2003/02/22 04:04:38  steve
- *  Only include malloc.h if it is present.
- *
- * Revision 1.2  2003/02/17 00:01:25  steve
- *  Use a variant of ivl_dlfcn to do dynamic loading
- *  from within the cadpli module.
- *
- *  Change the +cadpli flag to -cadpli, to keep the
- *  plusargs namespace clear.
- *
- * Revision 1.1  2003/02/16 02:23:54  steve
- *  Add the cadpli interface module.
- *
- */
-

cadpli/cadpli.txt

@@ -1,48 +0,0 @@
-
-CADENCE PLI1 MODULES
-
-   Copyright 2003 Stephen Williams
-   $Id: cadpli.txt,v 1.2 2003/02/17 00:01:25 steve Exp $
-
-With the cadpli module, Icarus Verilog is able to load PLI1
-applications that were compiled and linked to be dynamic loaded by
-Verilog-XL or NC-Verilog. This allows Icarus Verilog users to run
-third-party modules that were compiled to interface with XL or
-NC. Obviously, this only works on the operating system that the PLI
-application was compiled to run on. For example, a Linux module can
-only be loaded and run under Linux.
-
-Icarus Verilog uses an interface module, the "cadpli" module, to
-connect the worlds. This module is installed with Icarus Verilog, and
-is invoked by the usual -m flag to iverilog or vvp. This module in
-turn scans the extended arguments, looking for +cadpli= arguments. The
-latter specify the share object and bootstrap function for running the
-module. For example, to run the module product.so, that has the
-bootstrap function "my_boot":
-
-    vvp -mcadpli a.out -cadpli=./product.so:my_boot
-
-The "-mcadpli" argument causes vvp to load the cadpli.vpl library
-module. This activates the -cadpli= argument interpreter. The
--cadpli=<module>:<boot_func> argument, then, causes vvp, through the
-cadpli module, to load the loadable PLI application, invoke the
-my_boot function to get a veriusertfs table, and scan that table to
-register the system tasks and functions exported by that object. The
-format of the -cadpli= extended argument is essentially the same as
-the +loadpli1= argument to Verilog-XL.
-
-The integration from this point is seamless. The PLI application
-hardly knows that it is being invoked by Icarus Verilog instead of
-Verilog-XL, so operates as it would otherwise.
-
-$Log: cadpli.txt,v $
-Revision 1.2  2003/02/17 00:01:25  steve
- Use a variant of ivl_dlfcn to do dynamic loading
- from within the cadpli module.
-
- Change the +cadpli flag to -cadpli, to keep the
- plusargs namespace clear.
-
-Revision 1.1  2003/02/16 02:44:47  steve
- Add the cadpli HOWTO.
-

cadpli/configure.in

@@ -1,76 +0,0 @@
-AC_INIT(Makefile.in)
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_CHECK_TOOL(STRIP, strip, true)
-
-AC_EXEEXT
-AC_SUBST(EXEEXT)
-
-# Combined check for Microsoft-related bogosities; sets WIN32 if found
-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)
-AC_CHECK_SIZEOF(unsigned long)
-AC_CHECK_SIZEOF(unsigned)
-
-# --
-# Look for a dl library to use. First look for the standard dlopen
-# functions, and failing that look for the HP specific shl_load function.
-
-AC_CHECK_HEADERS(dlfcn.h dl.h, break)
-
-DLLIB=''
-AC_CHECK_LIB(dl,dlopen,[DLLIB=-ldl])
-if test -z "$DLLIB" ; then
-AC_CHECK_LIB(dld,shl_load,[DLLIB=-ldld])
-fi
-AC_SUBST(DLLIB)
-
-AX_CPP_PRECOMP
-
-# Compiler option for position independent code, needed whan making shared objects.
-AX_C_PICFLAG
-
-# Linker option used when compiling the target
-AX_LD_RDYNAMIC
-
-# linker options when building a shared library
-AX_LD_SHAREDLIB_OPTS
-
-AX_LD_EXTRALIBS
-
-#######################
-## test for underscores. The vpi module loader in vvm needs to know this
-## in order to know the name of the start symbol for the .vpi module.
-#######################
-
-AX_C_UNDERSCORES_LEADING
-AX_C_UNDERSCORES_TRAILING
-
-#######################
-## end of test for underscores
-#######################
-
-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

@@ -1,113 +0,0 @@
-#ifndef __ivl_dlfcn_H
-#define __ivl_dlfcn_H
-/*
- * Copyright (c) 2001 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: ivl_dlfcn.h,v 1.3 2004/10/04 01:10:56 steve Exp $"
-#endif
-
-#if defined(__MINGW32__)
-# include <windows.h>
-# include <stdio.h>
-typedef void * ivl_dll_t;
-#elif defined(HAVE_DLFCN_H)
-# include  <dlfcn.h>
-typedef void* ivl_dll_t;
-#elif defined(HAVE_DL_H)
-# include  <dl.h>
-typedef shl_t ivl_dll_t;
-#endif
-
-#if defined(__MINGW32__)
-inline ivl_dll_t ivl_dlopen(const char *name)
-{ return (void *)LoadLibrary(name); }
-
-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)
-{ (void)FreeLibrary((HINSTANCE)dll);}
-
-inline const char *dlerror(void)
-{
-  static char msg[256];
-  unsigned long err = GetLastError();
-  FormatMessage(
-		FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-		NULL,
-		err,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-		(LPTSTR) &msg,
-		sizeof(msg) - 1,
-		NULL
-		);
-  return msg;
-}
-
-#elif defined(HAVE_DLFCN_H)
-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)
-{
-      void*sym = dlsym(dll, nm);
-	/* Not found? try without the leading _ */
-      if (sym == 0 && nm[0] == '_')
-	    sym = dlsym(dll, nm+1);
-      return sym;
-}
-
-inline void ivl_dlclose(ivl_dll_t dll)
-{ dlclose(dll); }
-
-#elif defined(HAVE_DL_H)
-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)
-{
-      void*sym;
-      int rc = shl_findsym(&dll, nm, TYPE_PROCEDURE, &sym);
-      return (rc == 0) ? sym : 0;
-}
-
-inline void ivl_dlclose(ivl_dll_t dll)
-{ shl_unload(dll); }
-
-inline const char*dlerror(void)
-{ return strerror( errno ); }
-#endif
-
-/*
- * $Log: ivl_dlfcn.h,v $
- * Revision 1.3  2004/10/04 01:10:56  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.2  2003/12/12 05:43:08  steve
- *  Some systems dlsym requires leading _ or not on whim.
- *
- * Revision 1.1  2003/02/17 00:01:25  steve
- *  Use a variant of ivl_dlfcn to do dynamic loading
- *  from within the cadpli module.
- *
- *  Change the +cadpli flag to -cadpli, to keep the
- *  plusargs namespace clear.
- *
- */
-#endif

check.conf

@@ -1,4 +0,0 @@
-functor:cprop
-functor:nodangle
--t:dll
-flag:DLL=tgt-vvp/vvp.tgt

compiler.h

@@ -1,7 +1,7 @@
 #ifndef __compiler_H
 #define __compiler_H
 /*
- * Copyright (c) 1999-2004 Stephen Williams ([email protected])
+ * Copyright (c) 1999 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,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: compiler.h,v 1.31 2006/09/28 04:35:18 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: compiler.h,v 1.1 1999/06/06 20:42:48 steve Exp $"
 #endif
 
-# include  <list>
-# include  <map>
-# include  "netlist.h"
-# include  "StringHeap.h"
-
 /*
  * This defines constants and defaults for the compiler in general.
  */
@@ -38,168 +33,10 @@
 # define INTEGER_WIDTH 32
 #endif
 
-/* The TIME_WIDTH is the width of time variables. */
-#ifndef TIME_WIDTH
-# define TIME_WIDTH 64
-#endif
-
-/*
- * When doing dynamic linking, we need a uniform way to identify the
- * symbol. Some compilers put leading _, some trailing _. The
- * configure script figures out which is the local convention and
- * defines NEED_LU and NEED_TU as required.
- */
-#ifdef NEED_LU
-#define LU "_"
-#else
-#define LU ""
-#endif
-
-#ifdef NEED_TU
-#define TU "_"
-#else
-#define TU ""
-#endif
-
-
-/*
- * These are flags to enable various sorts of warnings. By default all
- * the warnings are off, the -W<list> parameter arranges for each to be
- * enabled.
- */
-
-/* Implicit definitions of wires. */
-extern bool warn_implicit;
-extern bool error_implicit;
-
-/* inherit timescales across files. */
-extern bool warn_timescale;
-
-/* Warn about legal but questionable module port bindings. */
-extern bool warn_portbinding;
-
-/* This is true if verbose output is requested. */
-extern bool verbose_flag;
-
-extern bool debug_scopes;
-extern bool debug_eval_tree;
-extern bool debug_elaborate;
-extern bool debug_synth2;
-
-/* Path to a directory useful for finding subcomponents. */
-extern const char*basedir;
-
-/* This is an ordered list of library suffixes to search. */
-extern list<const char*>library_suff;
-extern int build_library_index(const char*path, bool key_case_sensitive);
-
-/* This is the generation of Verilog that the compiler is asked to
-   support. Then there are also more detailed controls for more
-   specific language features. */
-enum generation_t {
-      GN_VER1995  = 1,
-      GN_VER2001  = 2,
-      GN_VER2001X = 3,
-      GN_DEFAULT  = 3
-};
-
-extern generation_t generation_flag;
-
-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, then elaborate specify blocks. If this flag
-   is false, then skip elaboration of specify behavior. */
-extern bool gn_specify_blocks_flag;
-
-  /* This is the string to use to invoke the preprocessor. */
-extern char*ivlpp_string;
-
-extern map<perm_string,unsigned> missing_modules;
-
-/*
- * 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;
-
-
-/*
- * system task/function listings.
- */
-/*
- * This table describes all the return values of various system
- * functions. This table is used to elaborate expressions that are
- * system function calls.
- */
-struct sfunc_return_type {
-      const char*   name;
-      ivl_variable_type_t type;
-      unsigned      wid;
-      int           signed_flag;
-};
-
-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.31  2006/09/28 04:35:18  steve
- *  Support selective control of specify and xtypes features.
+ * Revision 1.1  1999/06/06 20:42:48  steve
+ *  Make compiler width a compile time constant.
  *
- * 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

@@ -1,88 +0,0 @@
-#ifndef __config_H                                           /* -*- c++ -*- */
-#define __config_H
-/*
- * Copyright (c) 2001 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: config.h.in,v 1.11 2004/10/04 01:10:52 steve Exp $"
-#endif
-
-#if defined(__cplusplus)
-#  if !defined(__GNUC__)
-     using namespace std;
-#  elif (__GNUC__ == 3)
-     using namespace std;
-#  endif
-#endif
-
-# undef NEED_LU
-# undef NEED_TU
-# undef WLU
-# undef WTU
-# undef HAVE_TIMES
-# undef HAVE_IOSFWD
-# undef HAVE_GETOPT_H
-# undef HAVE_LIBIBERTY_H
-# undef HAVE_MALLOC_H
-# undef HAVE_DLFCN_H
-# undef HAVE_DL_H
-# undef HAVE_FCHMOD
-# undef HAVE_LIBREADLINE
-# undef HAVE_LIBZ
-# undef HAVE_LIBBZ2
-# undef HAVE_SYS_WAIT_H
-# undef WORDS_BIGENDIAN
-
-/*
- * $Log: config.h.in,v $
- * Revision 1.11  2004/10/04 01:10:52  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.10  2003/08/26 16:26:01  steve
- *  ifdef idents correctly.
- *
- * Revision 1.9  2003/07/03 16:29:55  steve
- *  spemm WORDS_BIGENDIAN correctly.
- *
- * Revision 1.8  2003/03/07 02:44:33  steve
- *  Implement $realtobits.
- *
- * Revision 1.7  2003/02/20 00:49:24  steve
- *  detect -lz and -lbz2 libraries.
- *
- * Revision 1.6  2003/01/10 19:01:04  steve
- *  Only use libiberty.h if available.
- *
- * Revision 1.5  2002/08/11 23:39:33  steve
- *  Remove VVM option.
- *
- * Revision 1.4  2002/02/16 03:18:53  steve
- *  Make vvm optional, normally off.
- *
- * Revision 1.3  2001/10/18 16:16:23  steve
- *  Include HAVE_SYS_WAIT in config.h (PR#306)
- *
- * Revision 1.2  2001/09/15 18:27:04  steve
- *  Make configure detect malloc.h
- *
- * Revision 1.1  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)
- *
- */
-#endif // __config_H

configure.in

@@ -1,147 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(netlist.h)
-AC_CONFIG_HEADER(config.h)
-AC_CONFIG_HEADER(_pli_types.h)
 
-AC_CANONICAL_HOST
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_CHECK_TOOL(STRIP, strip, true)
-AC_CHECK_PROGS(XGPERF,gperf,none)
-if test "$XGPERF" = "none"
-then
-	echo ""
-        echo "*** Warning: No suitable gperf found. ***"
-	echo "    The gperf package is essential for building ivl from"
-	echo "    CVS sources, or modifying the parse engine of ivl itself."
-	echo "    You can get away without it when simply building from"
-	echo "    snapshots or major releases."
-	echo ""
-fi
-
-AC_CHECK_PROGS(LEX,flex,none)
-if test "$LEX" = "none"
-then
-	echo "*** Error: No suitable flex found. ***"
-        echo "    Please install the 'flex' package."
-        exit 1
-fi
-
-AC_CHECK_PROGS(YACC,bison,none)
-if test "$YACC" = "none"
-then
-	echo "*** Error: No suitable bison found. ***"
-        echo "    Please install the 'bison' package."
-        exit 1
-fi
-
-AC_EXEEXT
-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)
-
-AC_CHECK_LIB(z, gzwrite)
-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)
-else
-AC_CHECK_LIB(bz2, BZ2_bzdopen)
-fi
-
-AC_MSG_CHECKING(for sys/times)
-AC_TRY_LINK(
-#include <unistd.h>
-#include <sys/times.h>
-,{clock_t a = times(0)/sysconf(_SC_CLK_TCK);},
-do_times=yes
-AC_DEFINE(HAVE_TIMES,1),
-do_times=no
-)
-AC_MSG_RESULT($do_times)
-
-# --
-# Look for a dl library to use. First look for the standard dlopen
-# functions, and failing that look for the HP specific shl_load function.
-
-AC_CHECK_HEADERS(dlfcn.h dl.h, break)
-
-DLLIB=''
-AC_CHECK_LIB(dl,dlopen,[DLLIB=-ldl])
-if test -z "$DLLIB" ; then
-AC_CHECK_LIB(dld,shl_load,[DLLIB=-ldld])
-fi
-AC_SUBST(DLLIB)
-
+AC_CHECK_HEADERS(getopt.h)
 AC_PROG_INSTALL
 
-AC_LANG_C
-AC_C_BIGENDIAN
-
-# $host
-
-AX_LD_EXTRALIBS
-
-# Compiler option for position independent code, needed whan making shared objects.
-# CFLAGS inherited by cadpli/Makefile?
-AX_C_PICFLAG
-
-# may modify CPPFLAGS and CFLAGS
-AX_CPP_PRECOMP
-
-# Linker option used when compiling the target
-AX_LD_RDYNAMIC
-
-# linker options when building a shared library
-AX_LD_SHAREDLIB_OPTS
-
-#######################
-## test for underscores. The vpi module loader needs to know this
-## in order to know the name of the start symbol for the .vpi module.
-#######################
-
-AX_C_UNDERSCORES_LEADING
-AX_C_UNDERSCORES_TRAILING
-
-#######################
-## end of test for underscores
-#######################
-
-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)
-
-AC_OUTPUT(Makefile ivlpp/Makefile driver/Makefile driver-vpi/Makefile tgt-null/Makefile tgt-verilog/Makefile tgt-pal/Makefile)
+AC_OUTPUT(Makefile vpi/Makefile ivlpp/Makefile vvm/Makefile)

cygwin.txt

@@ -1,35 +0,0 @@
-
-This file describes the build procedure under cygwin32 (Windows 95/98/NT/2K)
-----------------------------------------------------------------------------
-
-Note: Icarus Verilog also compiles to native Windows binaries if you
-use the instructions in the mingw.txt file. Some people prefer cygwin
-binaries, and these instructions apply.
-
-
-To build using cygwin:
-
-Prerequisites:
-
- o Latest net release (1.1.4) of cygwin (sources.redhat.com/cygwin)
-
-Procedure:
- o Get the source code - see the main Icarus Verilog page for how to
-   do this
- o cd to the verilog directory
- o autoconf.sh
- o ./configure
- o make
- o make install
-
-That's all that's needed.
-
-To build your own extensions - just include vpi_user.h and link with
-a command like this:
-
- $(CC) -shared -o <dllname> <objects> -Wl,--enable-auto-image-base -L../vvm -lvvm -lvpip
-
- - Venkat Iyer <[email protected]>
-
-
-

dosify.c

@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2001 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: dosify.c,v 1.5 2003/07/15 16:17:47 steve Exp $"
-#endif
-
-/*
- * This is a simple program to make a dosified copy of the
- * original. That is, it converts unix style line ends to DOS
- * style. This is useful for installing text files.
- *
- * The exact substitution is to replace \n with \r\n. If the line
- * already ends with \r\n then it is not changed to \r\r\n.
- */
-
-# include  <stdio.h>
-
-int main(int argc, char*argv[])
-{
-      FILE*ifile;
-      FILE*ofile;
-      int ch, pr;
-
-      if (argc != 3) {
-	    fprintf(stderr, "Usage: %s <input> <output>\n", argv[0]);
-	    return 1;
-      }
-
-      ifile = fopen(argv[1], "rb");
-      if (ifile == 0) {
-	    fprintf(stderr, "Unable to open %s for input.\n", argv[1]);
-	    return 2;
-      }
-
-      ofile = fopen(argv[2], "wb");
-      if (ofile == 0) {
-	    fprintf(stderr, "Unable to open %s for output.\n", argv[2]);
-	    return 2;
-      }
-
-      pr = 0;
-      while ((ch = fgetc(ifile)) != EOF) {
-
-	    if ((ch == '\n') && (pr != '\r'))
-		  fputc('\r', ofile);
-
-	    fputc(ch, ofile);
-	    pr = ch;
-      }
-
-      return 0;
-}
-
-/*
- * $Log: dosify.c,v $
- * Revision 1.5  2003/07/15 16:17:47  steve
- *  Fix spelling of ifdef.
- *
- * Revision 1.4  2003/07/15 03:49:22  steve
- *  Spelling fixes.
- *
- * Revision 1.3  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.2  2002/08/11 23:47:04  steve
- *  Add missing Log and Ident strings.
- *
- * Revision 1.1  2001/08/03 17:06:47  steve
- *  Add install of examples for Windows.
- *
- */
-

driver-vpi/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-iverilog-vpi.exe

driver-vpi/Makefile.in

@@ -1,80 +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: Makefile.in,v 1.7 2004/10/13 22:01:34 steve Exp $"
-#
-#
-SHELL = /bin/sh
-
-VERSION = 0.8
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-srcdir = @srcdir@
-
-VPATH = $(srcdir)
-
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-mandir = @mandir@
-
-dllib=@DLLIB@
-
-CC = @CC@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@
-CFLAGS = -Wall @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-all: iverilog-vpi@EXEEXT@
-
-clean:
-	rm -f *.o
-	rm -f iverilog-vpi@EXEEXT@
-
-distclean: clean
-	rm -f Makefile
-
-O = main.o res.o
-
-iverilog-vpi@EXEEXT@: $O
-	$(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@
-
-
-main.o: main.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c
-
-# Windows specific...
-res.o: res.rc
-	windres -i res.rc -o res.o
-#
-
-install: all installdirs $(bindir)/iverilog-vpi@EXEEXT@
-
-$(bindir)/iverilog-vpi@EXEEXT@: ./iverilog-vpi@EXEEXT@
-	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ $(bindir)/iverilog-vpi@EXEEXT@
-
-installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(bindir)
-
-uninstall:
-	rm -f $(bindir)/iverilog-vpi@EXEEXT@

driver-vpi/main.c

@@ -1,573 +0,0 @@
-/*
- * Copyright (c) 2002 Gus Baldauf ([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
- */
-
-/*
- *	iverilog-vpi.c
- *
- *	this program provides the functionality of iverilog-vpi.sh under Win32
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <windows.h>
-
-/* Macros used for compiling and linking */
-
-#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 */
-
-/* pointers to global strings */
-
-static struct global_strings {
-	char *pCCSRC;		/* list of C source files */
-	char *pCXSRC;		/* list of C++ source files */
-	char *pOBJ;			/* list of object files */
-	char *pLIB;			/* list of library files */
-	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 */
-} gstr;
-
-
-static void deInitDynString(char *str)
-{
-	free(str);
-}
-
-/* when finished, free allocated memory and return error code */
-
-static void myExit(int exitVal)
-{
-	deInitDynString(gstr.pCCSRC);
-	deInitDynString(gstr.pCXSRC);
-	deInitDynString(gstr.pOBJ);
-	deInitDynString(gstr.pLIB);
-	deInitDynString(gstr.pOUT);
-	deInitDynString(gstr.pMINGW);
-	deInitDynString(gstr.pIVL);
-	deInitDynString(gstr.pCFLAGS);
-	deInitDynString(gstr.pLDLIBS);
-	deInitDynString(gstr.pNewPath);
-
-	exit(exitVal);
-}
-
-/* display usage summary and exit */
-
-static void usage()
-{
-	fprintf(stderr,"usage: iverilog-vpi [--name=name] [-llibrary] [-mingw=dir] [-ivl=dir] sourcefile...\n");
-	fprintf(stderr,"   or  iverilog-vpi -mingw=dir\n");
-	fprintf(stderr,"   or  iverilog-vpi -ivl=dir\n");
-	myExit(1);
-}
-
-static void initDynString(char **str)
-{
-	*str = (char *) malloc(1);
-
-	if (!*str) {
-		fprintf(stderr,"error: out of memory\n");
-		myExit(4);
-	}
-
-	*str[0] = 0;
-}
-
-/* initialize dynamic memory buffers */
-
-static void init()
-{
-	initDynString(&gstr.pCCSRC);
-	initDynString(&gstr.pCXSRC);
-	initDynString(&gstr.pOBJ);
-	initDynString(&gstr.pLIB);
-	initDynString(&gstr.pOUT);
-	initDynString(&gstr.pMINGW);
-	initDynString(&gstr.pIVL);
-	initDynString(&gstr.pCFLAGS);
-	initDynString(&gstr.pLDLIBS);
-	initDynString(&gstr.pNewPath);
-}
-
-/* return true if "str" is terminated with with "end", case insensitive */
-
-static int endsIn (char *end, char *str)
-{
-	char *ext;
-
-	if (strlen(end) >= strlen(str))
-		return 0;
-
-	ext = str + (strlen(str) - strlen(end));
-
-	return stricmp(end,ext) ? 0 : 1;
-}
-
-/* return true if "str" begins with "prefix", case insensitive */
-
-static int startsWith (char *prefix, char *str)
-{
-	if (strlen(prefix) >= strlen(str))
-		return 0;
-
-	return strnicmp(prefix,str,strlen(prefix)) ? 0 : 1;
-}
-
-/* append "app" to "ptr", allocating memory as needed    */
-/*   if count is zero, then copy all characters of "app" */
-
-static void appendn (char **ptr, char *app, int count)
-{
-	*ptr = (char *) realloc(*ptr,strlen(*ptr)+(count?count:strlen(app))+1);
-
-	if (*ptr == NULL) {
-		fprintf(stderr,"error: out of memory\n");
-		myExit(4);
-	}
-
-	if (count)
-		strncat(*ptr,app,count);
-	else
-		strcat(*ptr,app);
-}
-
-/* append "app" to "ptr", allocating memory as needed    */
-
-static void append (char **ptr, char *app)
-{
-	appendn(ptr,app,0);
-}
-
-/* if the string does not end with a backslash, add one */
-
-static void appendBackSlash(char **str)
-{
-	if ((*str)[strlen(*str)-1] != '\\')
-		append(str,"\\");
-}
-
-/* copy count characters of "str" to "ptr", allocating memory as needed */
-/*   if count is zero, then copy all characters of "str"                */
-
-static void assignn (char **ptr, char *str, int count)
-{
-	*ptr = (char *) realloc(*ptr,(count?count:strlen(str))+1);
-
-	if (*ptr == NULL) {
-		fprintf(stderr,"error: out of memory\n");
-		myExit(4);
-	}
-
-	if (count) {
-		strncpy(*ptr,str,count);
-		(*ptr)[count] = 0;
-	}
-	else
-		strcpy(*ptr,str);
-}
-
-/* copy count characters of "str" to "ptr", allocating memory as needed */
-
-static void assign (char **ptr, char *str)
-{
-	assignn(ptr,str,0);
-}
-
-/* get a copy of a Icarus Verilog registry string key */
-
-static int GetRegistryKey(char *key, char **value)
-{
-	long lrv;
-	HKEY hkKey;
-	char *regKeyBuffer;
-	DWORD regKeyType, regKeySize;
-
-	lrv = RegOpenKeyEx(HKEY_LOCAL_MACHINE,"Software\\Icarus Verilog",0,KEY_QUERY_VALUE,&hkKey);
-	if (lrv != ERROR_SUCCESS)
-		return 0;
-
-	lrv = RegQueryValueEx(hkKey,key,NULL,&regKeyType,NULL,&regKeySize);
-	if ((lrv != ERROR_SUCCESS) || (regKeyType != REG_SZ) || (!regKeySize)) {
-		lrv = RegCloseKey(hkKey);
-		return 0;
-	}
-
-	regKeyBuffer = (char *) malloc(regKeySize+1);
-	if (!regKeyBuffer) {
-		lrv = RegCloseKey(hkKey);
-		fprintf(stderr,"error: out of memory\n");
-		myExit(4);
-	}
-	regKeyBuffer[regKeySize] = 0;		/* makes sure there is a trailing NULL */
-
-	lrv = RegQueryValueEx(hkKey,key,NULL,&regKeyType,regKeyBuffer,&regKeySize);
-	if ((lrv != ERROR_SUCCESS) || (regKeyType != REG_SZ) || (!regKeySize)) {
-		lrv = RegCloseKey(hkKey);
-		free(regKeyBuffer);
-		return 0;
-	}
-
-	RegCloseKey(hkKey);
-
-	assign(value,regKeyBuffer);
-	free(regKeyBuffer);
-
-	return 1;
-}
-
-/* store a copy of a Icarus Verilog registry string key */
-
-static void SetRegistryKey(char *key, char *value)
-{
-	HKEY hkKey;
-	DWORD res;
-
-	if (RegCreateKeyEx(
-		HKEY_LOCAL_MACHINE,
-		"Software\\Icarus Verilog",
-		0,
-		"",
-		REG_OPTION_NON_VOLATILE,
-		KEY_ALL_ACCESS,NULL,
-		&hkKey,
-		&res) != ERROR_SUCCESS)
-			return;
-
-	RegSetValueEx(hkKey,key,0,REG_SZ,value,strlen(value)+1);
-	RegCloseKey(hkKey);
-
-	printf("info:  storing %s in Windows' registry entry\n",value);
-	printf("       HKEY_LOCAL_MACHINE\\Software\\Icarus Verilog\\%s\n",key);
-}
-
-/* parse the command line, assign results to global variable strings */
-
-static int parse(int argc, char *argv[])
-{
-	int idx, srcFileCnt=0;
-
-	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 mingw_option[] = "-mingw=";
-	char ivl_option[]   = "-ivl=";
-
-	if (argc == 1)
-		return 0;
-
-	for (idx=1; idx<argc; ++idx) {
-		if (endsIn(dot_c_ext,argv[idx])) {				/* check for C source files */
-			++srcFileCnt;
-			append(&gstr.pCCSRC,argv[idx]);
-			append(&gstr.pCCSRC," ");
-			if (!*gstr.pOUT)
-			   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 */
-			++srcFileCnt;
-			append(&gstr.pCXSRC,argv[idx]);
-			append(&gstr.pCXSRC," ");
-			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_cc_ext));
-		}
-		else if (endsIn(dot_cpp_ext,argv[idx])) {		/* check for C++ source files */
-			++srcFileCnt;
-			append(&gstr.pCXSRC,argv[idx]);
-			append(&gstr.pCXSRC," ");
-			if (!*gstr.pOUT)
-			   assignn(&gstr.pOUT,argv[idx],strlen(argv[idx])-strlen(dot_cpp_ext));
-		}
-		else if (endsIn(dot_o_ext,argv[idx])) {			/* check for compiled object files */
-			++srcFileCnt;
-			append(&gstr.pOBJ,argv[idx]);
-			append(&gstr.pOBJ," ");
-			if (!*gstr.pOUT)
-			   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));
-		}
-		else if (startsWith(lib_option,argv[idx])) {	/* check for -l option */
-			append(&gstr.pLIB,argv[idx]);
-			append(&gstr.pLIB," ");
-		}
-		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 */
-	}
-
-	if (0 == srcFileCnt)
-		assign(&gstr.pOUT,"");				/* in case they used --name with no source files */
-
-	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," ");
-	}
-
-	return 1;
-}
-
-/* do minimal check that the MinGW root directory looks valid */
-
-static void checkMingwDir(char *root)
-{
-	int irv;
-	struct _stat stat_buf;
-
-	char *path;
-	initDynString(&path);
-	assign(&path,gstr.pMINGW);
-	appendBackSlash(&path);
-	append(&path,"bin\\" IVERILOG_VPI_CC ".exe");
-
-	irv = _stat(path,&stat_buf);
-	deInitDynString(path);
-
-	if (irv) {
-		fprintf(stderr,"error: %s does not appear to be the valid root directory\n",root);
-		fprintf(stderr,"       of MinGW.  Use the -mingw option of iverilog-vpi.exe to\n");
-		fprintf(stderr,"       point to the MinGW root directory.  For a Windows command\n");
-		fprintf(stderr,"       shell the option would be something like -mingw=c:\\mingw\n");
-		fprintf(stderr,"       For a Cygwin shell the option would be something like\n");
-		fprintf(stderr,"       -mingw=c:\\\\mingw\n");
-		myExit(5);
-	}
-}
-
-/* do minimal check that the Icarus Verilog root directory looks valid */
-
-static void checkIvlDir(char *root)
-{
-	int irv;
-	struct _stat stat_buf;
-
-	char *path;
-	initDynString(&path);
-	assign(&path,gstr.pIVL);
-	appendBackSlash(&path);
-	append(&path,"bin\\vvp.exe");
-
-	irv = _stat(path,&stat_buf);
-	deInitDynString(path);
-
-	if (irv) {
-		fprintf(stderr,"error: %s does not appear to be the valid root directory of\n",root);
-		fprintf(stderr,"       Icarus Verilog.  Use the -ivl option of iverilog-vpi.exe to\n");
-		fprintf(stderr,"       point to the Icarus Verilog root directory.  For a Windows\n");
-		fprintf(stderr,"       command shell the option would be something like -ivl=c:\\iverilog\n");
-		fprintf(stderr,"       For a Cygwin shell the option would be something like\n");
-		fprintf(stderr,"       -ivl=c:\\\\iverilog\n");
-		myExit(6);
-	}
-}
-
-/* see if we can find mingw root */
-
-#define IVL_REGKEY_MINGW "MingwDir"
-
-static void setup_mingw_environment()
-{
-	char *pOldPATH = getenv("PATH");		/* get current path */
-
-	if (*gstr.pMINGW) {
-		checkMingwDir(gstr.pMINGW);
-		SetRegistryKey(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");
-			fprintf(stderr,"       -mingw=c:\\mingw  For a Cygwin shell the option would be\n");
-			fprintf(stderr,"       something like -mingw=c:\\\\mingw\n");
-			myExit(5);
-		}
-
-	assign(&gstr.pNewPath,"PATH=");			/* create new path */
-	append(&gstr.pNewPath,gstr.pMINGW);
-	appendBackSlash(&gstr.pNewPath);
-	append(&gstr.pNewPath,"bin;");
-	append(&gstr.pNewPath,pOldPATH);
-
-	_putenv(gstr.pNewPath);					/* place new path in environment variable */
-}
-
-/* see if we can find iverilog root */
-
-#define IVL_REGKEY_IVL   "InstallDir"
-
-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)) {
-			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");
-			fprintf(stderr,"       -ivl=c:\\iverilog  For a Cygwin shell the option would be something\n");
-			fprintf(stderr,"       like -ivl=c:\\\\iverilog\n");
-			myExit(6);
-		}
-
-	/* 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,"include");
-
-	/* build up the LDFLAGS option string */
-
-	assign(&gstr.pLDLIBS,"-L");
-	append(&gstr.pLDLIBS,gstr.pIVL);
-	appendBackSlash(&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)
-{
-	char *ptr1 = pSource;
-	char *ptr2 = strchr(pSource,' ');
-	char *buf=0,*src=0,*obj=0;
-
-	while (ptr2) {
-		int len = ptr2 - ptr1;
-		assignn(&src,ptr1,len);
-
-		assignn(&obj,ptr1,len-strlen(ext));		/* strip off the extension */
-		append (&obj,".o");
-
-		assign (&buf,compiler);
-		append (&buf," -c -o ");
-		append (&buf,obj);
-		append (&buf," ");
-		append (&buf,gstr.pCFLAGS);
-		append (&buf," ");
-		append (&buf,src);
-
-		append (pObject,obj);
-		append (pObject," ");
-
-		printf("%s\n",buf);
-
-		if (system(buf))
-			++*compile_errors;
-
-		ptr1 = ptr2 + 1;					/* advance to next token */
-		ptr2 = strchr(ptr1,' ');
-	}
-
-	free(buf);
-	free(src);
-	free(obj);
-}
-
-/* using the global strings, compile and link */
-
-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 */
-
-	printf("info:  %s will be used as the MinGW root directory.\n",gstr.pMINGW);
-	checkMingwDir(gstr.pMINGW);
-
-	printf("info:  %s will be used as the Icarus Verilog root directory.\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 */
-
-	if (compile_errors) {
-		fprintf(stderr,"iverilog-vpi: Some %d files failed to compile.\n",compile_errors);
-		myExit(2);
-	}
-
-	/* link */
-
-	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);
-
-	iRet = system(buf);
-
-	free(buf);
-
-	if (iRet)
-		myExit(3);
-}
-
-/* program execution starts here */
-
-int main(int argc, char *argv[])
-{
-	init();
-
-	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();
-
-	myExit(0);
-}

driver-vpi/res.rc

@@ -1,38 +0,0 @@
-
-// LANGUAGE ENGLISH
-LANGUAGE 9, 4
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION 2002,11,13,0
- PRODUCTVERSION 0,7,0,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x2L
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "Icarus Verilog\0"
-            VALUE "FileDescription", "Icarus Verilog VPI Tool\0"
-            VALUE "FileVersion", "2002, 11, 13, 0\0"
-            VALUE "InternalName", "iverilog-vpi\0"
-            VALUE "LegalCopyright", "Copyright 2002 Gus Baldauf\0"
-            VALUE "OriginalFilename", "iverilog-vpi.exe\0"
-            VALUE "ProductName", "Icarus Verilog\0"
-            VALUE "ProductVersion", "0, 7, 0, 0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

driver/.cvsignore

@@ -1,15 +0,0 @@
-a.out
-Makefile
-parse.c
-parse.h
-parse.output
-lexor.c
-cfparse.c
-cfparse.h
-cfparse.output
-cflexor.c
-foo.*
-iverilog
-iverilog.ps
-iverilog.pdf
-tmp.pdf

driver/Makefile.in

@@ -1,108 +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: Makefile.in,v 1.25 2006/10/30 22:45:37 steve Exp $"
-#
-#
-SHELL = /bin/sh
-
-VERSION = 0.8
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-srcdir = @srcdir@
-
-VPATH = $(srcdir)
-
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
-mandir = @mandir@
-
-dllib=@DLLIB@
-
-CC = @CC@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@
-CFLAGS = -Wall @CFLAGS@
-LDFLAGS = @LDFLAGS@
-
-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@ iverilog.pdf iverilog.ps
-
-distclean: clean
-	rm -f Makefile
-
-O = main.o substit.o cflexor.o cfparse.o
-
-iverilog@EXEEXT@: $O
-	$(CC) $(LDFLAGS) $O -o iverilog@EXEEXT@ @EXTRALIBS@
-
-cflexor.c: cflexor.lex
-	flex -s -Pcf -ocflexor.c $(srcdir)/cflexor.lex
-
-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
-	$(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
-cflexor.o: cflexor.c cfparse.h cfparse_misc.h globals.h
-cfparse.o: cfparse.c globals.h cfparse_misc.h
-
-iverilog.ps: $(srcdir)/iverilog.man
-	man -t $(srcdir)/iverilog.man > iverilog.ps
-
-iverilog.pdf: iverilog.ps
-	ps2pdf iverilog.ps iverilog.pdf
-
-ifeq (@WIN32@,yes)
-INSTALL_DOC = $(prefix)/iverilog.pdf $(mandir)/man1/iverilog.1
-INSTALL_DOCDIR = $(mandir)/man1
-all: iverilog.pdf
-else
-INSTALL_DOC = $(mandir)/man1/iverilog.1
-INSTALL_DOCDIR = $(mandir)/man1
-endif
-
-install: all installdirs $(bindir)/iverilog@EXEEXT@ $(INSTALL_DOC)
-
-$(bindir)/iverilog@EXEEXT@: ./iverilog@EXEEXT@
-	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ $(bindir)/iverilog@EXEEXT@
-
-$(mandir)/man1/iverilog.1: $(srcdir)/iverilog.man
-	$(INSTALL_DATA) $(srcdir)/iverilog.man $(mandir)/man1/iverilog.1
-
-$(prefix)/iverilog.pdf: iverilog.pdf
-	$(INSTALL_DATA) iverilog.pdf $(prefix)/iverilog.pdf
-
-installdirs: ../mkinstalldirs
-	$(srcdir)/../mkinstalldirs $(bindir) $(INSTALL_DOCDIR)
-
-uninstall:
-	rm -f $(bindir)/iverilog@EXEEXT@
-	rm -f $(mandir)/man1/iverilog.1

driver/cflexor.lex

@@ -1,172 +0,0 @@
-
-%{
-/*
- * Copyright (c) 2001 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: cflexor.lex,v 1.9 2006/11/30 06:00:28 steve Exp $"
-#endif
-
-# include  "cfparse.h"
-# include  "cfparse_misc.h"
-# 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);
-
-%}
-
-%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); }
-
-  /* Accept C style comments. */
-"/*" { comment_enter = YY_START; BEGIN(CCOMMENT); }
-<CCOMMENT>.    { yymore(); }
-<CCOMMENT>\n   { yylloc.first_line += 1; yymore(); }
-<CCOMMENT>"*/" { BEGIN(comment_enter); }
-
-  /* Accept shell type comments. */
-^"#".* { ; }
-
-  /* Skip white space. */
-[ \t\f\r] { ; }
-  /* Skip line ends, but also count the line. */
-\n { yylloc.first_line += 1; }
-
-
-"+define+" { BEGIN(PLUS_ARGS); return TOK_DEFINE; }
-
-"+incdir+" { BEGIN(PLUS_ARGS); return TOK_INCDIR; }
-
-"+libdir+" { BEGIN(PLUS_ARGS); return TOK_LIBDIR; }
-
-"+libdir-nocase+" { BEGIN(PLUS_ARGS); return TOK_LIBDIR_NOCASE; }
-
-"+libext+" { BEGIN(PLUS_ARGS); return TOK_LIBEXT; }
-
-
-  /* If it is not any known plus-flag, return the generic form. */
-"+"[^\n \t\b\f\r+]* {
-      cflval.text = strdup(yytext);
-      BEGIN(PLUS_ARGS);
-      return TOK_PLUSWORD; }
-
-  /* Once in PLUS_ARGS mode, words are delimited by +
-     characters. White space and line end terminate PLUS_ARGS mode,
-     but + terminates only the word. */
-<PLUS_ARGS>[^\n \t\b\f\r+]* {
-      cflval.text = strdup(yytext);
-      return TOK_PLUSARG; }
-
-  /* Within plusargs, this is a delimiter. */
-<PLUS_ARGS>"+" { }
-
-  /* White space end plus_args mode. */
-<PLUS_ARGS>[ \t\b\f\r] { BEGIN(0); }
-
-<PLUS_ARGS>\n {
-      yylloc.first_line += 1;
-      BEGIN(0); }
-
-  /* Notice the -a flag. */
-"-a" { return TOK_Da; }
-
-  /* Notice the -v flag. */
-"-v" { return TOK_Dv; }
-
-  /* Notice the -y flag. */
-"-y" { return TOK_Dy; }
-
-  /* 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. */
-"/"[\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 then "/" */
-      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]; }
-
-%%
-
-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 cfreset(FILE*fd, const char*path)
-{
-      yyin = fd;
-      yyrestart(fd);
-      yylloc.first_line = 1;
-      yylloc.text = (char*)path;
-}

driver/cfparse.y

@@ -1,214 +0,0 @@
-%{
-/*
- * Copyright (c) 20001 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: cfparse.y,v 1.10 2003/09/26 21:25:58 steve Exp $"
-#endif
-
-
-# include  "globals.h"
-# include  "cfparse_misc.h"
-# include  <ctype.h>
-# include  <stdlib.h>
-# include  <string.h>
-
-
-/*
- * This flag is set to 0, 1 or 2 if file names are to be translated to
- * uppercase(1) or lowercase(2).
- */
-static int setcase_filename_flag = 0;
-static void translate_file_name(char*text)
-{
-      switch (setcase_filename_flag) {
-	  case 0:
-	    break;
-	  case 1:
-	    while (*text) {
-		  *text = toupper(*text);
-		  text += 1;
-	    }
-	    break;
-	  case 2:
-	    while (*text) {
-		  *text = tolower(*text);
-		  text += 1;
-	    }
-	    break;
-      }
-}
-
-%}
-
-%union {
-      char*text;
-};
-
-%token TOK_Da TOK_Dv TOK_Dy
-%token TOK_DEFINE TOK_INCDIR TOK_LIBDIR TOK_LIBDIR_NOCASE TOK_LIBEXT
-%token <text> TOK_PLUSARG TOK_PLUSWORD TOK_STRING
-
-%%
-
-start
-	:
-	| item_list
-	;
-
-item_list
-	: item_list item
-	| item
-	;
-
-item
-  /* Absent any other matching, a token string is taken to be the name
-     of a source file. Add the file to the file list. */
-
-	: TOK_STRING
-		{ char*tmp = substitutions($1);
-		  translate_file_name(tmp);
-		  process_file_name(tmp);
-		  free($1);
-		  free(tmp);
-		}
-
-  /* The -a flag is completely ignored. */
-
-        | TOK_Da { }
-
-  /* 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);
-		  free($2);
-		  free(tmp);
-		}
-
-  /* This rule matches "-y <path>" sequences. This does the same thing
-     as -y on the command line, so add the path to the library
-     directory list. */
-
-        | TOK_Dy TOK_STRING
-		{ char*tmp = substitutions($2);
-		  process_library_switch(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
-        | TOK_LIBDIR TOK_PLUSARG
-		{ char*tmp = substitutions($2);
-		  process_library_switch(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
-        | TOK_LIBDIR_NOCASE TOK_PLUSARG
-		{ char*tmp = substitutions($2);
-		  process_library_nocase_switch(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
-	| TOK_DEFINE TOK_PLUSARG
-		{ process_define($2);
-		  free($2);
-		}
-
-  /* The +incdir token introduces a list of +<path> arguments that are
-     the include directories to search. */
-
-	| TOK_INCDIR inc_args
-
-  /* The +libext token introduces a list of +<ext> arguments that
-     become individual -Y flags to ivl. */
-
-	| TOK_LIBEXT libext_args
-
-  /* The +<word> tokens that are not otherwise matched, are
-     ignored. The skip_args rule arranges for all the argument words
-     to be consumed. */
-
-	| TOK_PLUSWORD skip_args
-		{ fprintf(stderr, "%s:%u: Ignoring %s\n",
-			  @1.text, @1.first_line, $1);
-		  free($1);
-		}
-	| TOK_PLUSWORD
-		{ if (strcmp($1, "+toupper-filenames") == 0) {
-		        setcase_filename_flag = 1;
-		  } else if (strcmp($1, "+tolower-filenames") == 0) {
-			setcase_filename_flag = 2;
-		  } else {
-			fprintf(stderr, "%s:%u: Ignoring %s\n",
-				@1.text, @1.first_line, $1);
-		  }
-		  free($1);
-		}
-	;
-
-  /* inc_args are +incdir+ arguments in order. */
-inc_args
-	: inc_args inc_arg
-	| inc_arg
-	;
-
-inc_arg : TOK_PLUSARG
-		{ char*tmp = substitutions($1);
-		  process_include_dir(tmp);
-		  free($1);
-		  free(tmp);
-		}
-	;
-
-  /* inc_args are +incdir+ arguments in order. */
-libext_args
-	: libext_args libext_arg
-	| libext_arg
-	;
-
-libext_arg : TOK_PLUSARG
-		{ process_library2_switch($1);
-		  free($1);
-		}
-	;
-
-  /* skip_args are arguments to a +word flag that is not otherwise
-     parsed. This rule matches them and releases the strings, so that
-     they can be safely ignored. */
-skip_args
-	: skip_args skip_arg
-	| skip_arg
-	;
-
-skip_arg : TOK_PLUSARG
-		{ free($1);
-		}
-	;
-
-%%
-
-int yyerror(const char*msg)
-{
-	return 0;
-}

driver/cfparse_misc.h

@@ -1,67 +0,0 @@
-#ifndef __cfparse_misc_H
-#define __cfparse_misc_H
-/*
- * Copyright (c) 2001 Picture Elements, Inc.
- *    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: 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
- * information between the lexical analyzer and the parser. Defining
- * YYLTYPE compels the lexor to use this type and not something other.
- */
-struct cfltype {
-      unsigned first_line;
-      unsigned first_column;
-      unsigned last_line;
-      unsigned last_column;
-      const char*text;
-};
-# define YYLTYPE struct cfltype
-extern YYLTYPE yylloc;
-
-int cflex(void);
-int cferror(const char *);
-int cfparse(void);
-
-/*
- * $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

@@ -1,104 +0,0 @@
-#ifndef __globals_H
-#define __globals_H
-/*
- * Copyright (c) 2000 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: globals.h,v 1.19 2003/11/18 06:31:46 steve Exp $"
-#endif
-
-# include  <stddef.h>
-
-  /* This is the base (i.e. -B<value>) of the Icarus Verilog files. */
-extern const char*base;
-
-  /* This is the path to the iconfig file sent to ivl. */
-extern char* iconfig_path;
-extern char* iconfig_common_path;
-
-  /* Ths 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. */
-extern const char*npath;
-
-  /* This is the name of the output file that the user selected. */
-extern const char*opath;
-
-  /* This pointer is set if there were -s<value> parameters. */
-extern char*start;
-
-  /* This flag is true if the -S flag was used on the command line. */
-extern int synth_flag;
-
-  /* This is the name of the selected target. */
-extern const char*targ;
-
-  /* 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);
-
-  /* Add the name to the list of library directories. */
-extern void process_library_switch(const char*name);
-extern void process_library_nocase_switch(const char*name);
-extern void process_library2_switch(const char*name);
-
-  /* Add a new include file search directory */
-extern void process_include_dir(const char*name);
-
-  /* Add a new -D define. */
-extern void process_define(const char*name);
-
-  /* -v */
-extern int verbose_flag;
-
-extern char warning_flags[];
-
-  /* -y and -Y flags from the command line. */
-extern char* library_flags;
-extern char* library_flags2;
-
-/*
- * $Log: globals.h,v $
- * Revision 1.19  2003/11/18 06:31:46  steve
- *  Remove the iverilog.conf file.
- *
- * Revision 1.18  2003/11/13 04:09:49  steve
- *  Pass flags through the temporary config file.
- *
- * Revision 1.17  2003/11/01 04:21:57  steve
- *  Add support for a target static config file.
- *
- * Revision 1.16  2002/08/12 01:35:01  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.15  2002/06/23 20:10:51  steve
- *  Variable substitution in command files.
- *
- * Revision 1.14  2002/05/28 20:40:37  steve
- *  ivl indexes the search path for libraries, and
- *  supports case insensitive module-to-file lookup.
- *
- * Revision 1.13  2002/05/28 00:50:40  steve
- *  Add the ivl -C flag for bulk configuration
- *  from the driver, and use that to run library
- *  modules through the preprocessor.
- */
-#endif

driver/iverilog.man

@@ -1,368 +0,0 @@
-.TH iverilog 1 "$Date: 2006/09/28 04:35:18 $" Version "$Date: 2006/09/28 04:35:18 $"
-.SH NAME
-iverilog - Icarus Verilog compiler
-
-.SH SYNOPSIS
-.B iverilog
-[-ESVv] [-Bpath] [-ccmdfile] [-g1|-g2|-g2x|-gspecify-gxtypes] [-Dmacro[=defn]] [-pflag=value]
-[-Iincludedir] [-mmodule] [-Mfile] [-Nfile] [-ooutputfilename]
-[-stopmodule] [-ttype] [-Tmin/typ/max] [-Wclass] [-ypath] sourcefile
-
-.SH DESCRIPTION
-.PP
-\fIiverilog\fP is a compiler that translates Verilog source code into
-executable programs for simulation, or other netlist formats for
-further processing. The currently supported targets are \fIvvp\fP for
-simulation, and \fIxnf\fP and \fIfpga\fP for synthesis. Other target
-types are added as code generators are implemented.
-
-.SH OPTIONS
-.l
-\fIiverilog\fP accepts the following options:
-.TP 8
-.B -B\fIbase\fP
-The \fIiverilog\fP program uses external programs and configuration
-files to preprocess and compile the Verilog source. Normally, the path
-used to locate these tools is built into the \fIiverilog\fP
-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
-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.
-.TP 8
-.B -D\fImacro\fP
-Defines macro \fImacro\fP with the string `1' as its definition. This
-form is normally only used to trigger ifdef conditionals in the
-Verilog source.
-.TP 8
-.B -D\fImacro=defn\fP
-Defines macro \fImacro\fP as \fIdefn\fP.
-.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
-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,
-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 -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 acuracy of
-full-timing simulations.
-.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 -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
-to specify several directories to search, the directories are searched
-in the order they appear on the command line.
-.TP 8
-.B -M\fIpath\fP
-Write into the file specified by path a list of files that contribute
-to the compilation of the design. This includes files that are
-included by include directives and files that are automatically loaded
-by library support. The output is one file name per line, with no
-leading or trailing space.
-.TP 8
-.B -m\fImodule\fP
-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.
-.TP 8
-.B -N\fIpath\fP
-This is used for debugging the compiler proper. Dump the final netlist
-form of the design to the specified file. It otherwise does not affect
-operation of the compiler. The dump happens after the design is
-elaborated and optimized.
-.TP 8
-.B -o \fIfilename\fP
-Place output in the file \fIfilename\fP. If no output file name is
-specified, \fIiverilog\fP uses the default name \fBa.out\fP.
-.TP 8
-.B -p\fIflag=value\fP
-Assign a value to a target specific flag. The \fB-p\fP switch may be
-used as often as necessary to specify all the desired flags. The flags
-that are used depend on the target that is selected, and are described
-in target specific documentation. Flags that are not used are ignored.
-.TP 8
-.B -S
-Synthesize. Normally, if the target can accept behavioral
-descriptions the compiler will leave processes in behavioral
-form. The \fB-S\fP switch causes the compiler to perform synthesis
-even if it is not necessary for the target. If the target type is a
-netlist format, the \fB-S\fP switch is unnecessary and has no effect.
-.TP 8
-.B -s \fItopmodule\fP
-Specify the top level module to elaborate. Icarus Verilog will by default
-choose modules that are not instantiated in any other modules, but
-sometimes that is not sufficient, or instantiates too many modules. If
-the user specifies one or more root modules with \fB-s\fP flags, then
-they will be used as root modules instead.
-.TP 8
-.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.
-.TP 8
-.B -t\fItarget\fP
-Use this switch to specify the target output format. See the
-\fBTARGETS\fP section below for a list of valid output formats.
-.TP 8
-.B -v
-Turn on verbose messages. This will print the command lines that are
-executed to perform the actual compilation, along with version
-information from the various components, as well as the version of the
-product as a whole.  You will notice that the command lines include
-a reference to a key temporary file that passes information to the
-compiler proper.  To keep that file from being deleted at the end
-of the process, provide a file name of your own in the environment
-variable \fBIVERILOG_ICONFIG\fP.
-.TP 8
-.B -V
-Print the version of the compiler, and exit.
-.TP 8
-.B -W\fIclass\fP
-Turn on different classes of warnings. See the \fBWARNING TYPES\fP
-section below for descriptions of the different warning groups. If
-multiple \fB-W\fP switches are used, the warning set is the union of
-all the requested classes.
-.TP 8
-.B -y\fIlibdir\fP
-Append the directory to the library module search path. When the
-compiler finds an undefined module, it looks in these directories for
-files with the right name.
-
-.SH MODULE LIBRARIES
-
-The Icarus Verilog compiler supports module libraries as directories
-that contain Verilog source files.  During elaboration, the compiler
-notices the instantiation of undefined module types. If the user
-specifies library search directories, the compiler will search the
-directory for files with the name of the missing module type. If it
-finds such a file, it loads it as a Verilog source file, they tries
-again to elaborate the module.
-
-Library module files should contain only a single module, but this is
-not a requirement. Library modules may reference other modules in the
-library or in the main design.
-
-.SH TARGETS
-
-The Icarus Verilog compiler supports a variety of targets, for
-different purposes, and the \fB-t\fP switch is used to select the
-desired target.
-
-.TP 8
-.B null
-The null target causes no code to be generated. It is useful for
-checking the syntax of the Verilog source.
-.TP 8
-.B vvp
-This is the default. The vvp target generates code for the vvp
-runtime. The output is a complete program that simulates the design
-but must be run by the \fBvvp\fP command.
-.TP 8
-.B xnf
-This is the Xilinx Netlist Format used by many tools for placing
-devices in FPGAs or other programmable devices. This target is
-obsolete, use the \fBfpga\fP target instead.
-.TP 8
-.B fpga
-This is a synthesis target that supports a variety of fpga devices,
-mostly by EDIF format output. The Icarus Verilog fpga code generator
-can generate complete designs or EDIF macros that can in turn be
-imported into larger designs by other tools. The \fBfpga\fP target
-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
-prefixed with \fBno-\fP to turn off that warning. This is most useful
-after a \fB-Wall\fP argument to suppress isolated warning types.
-
-.TP 8
-.B all
-This enables all supported warning categories.
-
-.TP 8
-.B implicit
-This enables warnings for creation of implicit declarations. For
-example, if a scalar wire X is used but not declared in the Verilog
-source, this will print a warning at its first use.
-
-.TP 8
-.B portbind
-This enables warnings for ports of module instantiations that are not
-connected but probably should be. Dangling input ports, for example,
-will generate a warning.
-
-.TP 8
-.B timescale
-This enables warnings for inconsistent use of the timescale
-directive. It detects if some modules have no timescale, or if modules
-inherit timescale from another file. Both probably mean that
-timescales are inconsistent, and simulation timing can be confusing
-and dependent on compilation order.
-
-.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
-describe to the compiler the return types for system functions. This
-is necessary because the compiler needs this information to elaborate
-expressions that contain these system functions, but cannot run the
-sizetf functions since it has no run-time.
-
-The format of the table is ASCII, one function per line. Empty lines
-are ignored, and lines that start with the '\fI#\fP' character are
-comment lines. Each non-comment line starts with the function name,
-then the vpi type (i.e. vpiSysFuncReal). The following types are
-supported:
-
-.TP 8
-.B vpiSysFuncReal
-The function returns a real/realtime value.
-
-.TP 8
-.B vpiSysFuncInt
-The function returns an integer.
-
-.TP 8
-.B vpiSysFuncSized <wid> <signed|unsigned>
-The function returns a vector with the given width, and is signed or
-unsigned according to the flag.
-
-.SH "COMMAND FILES"
-The command file allows the user to place source file names and
-certain command line switches into a text file instead of on a long
-command line. Command files can include C or C++ style comments, as
-well as # comments, if the # starts the line.
-
-.TP 8
-.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.
-
-.TP 8
-.B -y\ \fIlibdir\fP
-A \fB-y\fP token prefixes a library directory in the command file,
-exactly like it does on the command line. The parameter to the \fB-y\fP
-flag may be on the same line or the next non-comment line.
-
-Variables in the \fIlibdir\fP are substituted.
-
-.TP 8
-.B +incdir+\fIincludedir\fP
-The \fB+incdir+\fP token in command files gives directories to search
-for include files in much the same way that \fB-I\fP flags work on the
-command line. The difference is that multiple \fI+includedir\fP
-directories are valid parameters to a single \fB+incdir+\fP token,
-although you may also have multiple \fB+incdir+\fP lines.
-
-Variables in the \fIincludedir\fP are substituted.
-
-.TP 8
-.B +libext+\fIext\fP
-The \fB+libext\fP token in command files fives file extensions to try
-when looking for a library file. This is useful in conjunction with
-\fB-y\fP flags to list suffixes to try in each directory before moving
-on to the next library directory.
-
-.TP 8
-.B +libdir+\fIdir\fP
-This is another way to specify library directories. See the -y flag.
-
-.TP 8
-.B +libdir-nocase+\fIdir\fP
-This is like the \fB+libdir\fP statement, but file names inside the
-directories declared here are case insensitive. The missing module
-name in a lookup need not match the file name case, as long as the
-letters are correct. For example, "foo" matches "Foo.v" but not
-"bar.v".
-
-.TP 8
-.B +define+\fINAME\fP=\fIvalue\fP
-The \fB+define+\fP token is the same as the \fB-D\fP option on the
-command line. The value part of the token is optional.
-
-.TP 8
-.B +toupper-filename\fP
-This token causes file names after this in the command file to be
-translated to uppercase. This helps with situations where a directory
-has passed through a DOS machine, and in the process the file names
-become munged.
-
-.TP 8
-.B +tolower-filename\fP
-This is similar to the \fB+toupper-filename\fP hack described above.
-
-.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
-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 EXAMPLES
-These examples assume that you have a Verilog source file called hello.v in
-the current directory
-
-To compile hello.v to an executable file called a.out:
-
-	iverilog hello.v
-
-To compile hello.v to an executable file called hello:
-
-	iverilog -o hello hello.v
-
-To compile and run explicitly using the vvp runtime:
-
-	iverilog -ohello.vvp -tvvp hello.v
-
-To compile hello.v to a file in XNF-format called hello.xnf
-
-	iverilog -txnf -ohello.xnf hello.v
-
-
-.SH "AUTHOR"
-.nf
-Steve Williams ([email protected])
-
-.SH SEE ALSO
-vvp(1),
-.BR "<http://www.icarus.com/eda/verilog/>"
-
-.SH COPYRIGHT
-.nf
-Copyright \(co  2002 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,809 +0,0 @@
-/*
- * Copyright (c) 2000-2005 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: main.c,v 1.72 2006/10/02 18:15:47 steve Exp $"
-#endif
-
-# include "config.h"
-
-const char NOTICE[] =
-"  This program is free software; you can redistribute it and/or modify\n"
-"  it under the terms of the GNU General Public License as published by\n"
-"  the Free Software Foundation; either version 2 of the License, or\n"
-"  (at your option) any later version.\n"
-"\n"
-"  This program is distributed in the hope that it will be useful,\n"
-"  but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"  GNU General Public License for more details.\n"
-"\n"
-"  You should have received a copy of the GNU General Public License\n"
-"  along with this program; if not, write to the Free Software\n"
-"  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n"
-;
-
-const char HELP[] =
-"Usage: iverilog [-ESvV] [-B base] [-c 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.";
-
-#define MAXSIZE 4096
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef __MINGW32__
-#include <windows.h>
-#ifdef HAVE_LIBIBERTY_H
-#include <libiberty.h>
-#endif
-#endif
-
-#if HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
-#if defined(__MINGW32__) && !defined(HAVE_GETOPT_H)
-extern int getopt(int argc, char*argv[], const char*fmt);
-extern int optind;
-extern const char*optarg;
-#endif
-
-#if !defined(WIFEXITED)
-# define WIFEXITED(rc) ((rc&0x7f) == 0)
-#endif
-
-#if !defined(WEXITSTATUS)
-# define WEXITSTATUS(rc) (rc>>8)
-#endif
-
-#ifndef IVL_ROOT
-# define IVL_ROOT "."
-#endif
-
-# include  "globals.h"
-#include "cfparse_misc.h"   /* cfparse() */
-
-#ifdef __MINGW32__
-const char sep = '\\';
-#else
-const char sep = '/';
-#endif
-
-extern void cfreset(FILE*fd, const char*path);
-
-const char*base = 0;
-const char*pbase = 0;
-const char*mtm  = 0;
-const char*opath = "a.out";
-const char*npath = 0;
-const char*targ  = "vvp";
-const char*depfile = 0;
-
-const char*generation = "2x";
-const char*gen_specify = "specify";
-const char*gen_xtypes = "xtypes";
-
-char warning_flags[16] = "";
-
-char*mod_list = 0;
-char*command_filename = 0;
-
-/* These are used to collect the list of file names that will be
-   passed to ivlpp. Keep the list in a file because it can be a long
-   list. */
-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;
-
-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;
-
-char line[MAXSIZE];
-char tmp[MAXSIZE];
-
-static char ivl_root[MAXSIZE];
-
-#ifdef __MINGW32__
-# include  <io.h>
-# include  <fcntl.h>
-static FILE*fopen_safe(const char*path)
-{
-      FILE*file = 0;
-      int fd;
-
-      fd = _open(path, _O_WRONLY|_O_CREAT|_O_EXCL, 0700);
-      if (fd != -1)
-	    file = _fdopen(fd, "w");
-
-       return file;
-}
-#else
-# include  <fcntl.h>
-static FILE*fopen_safe(const char*path)
-{
-      FILE*file = 0;
-      int fd;
-
-      fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0700);
-      if (fd != -1)
-	    file = fdopen(fd, "w");
-
-       return file;
-}
-#endif
-
-static const char*my_tempfile(const char*str, FILE**fout)
-{
-      FILE*file;
-      int retry;
-
-      static char pathbuf[8192];
-
-      const char*tmpdir = getenv("TMP");
-      if (tmpdir == 0)
-	    tmpdir = getenv("TMPDIR");
-      if (tmpdir == 0)
-	    tmpdir = getenv("TEMP");
-#ifdef __MINGW32__
-      if (tmpdir == 0)
-	    tmpdir = "C:\\TEMP";
-#else
-      if (tmpdir == 0)
-	    tmpdir = "/tmp";
-#endif
-
-      assert(tmpdir);
-      assert((strlen(tmpdir) + strlen(str)) < sizeof pathbuf - 10);
-
-      srand(getpid());
-      retry = 100;
-      file = NULL;
-      while ((retry > 0) && (file == NULL)) {
-	    unsigned code = rand();
-	    sprintf(pathbuf, "%s%c%s%04x", tmpdir, sep, str, code);
-	    file = fopen_safe(pathbuf);
-	    retry -= 1;
-      }
-
-      *fout = file;
-      return pathbuf;
-}
-
-/*
- * This is the default target type. It looks up the bits that are
- * needed to run the command from the configuration file (which is
- * already parsed for us) so we can handle must of the generic cases.
- */
-static int t_default(char*cmd, unsigned ncmd)
-{
-      unsigned rc;
-#ifdef __MINGW32__
-      unsigned ncmd_start = ncmd;
-#endif
-
-      snprintf(tmp, sizeof tmp, " | %s/ivl", base);
-      rc = strlen(tmp);
-      cmd = realloc(cmd, ncmd+rc+1);
-      strcpy(cmd+ncmd, tmp);
-      ncmd += rc;
-
-      if (verbose_flag) {
-	    const char*vv = " -v";
-	    rc = strlen(vv);
-	    cmd = realloc(cmd, ncmd+rc+1);
-	    strcpy(cmd+ncmd, vv);
-	    ncmd += rc;
-      }
-
-      if (npath != 0) {
-	    snprintf(tmp, sizeof tmp, " -N%s", npath);
-	    rc = strlen(tmp);
-	    cmd = realloc(cmd, ncmd+rc+1);
-	    strcpy(cmd+ncmd, tmp);
-	    ncmd += rc;
-      }
-
-      snprintf(tmp, sizeof tmp, " -C%s", iconfig_path);
-      rc = strlen(tmp);
-      cmd = realloc(cmd, ncmd+rc+1);
-      strcpy(cmd+ncmd, tmp);
-      ncmd += rc;
-
-      snprintf(tmp, sizeof tmp, " -C%s -- -", iconfig_common_path);
-      rc = strlen(tmp);
-      cmd = realloc(cmd, ncmd+rc+1);
-      strcpy(cmd+ncmd, tmp);
-      ncmd += rc;
-
-#ifdef __MINGW32__
-      {
-	char *t;
-	for (t = cmd+ncmd_start; *t; t++)
-	  {
-	    if (*t == '/') *t = '\\';
-	  }
-      }
-#endif
-
-
-      if (verbose_flag)
-	    printf("translate: %s\n", cmd);
-
-
-      rc = system(cmd);
-      if ( ! getenv("IVERILOG_ICONFIG")) {
-	    remove(source_path);
-	    remove(iconfig_path);
-	    remove(defines_path);
-      }
-
-      if (rc != 0) {
-	    if (rc == 127) {
-		  fprintf(stderr, "Failed to execute: %s\n", cmd);
-		  return 1;
-	    }
-
-	    if (WIFEXITED(rc))
-		  return WEXITSTATUS(rc);
-
-	    fprintf(stderr, "Command signaled: %s\n", cmd);
-	    return -1;
-      }
-
-      return 0;
-}
-
-
-static void process_warning_switch(const char*name)
-{
-      if (strcmp(name,"all") == 0) {
-	    strcat(warning_flags, "ipt");
-
-      } else if (strcmp(name,"implicit") == 0) {
-	    if (! strchr(warning_flags+2, 'i'))
-		  strcat(warning_flags, "i");
-      } else if (strcmp(name,"portbind") == 0) {
-	    if (! strchr(warning_flags+2, 'p'))
-		  strcat(warning_flags, "p");
-      } else if (strcmp(name,"timescale") == 0) {
-	    if (! strchr(warning_flags+2, 't'))
-		  strcat(warning_flags, "t");
-      } else if (strcmp(name,"no-implicit") == 0) {
-	    char*cp = strchr(warning_flags+2, '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');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
-      } else if (strcmp(name,"no-timescale") == 0) {
-	    char*cp = strchr(warning_flags+2, 't');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
-      }
-}
-
-void process_library_switch(const char *name)
-{
-      fprintf(iconfig_file, "-y:%s\n", name);
-}
-
-void process_library_nocase_switch(const char *name)
-{
-      fprintf(iconfig_file, "-yl:%s\n", name);
-}
-
-void process_library2_switch(const char *name)
-{
-      fprintf(iconfig_file, "-Y:%s\n", name);
-}
-
-void process_include_dir(const char *name)
-{
-      fprintf(defines_file, "I:%s\n", name);
-}
-
-void process_define(const char*name)
-{
-      fprintf(defines_file,"D:%s\n", name);
-}
-
-/*
- * This function is called while processing a file name in a command
- * file, or a file name on the command line. Look to see if there is a
- * .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)
-{
-      if (strlen(name) > 4 && strcasecmp(".sft", name+strlen(name)-4) == 0) {
-	    fprintf(iconfig_file,"sys_func:%s\n", name);
-
-      } else {
-	    fprintf(source_file, "%s\n", name);
-	    source_count += 1;
-      }
-}
-
-int process_generation(const char*name)
-{
-      if (strcmp(name,"1") == 0)
-	    generation = "1";
-
-      else if (strcmp(name,"2") == 0)
-	    generation = "2";
-
-      else if (strcmp(name,"2x") == 0)
-	    generation = "2x";
-
-      else if (strcmp(name,"xtypes") == 0)
-	    gen_xtypes = "xtypes";
-
-       else if (strcmp(name,"no-xtypes") == 0)
-	    gen_xtypes = "no-xtypes";
-
-       else if (strcmp(name,"specify") == 0)
-	    gen_specify = "specify";
-
-       else if (strcmp(name,"no-specify") == 0)
-	    gen_specify = "no-specify";
-
-      else {
-	    fprintf(stderr, "Unknown/Unsupported Language generation "
-		    "%s\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"
-		            "Other generation flags:\n"
-		            "    specify | no-specify\n"
-		            "    xtypes | no-xtypes\n");
-	    return 1;
-      }
-
-      return 0;
-}
-
-int main(int argc, char **argv)
-{
-      char*cmd;
-      unsigned ncmd;
-      int e_flag = 0;
-      int version_flag = 0;
-      int opt, idx, rc;
-
-#ifdef __MINGW32__
-      { char * s;
-	char basepath[1024];
-	GetModuleFileName(NULL,basepath,1024);
-
-	  /* Calculate the ivl_root from the path to the command. This
-	     is necessary because of the installation process in
-	     Windows. Mostly, it is those darn drive letters, but oh
-	     well. We know the command path is formed like this:
-
-	         D:\iverilog\bin\iverilog.exe
-
-	     The IVL_ROOT in a Windows installation is the path:
-
-	         D:\iverilog\lib\ivl
-
-	     so we chop the file name and the last directory by
-	     turning the last two \ characters to null. Then we append
-	     the lib\ivl to finish. */
-
-        strncpy(ivl_root, basepath, MAXSIZE);
-	s = strrchr(ivl_root, sep);
-	if (s) *s = 0;
-	s = strrchr(ivl_root, sep);
-	if (s) *s = 0;
-	strcat(ivl_root, "\\lib\\ivl");
-
-	base = ivl_root;
-      }
-
-#else
-        /* In a UNIX environment, the IVL_ROOT from the Makefile is
-	   dependable. It points to the $prefix/lib/ivl directory,
-	   where the sub-parts are installed. */
-      strcpy(ivl_root, IVL_ROOT);
-      base = ivl_root;
-#endif
-
-	/* Create a temporary file for communicating input parameters
-	   to the preprocessor. */
-      source_path = strdup(my_tempfile("ivrlg", &source_file));
-      if (NULL == source_file) {
-	    fprintf(stderr, "%s: Error opening temporary file %s\n",
-		    argv[0], source_path);
-	    fprintf(stderr, "%s: Please check TMP or TMPDIR.\n", argv[0]);
-	    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");
-
-	/* Create another temporary file for passing configuration
-	   information to ivl. */
-
-      if ( (iconfig_path = getenv("IVERILOG_ICONFIG")) ) {
-	    fprintf(stderr, "%s: IVERILOG_ICONFIG=%s\n",
-		    argv[0], iconfig_path);
-
-	    iconfig_file = fopen(iconfig_path, "w");
-
-      } else {
-
-	    iconfig_path = strdup(my_tempfile("ivrlh", &iconfig_file));
-      }
-
-      if (NULL == iconfig_file) {
-	    fprintf(stderr, "%s: Error opening temporary file %s\n",
-		    argv[0], iconfig_path);
-	    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) {
-
-	    switch (opt) {
-		case 'B':
-		    /* Undocumented feature: The preprocessor itself
-		       may be located at a different location. If the
-		       base starts with a 'P', set this special base
-		       instead of the main base. */
-		  if (optarg[0] == 'P') {
-			pbase = optarg+1;
-		  } else {
-			base=optarg;
-		  }
-		  break;
- 		case 'c':
-		  command_filename = malloc(strlen(optarg)+1);
- 		  strcpy(command_filename, optarg);
- 		  break;
-		case 'D':
-		  process_define(optarg);
-		  break;
-		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 'g':
-		  rc = process_generation(optarg);
-		  if (rc != 0)
-			return -1;
-		  break;
- 		case 'h':
- 		  fprintf(stderr, "%s\n", HELP);
- 		  return 1;
-
-		case 'I':
-		  process_include_dir(optarg);
-		  break;
-
-		case 'M':
-		  depfile = optarg;
-		  break;
-
-		case 'm':
-		  fprintf(iconfig_file, "module:%s\n", optarg);
-		  break;
-
-		case 'N':
-		  npath = optarg;
-		  break;
-
-		case 'o':
-		  opath = optarg;
-		  break;
-
-		case 'S':
-		  synth_flag = 1;
-		  break;
-		case 's':
-		  fprintf(iconfig_file, "root:%s\n", optarg);
-		  break;
-		case 'T':
-		  if (strcmp(optarg,"min") == 0) {
-			mtm = "min";
-		  } else if (strcmp(optarg,"typ") == 0) {
-			mtm = "typ";
-		  } else if (strcmp(optarg,"max") == 0) {
-			mtm = "max";
-		  } else {
-			fprintf(stderr, "%s: invalid -T%s argument\n",
-				argv[0], optarg);
-			return 1;
-		  }
-		  break;
-		case 't':
-		  targ = optarg;
-		  break;
-		case 'v':
-		  verbose_flag = 1;
-		  break;
-		case 'V':
-		  version_flag = 1;
-		  break;
-		case 'W':
-		  process_warning_switch(optarg);
-		  break;
-		case 'y':
-		  process_library_switch(optarg);
-		  break;
-		case 'Y':
-		  process_library2_switch(optarg);
-		  break;
-		case '?':
-		default:
-		  return 1;
-	    }
-      }
-
-      if (pbase == 0)
-	    pbase = base;
-
-      if (version_flag || verbose_flag) {
-	    printf("Icarus Verilog version " VERSION " ($Name:  $)\n");
-	    printf("Copyright 1998-2003 Stephen Williams\n");
-	    puts(NOTICE);
-
-	    if (version_flag)
-		  return 0;
-      }
-
-	/* Make a common conf file path to reflect the target. */
-      sprintf(iconfig_common_path, "%s%c%s%s.conf",
-	      base,sep, targ, synth_flag? "-s" : "");
-
-	/* Write values to the iconfig file. */
-      fprintf(iconfig_file, "basedir:%s\n", base);
-
-	/* Tell the core where to find the system.sft. This file
-	   describes the system functions so that elaboration knows
-	   how to handle them. */
-      fprintf(iconfig_file, "sys_func:%s%csystem.sft\n", base, sep);
-
-      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, "warnings:%s\n", warning_flags);
-      fprintf(iconfig_file, "out:%s\n", opath);
-      if (depfile) fprintf(iconfig_file, "depfile:%s\n", depfile);
-
-      if (command_filename) {
-	    int rc;
-
-	    if (( fp = fopen(command_filename, "r")) == NULL ) {
-		  fprintf(stderr, "%s: Can't open %s\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);
-		  return 1;
-	    }
-      }
-
-      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]);
-
-
-      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);
-	    return 1;
-      }
-
-
-	/* Start building the preprocess command line. */
-
-      sprintf(tmp, "%s%civlpp %s%s -F%s -f%s ", pbase,sep,
-	      verbose_flag?" -v":"",
-	      e_flag?"":" -L", defines_path, source_path);
-
-      ncmd = strlen(tmp);
-      cmd = malloc(ncmd + 1);
-      strcpy(cmd, tmp);
-
-	/* 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. */
-      if (e_flag) {
-	    int rc;
-	    if (strcmp(opath,"-") != 0) {
-		  sprintf(tmp, " > %s", opath);
-		  cmd = realloc(cmd, ncmd+strlen(tmp)+1);
-		  strcpy(cmd+ncmd, tmp);
-		  ncmd += strlen(tmp);
-	    }
-
-	    if (verbose_flag)
-		  printf("preprocess: %s\n", cmd);
-
-	    rc = system(cmd);
-	    remove(source_path);
-	    fclose(iconfig_file);
-	    if ( ! getenv("IVERILOG_ICONFIG"))
-		  remove(iconfig_path);
-
-	    if (rc != 0) {
-		  if (WIFEXITED(rc)) {
-			fprintf(stderr, "errors preprocessing Verilog program.\n");
-			return WEXITSTATUS(rc);
-		  }
-
-		  fprintf(stderr, "Command signaled: %s\n", cmd);
-		  return -1;
-	    }
-
-	    return 0;
-      }
-
-	/* Write the preprocessor command needed to preprocess a
-	   single file. This may be used to preprocess library
-	   files. */
-      fprintf(iconfig_file, "ivlpp:%s%civlpp -L -F%s\n",
-	      pbase, sep, defines_path);
-
-	/* Done writing to the iconfig file. Close it now. */
-      fclose(iconfig_file);
-
-      return t_default(cmd, ncmd);
-
-      return 0;
-}
-
-/*
- * $Log: main.c,v $
- * Revision 1.72  2006/10/02 18:15:47  steve
- *  Fix handling of dep path in new argument passing method.
- *
- * Revision 1.71  2006/09/28 04:35:18  steve
- *  Support selective control of specify and xtypes features.
- *
- * Revision 1.70  2006/09/20 22:30:52  steve
- *  Do not pass -D__ICARUS__ to ivlpp.
- *
- * Revision 1.69  2006/07/26 00:11:40  steve
- *  Pass depfiles through temp defines file.
- *
- * Revision 1.68  2006/07/26 00:02:48  steve
- *  Pass defines and includes through temp file.
- *
- * 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.
- */
-

driver/substit.c

@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2002 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: substit.c,v 1.5 2003/12/19 01:27:10 steve Exp $"
-#endif
-
-# include  <string.h>
-# include  <stdlib.h>
-#ifdef HAVE_MALLOC_H
-# include  <malloc.h>
-#endif
-
-
-char* substitutions(const char*str)
-{
-      size_t nbuf = strlen(str) + 1;
-      char*buf = malloc(nbuf);
-      char*cp = buf;
-
-      while (*str) {
-
-	    if ((str[0] == '$') && (str[1] == '(')) {
-		    /* If I find a $(x) string in the source, replace
-		       it in the destination with the contents of the
-		       environment variable x. */
-		  char*name;
-		  char*value;
-		  const char*ep = strchr(str, ')');
-		  str += 2;
-
-		  name = malloc(ep-str+1);
-		  strncpy(name, str, ep-str);
-		  name[ep-str] = 0;
-
-		  str = ep + 1;
-
-		  value = getenv(name);
-		  free(name);
-		  if (value == 0)
-			continue;
-
-		  if (strlen(value) >= (nbuf - (cp-buf))) {
-			size_t old_size = cp - buf;
-			nbuf = (cp - buf) + strlen(value) + 1;
-			buf = realloc(buf, nbuf);
-			cp = buf + old_size;
-		  }
-
-		  strcpy(cp, value);
-		  cp += strlen(cp);
-
-	    } else {
-		  if ( cp == (buf + nbuf) ) {
-			size_t old_size = nbuf;
-			nbuf = old_size + 32;
-			buf = realloc(buf, nbuf);
-			cp = buf + old_size;
-		  }
-
-		  *cp++ = *str++;
-	    }
-      }
-
-	/* Add the trailing nul to the string, and reallocate the
-	   buffer to be a tight fit. */
-      if ( cp == (buf + nbuf) ) {
-	    size_t old_size = nbuf;
-	    nbuf = old_size + 1;
-	    buf = realloc(buf, nbuf);
-	    buf[old_size] = 0;
-      } else {
-	    *cp++ = 0;
-	    nbuf = cp - buf;
-	    buf = realloc(buf, nbuf);
-      }
-
-      return buf;
-}
-
-
-/*
- * $Log: substit.c,v $
- * Revision 1.5  2003/12/19 01:27:10  steve
- *  Fix various unsigned compare warnings.
- *
- * Revision 1.4  2002/08/12 01:35:01  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.3  2002/08/11 23:47:04  steve
- *  Add missing Log and Ident strings.
- *
- * Revision 1.2  2002/06/25 01:33:01  steve
- *  include malloc.h only when available.
- *
- * Revision 1.1  2002/06/23 20:10:51  steve
- *  Variable substitution in command files.
- *
- */
-

dup_expr.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2002 Stephen Williams ([email protected])
+ * Copyright (c) 1999 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,192 +16,23 @@
  *    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.21 2006/11/04 06:10:13 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: dup_expr.cc,v 1.1 1999/11/27 19:07:57 steve Exp $"
 #endif
 
-# include "config.h"
-
 # include  "netlist.h"
 # include  <cassert>
 
-NetEBComp* NetEBComp::dup_expr() const
-{
-      NetEBComp*result = new NetEBComp(op_, left_->dup_expr(),
-				       right_->dup_expr());
-      return result;
-}
-
-NetEConst* NetEConst::dup_expr() const
-{
-      NetEConst*tmp = new NetEConst(value_);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEConstParam* NetEConstParam::dup_expr() const
-{
-      NetEConstParam*tmp = new NetEConstParam(scope_, name_, value());
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetECRealParam* NetECRealParam::dup_expr() const
-{
-      NetECRealParam*tmp = new NetECRealParam(scope_, name_, value());
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEEvent* NetEEvent::dup_expr() const
-{
-      assert(0);
-      return 0;
-}
-
 NetEScope* NetEScope::dup_expr() const
 {
       assert(0);
       return 0;
 }
 
-NetESelect* NetESelect::dup_expr() const
-{
-      return new NetESelect(expr_->dup_expr(),
-			    base_? base_->dup_expr() : 0,
-			    expr_width());
-}
-
-NetESFunc* NetESFunc::dup_expr() const
-{
-      NetESFunc*tmp = new NetESFunc(name_, type_, expr_width(), nparms());
-      assert(tmp);
-
-      tmp->cast_signed(has_sign());
-      for (unsigned idx = 0 ;  idx < nparms() ;  idx += 1) {
-	    assert(tmp->parm(idx));
-	    tmp->parm(idx, tmp->parm(idx)->dup_expr());
-      }
-
-      return tmp;
-}
-
-NetESignal* NetESignal::dup_expr() const
-{
-      NetESignal*tmp = new NetESignal(net_);
-      assert(tmp);
-      tmp->expr_width(expr_width());
-      return tmp;
-}
-
-NetETernary* NetETernary::dup_expr() const
-{
-      NetETernary*tmp = new NetETernary(cond_->dup_expr(),
-					true_val_->dup_expr(),
-					false_val_->dup_expr());
-      return tmp;
-}
-
-NetEUFunc* NetEUFunc::dup_expr() const
-{
-      NetEUFunc*tmp;
-      svector<NetExpr*> tmp_parms (parms_.count());
-
-      for (unsigned idx = 0 ;  idx < tmp_parms.count() ;  idx += 1) {
-	    assert(parms_[idx]);
-	    tmp_parms[idx] = parms_[idx]->dup_expr();
-      }
-
-      tmp = new NetEUFunc(func_, result_sig_->dup_expr(), tmp_parms);
-
-      assert(tmp);
-      return tmp;
-}
-
-NetEUnary* NetEUnary::dup_expr() const
-{
-      NetEUnary*tmp = new NetEUnary(op_, expr_->dup_expr());
-      assert(tmp);
-      return tmp;
-}
-
-NetEUReduce* NetEUReduce::dup_expr() const
-{
-      NetEUReduce*tmp = new NetEUReduce(op_, expr_->dup_expr());
-      assert(tmp);
-      return tmp;
-}
-
 /*
  * $Log: dup_expr.cc,v $
- * Revision 1.21  2006/11/04 06:10:13  steve
- *  Handle dup of pad as well as normal select.
+ * Revision 1.1  1999/11/27 19:07:57  steve
+ *  Support the creation of scopes.
  *
- * 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

@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2000-2003 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: elab_anet.cc,v 1.12 2006/05/01 20:47:58 steve Exp $"
-#endif
-
-# include "config.h"
-
-/*
- * The elaborate_anet methods elaborate expressions that are intended
- * to be the left side of procedural continuous assignments.
- */
-
-# include  "PExpr.h"
-# include  "netlist.h"
-# include  "netmisc.h"
-# include  <iostream>
-
-NetNet* PExpr::elaborate_anet(Design*des, NetScope*scope) const
-{
-      cerr << get_line() << ": error: Invalid expression on left side "
-	   << "of procedural continuous assignment." << endl;
-      return 0;
-}
-
-
-NetNet* PEConcat::elaborate_anet(Design*des, NetScope*scope) const
-{
-      if (repeat_) {
-	    cerr << get_line() << ": error: Repeat concatenations make "
-		  "no sense in l-value expressions. I refuse." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      svector<NetNet*>nets (parms_.count());
-      unsigned pins = 0;
-      unsigned errors = 0;
-
-      for (unsigned idx = 0 ;  idx < nets.count() ;  idx += 1) {
-
-	    if (parms_[idx] == 0) {
-		  cerr << get_line() << ": error: Empty expressions "
-		       << "not allowed in concatenations." << endl;
-		  errors += 1;
-		  continue;
-	    }
-
-	    nets[idx] = parms_[idx]->elaborate_anet(des, scope);
-	    if (nets[idx] == 0)
-		  errors += 1;
-	    else
-		  pins += nets[idx]->pin_count();
-      }
-
-	/* If any of the sub expressions failed to elaborate, then
-	   delete all those that did and abort myself. */
-      if (errors) {
-	    for (unsigned idx = 0 ;  idx < nets.count() ;  idx += 1) {
-		  if (nets[idx]) delete nets[idx];
-	    }
-	    des->errors += 1;
-	    return 0;
-      }
-
-	/* Make the temporary signal that connects to all the
-	   operands, and connect it up. Scan the operands of the
-	   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
-	   connect loop as many times as necessary. */
-
-      NetNet*osig = new NetNet(scope, scope->local_symbol(),
-			       NetNet::IMPLICIT_REG, pins);
-	/* Assume that all the data types are the same. */
-      osig->data_type(nets[0]->data_type());
-
-      pins = 0;
-      for (unsigned idx = nets.count() ;  idx > 0 ;  idx -= 1) {
-	    NetNet*cur = nets[idx-1];
-	    assert(cur->data_type() == osig->data_type());
-	    for (unsigned pin = 0;  pin < cur->pin_count();  pin += 1) {
-		  connect(osig->pin(pins), cur->pin(pin));
-		  pins += 1;
-	    }
-      }
-
-      osig->local_flag(true);
-      return osig;
-}
-
-NetNet* PEIdent::elaborate_anet(Design*des, NetScope*scope) const
-{
-      assert(scope);
-
-      NetNet*       sig = 0;
-      NetMemory*    mem = 0;
-      const NetExpr*par = 0;
-      NetEvent*     eve = 0;
-
-      symbol_search(des, scope, path_, sig, mem, par, eve);
-
-
-      if (mem != 0) {
-	    cerr << get_line() << ": error: memories not allowed "
-		 << "on left side of procedural continuous "
-		 << "assignment." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      if (eve != 0) {
-	    cerr << get_line() << ": error: named events not allowed "
-		 << "on left side of procedural continuous "
-		 << "assignment." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      if (sig == 0) {
-	    cerr << get_line() << ": error: reg ``" << path_ << "'' "
-		 << "is undefined in this scope." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      switch (sig->type()) {
-	  case NetNet::REG:
-	  case NetNet::IMPLICIT_REG:
-	    break;
-
-	  default:
-	    cerr << get_line() << ": error: " << path_ << " is not "
-		 << "a reg in this context." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      assert(sig);
-
-      if (msb_ || lsb_) {
-
-	    cerr << get_line() << ": error: bit/part selects not allowed "
-		 << "on left side of procedural continuous assignment."
-		 << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      return sig;
-}
-
-/*
- * $Log: elab_anet.cc,v $
- * Revision 1.12  2006/05/01 20:47:58  steve
- *  More explicit datatype setup.
- *
- * Revision 1.11  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.10  2004/10/04 01:10:52  steve
- *  Clean up spurious trailing white space.
- *
- * Revision 1.9  2003/09/19 03:50:12  steve
- *  Remove find_memory method from Design class.
- *
- * Revision 1.8  2003/06/21 01:21:43  steve
- *  Harmless fixup of warnings.
- *
- * Revision 1.7  2003/03/06 00:28:41  steve
- *  All NetObj objects have lex_string base names.
- *
- * Revision 1.6  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.5  2002/08/12 01:34:58  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.4  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.3  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.2  2001/01/06 02:29:36  steve
- *  Support arrays of integers.
- *
- * Revision 1.1  2000/12/06 06:31:09  steve
- *  Check lvalue of procedural continuous assign (PR#29)
- *
- */
-

elab_lval.cc

@@ -1,503 +0,0 @@
-/*
- * Copyright (c) 2000-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: elab_lval.cc,v 1.38 2007/01/16 05:44:15 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  "PExpr.h"
-# include  "netlist.h"
-# include  "netmisc.h"
-# include  "compiler.h"
-# include  <iostream>
-
-/*
- * 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_
- * is created the width of the foo reg and connected to all the
- * bits.
- *
- * If there is a part select (i.e., foo[3:1] <= <value>) the NetAssign_
- * is made only as wide as it needs to be (3 bits in this example) and
- * connected to the correct bits of foo. A constant bit select is a
- * special case of the part select.
- *
- * If the bit-select is non-constant (i.e., foo[<expr>] = <value>) the
- * NetAssign_ is made wide enough to connect to all the bits of foo,
- * then the mux expression is elaborated and attached to the
- * NetAssign_ node as a b_mux value. The target must interpret the
- * presence of a bmux value as taking a single bit and assigning it to
- * the bit selected by the bmux expression.
- *
- * If the l-value expression is non-trivial, but can be fully
- * evaluated at compile time (meaning any bit selects are constant)
- * then elaboration will make a single NetAssign_ that connects to a
- * synthetic reg that in turn connects to all the proper pins of the
- * l-value.
- *
- * This last case can turn up in statements like: {a, b[1]} = c;
- * rather then create a NetAssign_ for each item in the concatenation,
- * elaboration makes a single NetAssign_ and connects it up properly.
- */
-
-
-/*
- * The default interpretation of an l-value to a procedural assignment
- * is to try to make a net elaboration, and see if the result is
- * suitable for assignment.
- */
-NetAssign_* PExpr::elaborate_lval(Design*des,
-				  NetScope*scope,
-				  bool is_force) const
-{
-      NetNet*ll = 0;
-      if (ll == 0) {
-	    cerr << get_line() << ": Assignment l-value too complex."
-		 << endl;
-	    return 0;
-      }
-
-      NetAssign_*lv = new NetAssign_(ll);
-      return lv;
-}
-
-/*
- * Concatenation expressions can appear as l-values. Handle them here.
- *
- * If adjacent l-values in the concatenation are not bit selects, then
- * merge them into a single NetAssign_ object. This can happen is code
- * like ``{ ...a, b, ...}''. As long as "a" and "b" do not have bit
- * selects (or the bit selects are constant) we can merge the
- * NetAssign_ objects.
- *
- * Be careful to get the bit order right. In the expression ``{a, b}''
- * a is the MSB and b the LSB. Connect the LSB to the low pins of the
- * NetAssign_ object.
- */
-NetAssign_* PEConcat::elaborate_lval(Design*des,
-				     NetScope*scope,
-				     bool is_force) const
-{
-      if (repeat_) {
-	    cerr << get_line() << ": error: Repeat concatenations make "
-		  "no sense in l-value expressions. I refuse." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      NetAssign_*res = 0;
-
-      for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
-
-	    if (parms_[idx] == 0) {
-		  cerr << get_line() << ": error: Empty expressions "
-		       << "not allowed in concatenations." << endl;
-		  des->errors += 1;
-		  continue;
-	    }
-
-	    NetAssign_*tmp = parms_[idx]->elaborate_lval(des, scope, is_force);
-
-	      /* If the l-value doesn't elaborate, the error was
-		 already detected and printed. We just skip it and let
-		 the compiler catch more errors. */
-	    if (tmp == 0)
-		  continue;
-
-	    assert(tmp);
-
-
-	      /* Link the new l-value to the previous one. */
-
-	    NetAssign_*last = tmp;
-	    while (last->more)
-		  last = last->more;
-
-	    last->more = res;
-	    res = tmp;
-      }
-
-      return res;
-}
-
-/*
- * Handle the ident as an l-value. This includes bit and part selects
- * of that ident.
- */
-NetAssign_* PEIdent::elaborate_lval(Design*des,
-				    NetScope*scope,
-				    bool is_force) const
-{
-      NetNet*       reg = 0;
-      const NetExpr*par = 0;
-      NetEvent*     eve = 0;
-
-      symbol_search(des, scope, path_, reg, par, eve);
-      if (reg == 0) {
-	    cerr << get_line() << ": error: Could not find variable ``"
-		 << path_ << "'' in ``" << scope->name() <<
-		  "''" << endl;
-
-	    des->errors += 1;
-	    return 0;
-      }
-
-      assert(reg);
-
-      if (reg->array_dimensions() > 0)
-	    return elaborate_lval_net_word_(des, scope, reg);
-
-      if (sel_ == SEL_PART) {
-	    NetAssign_*lv = new NetAssign_(reg);
-	    elaborate_lval_net_part_(des, scope, lv);
-	    return lv;
-      }
-
-      if (sel_ == SEL_IDX_UP) {
-	    NetAssign_*lv = new NetAssign_(reg);
-	    elaborate_lval_net_idx_up_(des, scope, lv);
-	    return lv;
-      }
-
-      if (sel_ == SEL_IDX_DO) {
-	    NetAssign_*lv = new NetAssign_(reg);
-	    elaborate_lval_net_idx_do_(des, scope, lv);
-	    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() <<
-		  "." << endl;
-	    cerr << reg->get_line() << ":      : " << 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 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;
-
-	    } else {
-
-		  msb = v->as_long();
-		  lsb = v->as_long();
-		  mux = 0;
-	    }
-
-      } else {
-
-	      /* No select expressions, so presume a part select the
-		 width of the register. */
-
-	    msb = reg->msb();
-	    lsb = reg->lsb();
-	    mux = 0;
-      }
-
-
-      NetAssign_*lv;
-      if (mux) {
-
-	      /* If there is a non-constant bit select, make a
-		 NetAssign_ to the target reg and attach a
-		 bmux to select the target bit. */
-	    lv = new NetAssign_(reg);
-
-	      /* Correct the mux for the range of the vector. */
-	    if (reg->msb() < reg->lsb())
-		  mux = make_sub_expr(reg->lsb(), mux);
-	    else if (reg->lsb() != 0)
-		  mux = make_add_expr(mux, - reg->lsb());
-
-	    lv->set_part(mux, 1);
-
-      } else if (msb == reg->msb() && lsb == reg->lsb()) {
-
-	      /* No bit select, and part select covers the entire
-		 vector. Simplest case. */
-	    lv = new NetAssign_(reg);
-
-      } else {
-
-	      /* If the bit/part select is constant, then make the
-		 NetAssign_ only as wide as it needs to be and connect
-		 only to the selected bits of the reg. */
-	    unsigned loff = reg->sb_to_idx(lsb);
-	    unsigned moff = reg->sb_to_idx(msb);
-	    unsigned wid = moff - loff + 1;
-
-	    if (moff < loff) {
-		  cerr << get_line() << ": error: part select "
-		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
-		       << " is reversed." << endl;
-		  des->errors += 1;
-		  return 0;
-	    }
-
-	      /* If the part select extends beyond the extreme of the
-		 variable, then report an error. Note that loff is
-		 converted to normalized form so is relative the
-		 variable pins. */
-
-	    if ((wid + loff) > reg->vector_width()) {
-		  cerr << get_line() << ": error: bit/part select "
-		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
-		       << " is out of range." << endl;
-		  des->errors += 1;
-		  return 0;
-	    }
-
-	    lv = new NetAssign_(reg);
-	    lv->set_part(new NetEConst(verinum(loff)), wid);
-      }
-
-
-      return lv;
-}
-
-NetAssign_* PEIdent::elaborate_lval_net_word_(Design*des,
-					      NetScope*scope,
-					      NetNet*reg) const
-{
-      assert(idx_.size() == 1);
-
-      NetExpr*word = elab_and_eval(des, scope, idx_[0], -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);
-	    if (NetExpr*tmp = word->eval_tree()) {
-		  word = tmp;
-	    }
-      }
-
-      NetAssign_*lv = new NetAssign_(reg);
-      lv->set_word(word);
-
-      if (debug_elaborate)
-	    cerr << get_line() << ": debug: Set array word=" << *word << endl;
-
-	/* An array word may also have part selects applied to them. */
-
-      if (sel_ == SEL_PART)
-	    elaborate_lval_net_part_(des, scope, lv);
-
-      if (sel_ == SEL_IDX_UP)
-	    elaborate_lval_net_idx_up_(des, scope, lv);
-
-      if (sel_ == SEL_IDX_DO)
-	    elaborate_lval_net_idx_do_(des, scope, lv);
-
-      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. */
-
-      } else {
-
-	      /* If the bit/part select is constant, then make the
-		 NetAssign_ only as wide as it needs to be and connect
-		 only to the selected bits of the reg. */
-	    unsigned loff = reg->sb_to_idx(lsb);
-	    unsigned moff = reg->sb_to_idx(msb);
-	    unsigned wid = moff - loff + 1;
-
-	    if (moff < loff) {
-		  cerr << get_line() << ": error: part select "
-		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
-		       << " is reversed." << endl;
-		  des->errors += 1;
-		  return false;
-	    }
-
-	      /* If the part select extends beyond the extreme of the
-		 variable, then report an error. Note that loff is
-		 converted to normalized form so is relative the
-		 variable pins. */
-
-	    if ((wid + loff) > reg->vector_width()) {
-		  cerr << get_line() << ": error: bit/part select "
-		       << reg->name() << "[" << msb<<":"<<lsb<<"]"
-		       << " is out of range." << endl;
-		  des->errors += 1;
-		  return false;
-	    }
-
-	    lv->set_part(new NetEConst(verinum(loff)), wid);
-      }
-
-      return true;
-}
-
-bool PEIdent::elaborate_lval_net_idx_up_(Design*des,
-					 NetScope*scope,
-					 NetAssign_*lv) const
-{
-      assert(lsb_);
-      assert(msb_);
-
-      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() <<
-		  "." << endl;
-	    cerr << reg->get_line() << ":      : " << path_ <<
-		  " is declared here as " << reg->type() << "." << endl;
-	    des->errors += 1;
-	    return false;
-      }
-
-      unsigned long wid;
-      calculate_up_do_width_(des, scope, wid);
-
-      NetExpr*base = elab_and_eval(des, scope, msb_, -1);
-
-	/* Correct the mux for the range of the vector. */
-      if (reg->msb() < reg->lsb())
-	    base = make_sub_expr(reg->lsb(), base);
-      else if (reg->lsb() != 0)
-	    base = make_add_expr(base, - reg->lsb());
-
-      if (debug_elaborate)
-	    cerr << get_line() << ": debug: Set part select width="
-		 << wid << ", base=" << *base << endl;
-
-      lv->set_part(base, wid);
-
-      return true;
-}
-
-bool PEIdent::elaborate_lval_net_idx_do_(Design*des,
-					 NetScope*scope,
-					 NetAssign_*lv) 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 false;
-}
-
-NetAssign_* PENumber::elaborate_lval(Design*des, NetScope*, bool) const
-{
-      cerr << get_line() << ": error: Constant values not allowed "
-	   << "in l-value expressions." << endl;
-      des->errors += 1;
-      return 0;
-}
-
-/*
- * $Log: elab_lval.cc,v $
- * Revision 1.38  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.37  2006/11/04 06:19:25  steve
- *  Remove last bits of relax_width methods, and use test_width
- *  to calculate the width of an r-value expression that may
- *  contain unsized numbers.
- *
- * 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,336 +0,0 @@
-/*
- * Copyright (c) 2000 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: elab_pexpr.cc,v 1.25 2006/11/04 06:19:25 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  "PExpr.h"
-# include  "compiler.h"
-# include  "util.h"
-
-# include  <iostream>
-
-NetExpr*PExpr::elaborate_pexpr(Design*des, NetScope*sc) const
-{
-      cerr << get_line() << ": error: invalid parameter expression: "
-	   << *this << endl;
-      des->errors += 1;
-
-      return 0;
-}
-
-/*
- * Binary operators have sub-expressions that must be elaborated as
- * parameter expressions. If either of them fail, then give up. Once
- * they are taken care of, make the base object just as in any other
- * expression.
- */
-NetExpr*PEBinary::elaborate_pexpr (Design*des, NetScope*scope) const
-{
-      NetExpr*lp = left_->elaborate_pexpr(des, scope);
-      NetExpr*rp = right_->elaborate_pexpr(des, scope);
-      if ((lp == 0) || (rp == 0)) {
-	    delete lp;
-	    delete rp;
-	    return 0;
-      }
-
-      NetEBinary*tmp = elaborate_expr_base_(des, lp, rp, -1);
-      return tmp;
-}
-
-/*
- * Event though parameters are not generally sized, parameter
- * expressions can include concatenation expressions. This requires
- * that the subexpressions all have well-defined size (in spite of
- * being in a parameter expression) in order to get a defined
- * value. The sub-expressions themselves must also be value parameter
- * expressions.
- */
-NetEConcat* PEConcat::elaborate_pexpr(Design*des, NetScope*scope) const
-{
-      NetExpr* repeat = 0;
-
-	/* If there is a repeat expression, then evaluate the constant
-	   value and set the repeat count.  */
-      if (repeat_) {
-	    repeat = repeat_->elaborate_pexpr(des, scope);
-	    if (repeat == 0) {
-		  cerr << get_line() << ": error: "
-			"concatenation repeat expression cannot be evaluated."
-		       << endl;
-		  des->errors += 1;
-	    }
-
-	      /* continue on even if the repeat expression doesn't
-		 work, as we can find more errors. */
-      }
-
-	/* Make the empty concat expression. */
-      NetEConcat*tmp = new NetEConcat(parms_.count(), repeat);
-      tmp->set_line(*this);
-
-	/* Elaborate all the operands and attach them to the concat
-	   node. Use the elaborate_pexpr method instead of the
-	   elaborate_expr method. */
-      for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
-	    assert(parms_[idx]);
-	    NetExpr*ex = parms_[idx]->elaborate_pexpr(des, scope);
-	    if (ex == 0) continue;
-
-	    ex->set_line(*parms_[idx]);
-
-	    if (dynamic_cast<NetEParam*>(ex)) {
-
-		    /* If this parameter is a NetEParam, then put off
-		       the width check for later. */
-
-	    } else if (! ex->has_width()) {
-		  cerr << ex->get_line() << ": error: operand of "
-		       << "concatenation has indefinite width: "
-		       << *ex << endl;
-		  des->errors += 1;
-
-	    }
-
-	    tmp->set(idx, ex);
-      }
-
-      return tmp;
-}
-
-NetExpr*PEFNumber::elaborate_pexpr(Design*des, NetScope*scope) const
-{
-      return elaborate_expr(des, scope, -1, false);
-}
-
-/*
- * Parameter expressions may reference other parameters, but only in
- * the current scope. Preserve the parameter reference in the
- * parameter expression I'm generating, instead of evaluating it now,
- * because the referenced parameter may yet be overridden.
- */
-NetExpr*PEIdent::elaborate_pexpr(Design*des, NetScope*scope) const
-{
-      hname_t path = path_;
-      char*name = path.remove_tail_name();
-
-      NetScope*pscope = scope;
-      if (path.peek_name(0))
-	    pscope = des->find_scope(scope, path);
-
-      perm_string perm_name = lex_strings.make(name);
-      delete name;
-
-      const NetExpr*ex_msb;
-      const NetExpr*ex_lsb;
-      const NetExpr*ex = pscope->get_parameter(perm_name, ex_msb, ex_lsb);
-      if (ex == 0) {
-	    cerr << get_line() << ": error: identifier ``" << path_ <<
-		  "'' is not a parameter in " << scope->name() << "." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-      NetExpr*res = new NetEParam(des, pscope, perm_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;
-
-      } else if (!idx_.empty()) {
-	    assert(msb_==0);
-	    assert(lsb_==0);
-	    assert(idx_.size() == 1);
-
-	      /* 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);
-	    }
-      }
-
-      return res;
-}
-
-/*
- * Simple numbers can be elaborated by the elaborate_expr method.
- */
-NetExpr*PENumber::elaborate_pexpr(Design*des, NetScope*sc) const
-{
-      return elaborate_expr(des, sc, -1, false);
-}
-
-
-NetEConst* PEString::elaborate_pexpr(Design*des, NetScope*scope) const
-{
-      return elaborate_expr(des, scope, -1, false);
-}
-
-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);
-}
-
-NetExpr*PEUnary::elaborate_pexpr (Design*des, NetScope*scope) const
-{
-      NetExpr*ip = expr_->elaborate_pexpr(des, scope);
-      if (ip == 0) return 0;
-
-      /* Should we evaluate expressions ahead of time,
-       * just like in PEBinary::elaborate_expr() ?
-       */
-
-      NetEUnary*tmp;
-      switch (op_) {
-	  default:
-	    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
-	  case '^': // Reduction XOR
-	  case 'A': // Reduction NAND (~&)
-	  case 'N': // Reduction NOR (~|)
-	  case 'X': // Reduction NXOR (~^)
-	    tmp = new NetEUReduce(op_, ip);
-	    tmp->set_line(*this);
-	    break;
-      }
-      return tmp;
-}
-
-/*
- * $Log: elab_pexpr.cc,v $
- * Revision 1.25  2006/11/04 06:19:25  steve
- *  Remove last bits of relax_width methods, and use test_width
- *  to calculate the width of an r-value expression that may
- *  contain unsized numbers.
- *
- * 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,849 +0,0 @@
-/*
- * Copyright (c) 2000-2003 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: 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  <iostream>
-# include  <stdio.h>
-
-/*
- * Elaboration happens in two passes, generally. The first scans the
- * pform to generate the NetScope tree and attach it to the Design
- * object. The methods in this source file implement the elaboration
- * of the scopes.
- */
-
-# include  "Module.h"
-# include  "PEvent.h"
-# include  "PExpr.h"
-# include  "PGate.h"
-# include  "PGenerate.h"
-# include  "PTask.h"
-# include  "PWire.h"
-# include  "Statement.h"
-# include  "netlist.h"
-# include  "util.h"
-# include  <typeinfo>
-# include  <assert.h>
-
-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;
-      }
-
-	// Generate all the parameters that this instance of this
-	// module introduces to the design. This loop elaborates the
-	// parameters, but doesn't evaluate references to
-	// parameters. This scan practically locates all the
-	// parameters and puts them in the parameter table in the
-	// design.
-
-	// No expressions are evaluated, yet. For now, leave them in
-	// the pform and just place a NetEParam placeholder in the
-	// 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;
-
-
-	// This loop scans the parameters in the module, and creates
-	// stub parameter entries in the scope for the parameter name.
-
-      for (mparm_it_t cur = parameters.begin()
-		 ; cur != parameters.end() ;  cur ++) {
-
-	    NetEParam*tmp = new NetEParam;
-	    tmp->set_line(*((*cur).second.expr));
-	    tmp->cast_signed( (*cur).second.signed_flag );
-
-	    scope->set_parameter((*cur).first, tmp, 0, 0, false);
-      }
-
-      for (mparm_it_t cur = localparams.begin()
-		 ; cur != localparams.end() ;  cur ++) {
-
-	    NetEParam*tmp = new NetEParam;
-	    tmp->set_line(*((*cur).second.expr));
-	    if ((*cur).second.msb)
-		  tmp->cast_signed( (*cur).second.signed_flag );
-
-	    scope->set_parameter((*cur).first, tmp, 0, 0, false);
-      }
-
-
-	// Now scan the parameters again, this time elaborating them
-	// for use as parameter values. This is after the previous
-	// scan so that local parameter names can be used in the
-	// r-value expressions.
-
-      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;
-      }
-
-	/* run parameter replacements that were collected from the
-	   containing scope and meant for me. */
-      for (replace_t::const_iterator cur = replacements.begin()
-		 ; cur != replacements.end() ;  cur ++) {
-
-	    NetExpr*val = (*cur).second;
-	    if (debug_scopes) {
-		  cerr << get_line() << ": debug: "
-		       << "Replace " << (*cur).first
-		       << " with expression " << *val
-		       << " from " << val->get_line() << "." << endl;
-	    }
-	    bool flag = scope->replace_parameter((*cur).first, val);
-	    if (! flag) {
-		  cerr << val->get_line() << ": warning: parameter "
-		       << (*cur).first << " not found in "
-		       << scope->name() << "." << 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;
-      }
-
-	// Run through the defparams for this module, elaborate the
-	// expressions in this context and save the result is a table
-	// for later final override.
-
-	// It is OK to elaborate the expressions of the defparam here
-	// because Verilog requires that the expressions only use
-	// local parameter names. It is *not* OK to do the override
-	// here because the parameter receiving the assignment may be
-	// in a scope not discovered by this pass.
-
-      for (hparm_it_t cur = defparms.begin()
-		 ; cur != defparms.end() ;  cur ++ ) {
-
-	    PExpr*ex = (*cur).second;
-	    assert(ex);
-
-	    NetExpr*val = ex->elaborate_pexpr(des, scope);
-	    if (val == 0) continue;
-	    scope->defparams[(*cur).first] = val;
-      }
-
-	// Evaluate the attributes. Evaluate them in the scope of the
-	// module that the attribute is attached to. Is this correct?
-      unsigned nattr;
-      attrib_list_t*attr = evaluate_attributes(attributes, nattr, des, scope);
-
-      for (unsigned idx = 0 ;  idx < nattr ;  idx += 1)
-	    scope->attribute(attr[idx].key, attr[idx].val);
-
-      delete[]attr;
-
-	// Generate schemes can create new scopes in the form of
-	// generated code. Scan the 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 = generate_schemes.begin()
-		 ; cur != generate_schemes.end() ; cur ++ ) {
-	    (*cur) -> generate_scope(des, scope);
-      }
-
-
-	// Tasks introduce new scopes, so scan the tasks in this
-	// module. Create a scope for the task and pass that to the
-	// elaborate_scope method of the PTask for detailed
-	// processing.
-
-      typedef map<perm_string,PTask*>::const_iterator tasks_it_t;
-
-      for (tasks_it_t cur = tasks_.begin()
-		 ; cur != tasks_.end() ;  cur ++ ) {
-
-	    NetScope*task_scope = new NetScope(scope, (*cur).first,
-					       NetScope::TASK);
-	    (*cur).second->elaborate_scope(des, task_scope);
-      }
-
-
-	// Functions are very similar to tasks, at least from the
-	// perspective of scopes. So handle them exactly the same
-	// way.
-
-      typedef map<perm_string,PFunction*>::const_iterator funcs_it_t;
-
-      for (funcs_it_t cur = funcs_.begin()
-		 ; cur != funcs_.end() ;  cur ++ ) {
-
-	    NetScope*func_scope = new NetScope(scope, (*cur).first,
-					       NetScope::FUNC);
-	    (*cur).second->elaborate_scope(des, func_scope);
-      }
-
-
-	// Gates include modules, which might introduce new scopes, so
-	// scan all of them to create those scopes.
-
-      typedef list<PGate*>::const_iterator gates_it_t;
-      for (gates_it_t cur = gates_.begin()
-		 ; cur != gates_.end() ;  cur ++ ) {
-
-	    (*cur) -> elaborate_scope(des, scope);
-      }
-
-
-	// initial and always blocks may contain begin-end and
-	// fork-join blocks that can introduce scopes. Therefore, I
-	// get to scan processes here.
-
-      typedef list<PProcess*>::const_iterator proc_it_t;
-
-      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
-	// elaboration, so do it now. This allows for normal
-	// elaboration to reference these events.
-
-      for (map<perm_string,PEvent*>::const_iterator et = events.begin()
-		 ; et != events.end() ;  et ++ ) {
-
-	    (*et).second->elaborate_scope(des, scope);
-      }
-
-      return des->errors == 0;
-}
-
-bool PGenerate::generate_scope(Design*des, NetScope*container)
-{
-      switch (scheme_type) {
-	  case GS_LOOP:
-	    return generate_scope_loop_(des, container);
-
-	  default:
-	    cerr << get_line() << ": sorry: Generate of this sort"
-		 << " is not supported yet!" << endl;
-	    return false;
-      }
-}
-
-/*
- * This is the elaborate scope method for a generate loop.
- */
-bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
-{
-	// 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.
-      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"
-		 << " init expression: " << *loop_init << 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;
-
-      container->genvar_tmp = loop_index;
-      container->genvar_tmp_val = 0;
-      NetExpr*test_ex = elab_and_eval(des, container, loop_test, -1);
-      NetEConst*test = dynamic_cast<NetEConst*>(test_ex);
-      assert(test);
-      while (test->value().as_long()) {
-
-	      // The actual name of the scope includes the genvar so
-	      // 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: "
-		       << "Create generated scope " << use_name << endl;
-
-	    NetScope*scope = new NetScope(container, use_name,
-					  NetScope::GENBLOCK);
-
-	      // Set in the scope a localparam for the value of the
-	      // genvar within this instance of the generate
-	      // block. Code within this scope thus has access to the
-	      // genvar as a constant.
-	    {
-		  verinum genvar_verinum(genvar);
-		  genvar_verinum.has_sign(true);
-		  NetEConstParam*gp = new NetEConstParam(scope,
-							 loop_index,
-							 genvar_verinum);
-		  scope->set_localparam(loop_index, gp);
-	    }
-
-	    scope_list_.push_back(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 "
-		       << genvar << " to " << step->value().as_long() << endl;
-
-	    genvar = step->value().as_long();
-	    container->genvar_tmp_val = genvar;
-	    delete step;
-	    delete test_ex;
-	    test_ex = elab_and_eval(des, container, loop_test, -1);
-	    test = dynamic_cast<NetEConst*>(test_ex);
-	    assert(test);
-      }
-
-	// Clear the genvar_tmp field in the scope to reflect that the
-	// genvar is no longer value for evaluating expressions.
-      container->genvar_tmp = perm_string();
-
-      return true;
-}
-
-void PGModule::elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const
-{
-      if (get_name() == "") {
-	    cerr << get_line() << ": error: Instantiation of module "
-		 << mod->mod_name() << " requires an instance name." << endl;
-	    des->errors += 1;
-	    return;
-      }
-
-	// Missing module instance names have already been rejected.
-      assert(get_name() != "");
-
-	// Check for duplicate scopes. Simply look up the scope I'm
-	// 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 " <<
-		  get_name() << " already used in this context." <<
-		  endl;
-	    des->errors += 1;
-	    return;
-      }
-
-	// check for recursive instantiation by scanning the current
-	// scope and its parents. Look for a module instantiation of
-	// the same module, but farther up in the scope.
-
-      for (NetScope*scn = sc ;  scn ;  scn = scn->parent()) {
-	    if (scn->type() != NetScope::MODULE)
-		  continue;
-
-	    if (strcmp(mod->mod_name(), scn->module_name()) != 0)
-		  continue;
-
-	    cerr << get_line() << ": 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;
-
-	    des->errors += 1;
-	    return;
-      }
-
-      NetExpr*mse = msb_ ? elab_and_eval(des, sc, msb_, -1) : 0;
-      NetExpr*lse = lsb_ ? elab_and_eval(des, sc, lsb_, -1) : 0;
-      NetEConst*msb = dynamic_cast<NetEConst*> (mse);
-      NetEConst*lsb = dynamic_cast<NetEConst*> (lse);
-
-      assert( (msb == 0) || (lsb != 0) );
-
-      long instance_low  = 0;
-      long instance_high = 0;
-      long instance_count  = 1;
-      bool instance_array = false;
-
-      if (msb) {
-	    instance_array = true;
-	    instance_high = msb->value().as_long();
-	    instance_low  = lsb->value().as_long();
-	    if (instance_high > instance_low)
-		  instance_count = instance_high - instance_low + 1;
-	    else
-		  instance_count = instance_low - instance_high + 1;
-
-	    delete mse;
-	    delete lse;
-      }
-
-      NetScope::scope_vec_t instances (instance_count);
-      if (debug_scopes) {
-	    cerr << get_line() << ": debug: Create " << instance_count
-		 << " instances of " << get_name()
-		 << "." << endl;
-      }
-
-	// Run through the module instances, and make scopes out of
-	// them. Also do parameter overrides that are done on the
-	// instantiation line.
-      for (int idx = 0 ;  idx < instance_count ;  idx += 1) {
-
-	    perm_string 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);
-	    }
-
-	    if (debug_scopes) {
-		  cerr << get_line() << ": debug: Module instance " << use_name
-		       << " becomes child of " << sc->name()
-		       << "." << endl;
-	    }
-
-	      // Create the new scope as a MODULE with my name.
-	    NetScope*my_scope = new NetScope(sc, use_name, NetScope::MODULE);
-	    my_scope->set_module_name(mod->mod_name());
-	    my_scope->default_nettype(mod->default_nettype);
-
-	    instances[idx] = my_scope;
-
-	      // Set time units and precision.
-	    my_scope->time_unit(mod->time_unit);
-	    my_scope->time_precision(mod->time_precision);
-	    des->set_precision(mod->time_precision);
-
-	      // Look for module parameter replacements. The "replace" map
-	      // maps parameter name to replacement expression that is
-	      // passed. It is built up by the ordered overrides or named
-	      // overrides.
-
-	    typedef map<perm_string,PExpr*>::const_iterator mparm_it_t;
-	    map<perm_string,PExpr*> replace;
-
-
-	      // Positional parameter overrides are matched to parameter
-	      // names by using the param_names list of parameter
-	      // names. This is an ordered list of names so the first name
-	      // is parameter 0, the second parameter 1, and so on.
-
-	    if (overrides_) {
-		  assert(parms_ == 0);
-		  list<perm_string>::const_iterator cur
-			= mod->param_names.begin();
-		  unsigned idx = 0;
-		  for (;;) {
-			if (idx >= overrides_->count())
-			      break;
-			if (cur == mod->param_names.end())
-			      break;
-
-			replace[*cur] = (*overrides_)[idx];
-
-			idx += 1;
-			cur ++;
-		  }
-	    }
-
-	      // Named parameter overrides carry a name with each override
-	      // so the mapping into the replace list is much easier.
-	    if (parms_) {
-		  assert(overrides_ == 0);
-		  for (unsigned idx = 0 ;  idx < nparms_ ;  idx += 1)
-			replace[parms_[idx].name] = parms_[idx].parm;
-
-	    }
-
-
-	    Module::replace_t replace_net;
-
-	      // And here we scan the replacements we collected. Elaborate
-	      // the expression in my context, then replace the sub-scope
-	      // parameter value with the new expression.
-
-	    for (mparm_it_t cur = replace.begin()
-		       ; cur != replace.end() ;  cur ++ ) {
-
-		  PExpr*tmp = (*cur).second;
-		  NetExpr*val = tmp->elaborate_pexpr(des, sc);
-		  replace_net[(*cur).first] = val;
-	    }
-
-	      // This call actually arranges for the description of the
-	      // module type to process this instance and handle parameters
-	      // and sub-scopes that might occur. Parameters are also
-	      // created in that scope, as they exist. (I'll override them
-	      // later.)
-	    mod->elaborate_scope(des, my_scope, replace_net);
-
-      }
-
-	/* Stash the instance array of scopes into the parent
-	   scope. Later elaboration passes will use this vector to
-	   further elaborate the array. */
-      sc->instance_arrays[get_name()] = instances;
-}
-
-/*
- * The isn't really able to create new scopes, but it does create the
- * event name in the current scope, so can be done during the
- * elaborate_scope scan. Note that the name_ of the PEvent object has
- * no hierarchy, but neither does the NetEvent, until it is stored in
- * the NetScope object.
- */
-void PEvent::elaborate_scope(Design*des, NetScope*scope) const
-{
-      NetEvent*ev = new NetEvent(name_);
-      ev->set_line(*this);
-      scope->add_event(ev);
-}
-
-void PFunction::elaborate_scope(Design*des, NetScope*scope) const
-{
-      assert(scope->type() == NetScope::FUNC);
-
-      if (statement_)
-	    statement_->elaborate_scope(des, scope);
-}
-
-void PTask::elaborate_scope(Design*des, NetScope*scope) const
-{
-      assert(scope->type() == NetScope::TASK);
-
-      if (statement_)
-	    statement_->elaborate_scope(des, scope);
-}
-
-
-/*
- * The base statement does not have sub-statements and does not
- * introduce any scope, so this is a no-op.
- */
-void Statement::elaborate_scope(Design*, NetScope*) const
-{
-}
-
-/*
- * When I get a behavioral block, check to see if it has a name. If it
- * does, then create a new scope for the statements within it,
- * otherwise use the current scope. Use the selected scope to scan the
- * statements that I contain.
- */
-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
-				    ? NetScope::FORK_JOIN
-				    : NetScope::BEGIN_END);
-      }
-
-      for (unsigned idx = 0 ;  idx < list_.count() ;  idx += 1)
-	    list_[idx] -> elaborate_scope(des, my_scope);
-
-}
-
-/*
- * The case statement itself does not introduce scope, but contains
- * other statements that may be named blocks. So scan the case items
- * with the elaborate_scope method.
- */
-void PCase::elaborate_scope(Design*des, NetScope*scope) const
-{
-      assert(items_);
-      for (unsigned idx = 0 ;  idx < (*items_).count() ;  idx += 1) {
-	    assert( (*items_)[idx] );
-
-	    if (Statement*sp = (*items_)[idx]->stat)
-		  sp -> elaborate_scope(des, scope);
-      }
-}
-
-/*
- * The conditional statement (if-else) does not introduce scope, but
- * the statements of the clauses may, so elaborate_scope the contained
- * statements.
- */
-void PCondit::elaborate_scope(Design*des, NetScope*scope) const
-{
-      if (if_)
-	    if_ -> elaborate_scope(des, scope);
-
-      if (else_)
-	    else_ -> elaborate_scope(des, scope);
-}
-
-/*
- * Statements that contain a further statement but do not
- * intrinsically add a scope need to elaborate_scope the contained
- * statement.
- */
-void PDelayStatement::elaborate_scope(Design*des, NetScope*scope) const
-{
-      if (statement_)
-	    statement_ -> elaborate_scope(des, scope);
-}
-
-/*
- * Statements that contain a further statement but do not
- * intrinsically add a scope need to elaborate_scope the contained
- * statement.
- */
-void PEventStatement::elaborate_scope(Design*des, NetScope*scope) const
-{
-      if (statement_)
-	    statement_ -> elaborate_scope(des, scope);
-}
-
-/*
- * Statements that contain a further statement but do not
- * intrinsically add a scope need to elaborate_scope the contained
- * statement.
- */
-void PForever::elaborate_scope(Design*des, NetScope*scope) const
-{
-      if (statement_)
-	    statement_ -> elaborate_scope(des, scope);
-}
-
-/*
- * Statements that contain a further statement but do not
- * intrinsically add a scope need to elaborate_scope the contained
- * statement.
- */
-void PForStatement::elaborate_scope(Design*des, NetScope*scope) const
-{
-      if (statement_)
-	    statement_ -> elaborate_scope(des, scope);
-}
-
-/*
- * Statements that contain a further statement but do not
- * intrinsically add a scope need to elaborate_scope the contained
- * statement.
- */
-void PRepeat::elaborate_scope(Design*des, NetScope*scope) const
-{
-      if (statement_)
-	    statement_ -> elaborate_scope(des, scope);
-}
-
-/*
- * Statements that contain a further statement but do not
- * intrinsically add a scope need to elaborate_scope the contained
- * statement.
- */
-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.
- */
-

elab_sig.cc

@@ -1,837 +0,0 @@
-/*
- * Copyright (c) 2000-2004 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: elab_sig.cc,v 1.43 2007/01/16 05:44:15 steve Exp $"
-#endif
-
-# include "config.h"
-
-# include  <iostream>
-
-# include  "Module.h"
-# include  "PExpr.h"
-# include  "PGate.h"
-# include  "PGenerate.h"
-# include  "PTask.h"
-# include  "PWire.h"
-# include  "compiler.h"
-# include  "netlist.h"
-# include  "netmisc.h"
-# include  "util.h"
-
-/*
- * This local function checks if a named signal is connected to a
- * port. It looks in the array of ports passed, for NetEIdent objects
- * within the port_t that have a matching name.
- */
-static bool signal_is_in_port(const svector<Module::port_t*>&ports,
-			      const hname_t&name)
-{
-      for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
-
-	    Module::port_t*pp = ports[idx];
-	      // Skip internally unconnected ports.
-	    if (pp == 0)
-		  continue;
-
-	      // This port has an internal connection. In this case,
-	      // the port has 0 or more NetEIdent objects concatenated
-	      // together that form the port.
-	    for (unsigned cc = 0 ;  cc < pp->expr.count() ;  cc += 1) {
-		  assert(pp->expr[cc]);
-		  if (pp->expr[cc]->path() == name)
-			return true;
-	    }
-      }
-
-      return false;
-}
-
-bool Module::elaborate_sig(Design*des, NetScope*scope) const
-{
-      bool flag = true;
-
-	// Get all the explicitly declared wires of the module and
-	// start the signals list with them.
-      const map<hname_t,PWire*>&wl = get_wires();
-
-	// Scan all the ports of the module, and make sure that each
-	// is connected to wires that have port declarations.
-      for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
-	    Module::port_t*pp = ports[idx];
-	    if (pp == 0)
-		  continue;
-
-	    map<hname_t,PWire*>::const_iterator wt;
-	    for (unsigned cc = 0 ;  cc < pp->expr.count() ;  cc += 1) {
-		  hname_t port_path (pp->expr[cc]->path());
-		  wt = wl.find(port_path);
-
-		  if (wt == wl.end()) {
-			cerr << get_line() << ": error: "
-			     << "Port " << pp->expr[cc]->path() << " ("
-			     << (idx+1) << ") of module " << name_
-			     << " is not declared within module." << endl;
-			des->errors += 1;
-			continue;
-		  }
-
-		  if ((*wt).second->get_port_type() == NetNet::NOT_A_PORT) {
-			cerr << get_line() << ": error: "
-			     << "Port " << pp->expr[cc]->path() << " ("
-			     << (idx+1) << ") of module " << name_
-			     << " has no direction declaration."
-			     << endl;
-			des->errors += 1;
-		  }
-	    }
-      }
-
-      for (map<hname_t,PWire*>::const_iterator wt = wl.begin()
-		 ; wt != wl.end()
-		 ; wt ++ ) {
-
-	    PWire*cur = (*wt).second;
-	    cur->elaborate_sig(des, scope);
-
-	    NetNet*sig = scope->find_signal_in_child(cur->path());
-
-	      // If this wire is a signal of the module (as opposed to
-	      // a port of a function) and is a port, then check that
-	      // the module knows about it. We know that the signal is
-	      // the name of a signal within a subscope of a module
-	      // (a task, a function, etc.) if the name for the PWire
-	      // has hierarchy.
-
-	    if (sig && (sig->scope() == scope)
-		&& (cur->get_port_type() != NetNet::NOT_A_PORT)) {
-
-		  hname_t name = (*wt).first;
-
-		  if (! signal_is_in_port(ports, name)) {
-
-			cerr << cur->get_line() << ": error: Signal "
-			     << name << " has a declared direction "
-			     << "but is not a port." << endl;
-			des->errors += 1;
-		  }
-	    }
-
-
-	      /* If the signal is an input and is also declared as a
-		 reg, then report an error. */
-
-	    if (sig && (sig->scope() == scope)
-		&& (sig->port_type() == NetNet::PINPUT)
-		&& (sig->type() == NetNet::REG)) {
-
-		  cerr << cur->get_line() << ": error: "
-		       << cur->path() << " in module "
-		       << scope->module_name()
-		       << " declared as input and as a reg type." << endl;
-		  des->errors += 1;
-	    }
-
-	    if (sig && (sig->scope() == scope)
-		&& (sig->port_type() == NetNet::PINOUT)
-		&& (sig->type() == NetNet::REG)) {
-
-		  cerr << cur->get_line() << ": error: "
-		       << cur->path() << " in  module "
-		       << scope->module_name()
-		       << " declared as inout and as a reg type." << endl;
-		  des->errors += 1;
-	    }
-
-      }
-
-	// Run through all the generate schemes to enaborate the
-	// signals that they hold. Note that the generate schemes hold
-	// the scopes that they instantiated, so we don't pass any
-	// scope in.
-      typedef list<PGenerate*>::const_iterator generate_it_t;
-      for (generate_it_t cur = generate_schemes.begin()
-		 ; cur != generate_schemes.end() ; cur ++ ) {
-	    (*cur) -> elaborate_sig(des);
-      }
-
-	// Get all the gates of the module and elaborate them by
-	// connecting them to the signals. The gate may be simple or
-	// complex. What we are looking for is gates that are modules
-	// that can create scopes and signals.
-
-      const list<PGate*>&gl = get_gates();
-
-      for (list<PGate*>::const_iterator gt = gl.begin()
-		 ; gt != gl.end()
-		 ; gt ++ ) {
-
-	    flag &= (*gt)->elaborate_sig(des, scope);
-      }
-
-
-      typedef map<perm_string,PFunction*>::const_iterator mfunc_it_t;
-
-      for (mfunc_it_t cur = funcs_.begin()
-		 ; cur != funcs_.end() ;  cur ++) {
-	    NetScope*fscope = scope->child((*cur).first);
-	    if (scope == 0) {
-		  cerr << (*cur).second->get_line() << ": internal error: "
-		       << "Child scope for function " << (*cur).first
-		       << " missing in " << scope->name() << "." << endl;
-		  des->errors += 1;
-		  continue;
-	    }
-
-	    (*cur).second->elaborate_sig(des, fscope);
-      }
-
-
-	// After all the wires are elaborated, we are free to
-	// elaborate the ports of the tasks defined within this
-	// module. Run through them now.
-
-      typedef map<perm_string,PTask*>::const_iterator mtask_it_t;
-
-      for (mtask_it_t cur = tasks_.begin()
-		 ; cur != tasks_.end() ;  cur ++) {
-	    NetScope*tscope = scope->child((*cur).first);
-	    assert(tscope);
-	    (*cur).second->elaborate_sig(des, tscope);
-      }
-
-      return flag;
-}
-
-bool PGModule::elaborate_sig_mod_(Design*des, NetScope*scope,
-				  Module*rmod) const
-{
-      bool flag = true;
-
-      NetScope::scope_vec_t instance = scope->instance_arrays[get_name()];
-
-      for (unsigned idx = 0 ;  idx < instance.count() ;  idx += 1) {
-	      // I know a priori that the elaborate_scope created the scope
-	      // already, so just look it up as a child of the current scope.
-	    NetScope*my_scope = instance[idx];
-	    assert(my_scope);
-
-	    if (my_scope->parent() != scope) {
-		  cerr << get_line() << ": internal error: "
-		       << "Instance " << my_scope->name()
-		       << " is in parent " << my_scope->parent()->name()
-		       << " instead of " << scope->name()
-		       << endl;
-	    }
-	    assert(my_scope->parent() == scope);
-
-	    if (! rmod->elaborate_sig(des, my_scope))
-		  flag = false;
-
-      }
-
-      return flag;
-}
-
-bool PGenerate::elaborate_sig(Design*des) const
-{
-      bool flag = true;
-
-      typedef list<NetScope*>::const_iterator scope_list_it_t;
-      for (scope_list_it_t cur = scope_list_.begin()
-		 ; cur != scope_list_.end() ; cur ++ ) {
-
-	    if (debug_elaborate)
-		  cerr << get_line() << ": debug: Elaborate nets in "
-		       << "scope " << (*cur)->name() << endl;
-	    flag = elaborate_sig_(des, *cur) & flag;
-      }
-
-      return flag;
-}
-
-bool PGenerate::elaborate_sig_(Design*des, NetScope*scope) const
-{
-	// Scan the declared PWires to elaborate the obvious signals
-	// in the current scope.
-      typedef map<hname_t,PWire*>::const_iterator wires_it_t;
-      for (wires_it_t wt = wires.begin()
-		 ; wt != wires.end() ;  wt ++ ) {
-
-	    PWire*cur = (*wt).second;
-
-	    if (debug_elaborate)
-		  cerr << get_line() << ": debug: Elaborate PWire "
-		       << cur->path() << " in scope " << scope->name() << endl;
-
-	    cur->elaborate_sig(des, scope);
-      }
-
-      return true;
-}
-
-
-/*
- * A function definition exists within an elaborated module. This
- * matters when elaborating signals, as the ports of the function are
- * created as signals/variables for each instance of the
- * function. That is why PFunction has an elaborate_sig method.
- */
-void PFunction::elaborate_sig(Design*des, NetScope*scope) const
-{
-      perm_string fname = scope->basename();
-      assert(scope->type() == NetScope::FUNC);
-
-	/* Make sure the function has at least one input port. If it
-	   fails this test, print an error message. Keep going so we
-	   can find more errors. */
-      if (ports_ == 0) {
-	    cerr << get_line() << ": error: Function " << fname
-		 << " has no ports." << endl;
-	    cerr << get_line() << ":      : Functions must have"
-		 << " at least one input port." << endl;
-	    des->errors += 1;
-      }
-
-      NetNet*ret_sig = 0;
-
-	/* Create the signals/variables of the return value and write
-	   them into the function scope. */
-      switch (return_type_.type) {
-
-	  case PTF_REG:
-	    if (return_type_.range) {
-		  NetExpr*me = elab_and_eval(des, scope,
-					     (*return_type_.range)[0], -1);
-		  assert(me);
-		  NetExpr*le = elab_and_eval(des, scope,
-					     (*return_type_.range)[1], -1);
-		  assert(le);
-
-		  long mnum = 0, lnum = 0;
-		  if (NetEConst*tmp = dynamic_cast<NetEConst*>(me)) {
-			mnum = tmp->value().as_long();
-		  } else {
-			cerr << me->get_line() << ": error: "
-			      "Unable to evaluate constant expression "
-			     << *me << "." << endl;
-			des->errors += 1;
-		  }
-
-		  if (NetEConst*tmp = dynamic_cast<NetEConst*>(le)) {
-			lnum = tmp->value().as_long();
-		  } else {
-			cerr << le->get_line() << ": error: "
-			      "Unable to evaluate constant expression "
-			     << *le << "." << endl;
-			des->errors += 1;
-		  }
-
-		  ret_sig = new NetNet(scope, fname, NetNet::REG, mnum, lnum);
-
-	    } else {
-		  ret_sig = new NetNet(scope, fname, NetNet::REG);
-	    }
-	    ret_sig->set_line(*this);
-	    ret_sig->port_type(NetNet::POUTPUT);
-	    ret_sig->data_type(IVL_VT_LOGIC);
-	    break;
-
-	  case PTF_INTEGER:
-	    ret_sig = new NetNet(scope, fname, NetNet::REG, INTEGER_WIDTH);
-	    ret_sig->set_line(*this);
-	    ret_sig->set_signed(true);
-	    ret_sig->set_isint(true);
-	    ret_sig->port_type(NetNet::POUTPUT);
-	    ret_sig->data_type(IVL_VT_LOGIC);
-	    break;
-
-	  case PTF_TIME:
-	    ret_sig = new NetNet(scope, fname, NetNet::REG, 64);
-	    ret_sig->set_line(*this);
-	    ret_sig->set_signed(false);
-	    ret_sig->set_isint(false);
-	    ret_sig->port_type(NetNet::POUTPUT);
-	    ret_sig->data_type(IVL_VT_LOGIC);
-	    break;
-
-	  case PTF_REAL:
-	  case PTF_REALTIME:
-	    ret_sig = new NetNet(scope, fname, NetNet::REG, 1);
-	    ret_sig->set_line(*this);
-	    ret_sig->set_signed(true);
-	    ret_sig->set_isint(false);
-	    ret_sig->port_type(NetNet::POUTPUT);
-	    ret_sig->data_type(IVL_VT_REAL);
-	    break;
-
-	  default:
-	    cerr << get_line() << ": internal error: I don't know how "
-		 << "to deal with return type of function "
-		 << scope->basename() << "." << endl;
-      }
-
-      svector<NetNet*>ports (ports_? ports_->count() : 0);
-
-      if (ports_)
-	    for (unsigned idx = 0 ;  idx < ports_->count() ;  idx += 1) {
-
-		    /* Parse the port name into the task name and the reg
-		       name. We know by design that the port name is given
-		       as two components: <func>.<port>. */
-
-		  hname_t path = (*ports_)[idx]->path();
-		  perm_string pname = lex_strings.make(path.peek_name(1));
-		  perm_string ppath = lex_strings.make(path.peek_name(0));
-
-		  if (ppath != scope->basename()) {
-			cerr << get_line() << ": internal error: function "
-			     << "port " << (*ports_)[idx]->path()
-			     << " has wrong name for function "
-			     << scope->name() << "." << endl;
-			des->errors += 1;
-		  }
-
-		  NetNet*tmp = scope->find_signal(pname);
-		  if (tmp == 0) {
-			cerr << get_line() << ": internal error: function "
-			     << scope->name() << " is missing port "
-			     << pname << "." << endl;
-			scope->dump(cerr);
-			cerr << get_line() << ": Continuing..." << endl;
-			des->errors += 1;
-		  }
-
-		  ports[idx] = tmp;
-	    }
-
-
-      NetFuncDef*def = 0;
-      if (ret_sig)  def = new NetFuncDef(scope, ret_sig, ports);
-
-      assert(def);
-      scope->set_func_def(def);
-}
-
-/*
- * A task definition is a scope within an elaborated module. When we
- * are elaborating signals, the scopes have already been created, as
- * have the reg objects that are the parameters of this task. The
- * elaborate_sig method of PTask is therefore left to connect the
- * signals to the ports of the NetTaskDef definition. We know for
- * certain that signals exist (They are in my scope!) so the port
- * binding is sure to work.
- */
-void PTask::elaborate_sig(Design*des, NetScope*scope) const
-{
-      assert(scope->type() == NetScope::TASK);
-
-      svector<NetNet*>ports (ports_? ports_->count() : 0);
-      for (unsigned idx = 0 ;  idx < ports.count() ;  idx += 1) {
-
-	      /* Parse the port name into the task name and the reg
-		 name. We know by design that the port name is given
-		 as two components: <task>.<port>. */
-
-	    hname_t path = (*ports_)[idx]->path();
-	    assert(path.peek_name(0) && path.peek_name(1));
-
-	      /* check that the current scope really does have the
-		 name of the first component of the task port name. Do
-		 this by looking up the task scope in the parent of
-		 the current scope. */
-	    if (scope->parent()->child(path.peek_name(0)) != scope) {
-		  cerr << "internal error: task scope " << path
-		       << " not the same as scope " << scope->name()
-		       << "?!" << endl;
-		  return;
-	    }
-
-	      /* Find the signal for the port. We know by definition
-		 that it is in the scope of the task, so look only in
-		 the scope. */
-	    NetNet*tmp = scope->find_signal(path.peek_name(1));
-
-	    if (tmp == 0) {
-		  cerr << get_line() << ": internal error: "
-		       << "Could not find port " << path.peek_name(1)
-		       << " in scope " << scope->name() << endl;
-		  scope->dump(cerr);
-	    }
-
-	    ports[idx] = tmp;
-      }
-
-      NetTaskDef*def = new NetTaskDef(scope->name(), ports);
-      scope->set_task_def(def);
-}
-
-bool PGate::elaborate_sig(Design*des, NetScope*scope) const
-{
-      return true;
-}
-
-/*
- * Elaborate a source wire. The "wire" is the declaration of wires,
- * registers, ports and memories. The parser has already merged the
- * multiple properties of a wire (i.e., "input wire") so come the
- * elaboration this creates an object in the design that represent the
- * defined item.
- */
-void PWire::elaborate_sig(Design*des, NetScope*scope) const
-{
-
-	/* The parser may produce hierarchical names for wires. I here
-	   follow the scopes down to the base where I actually want to
-	   elaborate the NetNet object. */
-      { hname_t tmp_path = hname_;
-        free(tmp_path.remove_tail_name());
-	for (unsigned idx = 0 ;  tmp_path.peek_name(idx) ;  idx += 1) {
-	      scope = scope->child(tmp_path.peek_name(idx));
-
-	      if (scope == 0) {
-		    cerr << get_line() << ": internal error: "
-			 << "Bad scope component for name "
-			 << hname_ << endl;
-		    assert(scope);
-	      }
-	}
-      }
-
-      NetNet::Type wtype = type_;
-      if (wtype == NetNet::IMPLICIT)
-	    wtype = NetNet::WIRE;
-      if (wtype == NetNet::IMPLICIT_REG)
-	    wtype = NetNet::REG;
-
-      unsigned wid = 1;
-      long lsb = 0, msb = 0;
-
-      assert(msb_.count() == lsb_.count());
-      if (msb_.count()) {
-	    svector<long>mnum (msb_.count());
-	    svector<long>lnum (msb_.count());
-	      /* There may be places where the signal is declared as a
-		 scalar. Count those here, for consistency check
-		 later. */
-	    unsigned count_scalars = 0;
-
-	      /* There may be multiple declarations of ranges, because
-		 the symbol may have its range declared in e.g., input
-		 and reg declarations. Calculate *all* the numbers
-		 here. I will resolve the values later. */
-
-	    for (unsigned idx = 0 ;  idx < msb_.count() ;  idx += 1) {
-
-		  if (msb_[idx] == 0) {
-			count_scalars += 1;
-			assert(lsb_[idx] == 0);
-			mnum[idx] = 0;
-			lnum[idx] = 0;
-			continue;
-		  }
-
-		  NetEConst*tmp;
-		  NetExpr*texpr = elab_and_eval(des, scope, msb_[idx], -1);
-
-		  tmp = dynamic_cast<NetEConst*>(texpr);
-		  if (tmp == 0) {
-			cerr << msb_[idx]->get_line() << ": error: "
-			      "Unable to evaluate constant expression ``" <<
-			      *msb_[idx] << "''." << endl;
-			des->errors += 1;
-			return;
-		  }
-
-		  mnum[idx] = tmp->value().as_long();
-		  delete texpr;
-
-		  texpr = elab_and_eval(des, scope, lsb_[idx], -1);
-		  tmp = dynamic_cast<NetEConst*>(texpr);
-		  if (tmp == 0) {
-			cerr << msb_[idx]->get_line() << ": error: "
-			      "Unable to evaluate constant expression ``" <<
-			      *lsb_[idx] << "''." << endl;
-			des->errors += 1;
-			return;
-		  }
-
-		  lnum[idx] = tmp->value().as_long();
-		  delete texpr;
-
-	    }
-
-	      /* Check that the declarations were all scalar or all
-		 vector. It is an error to mix them. Use the
-		 count_scalars to know. */
-	    if ((count_scalars > 0) && (count_scalars != msb_.count())) {
-		  cerr << get_line() << ": error: Signal ``" << hname_
-		       << "'' declared both as a vector and a scalar."
-		       << endl;
-		  des->errors += 1;
-		  return;
-	    }
-
-
-	      /* Make sure all the values for msb and lsb match by
-		 value. If not, report an error. */
-	    for (unsigned idx = 1 ;  idx < msb_.count() ;  idx += 1) {
-		  if ((mnum[idx] != mnum[0]) || (lnum[idx] != lnum[0])) {
-			cerr << get_line() << ": error: Inconsistent width, "
-			      "[" << mnum[idx] << ":" << lnum[idx] << "]"
-			      " vs. [" << mnum[0] << ":" << lnum[0] << "]"
-			      " for signal ``" << hname_ << "''" << endl;
-			des->errors += 1;
-			return;
-		  }
-	    }
-
-	    lsb = lnum[0];
-	    msb = mnum[0];
-	    if (mnum[0] > lnum[0])
-		  wid = mnum[0] - lnum[0] + 1;
-	    else
-		  wid = lnum[0] - mnum[0] + 1;
-
-
-      }
-
-      unsigned nattrib = 0;
-      attrib_list_t*attrib_list = evaluate_attributes(attributes, nattrib,
-						      des, scope);
-
-      long array_s0 = 0;
-      long array_e0 = 0;
-
-	/* If the ident has idx expressions, then this is a
-	   memory. It can only have the idx registers after the msb
-	   and lsb expressions are filled. And, if it has one index,
-	   it has both. */
-      if (lidx_ || ridx_) {
-	    assert(lidx_ && ridx_);
-
-	    NetExpr*lexp = elab_and_eval(des, scope, lidx_, -1);
-	    NetExpr*rexp = elab_and_eval(des, scope, ridx_, -1);
-
-	    if ((lexp == 0) || (rexp == 0)) {
-		  cerr << get_line() << ": internal error: There is "
-		       << "a problem evaluating indices for ``"
-		       << hname_.peek_tail_name() << "''." << endl;
-		  des->errors += 1;
-		  return;
-	    }
-
-	    NetEConst*lcon = dynamic_cast<NetEConst*> (lexp);
-	    NetEConst*rcon = dynamic_cast<NetEConst*> (rexp);
-
-	    if ((lcon == 0) || (rcon == 0)) {
-		  cerr << get_line() << ": internal error: The indices "
-		       << "are not constant for array ``"
-		       << hname_.peek_tail_name() << "''." << endl;
-		  des->errors += 1;
-		  return;
-	    }
-
-	    verinum lval = lcon->value();
-	    verinum rval = rcon->value();
-
-	    delete lexp;
-	    delete rexp;
-
-	    perm_string name = lex_strings.make(hname_.peek_tail_name());
-
-	    array_s0 = lval.as_long();
-	    array_e0 = rval.as_long();
-      }
-
-	/* If the net type is supply0 or supply1, replace it
-	   with a simple wire with a pulldown/pullup with supply
-	   strength. In other words, transform:
-
-	   supply0 foo;
-
-	   to:
-
-	   wire foo;
-	   pulldown #(supply0) (foo);
-
-	   This reduces the backend burden, and behaves exactly
-	   the same. */
-
-      NetLogic*pull = 0;
-      if (wtype == NetNet::SUPPLY0 || wtype == NetNet::SUPPLY1) {
-	    NetLogic::TYPE pull_type = (wtype==NetNet::SUPPLY1)
-		  ? NetLogic::PULLUP
-		  : NetLogic::PULLDOWN;
-	    pull = new NetLogic(scope, scope->local_symbol(),
-				1, pull_type, wid);
-	    pull->set_line(*this);
-	    pull->pin(0).drive0(Link::SUPPLY);
-	    pull->pin(0).drive1(Link::SUPPLY);
-	    des->add_node(pull);
-	    wtype = NetNet::WIRE;
-
-	    if (debug_elaborate) {
-		  cerr << get_line() << ": debug: "
-		       << "Generate a SUPPLY pulldown for the "
-		       << "supply0 net." << endl;
-	    }
-      }
-
-      perm_string name = lex_strings.make(hname_.peek_tail_name());
-      if (debug_elaborate) {
-	    cerr << get_line() << ": debug: Create signal "
-		 << name << "["<<msb<<":"<<lsb<<"]"
-		 << " in scope " << scope->name() << endl;
-      }
-
-      NetNet*sig = new NetNet(scope, name, wtype, msb, lsb,
-			      array_s0, array_e0);
-      sig->data_type(data_type_);
-      sig->set_line(*this);
-      sig->port_type(port_type_);
-      sig->set_signed(get_signed());
-      sig->set_isint(get_isint());
-
-      if (pull)
-	    connect(sig->pin(0), pull->pin(0));
-
-      for (unsigned idx = 0 ;  idx < nattrib ;  idx += 1)
-	    sig->attribute(attrib_list[idx].key, attrib_list[idx].val);
-}
-
-/*
- * $Log: elab_sig.cc,v $
- * Revision 1.43  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.42  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.41  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
- *
- * Revision 1.40  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
- *
- * Revision 1.39  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
- *
- * Revision 1.38  2005/02/13 01:15:07  steve
- *  Replace supply nets with wires connected to pullup/down supply devices.
- *
- * Revision 1.37  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.36  2004/09/27 22:34:10  steve
- *  Cleanup and factoring of autoconf.
- *
- * Revision 1.35  2004/09/05 17:44:41  steve
- *  Add support for module instance arrays.
- *
- * Revision 1.34  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.33  2004/02/18 17:11:55  steve
- *  Use perm_strings for named langiage items.
- *
- * Revision 1.32  2003/09/20 05:24:00  steve
- *  Evaluate memory index constants using elab_and_eval.
- *
- * Revision 1.31  2003/07/15 03:49:22  steve
- *  Spelling fixes.
- *
- * Revision 1.30  2003/06/24 01:38:02  steve
- *  Various warnings fixed.
- *
- * Revision 1.29  2003/06/21 01:21:43  steve
- *  Harmless fixup of warnings.
- *
- * Revision 1.28  2003/03/06 00:28:41  steve
- *  All NetObj objects have lex_string base names.
- *
- * Revision 1.27  2003/01/30 16:23:07  steve
- *  Spelling fixes.
- *
- * Revision 1.26  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.25  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.24  2002/08/05 04:18:45  steve
- *  Store only the base name of memories.
- *
- * Revision 1.23  2002/06/21 04:59:35  steve
- *  Carry integerness throughout the compilation.
- *
- * Revision 1.22  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.21  2002/05/19 23:37:28  steve
- *  Parse port_declaration_lists from the 2001 Standard.
- *
- * Revision 1.20  2002/01/26 05:28:28  steve
- *  Detect scalar/vector declarion mismatch.
- *
- * Revision 1.19  2002/01/23 03:35:17  steve
- *  Detect incorrect function ports.
- *
- * Revision 1.18  2001/12/03 04:47:14  steve
- *  Parser and pform use hierarchical names as hname_t
- *  objects instead of encoded strings.
- *
- * Revision 1.17  2001/11/07 04:01:59  steve
- *  eval_const uses scope instead of a string path.
- *
- * Revision 1.16  2001/11/01 05:21:26  steve
- *  Catch ports that have no direction.
- *
- * Revision 1.15  2001/10/31 03:11:15  steve
- *  detect module ports not declared within the module.
- *
- * Revision 1.14  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.13  2001/05/25 02:21:34  steve
- *  Detect input and input ports declared as reg.
- *
- * Revision 1.12  2001/02/17 05:15:33  steve
- *  Allow task ports to be given real types.
- *
- * Revision 1.11  2001/02/10 20:29:39  steve
- *  In the context of range declarations, use elab_and_eval instead
- *  of the less robust eval_const methods.
- */
-

emit.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2005 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998 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,256 +16,200 @@
  *    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.89 2007/01/16 05:44:15 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: emit.cc,v 1.31 1999/11/28 23:42:02 steve Exp $"
 #endif
 
-# include "config.h"
-
-# include  <iostream>
-
 /*
  * The emit function is called to generate the output required of the
  * target.
  */
 # include  "target.h"
 # include  "netlist.h"
+# include  <iostream>
 # include  <typeinfo>
 # include  <cassert>
 
-bool NetNode::emit_node(struct target_t*tgt) const
+void NetNode::emit_node(ostream&o, struct target_t*tgt) const
 {
       cerr << "EMIT: Gate type? " << typeid(*this).name() << endl;
-      return false;
 }
 
-bool NetLogic::emit_node(struct target_t*tgt) const
+void NetLogic::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->logic(this);
-      return true;
+      tgt->logic(o, this);
 }
 
-bool NetUDP::emit_node(struct target_t*tgt) const
+void NetUDP::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->udp(this);
-      return true;
+      tgt->udp(o, this);
 }
 
-bool NetAddSub::emit_node(struct target_t*tgt) const
+void NetAddSub::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_add_sub(this);
-      return true;
+      tgt->lpm_add_sub(o, this);
 }
 
-bool NetArrayDq::emit_node(struct target_t*tgt) const
+void NetAssign::emit_node(ostream&o, struct target_t*tgt) const
 {
-      return tgt->lpm_array_dq(this);
+      tgt->net_assign(o, this);
 }
 
-bool NetCaseCmp::emit_node(struct target_t*tgt) const
+void NetAssignNB::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->net_case_cmp(this);
-      return true;
+      tgt->net_assign_nb(o, this);
 }
 
-bool NetCLShift::emit_node(struct target_t*tgt) const
+void NetCaseCmp::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_clshift(this);
-      return true;
+      tgt->net_case_cmp(o, this);
 }
 
-bool NetCompare::emit_node(struct target_t*tgt) const
+void NetCLShift::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_compare(this);
-      return true;
+      tgt->lpm_clshift(o, this);
 }
 
-bool NetConcat::emit_node(struct target_t*tgt) const
+void NetCompare::emit_node(ostream&o, struct target_t*tgt) const
 {
-      return tgt->concat(this);
+      tgt->lpm_compare(o, this);
 }
 
-bool NetConst::emit_node(struct target_t*tgt) const
+void NetConst::emit_node(ostream&o, struct target_t*tgt) const
 {
-      return tgt->net_const(this);
+      tgt->net_const(o, this);
 }
 
-bool NetDivide::emit_node(struct target_t*tgt) const
+void NetFF::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_divide(this);
-      return true;
+      tgt->lpm_ff(o, this);
 }
 
-bool NetFF::emit_node(struct target_t*tgt) const
+void NetMux::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_ff(this);
-      return true;
+      tgt->lpm_mux(o, this);
 }
 
-bool NetLiteral::emit_node(struct target_t*tgt) const
+void NetRamDq::emit_node(ostream&o, struct target_t*tgt) const
 {
-      return tgt->net_literal(this);
+      tgt->lpm_ram_dq(o, this);
 }
 
-bool NetModulo::emit_node(struct target_t*tgt) const
+void NetNEvent::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_modulo(this);
-      return true;
+      tgt->net_event(o, this);
 }
 
-bool NetMult::emit_node(struct target_t*tgt) const
+void NetBUFZ::emit_node(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_mult(this);
-      return true;
+      tgt->bufz(o, this);
 }
 
-bool NetMux::emit_node(struct target_t*tgt) const
+bool NetProcTop::emit(ostream&o, struct target_t*tgt) const
 {
-      tgt->lpm_mux(this);
-      return true;
+      return tgt->process(o, this);
 }
 
-bool NetPartSelect::emit_node(struct target_t*tgt) const
-{
-      return tgt->part_select(this);
-}
-
-bool NetReplicate::emit_node(struct target_t*tgt) const
-{
-      return tgt->replicate(this);
-}
-
-bool NetSignExtend::emit_node(struct target_t*tgt) const
-{
-      return tgt->sign_extend(this);
-}
-
-bool NetUReduce::emit_node(struct target_t*tgt) const
-{
-      return tgt->ureduce(this);
-}
-
-bool NetSysFunc::emit_node(struct target_t*tgt) const
-{
-      return tgt->net_sysfunction(this);
-}
-
-bool NetUserFunc::emit_node(struct target_t*tgt) const
-{
-      return tgt->net_function(this);
-}
-
-bool NetBUFZ::emit_node(struct target_t*tgt) const
-{
-      return tgt->bufz(this);
-}
-
-bool NetProcTop::emit(struct target_t*tgt) const
-{
-      return tgt->process(this);
-}
-
-bool NetProc::emit_proc(struct target_t*tgt) const
+bool NetProc::emit_proc(ostream&o, struct target_t*tgt) const
 {
       cerr << "EMIT: Proc type? " << typeid(*this).name() << endl;
       return false;
 }
 
-bool NetAssign::emit_proc(struct target_t*tgt) const
+bool NetAssign::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      tgt->proc_assign(this);
+      tgt->proc_assign(o, this);
       return true;
 }
 
-bool NetAssignNB::emit_proc(struct target_t*tgt) const
+bool NetAssignNB::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      tgt->proc_assign_nb(this);
+      tgt->proc_assign_nb(o, this);
       return true;
 }
 
-bool NetBlock::emit_proc(struct target_t*tgt) const
+bool NetAssignMem::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      return tgt->proc_block(this);
-}
-
-bool NetCase::emit_proc(struct target_t*tgt) const
-{
-      tgt->proc_case(this);
+      tgt->proc_assign_mem(o, this);
       return true;
 }
 
-bool NetCAssign::emit_proc(struct target_t*tgt) const
+bool NetAssignMemNB::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      return tgt->proc_cassign(this);
-}
-
-bool NetCondit::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_condit(this);
-}
-
-bool NetDeassign::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_deassign(this);
-}
-
-bool NetDisable::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_disable(this);
-}
-
-bool NetForce::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_force(this);
-}
-
-bool NetForever::emit_proc(struct target_t*tgt) const
-{
-      tgt->proc_forever(this);
+      tgt->proc_assign_mem_nb(o, this);
       return true;
 }
 
-bool NetPDelay::emit_proc(struct target_t*tgt) const
+bool NetBlock::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      return tgt->proc_delay(this);
+      return tgt->proc_block(o, this);
 }
 
-bool NetPDelay::emit_proc_recurse(struct target_t*tgt) const
+bool NetCase::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      if (statement_) return statement_->emit_proc(tgt);
+      tgt->proc_case(o, this);
       return true;
 }
 
-bool NetRelease::emit_proc(struct target_t*tgt) const
+bool NetCondit::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      return tgt->proc_release(this);
-}
-
-bool NetRepeat::emit_proc(struct target_t*tgt) const
-{
-      tgt->proc_repeat(this);
+      tgt->proc_condit(o, this);
       return true;
 }
 
-bool NetSTask::emit_proc(struct target_t*tgt) const
+bool NetForever::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      tgt->proc_stask(this);
+      tgt->proc_forever(o, this);
       return true;
 }
 
-bool NetUTask::emit_proc(struct target_t*tgt) const
+bool NetPDelay::emit_proc(ostream&o, struct target_t*tgt) const
 {
-      tgt->proc_utask(this);
+      tgt->proc_delay(o, this);
       return true;
 }
 
-bool NetWhile::emit_proc(struct target_t*tgt) const
+void NetPDelay::emit_proc_recurse(ostream&o, struct target_t*tgt) const
 {
-      tgt->proc_while(this);
+      if (statement_) statement_->emit_proc(o, tgt);
+}
+
+bool NetPEvent::emit_proc(ostream&o, struct target_t*tgt) const
+{
+      tgt->proc_event(o, this);
       return true;
 }
 
-void NetBlock::emit_recurse(struct target_t*tgt) const
+void NetPEvent::emit_proc_recurse(ostream&o, struct target_t*tgt) const
+{
+      if (statement_) statement_->emit_proc(o, tgt);
+}
+
+bool NetRepeat::emit_proc(ostream&o, struct target_t*tgt) const
+{
+      tgt->proc_repeat(o, this);
+      return true;
+}
+
+bool NetSTask::emit_proc(ostream&o, struct target_t*tgt) const
+{
+      tgt->proc_stask(o, this);
+      return true;
+}
+
+bool NetUTask::emit_proc(ostream&o, struct target_t*tgt) const
+{
+      tgt->proc_utask(o, this);
+      return true;
+}
+
+bool NetWhile::emit_proc(ostream&o, struct target_t*tgt) const
+{
+      tgt->proc_while(o, this);
+      return true;
+}
+
+void NetBlock::emit_recurse(ostream&o, struct target_t*tgt) const
 {
       if (last_ == 0)
 	    return;
@@ -273,164 +217,101 @@ void NetBlock::emit_recurse(struct target_t*tgt) const
       NetProc*cur = last_;
       do {
 	    cur = cur->next_;
-	    cur->emit_proc(tgt);
+	    cur->emit_proc(o, tgt);
       } while (cur != last_);
 }
 
-bool NetCondit::emit_recurse_if(struct target_t*tgt) const
+void NetCondit::emit_recurse_if(ostream&o, struct target_t*tgt) const
 {
       if (if_)
-	    return if_->emit_proc(tgt);
-      else
-	    return true;
+	    if_->emit_proc(o, tgt);
 }
 
-bool NetCondit::emit_recurse_else(struct target_t*tgt) const
+void NetCondit::emit_recurse_else(ostream&o, struct target_t*tgt) const
 {
       if (else_)
-	    return else_->emit_proc(tgt);
-      else
-	    return true;
+	    else_->emit_proc(o, tgt);
 }
 
-bool NetEvProbe::emit_node(struct target_t*tgt) const
-{
-      tgt->net_probe(this);
-      return true;
-}
-
-bool NetEvTrig::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_trigger(this);
-}
-
-bool NetEvWait::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_wait(this);
-}
-
-bool NetEvWait::emit_recurse(struct target_t*tgt) const
-{
-      if (!statement_) return true;
-      return statement_->emit_proc(tgt);
-}
-
-void NetForever::emit_recurse(struct target_t*tgt) const
+void NetForever::emit_recurse(ostream&o, struct target_t*tgt) const
 {
       if (statement_)
-	    statement_->emit_proc(tgt);
+	    statement_->emit_proc(o, tgt);
 }
 
-void NetRepeat::emit_recurse(struct target_t*tgt) const
+void NetRepeat::emit_recurse(ostream&o, struct target_t*tgt) const
 {
       if (statement_)
-	    statement_->emit_proc(tgt);
+	    statement_->emit_proc(o, tgt);
 }
 
-void NetScope::emit_scope(struct target_t*tgt) const
+void NetWhile::emit_proc_recurse(ostream&o, struct target_t*tgt) const
 {
-      tgt->scope(this);
+      proc_->emit_proc(o, tgt);
+}
 
-      for (NetEvent*cur = events_ ;  cur ;  cur = cur->snext_)
-	    tgt->event(cur);
+bool Design::emit(ostream&o, struct target_t*tgt) const
+{
+      bool rc = true;
+      tgt->start_design(o, this);
 
-      for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_)
-	    cur->emit_scope(tgt);
+	// enumerate the scopes
+      { map<string,NetScope*>::const_iterator sc;
+        for (sc = scopes_.begin() ;  sc != scopes_.end() ;  sc++) {
+	      tgt->scope(o, (*sc).second);
+	}
+      }
 
+	// emit signals
       if (signals_) {
 	    NetNet*cur = signals_->sig_next_;
 	    do {
-		  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);
+		  tgt->signal(o, cur);
 		  cur = cur->sig_next_;
 	    } while (cur != signals_->sig_next_);
       }
 
-}
 
-bool NetScope::emit_defs(struct target_t*tgt) const
-{
-      bool flag = true;
-
-      switch (type_) {
-	  case MODULE:
-	    for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_)
-		  flag &= cur->emit_defs(tgt);
-	    break;
-
-	  case FUNC:
-	    flag &= tgt->func_def(this);
-	    break;
-	  case TASK:
-	    tgt->task_def(this);
-	    break;
-	  default:  /* BEGIN_END and FORK_JOIN, do nothing */
-	    break;
+	// emit memories
+      {
+	    map<string,NetMemory*>::const_iterator mi;
+	    for (mi = memories_.begin() ;  mi != memories_.end() ; mi++) {
+		  tgt->memory(o, (*mi).second);
+	    }
       }
 
-      return flag;
-}
-
-void NetWhile::emit_proc_recurse(struct target_t*tgt) const
-{
-      proc_->emit_proc(tgt);
-}
-
-int Design::emit(struct target_t*tgt) const
-{
-      int rc = 0;
-
-      if (tgt->start_design(this) == false)
-	    return -2;
-
-	// enumerate the scopes
-      for (list<NetScope*>::const_iterator scope = root_scopes_.begin();
-	   scope != root_scopes_.end(); scope++)
-	    (*scope)->emit_scope(tgt);
-
 
 	// emit nodes
-      bool nodes_rc = true;
       if (nodes_) {
 	    NetNode*cur = nodes_->node_next_;
 	    do {
-		  nodes_rc = nodes_rc && cur->emit_node(tgt);
+		  cur->emit_node(o, tgt);
 		  cur = cur->node_next_;
 	    } while (cur != nodes_->node_next_);
       }
 
 
-	// emit task and function definitions
-      bool tasks_rc = true;
-      for (list<NetScope*>::const_iterator scope = root_scopes_.begin();
-	   scope != root_scopes_.end(); scope++)
-	    tasks_rc &= (*scope)->emit_defs(tgt);
+	// emit function definitions
+      {
+	    map<string,NetFuncDef*>::const_iterator ta;
+	    for (ta = funcs_.begin() ; ta != funcs_.end() ;  ta ++) {
+		  tgt->func_def(o, (*ta).second);
+	    }
+      }
 
+	// emit task definitions
+      {
+	    map<string,NetTaskDef*>::const_iterator ta;
+	    for (ta = tasks_.begin() ; ta != tasks_.end() ;  ta ++) {
+		  tgt->task_def(o, (*ta).second);
+	    }
+      }
 
 	// emit the processes
-      bool proc_rc = true;
       for (const NetProcTop*idx = procs_ ;  idx ;  idx = idx->next_)
-	    proc_rc &= idx->emit(tgt);
-
-      rc = tgt->end_design(this);
-
-      if (nodes_rc == false)
-	    return -1;
-      if (tasks_rc == false)
-	    return -2;
-      if (proc_rc == false)
-	  return -3;
+	    rc = rc && idx->emit(o, tgt);
 
+      tgt->end_design(o, this);
       return rc;
 }
 
@@ -449,19 +330,14 @@ void NetEConst::expr_scan(struct expr_scan_t*tgt) const
       tgt->expr_const(this);
 }
 
-void NetEConstParam::expr_scan(struct expr_scan_t*tgt) const
+void NetEIdent::expr_scan(struct expr_scan_t*tgt) const
 {
-      tgt->expr_param(this);
+      tgt->expr_ident(this);
 }
 
-void NetECReal::expr_scan(struct expr_scan_t*tgt) const
+void NetEMemory::expr_scan(struct expr_scan_t*tgt) const
 {
-      tgt->expr_creal(this);
-}
-
-void NetECRealParam::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_rparam(this);
+      tgt->expr_memory(this);
 }
 
 void NetEParam::expr_scan(struct expr_scan_t*tgt) const
@@ -470,26 +346,11 @@ void NetEParam::expr_scan(struct expr_scan_t*tgt) const
 	   << endl;
 }
 
-void NetEEvent::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_event(this);
-}
-
 void NetEScope::expr_scan(struct expr_scan_t*tgt) const
 {
       tgt->expr_scope(this);
 }
 
-void NetESelect::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_select(this);
-}
-
-void NetESFunc::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_sfunc(this);
-}
-
 void NetEUFunc::expr_scan(struct expr_scan_t*tgt) const
 {
       tgt->expr_ufunc(this);
@@ -500,6 +361,11 @@ void NetESignal::expr_scan(struct expr_scan_t*tgt) const
       tgt->expr_signal(this);
 }
 
+void NetESubSignal::expr_scan(struct expr_scan_t*tgt) const
+{
+      tgt->expr_subsignal(this);
+}
+
 void NetETernary::expr_scan(struct expr_scan_t*tgt) const
 {
       tgt->expr_ternary(this);
@@ -510,95 +376,148 @@ void NetEUnary::expr_scan(struct expr_scan_t*tgt) const
       tgt->expr_unary(this);
 }
 
-int emit(const Design*des, const char*type)
+bool emit(ostream&o, const Design*des, const char*type)
 {
       for (unsigned idx = 0 ;  target_table[idx] ;  idx += 1) {
 	    const struct target*tgt = target_table[idx];
-	    if (strcmp(tgt->name, type) == 0)
-		  return des->emit(tgt->meth);
+	    if (tgt->name == type)
+		  return des->emit(o, tgt->meth);
 
       }
-
-      cerr << "error: Code generator type " << type
-	   << " not found." << endl;
-      return -1;
 }
 
 
 /*
  * $Log: emit.cc,v $
- * Revision 1.89  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.31  1999/11/28 23:42:02  steve
+ *  NetESignal object no longer need to be NetNode
+ *  objects. Let them keep a pointer to NetNet objects.
  *
- * Revision 1.88  2006/11/10 05:44:44  steve
- *  Process delay paths in second path over signals.
+ * Revision 1.30  1999/11/27 19:07:57  steve
+ *  Support the creation of scopes.
  *
- * Revision 1.87  2006/06/18 04:15:50  steve
- *  Add support for system functions in continuous assignments.
+ * Revision 1.29  1999/11/21 00:13:08  steve
+ *  Support memories in continuous assignments.
  *
- * Revision 1.86  2005/07/11 16:56:50  steve
- *  Remove NetVariable and ivl_variable_t structures.
+ * Revision 1.28  1999/11/14 23:43:45  steve
+ *  Support combinatorial comparators.
  *
- * Revision 1.85  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
+ * Revision 1.27  1999/11/14 20:24:28  steve
+ *  Add support for the LPM_CLSHIFT device.
  *
- * Revision 1.84  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
+ * Revision 1.26  1999/11/04 03:53:26  steve
+ *  Patch to synthesize unary ~ and the ternary operator.
+ *  Thanks to Larry Doolittle <LRDoolittle@lbl.gov>.
  *
- * Revision 1.83  2005/02/08 00:12:36  steve
- *  Add the NetRepeat node, and code generator support.
+ *  Add the LPM_MUX device, and integrate it with the
+ *  ternary synthesis from Larry. Replace the lpm_mux
+ *  generator in t-xnf.cc to use XNF EQU devices to
+ *  put muxs into function units.
  *
- * Revision 1.82  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
+ *  Rewrite elaborate_net for the PETernary class to
+ *  also use the LPM_MUX device.
  *
- * 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.25  1999/11/01 02:07:40  steve
+ *  Add the synth functor to do generic synthesis
+ *  and add the LPM_FF device to handle rows of
+ *  flip-flops.
  *
- * Revision 1.80  2005/01/22 01:06:55  steve
- *  Change case compare from logic to an LPM node.
+ * Revision 1.24  1999/10/10 01:59:54  steve
+ *  Structural case equals device.
  *
- * Revision 1.79  2004/12/29 23:55:43  steve
- *  Unify elaboration of l-values for all proceedural assignments,
- *  including assing, cassign and force.
+ * Revision 1.23  1999/09/22 16:57:23  steve
+ *  Catch parallel blocks in vvm emit.
  *
- *  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.22  1999/09/20 02:21:10  steve
+ *  Elaborate parameters in phases.
  *
- * 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.21  1999/09/15 01:55:06  steve
+ *  Elaborate non-blocking assignment to memories.
  *
- * Revision 1.77  2004/10/04 01:10:53  steve
- *  Clean up spurious trailing white space.
+ * Revision 1.20  1999/09/03 04:28:38  steve
+ *  elaborate the binary plus operator.
  *
- * 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.19  1999/08/31 22:38:29  steve
+ *  Elaborate and emit to vvm procedural functions.
  *
- * Revision 1.75  2003/09/13 01:30:07  steve
- *  Missing case warnings.
+ * Revision 1.18  1999/07/17 19:50:59  steve
+ *  netlist support for ternary operator.
  *
- * 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.17  1999/07/17 03:39:11  steve
+ *  simplified process scan for targets.
  *
- * Revision 1.73  2003/04/22 04:48:29  steve
- *  Support event names as expressions elements.
+ * Revision 1.16  1999/07/07 04:20:57  steve
+ *  Emit vvm for user defined tasks.
  *
- * Revision 1.72  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
+ * Revision 1.15  1999/07/03 02:12:51  steve
+ *  Elaborate user defined tasks.
+ *
+ * Revision 1.14  1999/06/19 21:06:16  steve
+ *  Elaborate and supprort to vvm the forever
+ *  and repeat statements.
+ *
+ * Revision 1.13  1999/06/09 03:00:06  steve
+ *  Add support for procedural concatenation expression.
+ *
+ * Revision 1.12  1999/06/06 20:45:38  steve
+ *  Add parse and elaboration of non-blocking assignments,
+ *  Replace list<PCase::Item*> with an svector version,
+ *  Add integer support.
+ *
+ * Revision 1.11  1999/05/12 04:03:19  steve
+ *  emit NetAssignMem objects in vvm target.
+ *
+ * Revision 1.10  1999/05/07 01:21:18  steve
+ *  Handle total lack of nodes and signals.
+ *
+ * Revision 1.9  1999/05/01 02:57:53  steve
+ *  Handle much more complex event expressions.
+ *
+ * Revision 1.8  1999/04/25 00:44:10  steve
+ *  Core handles subsignal expressions.
+ *
+ * Revision 1.7  1999/04/19 01:59:36  steve
+ *  Add memories to the parse and elaboration phases.
+ *
+ * Revision 1.6  1999/02/08 02:49:56  steve
+ *  Turn the NetESignal into a NetNode so
+ *  that it can connect to the netlist.
+ *  Implement the case statement.
+ *  Convince t-vvm to output code for
+ *  the case statement.
+ *
+ * Revision 1.5  1999/02/01 00:26:49  steve
+ *  Carry some line info to the netlist,
+ *  Dump line numbers for processes.
+ *  Elaborate prints errors about port vector
+ *  width mismatch
+ *  Emit better handles null statements.
+ *
+ * Revision 1.4  1998/12/01 00:42:14  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.3  1998/11/09 18:55:34  steve
+ *  Add procedural while loops,
+ *  Parse procedural for loops,
+ *  Add procedural wait statements,
+ *  Add constant nodes,
+ *  Add XNOR logic gate,
+ *  Make vvm output look a bit prettier.
+ *
+ * Revision 1.2  1998/11/07 17:05:05  steve
+ *  Handle procedural conditional, and some
+ *  of the conditional expressions.
+ *
+ *  Elaborate signals and identifiers differently,
+ *  allowing the netlist to hold signal information.
+ *
+ * Revision 1.1  1998/11/03 23:28:57  steve
+ *  Introduce verilog to CVS.
  *
- * Revision 1.71  2003/01/26 21:15:58  steve
- *  Rework expression parsing and elaboration to
- *  accommodate real/realtime values and expressions.
  */
 

eval.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-1999 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998 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,217 +16,112 @@
  *    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.44 2007/01/16 05:44:15 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: eval.cc,v 1.12 1999/11/30 04:48:17 steve Exp $"
 #endif
 
-# include "config.h"
-
-# include  <iostream>
-
 # include  "PExpr.h"
 # include  "netlist.h"
-# include  "netmisc.h"
-# include  "compiler.h"
 
-verinum* PExpr::eval_const(const Design*, NetScope*) const
+verinum* PExpr::eval_const(const Design*, const string&) const
 {
       return 0;
 }
 
-verinum* PEBinary::eval_const(const Design*des, NetScope*scope) const
+verinum* PEBinary::eval_const(const Design*des, const string&path) const
 {
-      verinum*l = left_->eval_const(des, scope);
+      verinum*l = left_->eval_const(des, path);
       if (l == 0) return 0;
-      verinum*r = right_->eval_const(des, scope);
+      verinum*r = right_->eval_const(des, path);
       if (r == 0) {
 	    delete l;
 	    return 0;
       }
+
       verinum*res;
 
       switch (op_) {
 	  case '+': {
-		if (l->is_defined() && r->is_defined()) {
-		      res = new verinum(*l + *r);
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
+		assert(l->is_defined());
+		assert(r->is_defined());
+		long lv = l->as_long();
+		long rv = r->as_long();
+		res = new verinum(lv+rv, l->len());
 		break;
 	  }
 	  case '-': {
-		if (l->is_defined() && r->is_defined()) {
-		      res = new verinum(*l - *r);
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
+		assert(l->is_defined());
+		assert(r->is_defined());
+		long lv = l->as_long();
+		long rv = r->as_long();
+		res = new verinum(lv-rv, l->len());
 		break;
 	  }
 	  case '*': {
-		if (l->is_defined() && r->is_defined()) {
-		      res = new verinum(*l * *r);
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
+		assert(l->is_defined());
+		assert(r->is_defined());
+		long lv = l->as_long();
+		long rv = r->as_long();
+		res = new verinum(lv * rv, l->len());
 		break;
 	  }
 	  case '/': {
-		if (l->is_defined() && r->is_defined()) {
-		      long lv = l->as_long();
-		      long rv = r->as_long();
-		      res = new verinum(lv / rv, l->len());
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
+		assert(l->is_defined());
+		assert(r->is_defined());
+		long lv = l->as_long();
+		long rv = r->as_long();
+		res = new verinum(lv / rv, l->len());
 		break;
 	  }
 	  case '%': {
-		if (l->is_defined() && r->is_defined()) {
-		      long lv = l->as_long();
-		      long rv = r->as_long();
-		      res = new verinum(lv % rv, l->len());
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
-		break;
-	  }
-	  case '>': {
-		if (l->is_defined() && r->is_defined()) {
-		      long lv = l->as_long();
-		      long rv = r->as_long();
-		      res = new verinum(lv > rv, l->len());
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
-		break;
-	  }
-	  case '<': {
-		if (l->is_defined() && r->is_defined()) {
-		      long lv = l->as_long();
-		      long rv = r->as_long();
-		      res = new verinum(lv < rv, l->len());
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
-		break;
-	  }
-	  case 'l': { // left shift (<<)
+		assert(l->is_defined());
 		assert(r->is_defined());
-		unsigned long rv = r->as_ulong();
-		res = new verinum(verinum::V0, l->len());
-		if (rv < res->len()) {
-		      unsigned cnt = res->len() - rv;
-		      for (unsigned idx = 0 ;  idx < cnt ;  idx += 1)
-			    res->set(idx+rv, l->get(idx));
-		}
+		long lv = l->as_long();
+		long rv = r->as_long();
+		res = new verinum(lv % rv, l->len());
 		break;
 	  }
-	  case 'r': { // right shift (>>)
-		assert(r->is_defined());
-		unsigned long rv = r->as_ulong();
-		res = new verinum(verinum::V0, l->len());
-		if (rv < res->len()) {
-		      unsigned cnt = res->len() - rv;
-		      for (unsigned idx = 0 ;  idx < cnt ;  idx += 1)
-			    res->set(idx, l->get(idx+rv));
-		}
-		break;
-	  }
-
 	  default:
 	    delete l;
 	    delete r;
 	    return 0;
       }
 
-      delete l;
-      delete r;
       return res;
 }
-verinum* PEConcat::eval_const(const Design*des, NetScope*scope) const
-{
-      verinum*accum = parms_[0]->eval_const(des, scope);
-      if (accum == 0)
-	    return 0;
-
-      for (unsigned idx = 1 ;  idx < parms_.count() ;  idx += 1) {
-
-	    verinum*tmp = parms_[idx]->eval_const(des, scope);
-	    if (tmp == 0) {
-		  delete accum;
-		  return 0;
-	    }
-	    assert(tmp);
-
-	    *accum = concat(*accum, *tmp);
-	    delete tmp;
-      }
-
-      return accum;
-}
-
 
 /*
  * 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(const Design*des, const string&path) const
 {
-      assert(scope);
-      NetNet*net;
-      NetEvent*eve;
-      const NetExpr*expr;
-
-	// 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) {
-	    return new verinum(scope->genvar_tmp_val);
-      }
-
-      NetScope*found_in = symbol_search(des, scope, path_,
-					net, expr, eve);
+      const NetExpr*expr = des->find_parameter(path, text_);
 
       if (expr == 0)
 	    return 0;
 
-      const NetEConst*eval = dynamic_cast<const NetEConst*>(expr);
-      if (eval == 0) {
-	    cerr << get_line() << ": internal error: Unable to evaluate "
-		 << "constant expression (parameter=" << path_
-		 << "): " << *expr << endl;
+      assert(msb_ == 0);
+
+      if (dynamic_cast<const NetEParam*>(expr)) {
+	    cerr << get_line() << ": sorry: I cannot evaluate ``" <<
+		  text_ << "'' in this context." << endl;
 	    return 0;
       }
 
+      const NetEConst*eval = dynamic_cast<const NetEConst*>(expr);
       assert(eval);
-
-      if (msb_ || lsb_)
-	    return 0;
-
-
       return new verinum(eval->value());
 }
 
-verinum* PEFNumber::eval_const(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(const Design*, const string&) const
 {
       return new verinum(value());
 }
 
-verinum* PEString::eval_const(const Design*, NetScope*) const
+verinum* PETernary::eval_const(const Design*des, const string&path) const
 {
-      return new verinum(string(text_));
-}
-
-verinum* PETernary::eval_const(const Design*des, NetScope*scope) const
-{
-      verinum*test = expr_->eval_const(des, scope);
+      verinum*test = expr_->eval_const(des, path);
       if (test == 0)
 	    return 0;
 
@@ -234,9 +129,9 @@ verinum* PETernary::eval_const(const Design*des, NetScope*scope) const
       delete test;
       switch (bit) {
 	  case verinum::V0:
-	    return fal_->eval_const(des, scope);
+	    return fal_->eval_const(des, path);
 	  case verinum::V1:
-	    return tru_->eval_const(des, scope);
+	    return tru_->eval_const(des, path);
 	  default:
 	    return 0;
 	      // XXXX It is possible to handle this case if both fal_
@@ -244,140 +139,51 @@ verinum* PETernary::eval_const(const Design*des, NetScope*scope) const
       }
 }
 
-verinum* PEUnary::eval_const(const Design*des, NetScope*scope) const
-{
-      verinum*val = expr_->eval_const(des, scope);
-      if (val == 0)
-	    return 0;
-
-      switch (op_) {
-	  case '+':
-	    return val;
-
-	  case '-': {
-		  /* 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 ((uint64_t)0, val->len()+1);
-		for (unsigned idx = 0 ;  idx < val->len() ;  idx += 1)
-		      tmp.set(idx, val->get(idx));
-
-		*val = v_not(tmp) + verinum(verinum::V1, 1);
-		val->has_sign(true);
-		return val;
-	  }
-
-      }
-	    delete val;
-      return 0;
-}
-
 
 /*
  * $Log: eval.cc,v $
- * Revision 1.44  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.12  1999/11/30 04:48:17  steve
+ *  Handle evaluation of ternary during elaboration.
  *
- * Revision 1.43  2006/08/08 05:11:37  steve
- *  Handle 64bit delay constants.
+ * Revision 1.11  1999/11/28 23:42:02  steve
+ *  NetESignal object no longer need to be NetNode
+ *  objects. Let them keep a pointer to NetNet objects.
  *
- * Revision 1.42  2006/05/19 04:07:24  steve
- *  eval_const is not strict.
+ * Revision 1.10  1999/11/21 20:03:24  steve
+ *  Handle multiply in constant expressions.
  *
- * Revision 1.41  2006/05/17 16:49:30  steve
- *  Error message if concat expression cannot evaluate.
+ * Revision 1.9  1999/10/08 17:48:09  steve
+ *  Support + in constant expressions.
  *
- * Revision 1.40  2006/04/10 00:37:42  steve
- *  Add support for generate loops w/ wires and gates.
+ * Revision 1.8  1999/09/20 02:21:10  steve
+ *  Elaborate parameters in phases.
  *
- * Revision 1.39  2005/12/07 04:04:23  steve
- *  Allow constant concat expressions.
+ * Revision 1.7  1999/09/18 01:52:48  steve
+ *  Remove spurious message.
  *
- * Revision 1.38  2005/11/27 17:01:57  steve
- *  Fix for stubborn compiler.
+ * Revision 1.6  1999/09/16 04:18:15  steve
+ *  elaborate concatenation repeats.
  *
- * Revision 1.37  2005/11/27 05:56:20  steve
- *  Handle bit select of parameter with ranges.
+ * Revision 1.5  1999/08/06 04:05:28  steve
+ *  Handle scope of parameters.
  *
- * Revision 1.36  2003/06/21 01:21:43  steve
- *  Harmless fixup of warnings.
+ * Revision 1.4  1999/07/17 19:51:00  steve
+ *  netlist support for ternary operator.
  *
- * Revision 1.35  2003/04/14 03:40:21  steve
- *  Make some effort to preserve bits while
- *  operating on constant values.
+ * Revision 1.3  1999/05/30 01:11:46  steve
+ *  Exressions are trees that can duplicate, and not DAGS.
  *
- * Revision 1.34  2003/03/26 06:16:18  steve
- *  Evaluate > and < in constant expressions.
+ * Revision 1.2  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.
  *
- * Revision 1.33  2003/03/10 23:40:53  steve
- *  Keep parameter constants for the ivl_target API.
+ *  Parse task declarations, integer types.
  *
- * Revision 1.32  2002/10/19 22:59:49  steve
- *  Redo the parameter vector support to allow
- *  parameter names in range expressions.
+ * Revision 1.1  1998/11/03 23:28:58  steve
+ *  Introduce verilog to CVS.
  *
- * 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

@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2002-2004 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: eval_attrib.cc,v 1.8 2005/11/27 17:01:57 steve Exp $"
-#endif
-
-# include  "config.h"
-# include  "util.h"
-# include  "PExpr.h"
-# include  "netlist.h"
-# include  <iostream>
-# include  <assert.h>
-
-/*
- * The evaluate_attributes function evaluates the attribute
- * expressions from the map, and returns a table in a form suitable
- * for passing to netlist devices.
- */
-
-attrib_list_t* evaluate_attributes(const map<perm_string,PExpr*>&att,
-				   unsigned&natt,
-				   const Design*des,
-				   NetScope*scope)
-{
-      natt = att.size();
-      if (natt == 0)
-	    return 0;
-
-      attrib_list_t*table = new attrib_list_t [natt];
-
-      unsigned idx = 0;
-
-      typedef map<perm_string,PExpr*>::const_iterator iter_t;
-      for (iter_t cur = att.begin() ;  cur != att.end() ;  cur ++, idx++) {
-	    table[idx].key = (*cur).first;
-	    PExpr*exp = (*cur).second;
-
-	      /* If the attribute value is given in the source, then
-		 evaluate it as a constant. If the value is not
-		 given, then assume the value is 1. */
-	    verinum*tmp;
-	    if (exp)
-		  tmp = exp->eval_const(des, scope);
-	    else
-		  tmp = new verinum(1);
-
-	    if (tmp == 0)
-		  cerr << "internal error: no result for " << *exp << endl;
-	    assert(tmp);
-
-	    table[idx].val = *tmp;
-	    delete tmp;
-      }
-
-      assert(idx == natt);
-      return table;
-}
-
-/*
- * $Log: eval_attrib.cc,v $
- * Revision 1.8  2005/11/27 17:01:57  steve
- *  Fix for stubborn compiler.
- *
- * Revision 1.7  2004/02/20 18:53:35  steve
- *  Addtrbute keys are perm_strings.
- *
- * Revision 1.6  2003/01/27 05:09:17  steve
- *  Spelling fixes.
- *
- * Revision 1.5  2002/08/12 01:34:59  steve
- *  conditional ident string using autoconfig.
- *
- * Revision 1.4  2002/08/10 21:59:39  steve
- *  The default attribute value is 1.
- *
- * Revision 1.3  2002/06/06 18:57:18  steve
- *  Use standard name for iostream.
- *
- * Revision 1.2  2002/06/03 03:55:14  steve
- *  compile warnings.
- *
- * Revision 1.1  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.
- *
- */
-

examples/.cvsignore

@@ -1,3 +0,0 @@
-,*
-hello_vpi.vpi
-show_vcd.vcd

examples/clbff.v

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2000 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
- */
-
-/*
- * This source file demonstrates how to synthesize CLB flip-flops from
- * Icarus Verilog, including giving the device an initial value.
- *
- * To compile this for XNF, try a command like this:
- *
- *    iverilog -txnf -ppart=XC4010XLPQ160 -pncf=clbff.ncf -oclbff.xnf clbff.v
- *
- * That command causes an clbff.xnf and clbff.ncf file to be created.
- * Next, make the clbff.ngd file with the command:
- *
- *    xnf2ngd -l xilinxun -u clbff.xnf clbff.ngo
- *    ngdbuild clbff.ngo clbff.ngd
- *
- * Finally, map the file to fully render it in the target part. The
- * par command is the step that actually optimizes the design and tries
- * to meet timing constraints.
- *
- *    map -o map.ncd clbff.ngd
- *    par -w map.ncd clbff.ncd
- *
- * At this point, you can use the FPGA Editor to edit the clbff.ncd
- * file. Notice that the design uses two CLB flip-flops (possibly in
- * the same CLB) with their outputs ANDed together. If you go into the
- * block editor, you will see that the FF connected to main/Q<0> is
- * configured so start up reset, and the FF connected to main/Q<1> is
- * configured to start up set.
- */
-
-module main;
-
-   wire clk, iclk;
-   wire i0, i1;
-   wire out;
-
-   wire [1:0] D = {i1, i0};
-
-      // This statement declares Q to be a 2 bit reg vector. The
-      // initial assignment will cause the synthesized device to take
-      // on an initial value specified here. Without the assignment,
-      // the initial value is unspecified. (Verilog simulates it as 2'bx.)
-   reg  [1:0] Q = 2'b10;
-
-      // This simple logic gate get turned into a function unit.
-      // The par program will map this into a CLB F or G unit.
-   and (out, Q[0], Q[1]);
-
-     // This creates a global clock buffer. Notice how I attach an
-     // attribute to the named gate to force it to be mapped to the
-     // desired XNF device. This device will not be pulled into the
-     // IOB associated with iclk because of the attribute.
-   buf gbuf(clk, iclk);
-   $attribute(gbuf, "XNF-LCA", "GCLK:O,I");
-
-      // This is mapped to a DFF. Since Q and D are two bits wide, the
-      // code generator actually makes two DFF devices that share a
-      // clock input.
-   always @(posedge clk) Q <= D;
-
-      // These attribute commands assign pins to the listed wires.
-      // This can be done to wires and registers, as internally both
-      // are treated as named signals.
-   $attribute(out, "PAD", "o150");
-   $attribute(i0,  "PAD", "i152");
-   $attribute(i1,  "PAD", "i153");
-   $attribute(iclk,"PAD", "i154");
-
-endmodule /* main */

examples/hello_vpi.c

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2002 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: hello_vpi.c,v 1.5 2007/01/17 05:35:48 steve Exp $"
-#endif
-
-/*
- * This file contains an example VPI module to demonstrate the tools
- * to create vpi modules. To compile this module, use the iverilog-vpi
- * command like so:
- *
- *    iverilog-vpi hello_vpi.c
- *
- * The result is the hello_vpi.vpi module. See the hello_vpi.vl
- * program for example Verilog code to call this module.
- */
-
-# include  <vpi_user.h>
-
-static PLI_INT32 my_hello_calltf(char *xx)
-{
-      vpi_printf("Hello World, from VPI.\n");
-      return 0;
-}
-
-static void my_hello_register()
-{
-      s_vpi_systf_data tf_data;
-
-      tf_data.type      = vpiSysTask;
-      tf_data.tfname    = "$my_hello";
-      tf_data.calltf    = my_hello_calltf;
-      tf_data.compiletf = 0;
-      tf_data.sizetf    = 0;
-      vpi_register_systf(&tf_data);
-
-}
-
-/*
- * This is a table of register functions. This table is the external
- * symbol that the simulator looks for when loading this .vpi module.
- */
-void (*vlog_startup_routines[])() = {
-      my_hello_register,
-      0
-};
-/*
- * $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.
- *
- * Revision 1.2  2002/08/11 23:47:04  steve
- *  Add missing Log and Ident strings.
- *
- * Revision 1.1  2002/04/18 03:25:16  steve
- *  More examples.
- *
- */
-

examples/hello_vpi.vl

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2002 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
- */
-
- /*
-  *  Here we have the canonical "Hello, World" program written in Verilog,
-  *  with VPI. It uses the hello_vpi.vpi module that is compiled from
-  *  the hello_vpi.c program also in this directory. See the
-  *  hello_vpi.c for instructions on how to compile it.
-  *
-  *  Compile this program with the command:
-  *
-  *      iverilog -ohello_vpi hello_vpi.vl
-  *
-  *  After churning for a little while, the program will create the output
-  *  file "hello" which is compiled, linked and ready to run. Run this
-  *  program like so:
-  *
-  *      vvp -M. -mhello_vpi hello_vpi
-  *
-  *  and the program will print the message to its output. Easy! For
-  *  more on how to make the iverilog command work, see the iverilog
-  *  manual page.
-  */
-
-module main();
-
-initial
-  begin
-     $my_hello;
-     $finish ;
-  end
-
-endmodule

examples/outff.v

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1998-1999 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
- */
-
-/*
- * IVL should generate an AND gate, and should make an OBUF and two
- * IBUF objects, along with the PAD objects.
- *
- * To compile this for XNF, try a command like this:
- *
- *    iverilog -txnf -ppart=XC4010XLPQ160 -ooutff.xnf -pncf=outff.ncf outff.v
- *
- * That command causes an outff.xnf and outff.ncf file to be created.
- * Next, make the outff.ngd file with the command:
- *
- *    xnf2ngd -l xilinxun -u outff.xnf outff.ngo
- *    ngdbuild outff.ngo outff.ngd
- *
- * Finally, map the file to fully render it in the target part. The
- * par command is the step that actually optimizes the design and tries
- * to meet timing constraints.
- *
- *    map -o map.ncd outff.ngd
- *    par -w map.ncd outff.ncd
- *
- * At this point, you can use the FPGA Editor to edit the outff.ncd
- * file to see that the AND gate is in a CLB and the IOB for pin 150
- * has its flip-flop in use, and that gbuf is a global buffer.
- */
-
-module main;
-
-   wire clk, iclk;
-   wire i0, i1;
-   wire out;
-   reg o0;
-
-      // This simple logic gate get turned into a function unit.
-      // The par program will map this into a CLB F or G unit.
-   and (out, i0, i1);
-
-     // This creates a global clock buffer. Notice how I attach an
-     // attribute to the named gate to force it to be mapped to the
-     // desired XNF device. This device will not be pulled into the
-     // IOB associated with iclk because of the attribute.
-   buf gbuf(clk, iclk);
-   $attribute(gbuf, "XNF-LCA", "GCLK:O,I");
-
-      // This is mapped to a DFF. Since o0 is connected to a PAD, it
-      // is turned into a OUTFF so that it get placed into an IOB.
-   always @(posedge clk) o0 = out;
-
-      // These attribute commands assign pins to the listed wires.
-      // This can be done to wires and registers, as internally both
-      // are treated as named signals.
-   $attribute(o0,  "PAD", "o150");
-   $attribute(i0,  "PAD", "i152");
-   $attribute(i1,  "PAD", "i153");
-   $attribute(iclk,"PAD", "i154");
-
-endmodule /* main */

examples/pal_reg.v

@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2000 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
- */
-
-/*
- * This example shows how to use Icarus Verilog to generate PLD output.
- * The design is intended to fit into a 22v10 in a PLCC package, with
- * pin assignments locked down by design. The command to compile this
- * into a jedec file is;
- *
- *   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
- * output file will be a JEDEC file that you can take to your favorite
- * PROM programmer to program the part.
- *
- * This source demonstrates some important principles of synthesizing
- * a design for a PLD, including how to specify synchronous logic, and
- * how to assign signals to pins. The pin assignment in particular is
- * part specific, and must be right for the fitting to succeed.
- */
-
-
-/*
- * The register module is an 8 bit register that copies the input to
- * the output registers on the rising edge of the clk input. The
- * always statement creates a simple d-type flip-flop that is loaded
- * on the rising edge of the clock.
- *
- * 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:
- *
- *   assign out = oe? 8'hzz : Q;
- *
- * Many people prefer the expression form. It is true that it does
- * seem to express the intent a bit more clearly.
- */
-module register (out, val, clk, oe);
-
-   output [7:0] out;
-   input [7:0] 	val;
-   input 	clk, oe;
-
-   reg [7:0] 	Q;
-
-   wire [7:0] 	out;
-
-   bufif0 drv[7:0](out, Q, oe);
-
-   always @(posedge clk) Q = val;
-
-endmodule
-
-
-/*
- * The module pal is used to attach pin information to all the pins of
- * the device. We use this to lock down the pin assignments of the
- * synthesized result. The pin number assignments are for a 22v10 in
- * 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)
- * 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
- * need to worry that functionality will be affected.
- */
-module pal;
-
-   wire out7, out6, out5, out4, out3, out2, out1, out0;
-   wire inp7, inp6, inp5, inp4, inp3, inp2, inp1, inp0;
-   wire clk, oe;
-
-   // The PAD attributes attach the wires to pins of the
-   // device. Output pins are prefixed by a 'o', and input pins by an
-   // 'i'. If not all the available output pins are used, then the
-   // remaining are available for the synthesizer to drop internal
-   // registers or extra logic layers.
-   $attribute(out7, "PAD", "o27");
-   $attribute(out6, "PAD", "o26");
-   $attribute(out5, "PAD", "o25");
-   $attribute(out4, "PAD", "o24");
-   $attribute(out3, "PAD", "o23");
-   $attribute(out2, "PAD", "o21");
-   $attribute(out1, "PAD", "o20");
-   $attribute(out0, "PAD", "o19");
-
-   $attribute(inp7, "PAD", "i10");
-   $attribute(inp6, "PAD", "i9");
-   $attribute(inp5, "PAD", "i7");
-   $attribute(inp4, "PAD", "i6");
-   $attribute(inp3, "PAD", "i5");
-   $attribute(inp2, "PAD", "i4");
-   $attribute(inp1, "PAD", "i3");
-   $attribute(inp0, "PAD", "i2");
-
-   //$attribute(clk, "PAD", "CLK");
-   $attribute(oe,  "PAD", "i13");
-
-   register dev({out7, out6, out5, out4, out3, out2, out1, out0},
-		{inp7, inp6, inp5, inp4, inp3, inp2, inp1, inp0},
-		clk, oe);
-
-endmodule // pal

examples/show_vcd.vl

@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 1999 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
- */
-
- /*
-  *  This example program simulates a 16x1 ram, and is used as an
-  *  example for using VCD output and waveform viewers.
-  *
-  *  Like any other Verilog simulation, compile this program with the
-  *  command:
-  *
-  *      iverilog show_vcd.vl
-  *
-  *  This will generate the show_vcd command in the current directory.
-  *  When you run the command, you will see the output from all the
-  *  calls to $display, but also there will be a dump file ``show_vcd.vcd''.
-  *  The name of this file is set by the statement:
-  *
-  *      $dumpfile("show_vcd.vcd");
-  *
-  *  in the main module. The output file uses the standard VCD file format
-  *  so can be viewed using off-the-shelf waveform viewers. The remaining
-  *  steps describe how to use GTKWave to view the file. If you are using
-  *  a different viewer, see the documentation for that tool.
-  *
-  *  To view the output generated by running show_vcd, start the GTKWave
-  *  viewer with the command:
-  *
-  *      gtkwave show_vcd.vcd
-  *
-  *  The GTKWave program will display its main window, and show in a small
-  *  status box (upper left corner) that it succeeded in loading the dump
-  *  file. However, there are no waveforms displayed yet. Select signals to
-  *  add to the waveform display using the menu selection:
-  *
-  *      "Search --> Signal Search Tree"
-  *
-  *  This will bring up a dialog box that shows in directory tree format
-  *  the signals of the program. Select the signals you wish to view, and
-  *  click one of the buttons on the bottom of the dialog box to display
-  *  the selected signals in the waveform window. Click "Exit" on the box
-  *  to get rid of it.
-  *
-  *  The magic that makes all this work is contained in the $dumpfile and
-  *  $dumpvars system tasks. The $dumpfile task tells the simulation where
-  *  to write the VCD output. This task must be called once before the
-  *  $dumpvars task is called.
-  *
-  *  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
-  *  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.
-  */
-
-module ram16x1 (q, d, a, we, wclk);
-   output q;
-   input d;
-   input [3:0] a;
-   input we;
-   input wclk;
-
-   reg mem[15:0];
-
-   assign q = mem[a];
-   always @(posedge wclk) if (we) mem[a] = d;
-
-endmodule /* ram16x1 */
-
-module main;
-   wire q;
-   reg d;
-   reg [3:0] a;
-   reg we, wclk;
-
-   ram16x1 r1 (q, d, a, we, wclk);
-
-   initial begin
-      $dumpfile("show_vcd.vcd");
-      $dumpvars(1, main.r1);
-      wclk = 0;
-      we = 1;
-      for (a = 0 ; a < 4'hf ;  a = a + 1) begin
-	 d = a[0];
-	 #1 wclk = 1;
-	 #1 wclk = 0;
-	 $display("r1[%x] == %b", a, q);
-      end
-
-      for (a = 0 ; a < 4'hf ;  a = a + 1)
-	 #1 if (q !== a[0]) begin
-	    $display("FAILED -- mem[%h] !== %b", a, a[0]);
-	    $finish;
-	 end
-
-      $display("PASSED");
-   end
-endmodule /* main */

examples/sqrt-virtex.v

@@ -1,378 +0,0 @@
-/*
- * Copyright (c) 2002 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
- *
- *   $Id: sqrt-virtex.v,v 1.4 2003/11/25 18:35:31 steve Exp $"
- */
-
-/*
- * This module is a synthesizeable 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
- * 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.
- *
- * 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.
- *
- * This example source contains all the Verilog needed to do
- * everything described below. We use conditional compilation to
- * select the bits of Verilog that are needed to perform each specific
- * task.
- *
- * SIMULATE THE DESIGN
- *
- * This source file includes a simulation test bench. To compile the
- * program to include this test bench, use the command line:
- *
- *    iverilog -DSIMULATE=1 -oa.out sqrt-virtex.v
- *
- * This generates the file "a.out" that can then be executed with the
- * command:
- *
- *    vvp a.out
- *
- * This causes the simulation to run a long set of example sqrt
- * calculations. Each result is checked by the test bench to assure
- * that the result is valid. When it is done, the program prints
- * "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
- * is fine, as we will never try to synthesize it.
- *
- * LIBRARY PARTS
- *
- * One can use the sqrt32 module to generate an EDIF file suitable for
- * use as a library part. This part can be imported to the Xilinx
- * schematic editor, then placed like any other pre-existing
- * macro. One can also pass the generated EDIF as a precompiled macro
- * that other designers may use as they see fit.
- *
- * To make an EDIF file from the sqrt32 module, execute the command:
- *
- *    iverilog -osqrt32.edf -tfpga -parch=virtex sqrt-virtex.v
- *
- * The -parch=virtex tells the code generator to generate code for the
- * virtex architecture family (we don't yet care what specific part)
- * and the -osqrt32.edf places the output into the file
- * sqrt32.edf.
- *
- * 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.
- *
- * COMPLETE CHIP DESIGNS
- *
- * To make a complete chip design, there are other bits that need to
- * be accounted for. Signals must be assigned to pins, and some
- * special devices may need to be created. We also want to write into
- * the EDIF file complete part information so that the implementation
- * tools know how to route the complete design. The command to compile
- * for our target part is:
- *
- *    iverilog -ochip.edf -tfpga \
- *           -parch=virtex -ppart=XC2S15-VQ100 \
- *           -DMAKE_CHIP=1 sqrt-virtex.v
- *
- * This command uses the "chip" module as the root. This module in
- * turn has ports that are destined to be the pins of the completed
- * part. The -ppart= option gives complete part information, that is
- * in turn written into the EDIF file. This saves us the drudgery of
- * repeating that part number for later commands.
- *
- * The next steps involve Xilinx software, and to talk to Xilinx
- * software, the netlist must be in the form of an "ngd" file, a
- * binary netlist format. The command:
- *
- *    ngdbuild chip.edf chip.ngd
- *
- * does the trick. The input to ngdbuild is the chip.edf file created
- * by Icarus Verilog, and the output is the chip.ngd file that the
- * implementation tools may read. From this point, it is best to refer
- * to Xilinx documentation for the software you are using, but the
- * quick summary is:
- *
- *    map -o map.ncd chip.ngd
- *    par -w map.ncd chip.ncd
- *
- * The result of this sequence of commands is the chip.ncd file that
- * is ready to be viewed by FPGA Edit, or converted to a bit stream,
- * or whatever.
- *
- * POST MAP SIMULATION
- *
- * Warm fuzzies are good, and retesting your design after the part
- * is mapped by the Xilinx backend tools is a cheap source of fuzzies.
- * The command to make a Verilog file out of the mapped design is:
- *
- *    ngd2ver chip.ngd chip_root.v
- *
- * 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
- * first place. The module has ports named just line the ports of the
- * chip_root module below.
- *
- * The generated Verilog uses the library in the directory
- * $(XILINX)/verilog/src/simprims. This directory comes with the ISE
- * WebPACK installation that you are using. Icarus Verilog is able to
- * simulate using that library.
- *
- * To compile a post-map simulation of the chip_root.v, use the
- * command:
- *
- *    iverilog -DSIMULATE -DPOST_MAP -ob.out \
- *             -y $(XILINX)/verilog/src/simprims \
- *             sqrt-virtex.v chip_root.v \
- *             $(XILINX)/verilog/src/glbl.v
- *
- * This command line generates b.out from the source files
- * sqrt-virtex.v and chip_root.v (the latter from ngd2ver)
- * and the "-y <path>" flag specifies the library directory that will
- * be needed. The glbl.v source file is also included to provide the
- * GSR and related signals.
- *
- * The POST_MAP compiler directive causes the GSR manipulations
- * included in the test bench to be compiled in, to simulate the chip
- * startup. Other then that, the test bench runs the post-map design
- * the same way the pre-synthesis design works.
- *
- * Run this design with the command:
- *
- *    vvp b.out
- *
- * And there you go.
- */
-
-`ifndef POST_MAP
- /*
-  * This module approximates the square root of an unsigned 32bit
-  * number. The algorithm works by doing a bit-wise binary search.
-  * Starting from the most significant bit, the accumulated value
-  * tries to put a 1 in the bit position. If that makes the square
-  * too big for the input, the bit is left zero, otherwise it is set
-  * in the result. This continues for each bit, decreasing in
-  * significance, until all the bits are calculated or all the
-  * remaining bits are zero.
-  *
-  * Since the result is an integer, this function really calculates
-  * value of the expression:
-  *
-  *      x = floor(sqrt(y))
-  *
-  * 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,
-  * which amounts to 16 clocks.
-  */
-
-module sqrt32(clk, rdy, reset, x, .y(acc));
-   input  clk;
-   output rdy;
-   input  reset;
-
-   input [31:0] x;
-   output [15:0] acc;
-
-
-   // acc holds the accumulated result, and acc2 is the accumulated
-   // square of the accumulated result.
-   reg [15:0] acc;
-   reg [31:0] acc2;
-
-   // Keep track of which bit I'm working on.
-   reg [4:0]  bitl;
-   wire [15:0] bit = 1 << bitl;
-   wire [31:0] bit2 = 1 << (bitl << 1);
-
-   // The output is ready when the bitl counter underflows.
-   wire rdy = bitl[4];
-
-   // guess holds the potential next values for acc, and guess2 holds
-   // the square of that guess. The guess2 calculation is a little bit
-   // subtle. The idea is that:
-   //
-   //      guess2 = (acc + bit) * (acc + bit)
-   //             = (acc * acc) + 2*acc*bit + bit*bit
-   //             = acc2 + 2*acc*bit + bit2
-   //             = acc2 + 2 * (acc<<bitl) + bit
-   //
-   // This works out using shifts because bit and bit2 are known to
-   // have only a single bit in them.
-   wire [15:0] guess  = acc | bit;
-   wire [31:0] guess2 = acc2 + bit2 + ((acc << bitl) << 1);
-
-   (* ivl_synthesis_on *)
-   always @(posedge clk or posedge reset)
-      if (reset) begin
-	 acc = 0;
-	 acc2 = 0;
-	 bitl = 15;
-      end else begin
-	 if (guess2 <= x) begin
-	    acc  <= guess;
-	    acc2 <= guess2;
-	 end
-	 bitl <= bitl - 5'd1;
-      end
-
-endmodule // sqrt32
-
-`endif //  `ifndef POST_MAP
-
-`ifdef SIMULATE
- /*
-  * This module is a test bench for the sqrt32 module. It runs some
-  * test input values through the sqrt32 module, and checks that the
-  * output is valid. If an invalid output is generated, print and
-  * error message and stop immediately. If all the tested values pass,
-  * then print PASSED after the test is complete.
-  */
-module main;
-
-   reg [31:0] x;
-   reg 	      clk, reset;
-
-   wire [15:0] y;
-   wire        rdy;
-
-`ifdef POST_MAP
-   chip_root dut(.clk(clk), .reset(reset), .rdy(rdy), .x(x), .y(y));
-`else
-   sqrt32 dut(.clk(clk), .reset(reset), .rdy(rdy), .x(x), .y(y));
-`endif
-
-   (* ivl_synthesis_off *)
-   always #5 clk = !clk;
-
-   task reset_dut;
-      begin
-	 reset = 1;
-	 @(posedge clk) ;
-	 #1 reset = 0;
-	 @(negedge clk) ;
-      end
-   endtask // reset_dut
-
-   task crank_dut;
-      begin
-	 while (rdy == 0) begin
-	    @(posedge clk) /* wait */;
-	 end
-      end
-   endtask // crank_dut
-
-`ifdef POST_MAP
-   reg        GSR;
-   assign      glbl.GSR = GSR;
-`endif
-
-   integer idx;
-
-   (* ivl_synthesis_off *)
-   initial begin
-      reset = 0;
-      clk = 0;
-
-      /* If doing a post-map simulation, when we need to wiggle
-         The GSR bit to simulate chip power-up. */
-`ifdef POST_MAP
-      GSR = 1;
-      #100 GSR = 0;
-`endif
-      #100 x = 1;
-      reset_dut;
-      crank_dut;
-      $display("x=%d, y=%d", x, y);
-
-      x = 3;
-      reset_dut;
-      crank_dut;
-      $display("x=%d, y=%d", x, y);
-
-      x = 4;
-      reset_dut;
-      crank_dut;
-      $display("x=%d, y=%d", x, y);
-
-      for (idx = 0 ;  idx < 200 ;  idx = idx + 1) begin
-	 x = $random;
-	 reset_dut;
-	 crank_dut;
-	 $display("x=%d, y=%d", x, y);
-
-	 if (x < (y * y)) begin
-	    $display("ERROR: y is too big");
-	    $finish;
-	 end
-
-	 if (x > ((y + 1)*(y + 1))) begin
-	    $display("ERROR: y is too small");
-	    $finish;
-	 end
-      end
-
-      $display("PASSED");
-      $finish;
-   end
-
-endmodule // main
-`endif
-
-`ifdef MAKE_CHIP
- /*
-  * This module represents the chip packaging that we intend to
-  * generate. We bind pins here, and route the clock to the global
-  * clock buffer.
-  */
-module chip_root(clk, rdy, reset, x, y);
-   input  clk;
-   output rdy;
-   input  reset;
-
-   input [31:0] x;
-   output [15:0] y;
-
-   wire 	 clk_int;
-
-   (* cellref="BUFG:O,I" *)
-   buf gbuf (clk_int, clk);
-
-   sqrt32 dut(.clk(clk_int), .reset(reset), .rdy(rdy), .x(x), .y(y));
-
-   /* Assign the clk to GCLK0, which is on pin P39. */
-   $attribute(clk, "PAD", "P39");
-
-   // We don't care where the remaining pins go, so set the pin number
-   // to 0. This tells the implementation tools that we want a PAD,
-   // but we don't care which. Also note the use of a comma (,)
-   // separated list to assign pins to the bits of a vector.
-   $attribute(rdy, "PAD", "0");
-   $attribute(reset, "PAD", "0");
-   $attribute(x, "PAD", "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
-   $attribute(y, "PAD", "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0");
-
-endmodule // chip_root
-
-`endif

examples/sqrt.vl

@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 1999 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
- *
- *   $Id: sqrt.vl,v 1.4 2004/10/04 01:10:56 steve Exp $"
- */
-
- /*
-  * This example shows that Icarus Verilog can run non-trivial
-  * programs, too. This uses a variety of Verilog language features
-  * to implement the module of a square-root device. The program
-  * uses IEEE1364-1995 language features and should work correctly
-  * on any Verilog compiler.
-  *
-  * Run the file with Icarus Verilog under UNIX using the command:
-  *
-  *     % iverilog -osqrt sqrt.v
-  *     % ./sqrt
-  */
-
- /*
-  * This module approximates the square root of an unsigned 32bit
-  * number. The algorithm works by doing a bit-wise binary search.
-  * Starting from the most significant bit, the accumulated value
-  * tries to put a 1 in the bit position. If that makes the square
-  * to big for the input, the bit is left zero, otherwise it is set
-  * in the result. This continues for each bit, decreasing in
-  * significance, until all the bits are calculated or all the
-  * remaining bits are zero.
-  *
-  * Since the result is an integer, this function really calculates
-  * value of the expression:
-  *
-  *      x = floor(sqrt(y))
-  *
-  * 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,
-  * which amounts to 16 clocks.
-  */
-
-module sqrt32(clk, rdy, reset, x, .y(acc));
-   input  clk;
-   output rdy;
-   input  reset;
-
-   input [31:0] x;
-   output [15:0] acc;
-
-
-   // acc holds the accumulated result, and acc2 is the accumulated
-   // square of the accumulated result.
-   reg [15:0] acc;
-   reg [31:0] acc2;
-
-   // Keep track of which bit I'm working on.
-   reg [4:0]  bitl;
-   wire [15:0] bit = 1 << bitl;
-   wire [31:0] bit2 = 1 << (bitl << 1);
-
-   // The output is ready when the bitl counter underflows.
-   wire rdy = bitl[4];
-
-   // guess holds the potential next values for acc, and guess2 holds
-   // the square of that guess. The guess2 calculation is a little bit
-   // subtle. The idea is that:
-   //
-   //      guess2 = (acc + bit) * (acc + bit)
-   //             = (acc * acc) + 2*acc*bit + bit*bit
-   //             = acc2 + 2*acc*bit + bit2
-   //             = acc2 + 2 * (acc<<bitl) + bit
-   //
-   // This works out using shifts because bit and bit2 are known to
-   // have only a single bit in them.
-   wire [15:0] guess  = acc | bit;
-   wire [31:0] guess2 = acc2 + bit2 + ((acc << bitl) << 1);
-
-   task clear;
-      begin
-	 acc = 0;
-	 acc2 = 0;
-	 bitl = 15;
-      end
-   endtask
-
-   initial clear;
-
-   always @(reset or posedge clk)
-      if (reset)
-       clear;
-      else begin
-	 if (guess2 <= x) begin
-	    acc  <= guess;
-	    acc2 <= guess2;
-	 end
-	 bitl <= bitl - 1;
-      end
-
-endmodule
-
-module main;
-
-   reg clk, reset;
-   reg [31:0] value;
-   wire [15:0] result;
-   wire rdy;
-
-   sqrt32 root(.clk(clk), .rdy(rdy), .reset(reset), .x(value), .y(result));
-
-   always #5 clk = ~clk;
-
-   always @(posedge rdy) begin
-      $display("sqrt(%d) --> %d", value, result);
-      $finish;
-   end
-
-
-   initial begin
-      clk = 0;
-      reset = 1;
-      $monitor($time,,"%m.acc = %b", root.acc);
-      #100 value = 63;
-      reset = 0;
-   end
-endmodule /* main */

examples/xnf_add.vl

@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1999 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
- */
-
-/*
- * This example demonstrates Icarus Verilog's ability to synthesize
- * efficient adders for Xilinx 4000 series FPGAs. The synthesis and
- * code generation makes an adder and translates that into XOR gates
- * and fast carry chain hardware.
- *
- * To compile this for XNF, try a command like this:
- *
- *    iverilog -txnf -ppart=XC4010XLPQ160 -pncf=xnf_add.ncf -oxnf_add.xnf xnf_add.v
- *
- * That command causes an xnf_add.xnf and xnf_add.ncf file to be created.
- * Next, Use Xilinx Alliance or Foundation tools to make the xnf_add.ngd
- * file with the command:
- *
- *    xnf2ngd -l xilinxun -u xnf_add.xnf xnf_add.ngo
- *    ngdbuild xnf_add.ngo xnf_add.ngd
- *
- * Finally, map the file to fully render it in the target part. The
- * par command is the step that actually optimizes the design and tries
- * to meet timing constraints.
- *
- *    map -o map.ncd xnf_add.ngd
- *    par -w map.ncd xnf_add.ncd
- *
- * At this point, you can use the Xilinx FPGA Editor to edit the xnf_add.ncd
- * file and see the carry chains made up to support the adder.
- */
-
-module main;
-
-   wire [3:0] a, b;
-   wire [3:0] out;
-   wire carry;
-
-   wire a0, a1, a2, a3, b0, b1, b2, b3;
-   wire out0, out1, out2, out3;
-
-   // This creates the actual adder. Note that we also create a link
-   // to the carry output. The principle adder is 4 bits wide, so two
-   // IOBs are used to to the actual addition. PAR will place them in
-   // order along carry lines. An extra carry cell from below a[0] is
-   // used in FORCE-0 mode to load the bottom carry node.
-   //
-   // The carry signal from the top CY device is used to drive the
-   // main.carry wire shown here. It is managed in this case by using
-   // an ADD-FG-CI CY device for the top pair and using the CLB above
-   // the carry chain, with its CY in EXAMINE-CI mode, to put the carry
-   // out through its G function unit.
-
-   assign {carry, out} = a + b;
-
-
-   // These attribute commands assign pins to the listed wires.
-   // This can be done to wires and registers, as internally both
-   // are treated as named signals. It doesn't work (yet) on vectors,
-   // though, so break out the vectors with scalar assignments.
-
-   assign a[0] = a0;
-   assign a[1] = a1;
-   assign a[2] = a2;
-   assign a[3] = a3;
-   $attribute(a0, "PAD", "i150");
-   $attribute(a1, "PAD", "i152");
-   $attribute(a2, "PAD", "i153");
-   $attribute(a3, "PAD", "i154");
-   assign b[0] = b0;
-   assign b[1] = b1;
-   assign b[2] = b2;
-   assign b[3] = b3;
-   $attribute(b0, "PAD", "i155");
-   $attribute(b1, "PAD", "i156");
-   $attribute(b2, "PAD", "i157");
-   $attribute(b3, "PAD", "i158");
-   assign out0 = out[0];
-   assign out1 = out[1];
-   assign out2 = out[2];
-   assign out3 = out[3];
-   $attribute(out0,  "PAD", "o71");
-   $attribute(out1,  "PAD", "o72");
-   $attribute(out2,  "PAD", "o73");
-   $attribute(out3,  "PAD", "o74");
-   $attribute(carry, "PAD", "o75");
-
-endmodule /* main */

examples/xram16x1.v

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1999 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
- */
-
-// This example describes a 16x1 RAM that can be synthesized into
-// a CLB ram in a Xilinx FPGA.
-
-module ram16x1 (q, d, a, we, wclk);
-   output q;
-   input d;
-   input [3:0] a;
-   input we;
-   input wclk;
-
-   reg mem[15:0];
-
-   assign q = mem[a];
-   always @(posedge wclk) if (we) mem[a] = d;
-
-endmodule /* ram16x1 */
-
-module main;
-   wire q;
-   reg d;
-   reg [3:0] a;
-   reg we, wclk;
-
-   ram16x1 r1 (q, d, a, we, wclk);
-
-   initial begin
-      $monitor("q = %b", q);
-      d = 0;
-      wclk = 0;
-      a = 5;
-      we = 1;
-      #1 wclk = 1;
-      #1 wclk = 0;
-   end
-endmodule /* main */

extensions.txt

@@ -1,84 +0,0 @@
-
-Icarus Verilog Extensions
-
-Icarus Verilog supports certain extensions to the baseline IEEE1364
-standard. Some of these are picked from extended variants of the
-language, such as SystemVerilog, and some are expressions of internal
-behavior of Icarus Verilog, made available as a tool debugging aid.
-
-* Builtin System Functions
-
-** Extended Verilog Data Types
-
-This feature is turned off if the generation flag "-g" is set to other
-then the default "2x".  For example, "iverilog -g2x" enables extended
-data types, and "iverilog -g2" disables them.
-
-Icarus Verilog adds support for extended data types. This extended
-type syntax is based on a proposal by Cadence Design Systems,
-originally as an update to the IEEE1364. That original proposal has
-apparently been absorbed by the IEEE1800 SystemVerilog
-standard. Icarus Verilog currently only takes the new primitive types
-from the proposal.
-
-Extended data types separates the concept of net/variable from the
-data type. Both nets and variables can declared with any data
-type. The primitive types available are:
-
-    logic  - The familiar 0, 1, x and z, optionally with strength.
-    bool   - Limited to only 0 and 1
-    real   - 64bit real values
-
-Nets with logic type may have multiple drivers with strength, and the
-value is resolved the usual way. Only logic values may be driven to
-logic nets, so bool values driven onto logic nets are implicitly
-converted to logic.
-
-Nets with any other type may not have multiple drivers. The compiler
-should detect the multiple drivers and report an error.
-
-- Declarations
-
-The declaration of a net is extended to include the type of the wire,
-with the syntax:
-
-    wire <type> <wire-assignment-list>... ;
-
-The <type>, if omitted, is taken to be logic. The "wire" can be any of
-the net keywords. Wires can be logic, bool, real, or vectors of logic
-or bool. Some valid examples:
-
-    wire real foo = 1.0;
-    tri logic bus[31:0];
-    wire bool addr[23:0];
-    ... and so on.
-
-The declarations of variables is similar. The "reg" keyword is used to
-specify that this is a variable. Variables can have the same data
-types as nets.
-
-- Ports
-
-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.
-
-- Expressions
-
-Expressions in the face of real values is covered by the baseline
-Verilog standard.
-
-The bool type supports the same operators as the logic type, with the
-obvious differences imposed by the limited domain.
-
-Comparison operators (not case compare) return logic if either of
-their operands is logic. If both are bool or real (including mix of
-bool and real) then the result is bool. This is because comparison of
-bools and reals always return exactly true or false.
-
-Case comparison returns bool. This differs from baseline Verilog,
-which strictly speaking returns a logic, but only 0 or 1 values.
-
-All the arithmetic operators return bool if both of their operands are
-bool or real. Otherwise, they return logic.

functor.cc

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999 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,14 +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: functor.cc,v 1.35 2005/07/07 16:22:49 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: functor.cc,v 1.5 1999/12/01 06:06:16 steve Exp $"
 #endif
 
-# include "config.h"
-
-# include  <iostream>
-
 # include  "functor.h"
 # include  "netlist.h"
 
@@ -31,10 +27,6 @@ functor_t::~functor_t()
 {
 }
 
-void functor_t::event(class Design*, class NetEvent*)
-{
-}
-
 void functor_t::signal(class Design*, class NetNet*)
 {
 }
@@ -43,92 +35,21 @@ void functor_t::process(class Design*, class NetProcTop*)
 {
 }
 
-void functor_t::lpm_add_sub(class Design*, class NetAddSub*)
-{
-}
-
-void functor_t::lpm_compare(class Design*, class NetCompare*)
-{
-}
-
-void functor_t::lpm_const(class Design*, class NetConst*)
-{
-}
-
-void functor_t::lpm_divide(class Design*, class NetDivide*)
-{
-}
-
-void functor_t::lpm_literal(class Design*, class NetLiteral*)
-{
-}
-
-void functor_t::lpm_modulo(class Design*, class NetModulo*)
-{
-}
-
 void functor_t::lpm_ff(class Design*, class NetFF*)
 {
 }
 
-void functor_t::lpm_logic(class Design*, class NetLogic*)
-{
-}
-
-void functor_t::lpm_mult(class Design*, class NetMult*)
-{
-}
-
-void functor_t::lpm_mux(class Design*, class NetMux*)
-{
-}
-
-void functor_t::sign_extend(class Design*, class NetSignExtend*)
-{
-}
-
-void functor_t::lpm_ureduce(class Design*, class NetUReduce*)
-{
-}
-
-
-void NetScope::run_functor(Design*des, functor_t*fun)
-{
-      for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_) {
-	    cur->run_functor(des, fun);
-      }
-
-      for (NetEvent*cur = events_ ;  cur ;  /* */) {
-	    NetEvent*tmp = cur;
-	    cur = cur->snext_;
-	    fun->event(des, tmp);
-      }
-
-	// apply to signals. Each iteration, allow for the possibility
-	// that the current signal deletes itself.
-      if (signals_) {
-	    unsigned count = 0;
-	    NetNet*cur = signals_->sig_next_;
-	    do {
-		  count += 1;
-		  cur = cur->sig_next_;
-	    } while (cur != signals_->sig_next_);
-
-	    cur = signals_->sig_next_;
-	    for (unsigned idx = 0 ;  idx < count ;  idx += 1) {
-		  NetNet*tmp = cur->sig_next_;
-		  fun->signal(des, cur);
-		  cur = tmp;
-	    }
-      }
-}
-
 void Design::functor(functor_t*fun)
 {
-	// Scan the scopes
-      for (list<NetScope*>::const_iterator scope = root_scopes_.begin();
-	   scope != root_scopes_.end(); scope++)
-	    (*scope)->run_functor(this, fun);
+	// apply to signals
+      if (signals_) {
+	    NetNet*cur = signals_->sig_next_;
+	    do {
+		  NetNet*tmp = cur->sig_next_;
+		  fun->signal(this, cur);
+		  cur = tmp;
+	    } while (cur != signals_->sig_next_);
+      }
 
 	// apply to processes
       procs_idx_ = procs_;
@@ -140,31 +61,12 @@ void Design::functor(functor_t*fun)
 
 	// apply to nodes
       if (nodes_) {
-	    assert(nodes_functor_cur_ == 0);
-	    assert(nodes_functor_nxt_ == 0);
-
-	      /* Scan the circular list of nodes, starting with the
-		 front of the list.
-
-		 This loop interacts with the Design::del_node method
-		 so that the functor is free to delete any nodes it
-		 choose. The destructors of the NetNode objects call
-		 the del_node method, which checks with the
-		 nodes_functor_* members, to keep the iterator
-		 operating safely. */
-	    nodes_functor_cur_ = nodes_;
+	    NetNode*cur = nodes_->node_next_;
 	    do {
-		  nodes_functor_nxt_ = nodes_functor_cur_->node_next_;
-		  nodes_functor_cur_->functor_node(this, fun);
-
-		  if (nodes_functor_nxt_ == 0)
-			break;
-
-		  nodes_functor_cur_ = nodes_functor_nxt_;
-	    } while (nodes_ && (nodes_functor_cur_ != nodes_));
-	    nodes_functor_cur_ = 0;
-	    nodes_functor_nxt_ = 0;
-
+		  NetNode*tmp = cur->node_next_;
+		  cur->functor_node(this, fun);
+		  cur = tmp;
+	    } while (cur != nodes_->node_next_);
       }
 }
 
@@ -173,66 +75,11 @@ void NetNode::functor_node(Design*, functor_t*)
 {
 }
 
-void NetAddSub::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_add_sub(des, this);
-}
-
-void NetCompare::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_compare(des, this);
-}
-
-void NetConst::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_const(des, this);
-}
-
-void NetDivide::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_divide(des, this);
-}
-
 void NetFF::functor_node(Design*des, functor_t*fun)
 {
       fun->lpm_ff(des, this);
 }
 
-void NetLiteral::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_literal(des, this);
-}
-
-void NetLogic::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_logic(des, this);
-}
-
-void NetModulo::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_modulo(des, this);
-}
-
-void NetMult::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_mult(des, this);
-}
-
-void NetMux::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_mux(des, this);
-}
-
-void NetSignExtend::functor_node(Design*des, functor_t*fun)
-{
-      fun->sign_extend(des, this);
-}
-
-void NetUReduce::functor_node(Design*des, functor_t*fun)
-{
-      fun->lpm_ureduce(des, this);
-}
-
 proc_match_t::~proc_match_t()
 {
 }
@@ -252,26 +99,6 @@ int NetAssign::match_proc(proc_match_t*that)
       return that->assign(this);
 }
 
-int proc_match_t::assign_nb(NetAssignNB*)
-{
-      return 0;
-}
-
-int NetAssignNB::match_proc(proc_match_t*that)
-{
-      return that->assign_nb(this);
-}
-
-int proc_match_t::block(NetBlock*)
-{
-      return 0;
-}
-
-int NetBlock::match_proc(proc_match_t*that)
-{
-      return that->block(this);
-}
-
 int proc_match_t::condit(NetCondit*)
 {
       return 0;
@@ -282,66 +109,37 @@ int NetCondit::match_proc(proc_match_t*that)
       return that->condit(this);
 }
 
-int NetEvWait::match_proc(proc_match_t*that)
-{
-      return that->event_wait(this);
-}
-
-int proc_match_t::event_wait(NetEvWait*)
+int proc_match_t::pevent(NetPEvent*)
 {
       return 0;
 }
 
+int NetPEvent::match_proc(proc_match_t*that)
+{
+      return that->pevent(this);
+}
+
 /*
  * $Log: functor.cc,v $
- * Revision 1.35  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
+ * Revision 1.5  1999/12/01 06:06:16  steve
+ *  Redo synth to use match_proc_t scanner.
  *
- * Revision 1.34  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
+ * Revision 1.4  1999/11/18 03:52:19  steve
+ *  Turn NetTmp objects into normal local NetNet objects,
+ *  and add the nodangle functor to clean up the local
+ *  symbols generated by elaboration and other steps.
  *
- * Revision 1.33  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
+ * Revision 1.3  1999/11/01 02:07:40  steve
+ *  Add the synth functor to do generic synthesis
+ *  and add the LPM_FF device to handle rows of
+ *  flip-flops.
  *
- * Revision 1.32  2004/10/04 01:10:53  steve
- *  Clean up spurious trailing white space.
+ * Revision 1.2  1999/07/18 05:52:46  steve
+ *  xnfsyn generates DFF objects for XNF output, and
+ *  properly rewrites the Design netlist in the process.
  *
- * Revision 1.31  2002/08/16 05:18:27  steve
- *  Fix intermix of node functors and node delete.
+ * Revision 1.1  1999/07/17 22:01:13  steve
+ *  Add the functor interface for functor transforms.
  *
- * 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 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,21 +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: functor.h,v 1.23 2005/07/07 16:22:49 steve Exp $"
+#if !defined(WINNT)
+#ident "$Id: functor.h,v 1.3 1999/12/01 06:06:16 steve Exp $"
 #endif
 
 /*
  * The functor is an object that can be applied to a design to
  * transform it. This is different from the target_t, which can only
  * scan the design but not transform it in any way.
- *
- * When a functor it scanning a process, signal or node, the functor
- * is free to manipulate the list by deleting items, including the
- * node being scanned. The Design class scanner knows how to handle
- * the situation. However, if objects are added to the netlist, there
- * is no guarantee that object will be scanned unless the functor is
- * rerun.
  */
 
 class Design;
@@ -42,99 +35,38 @@ class NetProcTop;
 struct functor_t {
       virtual ~functor_t();
 
-	/* Events are scanned here. */
-      virtual void event(class Design*des, class NetEvent*);
-
-	/* This is called once for each signal in the design. */
+	/* Signals are scanned first. This is called once for each
+	   signal in the design. */
       virtual void signal(class Design*des, class NetNet*);
 
 	/* 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 adder. */
-      virtual void lpm_add_sub(class Design*des, class NetAddSub*);
-
-	/* This method is called for each structural comparator. */
-      virtual void lpm_compare(class Design*des, class NetCompare*);
-
-	/* This method is called for each structural constant. */
-      virtual void lpm_const(class Design*des, class NetConst*);
-
-	/* This method is called for each structural constant. */
-      virtual void lpm_divide(class Design*des, class NetDivide*);
-
-	/* Constant literals. */
-      virtual void lpm_literal(class Design*des, class NetLiteral*);
-
-	/* This method is called for each structural constant. */
-      virtual void lpm_modulo(class Design*des, class NetModulo*);
-
 	/* This method is called for each FF in the design. */
       virtual void lpm_ff(class Design*des, class NetFF*);
-
-	/* Handle LPM combinational logic devices. */
-      virtual void lpm_logic(class Design*des, class NetLogic*);
-
-	/* This method is called for each multiplier. */
-      virtual void lpm_mult(class Design*des, class NetMult*);
-
-	/* This method is called for each MUX. */
-      virtual void lpm_mux(class Design*des, class NetMux*);
-
-	/* This method is called for each unary reduction gate. */
-      virtual void lpm_ureduce(class Design*des, class NetUReduce*);
-
-      virtual void sign_extend(class Design*des, class NetSignExtend*);
 };
 
 struct proc_match_t {
       virtual ~proc_match_t();
 
       virtual int assign(class NetAssign*);
-      virtual int assign_nb(class NetAssignNB*);
       virtual int condit(class NetCondit*);
-      virtual int event_wait(class NetEvWait*);
-      virtual int block(class NetBlock*);
+      virtual int pevent(class NetPEvent*);
 };
 
 
 /*
  * $Log: functor.h,v $
- * Revision 1.23  2005/07/07 16:22:49  steve
- *  Generalize signals to carry types.
+ * Revision 1.3  1999/12/01 06:06:16  steve
+ *  Redo synth to use match_proc_t scanner.
  *
- * Revision 1.22  2005/05/24 01:44:27  steve
- *  Do sign extension of structuran nets.
+ * Revision 1.2  1999/11/01 02:07:40  steve
+ *  Add the synth functor to do generic synthesis
+ *  and add the LPM_FF device to handle rows of
+ *  flip-flops.
  *
- * Revision 1.21  2005/02/03 04:56:20  steve
- *  laborate reduction gates into LPM_RED_ nodes.
+ * Revision 1.1  1999/07/17 22:01:13  steve
+ *  Add the functor interface for functor transforms.
  *
- * 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