Prepare for version 0.9.5

Use UINT_MAX instead of -1 to set unsigned to maximum value.
The Sun C compiler warns when -1 is used to initialize an unsigned. (cherry picked from commit 7d588d699b)
2026-08-23 14:27:01 +02:00 · 2011-11-01 09:57:50 -07:00 · 2011-10-31 17:23:15 -07:00 · 2011-10-31 10:44:43 -07:00 · 2011-10-31 10:40:33 -07:00 · 2011-10-31 10:40:27 -07:00
694 changed files with 40345 additions and 129538 deletions
@@ -1,2 +0,0 @@
-# gperf in MSYS chokes on DOS line endings
-*.gperf text eol=lf
@@ -4,22 +4,9 @@
 #
 # The following files will be ignored by git.

-# Normal editor rules
-*.swp
-*~
-
-# Top level generic files
-tags
-TAGS
-cscope.*
-*.patch
-*.orig
-
 # Object files and libraries
 *.[oa]
-
-gmon*.out
-gmon*.txt
+*~

 # From autoconf
 configure
@@ -29,11 +16,6 @@ Makefile

 /_pli_types.h
 config.h
-/tgt-pcb/pcb_config.h
-/tgt-pcb/fp.cc
-/tgt-pcb/fp.h
-/tgt-pcb/fp.output
-/tgt-pcb/fp_lex.cc
 /tgt-vvp/vvp_config.h
 /tgt-vhdl/vhdl_config.h
 /vpi/vpi_config.h
@@ -51,8 +33,6 @@ dep
 *.vpi
 /cadpli/cadpli.vpl

-/tgt-blif/Makefile
-
 # lex, yacc and gperf output
 /driver/cflexor.c
 /driver/cfparse.c
@@ -61,14 +41,6 @@ dep

 /ivlpp/lexor.c

-/vhdlpp/lexor.cc
-/vhdlpp/lexor_keyword.cc
-/vhdlpp/parse.cc
-/vhdlpp/parse.h
-/vhdlpp/parse.output
-/vhdlpp/vhdlpp_config.h
-/vhdlpp/vhdlpp
-
 /lexor.cc
 /lexor_keyword.cc
 /parse.cc
@@ -82,12 +54,7 @@ dep
 /vpi/sdf_parse.h
 /vpi/sdf_parse.output
 /vpi/sys_readmem_lex.c
-/vpi/table_mod_lexor.c
-/vpi/table_mod_parse.c
-/vpi/table_mod_parse.h
-/vpi/table_mod_parse.output

-/vvp/dump.*
 /vvp/lexor.cc
 /vvp/parse.cc
 /vvp/parse.h
@@ -1,71 +0,0 @@
-language: cpp
-sudo: required
-dist: xenial
-
-addons:
-  apt:
-    packages:
-    - gperf
-
-sudo: false
-
-notifications:
-  email: false
-
-jobs:
-  include:
-  
-    - stage: Test
-      os: linux
-      dist: xenial
-      before_install:
-        - git clone https://github.com/steveicarus/ivtest.git
-        - export PATH=$HOME/bin:$PATH
-      script:
-        - autoconf
-        - ./configure --prefix=$HOME
-        - make install
-        - make check
-        - cd ivtest
-        - perl vvp_reg.pl
-        - diff regression_report-devel.txt regression_report.txt
-        - perl vpi_reg.pl
-
-    - stage: Test
-      os: linux
-      dist: bionic
-      before_install:
-        - git clone https://github.com/steveicarus/ivtest.git
-        - export PATH=$HOME/bin:$PATH
-      script:
-        - autoconf
-        - ./configure --prefix=$HOME
-        - make install
-        - make check
-        - cd ivtest
-        - perl vvp_reg.pl
-        - diff regression_report-devel.txt regression_report.txt
-        - perl vpi_reg.pl
-
-    - stage: Test
-      os: windows
-      before_install:
-        - git clone https://github.com/steveicarus/ivtest.git
-        - choco uninstall -y mingw
-        - choco upgrade --no-progress -y msys2
-        - export msys2='cmd //C RefreshEnv.cmd '
-        - export msys2+='& set MSYS=winsymlinks:nativestrict '
-        - export msys2+='& C:\\tools\\msys64\\msys2_shell.cmd -defterm -no-start'
-        - export mingw64="$msys2 -mingw64 -full-path -here -c "\"\$@"\" --"
-        - export msys2+=" -msys2 -c "\"\$@"\" --"
-        - $msys2 pacman --sync --noconfirm --needed base-devel mingw-w64-x86_64-toolchain
-      script:
-        - $mingw64 ./autoconf.sh
-        - $mingw64 ./configure
-        - $mingw64 make install
-        - $mingw64 make check
-        - cd ivtest
-        - $mingw64 perl update_msys2_report.pl
-        - $mingw64 perl vvp_reg.pl
-        - diff --strip-trailing-cr regression_report-msys2.txt regression_report.txt
-        - $mingw64 perl vpi_reg.pl
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -1,7 +1,7 @@
-#ifndef IVL_AStatement_H
-#define IVL_AStatement_H
+#ifndef __AStatement_H
+#define __AStatement_H
 /*
- * Copyright (c) 2008-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2008 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <map>
@@ -82,4 +82,4 @@ class AProcess : public LineInfo {
      AProcess& operator= (const AProcess&);
 };

-#endif /* IVL_AStatement_H */
+#endif
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -1,7 +1,7 @@
-#ifndef IVL_Attrib_H
-#define IVL_Attrib_H
+#ifndef __Attrib_H
+#define __Attrib_H
 /*
- * Copyright (c) 2000-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2000-2009 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "StringHeap.h"
@@ -57,4 +57,4 @@ class Attrib {
      Attrib& operator= (const Attrib&);
 };

-#endif /* IVL_Attrib_H */
+#endif
@@ -54,7 +54,7 @@ So, if your program doesn't compile, tell me so, tell me where the
 error occurs, and include a complete Perfectly Valid Test Program(tm).
 You tell me that it fails to compile for you, and I find that it
 compiles for me, then hooray I fixed it. It can happen, you
-know. What's on my disk is more recent than the latest snapshot.
+know. What's on my disk is more recent then the latest snapshot.

 If your program does compile, but generates incorrect output, I need
 to know what it says and what you think it should say. From this I can
@@ -82,9 +82,9 @@ clarification.

 If the output is strictly correct, but just not good enough for
 practical use, I would like to know. These sorts of problems are
-likely to be more subjective than a core dump, but are worthy of
+likely to be more subjective then a core dump, but are worthy of
 consideration. However, realize that outright errors will get more
-attention than missed optimizations.
+attention then missed optimizations.

 THE MAKING OF A GOOD TEST PROGRAM

@@ -116,17 +116,13 @@ programs.

 RESEARCHING EXISTING/PAST BUGS, AND FILING REPORTS

-The URL <https://sourceforge.net/p/iverilog/bugs/> is the main
-bug tracking system, although some users have reported bugs at
-<https://github.com/steveicarus/iverilog/issues/>. 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. Also, consider if you are reporting a bug or really
-asking for a new feature, and use the appropriate tracker.
-
- system (although you will also find bug rep
-
+The URL <http://sourceforge.net/tracker/?group_id=149850> 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. Also,
+consider if you are reporting a bug or really asking for a new
+feature, and use the appropriate tracker.

 The bug database supports basic keyword searches, and you can
 optionally limit your search to active bugs, or fixed bugs. You may
@@ -149,7 +145,7 @@ version from git. Please see the developer documentation for more
 detailed instructions -- <http://iverilog.wikia.com/wiki/>.

 When you make a patch, submit it to the "Patches" tracker at
-<https://sourceforge.net/p/iverilog/patches/>. Patches added to
+<http://sourceforge.net/tracker/?group_id=149850>. Patches added to
 the "Patches" tracker enter the developer workflow, are checked,
 applied to the appropriate git branch, and are pushed. Then the
 tracker item is closed.
@@ -162,7 +158,7 @@ clarification before applying it.)

 COPYRIGHT ISSUES

-Icarus Verilog is Copyright (c) 1998-2018 Stephen Williams except
+Icarus Verilog is Copyright (c) 1998-2008 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
@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-                            Preamble
+			    Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.

  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.

 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-                            NO WARRANTY
+			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 19yy  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    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

 Also add information on how to contact you by electronic and paper mail.

 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:

-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) 19yy name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -335,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001-2010 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "config.h"
@@ -22,32 +22,30 @@
 # include  <iostream>
 # include  <cstring>
 # include  <cstdlib>
+# include  <climits>

-using namespace std;

 hname_t::hname_t()
 {
+      number_ = INT_MIN;
 }

 hname_t::hname_t(perm_string text)
-: name_(text)
 {
+      name_ = text;
+      number_ = INT_MIN;
 }

 hname_t::hname_t(perm_string text, int num)
-: name_(text), number_(1)
-{
-      number_[0] = num;
-}
-
-hname_t::hname_t(perm_string text, const vector<int>&nums)
-: name_(text), number_(nums)
 {
+      name_ = text;
+      number_ = num;
 }

 hname_t::hname_t(const hname_t&that)
-: name_(that.name_), number_(that.number_)
 {
+      name_ = that.name_;
+      number_ = that.number_;
 }

 hname_t& hname_t::operator = (const hname_t&that)
@@ -57,55 +55,51 @@ hname_t& hname_t::operator = (const hname_t&that)
      return *this;
 }

-bool hname_t::operator < (const hname_t&r) const
+hname_t::~hname_t()
 {
-      int cmp = strcmp(name_, r.name_);
+}
+
+perm_string hname_t::peek_name(void) const
+{
+      return name_;
+}
+
+bool hname_t::has_number() const
+{
+      return number_ != INT_MIN;
+}
+
+int hname_t::peek_number() const
+{
+      return number_;
+}
+
+bool operator < (const hname_t&l, const hname_t&r)
+{
+      int cmp = strcmp(l.peek_name(), r.peek_name());
      if (cmp < 0) return true;
      if (cmp > 0) return false;
-
-	// The text parts are equal, so compare then number
-	// parts. Finish as soon as we find one to be less or more
-	// than the other.
-      size_t idx = 0;
-      while (number_.size() > idx || r.number_.size() > idx) {
-
-	      // Ran out of l numbers, so less.
-	    if (number_.size() <= idx)
-		  return true;
-
-	      // Ran out of r numbers, so greater.
-	    if (r.number_.size() <= idx)
-		  return false;
-
-	    if (number_[idx] < r.number_[idx])
-		  return true;
-
-	    if (number_[idx] > r.number_[idx])
-		  return false;
-
-	    idx += 1;
-      }
-
-	// Fall-through means that we are equal, including all the
-	// number parts, so not less.
-      return false;
+      if (l.has_number() && r.has_number())
+	    return l.peek_number() < r.peek_number();
+      else
+	    return false;
 }

-bool hname_t::operator == (const hname_t&r) const
+bool operator == (const hname_t&l, const hname_t&r)
 {
-      if (name_ == r.name_) {
-	    if (number_.size() != r.number_.size())
-		  return false;
-
-	    for (size_t idx = 0 ; idx < number_.size() ; idx += 1)
-		  if (number_[idx] != r.number_[idx]) return false;
-
-	    return true;
+      if (l.peek_name() == r.peek_name()) {
+	    if (l.has_number() && r.has_number())
+		  return l.peek_number() == r.peek_number();
+	    else
+		  return true;
      }

      return false;
 }

+bool operator != (const hname_t&l, const hname_t&r)
+{ return ! (l==r); }
+
 ostream& operator<< (ostream&out, const hname_t&that)
 {
      if (that.peek_name() == 0) {
@@ -114,8 +108,8 @@ ostream& operator<< (ostream&out, const hname_t&that)
      }

      out << that.peek_name();
-      for (size_t idx = 0 ; idx < that.number_.size() ; idx += 1)
-	    out << "[" << that.number_[idx] << "]";
+      if (that.has_number())
+	    out << "[" << that.peek_number() << "]";

      return out;
 }
@@ -1,7 +1,7 @@
-#ifndef IVL_HName_H
-#define IVL_HName_H
+#ifndef __HName_H
+#define __HName_H
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001-2008 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,15 +16,17 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <iostream>
 # include  <list>
-# include  <vector>
 # include  "StringHeap.h"
-
-# include  <cassert>
+#ifdef __GNUC__
+#if __GNUC__ > 2
+using namespace std;
+#endif
+#endif

 /*
 * This class represents a component of a Verilog hierarchical name. A
@@ -36,77 +38,46 @@

 class hname_t {

-      friend ostream& operator<< (ostream&out, const hname_t&that);
-
    public:
      hname_t ();
      explicit hname_t (perm_string text);
      explicit hname_t (perm_string text, int num);
-      explicit hname_t (perm_string text, const std::vector<int>&nums);
      hname_t (const hname_t&that);
      ~hname_t();

      hname_t& operator= (const hname_t&);

-      bool operator == (const hname_t&that) const;
-      bool operator <  (const hname_t&that) const;
-
 	// Return the string part of the hname_t.
      perm_string peek_name(void) const;

-      size_t has_numbers() const;
-      int peek_number(size_t idx) const;
-      const std::vector<int>&peek_numbers() const;
+      bool has_number() const;
+      int peek_number() const;

    private:
      perm_string name_;
-	// If this vector has size, then the numbers all together make
-	// up part of the hierarchical name.
-      std::vector<int> number_;
+	// If the number is anything other than INT_MIN, then this is
+	// the numeric part of the name. Otherwise, it is not part of
+	// the name at all.
+      int number_;

    private: // not implemented
 };

-inline hname_t::~hname_t()
-{
-}
-
-inline perm_string hname_t::peek_name(void) const
-{
-      return name_;
-}
-
-inline int hname_t::peek_number(size_t idx) const
-{
-      assert(number_.size() > idx);
-      return number_[idx];
-}
-
-inline const std::vector<int>& hname_t::peek_numbers(void) const
-{
-      return number_;
-}
-
-inline size_t hname_t::has_numbers() const
-{
-      return number_.size();
-}
-
+extern bool operator <  (const hname_t&, const hname_t&);
+extern bool operator == (const hname_t&, const hname_t&);
+extern bool operator != (const hname_t&, const hname_t&);
 extern ostream& operator<< (ostream&, const hname_t&);

-inline bool operator != (const hname_t&l, const hname_t&r)
-{ return ! (l == r); }
-
 inline ostream& operator<< (ostream&out, const list<hname_t>&ll)
 {
      list<hname_t>::const_iterator cur = ll.begin();
      out << *cur;
-      ++ cur;
+      cur ++;
      while (cur != ll.end()) {
 	    out << "." << *cur;
-	    ++ cur;
+	    cur ++;
      }
      return out;
 }

-#endif /* IVL_HName_H */
+#endif
@@ -14,24 +14,19 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

+# include "config.h"
+
 # include  "LineInfo.h"
 # include  <sstream>

-using namespace std;
-
 LineInfo::LineInfo()
 : lineno_(0)
 {
 }

-LineInfo::LineInfo(const LineInfo&that) :
-    file_(that.file_), lineno_(that.lineno_)
-{
-}
-
 LineInfo::~LineInfo()
 {
 }
@@ -1,7 +1,7 @@
-#ifndef IVL_LineInfo_H
-#define IVL_LineInfo_H
+#ifndef __LineInfo_H
+#define __LineInfo_H
 /*
- * Copyright (c) 1999-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2009 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "StringHeap.h"
@@ -36,12 +36,11 @@ using namespace std;
 class LineInfo {
    public:
      LineInfo();
-      LineInfo(const LineInfo&that);
      virtual ~LineInfo();

 	// Get a fully formatted file/lineno
      string get_fileline() const;
-	// Set the file/line from another LineInfo object.
+	// Set the file/line fro another LineInfo object.
      void set_line(const LineInfo&that);

 	// Access parts of LineInfo data
@@ -55,4 +54,4 @@ class LineInfo {
      unsigned lineno_;
 };

-#endif /* IVL_LineInfo_H */
+#endif
@@ -12,8 +12,9 @@
 #
 #    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., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
 #
 SHELL = /bin/sh

@@ -37,8 +38,8 @@ exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 datarootdir = @datarootdir@

-SUBDIRS = ivlpp vhdlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp \
-          tgt-vhdl tgt-vlog95 tgt-pcb tgt-blif tgt-sizer driver
+SUBDIRS = ivlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp \
+          tgt-vhdl driver
 # Only run distclean for these directories.
 NOTUSED = tgt-fpga tgt-pal tgt-verilog

@@ -54,7 +55,6 @@ endif
 # rebuild the lexor_keyword.cc file. If we do, then we want to use the
 # local version instead of the one is $(srcdir).
 vpath lexor_keyword.cc .
-vpath %.cc $(srcdir)/libmisc
 vpath %.cc $(srcdir)

 bindir = @bindir@
@@ -66,14 +66,9 @@ mandir = @mandir@

 dllib=@DLLIB@

-# For a cross compile these defines will need to be set accordingly.
+CC = @CC@
 HOSTCC = @CC@
-HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
-
-BUILDCC = @CC_FOR_BUILD@
-BUILDEXT = @BUILD_EXEEXT@
 CXX = @CXX@
-DLLTOOL = @DLLTOOL@
 INSTALL = @INSTALL@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -84,43 +79,10 @@ MAN = @MAN@
 PS2PDF = @PS2PDF@
 GIT = @GIT@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -Ilibmisc
-else
-INCLUDE_PATH = -I. -I$(srcdir) -I$(srcdir)/libmisc
-endif
-
-CPPFLAGS = @DEFS@ $(INCLUDE_PATH) @CPPFLAGS@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
-CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
+CPPFLAGS = @DEFS@ -I. -I$(srcdir) @CPPFLAGS@
+CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
 PICFLAGS = @PICFLAG@
 LDFLAGS = @rdynamic@ @LDFLAGS@
-CTARGETFLAGS = @CTARGETFLAGS@
-
-# Source files in the libmisc directory
-M = LineInfo.o StringHeap.o
-
-TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o
-FF = cprop.o exposenodes.o nodangle.o synth.o synth2.o syn-rules.o
-
-O = main.o async.o design_dump.o discipline.o dup_expr.o elaborate.o \
-    elab_expr.o elaborate_analog.o elab_lval.o elab_net.o \
-    elab_scope.o elab_sig.o elab_sig_analog.o elab_type.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 nettypes.o net_analog.o net_assign.o \
-    net_design.o netclass.o netdarray.o \
-    netenum.o netparray.o netqueue.o netscalar.o netstruct.o netvector.o \
-    net_event.o net_expr.o net_func.o \
-    net_func_eval.o net_link.o net_modulo.o \
-    net_nex_input.o net_nex_output.o net_proc.o net_scope.o net_tran.o \
-    net_udp.o pad_to_width.o parse.o parse_misc.o pform.o pform_analog.o \
-    pform_disciplines.o pform_dump.o pform_package.o pform_pclass.o \
-    pform_class_type.o pform_string_type.o pform_struct_type.o pform_types.o \
-    symbol_search.o sync.o sys_funcs.o verinum.o verireal.o vpi_modules.o target.o \
-    Attrib.o HName.o Module.o PClass.o PDelays.o PEvent.o PExpr.o PFunction.o \
-    PGate.o PGenerate.o PModport.o PNamedItem.o PPackage.o PScope.o PSpec.o \
-    PTask.o PUdp.o PWire.o Statement.o AStatement.o $M $(FF) $(TT)

 all: dep config.h _pli_types.h version_tag.h ivl@EXEEXT@ version.exe iverilog-vpi.man
 	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
@@ -128,9 +90,9 @@ all: dep config.h _pli_types.h version_tag.h ivl@EXEEXT@ version.exe iverilog-vp
 # In the windows world, the installer will need a dosify program to
 # dosify text files.
 ifeq (@MINGW32@,yes)
-all: dosify$(BUILDEXT)
-dosify$(BUILDEXT): $(srcdir)/dosify.c
-	$(BUILDCC) $(CFLAGS) -o dosify$(BUILDEXT) $(srcdir)/dosify.c
+all: dep dosify.exe
+dosify.exe: $(srcdir)/dosify.c
+	$(CC) -o dosify.exe $(srcdir)/dosify.c
 endif

 # This rule rules the compiler in the trivial hello.vl program to make
@@ -138,7 +100,7 @@ endif
 check: all
 	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
 	test -r check.conf || cp $(srcdir)/check.conf .
-	driver/iverilog -B. -BMvpi -BPivlpp -tcheck -ocheck.vvp $(srcdir)/examples/hello.vl
+	driver/iverilog -B. -BPivlpp -tcheck -ocheck.vvp $(srcdir)/examples/hello.vl
 ifeq (@WIN32@,yes)
 ifeq (@install_suffix@,)
 	vvp/vvp -M- -M./vpi ./check.vvp | grep 'Hello, World'
@@ -156,8 +118,8 @@ endif
 clean:
 	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
 	rm -f *.o parse.cc parse.h lexor.cc
-	rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps
-	rm -f parse.output syn-rules.output dosify$(BUILDEXT) ivl@EXEEXT@ check.vvp
+	rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps parse.output
+	rm -f syn-rules.output dosify.exe ivl@EXEEXT@ check.vvp
 	rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc
 	rm -rf dep
 	rm -f version.exe
@@ -174,24 +136,30 @@ ifneq (@srcdir@,.)
 endif
 	rm -rf autom4te.cache

-cppcheck: $(O:.o=.cc) $(srcdir)/dosify.c $(srcdir)/version.c
-	cppcheck --enable=all --std=posix --std=c99 --std=c++03 -f \
-	         --suppressions-list=$(srcdir)/cppcheck.sup \
-	         -UYYPARSE_PARAM -UYYPRINT -Ushort -Usize_t -Uyyoverflow \
-	         -UYYTYPE_INT8 -UYYTYPE_INT16 -UYYTYPE_UINT8 -UYYTYPE_UINT16 \
-	         --relative-paths=$(srcdir) $(INCLUDE_PATH) $^
+TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o
+FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o

-cppcheck-all:
-	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) cppcheck && ) true
-	$(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) cppcheck && ) true
-	$(MAKE) cppcheck
+O = main.o async.o design_dump.o discipline.o dup_expr.o \
+elaborate.o elab_expr.o elaborate_analog.o \
+elab_lval.o elab_net.o elab_pexpr.o elab_scope.o \
+elab_sig.o elab_sig_analog.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_analog.o net_assign.o \
+net_design.o net_event.o net_expr.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_tran.o net_udp.o pad_to_width.o \
+parse.o parse_misc.o pform.o pform_analog.o pform_disciplines.o \
+pform_dump.o pform_types.o \
+set_width.o symbol_search.o sync.o sys_funcs.o \
+verinum.o verireal.o target.o \
+Attrib.o HName.o LineInfo.o Module.o PDelays.o PEvent.o \
+PExpr.o PGate.o PGenerate.o PScope.o PSpec.o \
+PTask.o PUdp.o PFunction.o PWire.o Statement.o AStatement.o StringHeap.o \
+$(FF) $(TT)

 Makefile: $(srcdir)/Makefile.in config.status
 	./config.status --file=$@

-dep:
-	mkdir dep
-
 stamp-config-h: $(srcdir)/config.h.in config.status
 	@rm -f $@
 	./config.status config.h
@@ -216,7 +184,7 @@ ifeq (@WIN32@,yes)
 # that really exports the things that the import library imports.
 ivl@EXEEXT@: $O $(srcdir)/ivl.def
 	$(CXX) -o ivl@EXEEXT@ $O $(dllib) @EXTRALIBS@
-	$(DLLTOOL) --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
+	dlltool --dllname ivl@EXEEXT@ --def $(srcdir)/ivl.def \
 		--output-lib libivl.a --output-exp ivl.exp
 	$(CXX) $(LDFLAGS) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
 else
@@ -225,23 +193,24 @@ ivl@EXEEXT@: $O
 endif

 ifeq (@MINGW32@,no)
-all: iverilog-vpi
+all: dep iverilog-vpi

 iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile
 	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
 	    -e 's;@SUFFIX@;$(suffix);' \
 	    -e 's;@IVCC@;$(CC);' \
 	    -e 's;@IVCXX@;$(CXX);' \
-	    -e 's;@IVCFLAGS@;$(CFLAGS);' \
-	    -e 's;@IVCXXFLAGS@;$(CXXFLAGS);' \
-	    -e 's;@IVCTARGETFLAGS@;$(CTARGETFLAGS);' \
+	    -e 's;@IVCFLAGS@;$(CXXFLAGS);' \
 	    -e 's;@INCLUDEDIR@;$(includedir);' \
 	    -e 's;@LIBDIR@;@libdir@;' $< > $@
 	chmod +x $@
 endif

 version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
-	$(BUILDCC) $(CFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
+	$(HOSTCC) @WARNING_FLAGS@ -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
+
+dep:
+	mkdir dep

 %.o: %.cc config.h
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
@@ -254,20 +223,20 @@ lexor.o: lexor.cc parse.h

 parse.o: parse.cc

-# Use pattern rules to avoid parallel build issues (see pr3462585)
-parse%cc parse%h: $(srcdir)/parse%y
-	$(YACC) --verbose -t -p VL --defines=parse.h -o 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 -t -p syn_ -o $@ $<
+	$(YACC) --verbose -p syn_ -o syn-rules.cc $(srcdir)/syn-rules.y

 lexor.cc: $(srcdir)/lexor.lex
-	$(LEX) -s -t $< > $@
+	$(LEX) -PVL -s -olexor.cc $(srcdir)/lexor.lex

 lexor_keyword.o: lexor_keyword.cc parse.h

 lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf
-	gperf -o -i 7 -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)
+	gperf -o -i 7 -C -k 1-4,$$ -L ANSI-C -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false)

 iverilog-vpi.man: $(srcdir)/iverilog-vpi.man.in version.exe
 	./version.exe `head -1 $(srcdir)/iverilog-vpi.man.in`'\n' > $@
@@ -292,74 +261,77 @@ endif
 version_tag.h version:
 	@if $(GIT_PRESENT) && test -d $(srcdir)/.git; then \
 	    echo "Using git-describe for VERSION_TAG"; \
-	    tmp=`(cd $(srcdir) && $(GIT) describe --always --dirty) \
-		   | sed -e 's;\(.*\);#define VERSION_TAG "\1";'`; \
+	    tag=`$(GIT) --git-dir $(srcdir)/.git describe`; \
+	    tmp=`printf "#ifndef VERSION_TAG\n#define VERSION_TAG \"$$tag\"\n#endif\n"`; \
 	    echo "$$tmp" | diff - version_tag.h > /dev/null 2>&1 || echo "$$tmp" > version_tag.h || exit 1; \
 	elif test -r $(srcdir)/version_tag.h; then \
 	    echo "Using $(srcdir)/version_tag.h for VERSION_TAG"; \
 	    diff $(srcdir)/version_tag.h version_tag.h > /dev/null 2>&1 || cp $(srcdir)/version_tag.h version_tag.h; \
 	else \
 	    echo "Using empty VERSION_TAG"; \
-	    echo '#define VERSION_TAG ""' > version_tag.h; \
+	    tmp=`printf "#ifndef VERSION_TAG\n#define VERSION_TAG \"\"\n#endif\n"`; \
+	    echo "$$tmp" | diff - version_tag.h > /dev/null 2>&1 || echo "$$tmp" > version_tag.h || exit 1; \
 	fi

 ifeq (@MINGW32@,yes)
 ifeq ($(MAN),none)
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
 else
 ifeq ($(PS2PDF),none)
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
 else
-INSTALL_DOC = installpdf installman
+INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1
 all: dep iverilog-vpi.pdf
 endif
 endif
 INSTALL_DOCDIR = $(mandir)/man1
 else
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1
 INSTALL_DOCDIR = $(mandir)/man1
 endif

 ifeq (@MINGW32@,yes)
 WIN32_INSTALL =
 else
-WIN32_INSTALL = installwin32
+WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix)
 endif

-install: all installdirs installfiles
+install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@  $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC)
 	$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true

-F = ./ivl@EXEEXT@ \
-	$(srcdir)/constants.vams \
-	$(srcdir)/disciplines.vams \
-	$(srcdir)/ivl_target.h \
-	./_pli_types.h \
-	$(srcdir)/sv_vpi_user.h \
-	$(srcdir)/vpi_user.h \
-	$(srcdir)/acc_user.h \
-	$(srcdir)/veriuser.h \
-	$(INSTALL_DOC) \
-	$(WIN32_INSTALL)
-
-installwin32: ./iverilog-vpi installdirs
+$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
 	$(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)"

-installman: iverilog-vpi.man installdirs
+$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
+	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
+
+$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams
+	$(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
+
+$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams
+	$(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams"
+
+$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h
+	$(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h"
+
+$(includedir)/_pli_types.h: _pli_types.h
+	$(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h"
+
+$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
+	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
+
+$(includedir)/acc_user.h: $(srcdir)/acc_user.h
+	$(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h"
+
+$(includedir)/veriuser.h: $(srcdir)/veriuser.h
+	$(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h"
+
+$(mandir)/man1/iverilog-vpi$(suffix).1: iverilog-vpi.man
 	$(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1"

-installpdf: iverilog-vpi.pdf installdirs
+$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
 	$(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"

-installfiles: $(F) | installdirs
-	$(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@"
-	$(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams"
-	$(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams"
-	$(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h"
-	$(INSTALL_DATA) ./_pli_types.h "$(DESTDIR)$(includedir)/_pli_types.h"
-	$(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h"
-	$(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h"
-	$(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h"
-	$(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h"

 installdirs: $(srcdir)/mkinstalldirs
 	$(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \
@@ -377,10 +349,11 @@ uninstall:
 	-rmdir "$(DESTDIR)$(libdir)/ivl$(suffix)"
 	for f in verilog$(suffix) iverilog-vpi$(suffix) gverilog$(suffix)@EXEEXT@; \
 	    do rm -f "$(DESTDIR)$(bindir)/$$f"; done
-	for f in ivl_target.h vpi_user.h _pli_types.h sv_vpi_user.h acc_user.h veriuser.h; \
+	for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
 	    do rm -f "$(DESTDIR)$(includedir)/$$f"; done
-	-test X$(suffix) = X || rmdir "$(DESTDIR)$(includedir)"
+	-test X$(suffix) = X || rmdir "$(DESTDIR)/$(includedir)"
 	rm -f "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf"


 -include $(patsubst %.o, dep/%.d, $O)
+-include $(patsubst %.o, dep/%.d, vpithunk.o)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2009 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -24,17 +24,15 @@
 # include  "PWire.h"
 # include  <cassert>

-list<Module::named_expr_t> Module::user_defparms;
-
 /* n is a permallocated string. */
-Module::Module(LexicalScope*parent, perm_string n)
-: PScopeExtra(n, parent)
+Module::Module(perm_string n)
+: PScope(n)
 {
      library_flag = false;
      is_cell = false;
-      is_interface = false;
-      program_block = false;
      uc_drive = UCD_NONE;
+      default_nettype = NetNet::NONE;
+      timescale_warn_done = false;
 }

 Module::~Module()
@@ -87,29 +85,12 @@ unsigned Module::find_port(const char*name) const
      return ports.size();
 }

-perm_string Module::get_port_name(unsigned idx) const
-{
-
-      assert(idx < ports.size());
-      if (ports[idx] == 0 || ports[idx]->name.str() == 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. Port references
-		 that aren't simple or escaped identifiers are
-		 also inaccessible to binding by name. */
-            return perm_string::literal("unnamed");
-      }
-      return ports[idx]->name;
-}
-
-

 PGate* Module::get_gate(perm_string name)
 {
      for (list<PGate*>::iterator cur = gates_.begin()
-		 ; cur != gates_.end() ; ++ cur ) {
+		 ; cur != gates_.end()
+		 ; cur ++ ) {

 	    if ((*cur)->get_name() == name)
 		  return *cur;
@@ -123,12 +104,3 @@ const list<PGate*>& Module::get_gates() const
      return gates_;
 }

-PNamedItem::SymbolType Module::symbol_type() const
-{
-      if (program_block)
-            return PROGRAM;
-      if (is_interface)
-            return INTERFACE;
-
-      return MODULE;
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_Module_H
-#define IVL_Module_H
+#ifndef __Module_H
+#define __Module_H
 /*
- * Copyright (c) 1998-2019 Stephen Williams ([email protected])
+ * Copyright (c) 1998-2009 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */


@@ -28,14 +28,13 @@
 # include  "HName.h"
 # include  "named.h"
 # include  "PScope.h"
-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "netlist.h"
 # include  "pform_types.h"
 class PExpr;
 class PEIdent;
 class PGate;
 class PGenerate;
-class PModport;
 class PSpecPath;
 class PTask;
 class PFunction;
@@ -48,13 +47,9 @@ class NetScope;
 * A module is a named container and scope. A module holds a bunch of
 * semantic quantities such as wires and gates. The module is
 * therefore the handle for grasping the described circuit.
- *
- * SystemVerilog introduces program blocks and interfaces. These have
- * much in common with modules, so the Module class is used to represent
- * these containers as well.
 */

-class Module : public PScopeExtra, public PNamedItem {
+class Module : public PScope, public LineInfo {

 	/* The module ports are in general a vector of port_t
 	   objects. Each port has a name and an ordered list of
@@ -69,8 +64,8 @@ class Module : public PScopeExtra, public PNamedItem {

    public:
 	/* The name passed here is the module name, not the instance
-	   name. This name must be a permallocated string. */
-      explicit Module(LexicalScope*parent, perm_string name);
+	   name. This make must be a permallocated string. */
+      explicit Module(perm_string name);
      ~Module();

 	/* Initially false. This is set to true if the module has been
@@ -81,23 +76,15 @@ class Module : public PScopeExtra, public PNamedItem {

      bool is_cell;

-	/* This is true if the module represents a program block
-	   instead of a module/cell. Program blocks have content
-	   restrictions and slightly modify scheduling semantics. */
-      bool program_block;
-
-	/* This is true if the module represents a interface
-	   instead of a module/cell. Interfaces have different
-	   content restrictions and some extra allowed items. */
-      bool is_interface;
-
      enum UCDriveType { UCD_NONE, UCD_PULL0, UCD_PULL1 };
      UCDriveType uc_drive;

-	/* specparams are simpler than other parameters, in that they
-	   can have a range, but not an explicit type. The restrictions
-	   are enforced by the parser. */
-      map<perm_string,param_expr_t*>specparams;
+      NetNet::Type default_nettype;
+
+	/* 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
@@ -105,7 +92,6 @@ class Module : public PScopeExtra, public PNamedItem {
 	   instantiated modules. */
      typedef pair<pform_name_t,PExpr*> named_expr_t;
      list<named_expr_t>defparms;
-      static list<named_expr_t>user_defparms;

        /* Parameters may be overridden at instantiation time;
           the overrides do not contain explicit parameter names,
@@ -121,19 +107,24 @@ class Module : public PScopeExtra, public PNamedItem {

      map<perm_string,PExpr*> attributes;

-	/* The module has a list of generate schemes that appear in
+	/* These are the timescale for this module. The default is
+	   set by the `timescale directive. */
+      int time_unit, time_precision;
+      bool time_from_timescale;
+      bool timescale_warn_done;
+
+	/* Task definitions within this module */
+      map<perm_string,PTask*> tasks;
+      map<perm_string,PFunction*> funcs;
+
+	/* The module has a list of genvars that may be used in
+	   various generate schemes. */
+      map<perm_string,LineInfo*> genvars;
+
+	/* the module has a list of generate schemes that appear in
 	   the module definition. These are used at elaboration time. */
      list<PGenerate*> generate_schemes;

-	/* Nested modules are placed here, and are not elaborated
-	   unless they are instantiated, implicitly or explicitly. */
-      std::map<perm_string,Module*> nested_modules;
-
-	/* An interface can contain one or more named modport lists.
-           The parser will ensure these don't appear in modules or
-           program blocks. */
-      map<perm_string,PModport*> modports;
-
      list<PSpecPath*> specify_paths;

 	// The mod_name() is the name of the module type.
@@ -145,9 +136,6 @@ class Module : public PScopeExtra, public PNamedItem {
      const vector<PEIdent*>& get_port(unsigned idx) const;
      unsigned find_port(const char*name) const;

-      // Return port name ("" for undeclared port)
-      perm_string get_port_name(unsigned idx) const;
-
      PGate* get_gate(perm_string name);

      const list<PGate*>& get_gates() const;
@@ -155,20 +143,20 @@ class Module : public PScopeExtra, public PNamedItem {
      void dump(ostream&out) const;
      bool elaborate(Design*, NetScope*scope) const;

-      typedef map<perm_string,PExpr*> replace_t;
+      typedef map<perm_string,NetExpr*> replace_t;
      bool elaborate_scope(Design*, NetScope*scope, const replace_t&rep);

      bool elaborate_sig(Design*, NetScope*scope) const;

-      SymbolType symbol_type() const;
-
    private:
-      void dump_specparams_(ostream&out, unsigned indent) const;
      list<PGate*> gates_;

+      static void elaborate_parm_item_(perm_string name, const param_expr_t&cur,
+				       Design*des, NetScope*scope);
+
    private: // Not implemented
      Module(const Module&);
      Module& operator= (const Module&);
 };

-#endif /* IVL_Module_H */
+#endif
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2012-2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PClass.h"
-
-PClass::PClass(perm_string name, LexicalScope*parent)
-: PScopeExtra(name, parent), type(0)
-{
-}
-
-
-PClass::~PClass()
-{
-}
-
-PNamedItem::SymbolType PClass::symbol_type() const
-{
-      return CLASS;
-}
@@ -1,49 +0,0 @@
-#ifndef IVL_PClass_H
-#define IVL_PClass_H
-/*
- * Copyright (c) 2012-2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PScope.h"
-# include  "PNamedItem.h"
-# include  "StringHeap.h"
-# include  <iostream>
-
-class PChainConstructor;
-
-/*
- * SystemVerilog supports class declarations with their own lexical
- * scope, etc. The parser arranges for these to be created and
- * collected.
- */
-
-class PClass : public PScopeExtra, public PNamedItem {
-
-    public:
-      explicit PClass (perm_string name, LexicalScope*parent);
-      ~PClass();
-
-      void dump(std::ostream&out, unsigned indent) const;
-
-      SymbolType symbol_type() const;
-
-    public:
-      class_type_t*type;
-};
-
-#endif /* IVL_PClass_H */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2017 Stephen Williams ([email protected])
+ * Copyright (c) 1999-2009 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -26,6 +26,11 @@
 # include  "verinum.h"
 # include  "netmisc.h"

+bool dly_used_no_timescale = false;
+bool dly_used_timescale = false;
+bool display_ts_dly_warning = true;
+
+
 PDelays::PDelays()
 {
      delete_flag_ = true;
@@ -50,42 +55,52 @@ void PDelays::set_delay(PExpr*del)
 }


-void PDelays::set_delays(const list<PExpr*>*del, bool df)
+void PDelays::set_delays(const svector<PExpr*>*del, bool df)
 {
      assert(del);
-      assert(del->size() <= 3);
-
-      list<PExpr*>::const_iterator cur = del->begin();
-      for (unsigned idx = 0 ;  cur != del->end() ;  idx += 1, ++cur)
-	    delay_[idx] = *cur;
+      assert(del->count() <= 3);
+      for (unsigned idx = 0 ;  idx < del->count() ;  idx += 1)
+	    delay_[idx] = (*del)[idx];

      delete_flag_ = df;
 }

-unsigned PDelays::delay_count() const
-{
-      unsigned dly_cnt = 0;
-      for (unsigned idx = 0 ;  idx < 3 ;  idx += 1)
-	    if (delay_[idx]) dly_cnt += 1;
-
-      return dly_cnt;
-}
-
 static NetExpr*calculate_val(Design*des, NetScope*scope, PExpr*expr)
 {
-      NetExpr*dex = elab_and_eval(des, scope, expr, -1);
+      ivl_variable_type_t tmp_type = IVL_VT_NO_TYPE;
+      bool tmp_flag = false;
+      expr->test_width(des, scope, 0, 0, tmp_type, tmp_flag);
+      NetExpr*dex = expr->elaborate_expr(des, scope, -1, false);
+      eval_expr(dex);

-      check_for_inconsistent_delays(scope);
+	/* Print a warning if we find default and `timescale based
+	 * delays in the design, since this is likely an error. */
+      if (scope->time_from_timescale()) dly_used_timescale = true;
+      else dly_used_no_timescale = true;
+
+      if (display_ts_dly_warning &&
+          dly_used_no_timescale && dly_used_timescale) {
+	    cerr << "warning: Found both default and "
+	            "`timescale based delays. Use" << endl;
+	    cerr << "         -Wtimescale to find the "
+	            "module(s) with no `timescale." << endl;
+	    display_ts_dly_warning = false;
+      }

 	/* 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)) {
-	    uint64_t delay = get_scaled_time_from_real(des, scope, tmp);
+	    verireal fn = tmp->value();
+
+	    int shift = scope->time_unit() - des->get_precision();
+	    int64_t delay = fn.as_long64(shift);
+	    if (delay < 0)
+		  delay = 0;

 	    delete tmp;
-	    NetEConst*tmp2 = new NetEConst(verinum(delay, 64));
+	    NetEConst*tmp2 = new NetEConst(verinum(delay));
 	    tmp2->set_line(*expr);
 	    return tmp2;
      }
@@ -93,10 +108,11 @@ static NetExpr*calculate_val(Design*des, NetScope*scope, PExpr*expr)

      if (NetEConst*tmp = dynamic_cast<NetEConst*>(dex)) {
 	    verinum fn = tmp->value();
+
 	    uint64_t delay = des->scale_to_precision(fn.as_ulong64(), scope);

 	    delete tmp;
-	    NetEConst*tmp2 = new NetEConst(verinum(delay, 64));
+	    NetEConst*tmp2 = new NetEConst(verinum(delay));
 	    tmp2->set_line(*expr);
 	    return tmp2;
      }
@@ -107,9 +123,6 @@ static NetExpr*calculate_val(Design*des, NetScope*scope, PExpr*expr)

 static NetExpr* make_delay_nets(Design*des, NetScope*scope, NetExpr*expr)
 {
-      if (expr == 0)
-            return 0;
-
      if (dynamic_cast<NetESignal*> (expr))
 	    return expr;

@@ -119,8 +132,7 @@ static NetExpr* make_delay_nets(Design*des, NetScope*scope, NetExpr*expr)
      NetNet*sig = expr->synthesize(des, scope, expr);
      if (sig == 0) {
 	    cerr << expr->get_fileline() << ": error: Expression " << *expr
-		 << " is not suitable as a delay expression." << endl;
-	    des->errors += 1;
+		 << " is not suitable for delay expression." << endl;
 	    return 0;
      }

@@ -137,6 +149,8 @@ static NetExpr* calc_decay_time(NetExpr *rise, NetExpr *fall)
 	    else return fall;
      }

+      cerr << fall->get_fileline() << ": sorry: can not calculate the "
+           << "decay time from " << *rise << " and " << *fall << endl;
      return 0;
 }

@@ -1,7 +1,7 @@
-#ifndef IVL_PDelays_H
-#define IVL_PDelays_H
+#ifndef __PDelays_H
+#define __PDelays_H
 /*
- * Copyright (c) 1999-2014 Stephen Williams ([email protected])
+ * Copyright (c) 1999-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
@@ -16,12 +16,11 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "svector.h"
 # include  <string>
-# include  <list>
 # include  <iostream>

 #ifdef __GNUC__
@@ -49,9 +48,7 @@ class PDelays {
 	   this object takes ownership of the expressions, and will
 	   delete it in the destructor. */
      void set_delay(PExpr*);
-      void set_delays(const list<PExpr*>*del, bool delete_flag=true);
-
-      unsigned delay_count() const;
+      void set_delays(const svector<PExpr*>*del, bool delete_flag=true);

      void eval_delays(Design*des, NetScope*scope,
 		       NetExpr*&rise_time,
@@ -72,4 +69,4 @@ class PDelays {

 ostream& operator << (ostream&o, const PDelays&);

-#endif /* IVL_PDelays_H */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -35,7 +35,3 @@ perm_string  PEvent::name() const
      return name_;
 }

-PNamedItem::SymbolType PEvent::symbol_type() const
-{
-      return EVENT;
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_PEvent_H
-#define IVL_PEvent_H
+#ifndef __PEvent_H
+#define __PEvent_H
 /*
- * Copyright (c) 2000-2019 Stephen Williams (steve@icarus.com)
+ * 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
@@ -16,10 +16,10 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  <string>

@@ -31,7 +31,7 @@ class NetScope;
 * are declared in Verilog as ``event foo;'' The name passed to the
 * constructor is the "foo" part of the declaration.
 */
-class PEvent : public PNamedItem {
+class PEvent : public LineInfo {

    public:
 	// The name is a perm-allocated string. It is the simple name
@@ -43,8 +43,6 @@ class PEvent : public PNamedItem {

      void elaborate_scope(Design*des, NetScope*scope) const;

-      SymbolType symbol_type() const;
-
    private:
      perm_string name_;

@@ -53,4 +51,4 @@ class PEvent : public PNamedItem {
      PEvent& operator= (const PEvent&);
 };

-#endif /* IVL_PEvent_H */
+#endif
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 1998-2020 Stephen Williams <steve@icarus.com>
- * Copyright CERN 2013 / Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2008,2011 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
@@ -15,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -24,28 +23,19 @@

 # include  "compiler.h"
 # include  "PExpr.h"
-# include  "PWire.h"
 # include  "Module.h"
 # include  "netmisc.h"
-# include  "util.h"
 # include  <typeinfo>

 PExpr::PExpr()
 {
-      expr_type_   = IVL_VT_NO_TYPE;
-      expr_width_  = 0;
-      min_width_   = 0;
-      signed_flag_ = false;
+      expr_type_ = IVL_VT_NO_TYPE;
 }

 PExpr::~PExpr()
 {
 }

-void PExpr::declare_implicit_nets(LexicalScope*, NetNet::Type)
-{
-}
-
 bool PExpr::has_aa_term(Design*, NetScope*) const
 {
      return false;
@@ -56,19 +46,18 @@ bool PExpr::is_the_same(const PExpr*that) const
      return typeid(this) == typeid(that);
 }

-NetNet* PExpr::elaborate_lnet(Design*, NetScope*) const
+NetNet* PExpr::elaborate_lnet(Design*des, NetScope*) const
 {
-      cerr << get_fileline() << ": error: "
-           << "expression not valid in assign l-value: "
-           << *this << endl;
+      cerr << get_fileline() << ": error: expression not valid in assign l-value: "
+	   << *this << endl;
      return 0;
 }

-NetNet* PExpr::elaborate_bi_net(Design*, NetScope*) const
+NetNet* PExpr::elaborate_bi_net(Design*des, NetScope*) const
 {
      cerr << get_fileline() << ": error: "
-           << "expression not valid as argument to inout port: "
-           << *this << endl;
+	   << "expression not valid as argument to inout port: "
+	   << *this << endl;
      return 0;
 }

@@ -77,44 +66,6 @@ bool PExpr::is_collapsible_net(Design*, NetScope*) const
      return false;
 }

-
-const char* PExpr::width_mode_name(width_mode_t mode)
-{
-      switch (mode) {
-          case PExpr::SIZED:
-            return "sized";
-          case PExpr::UNSIZED:
-            return "unsized";
-          case PExpr::EXPAND:
-            return "expand";
-          case PExpr::LOSSLESS:
-            return "lossless";
-          case PExpr::UPSIZE:
-            return "upsize";
-          default:
-            return "??";
-      }
-}
-
-PEAssignPattern::PEAssignPattern()
-{
-}
-
-PEAssignPattern::PEAssignPattern(const list<PExpr*>&p)
-: parms_(p.size())
-{
-      size_t idx = 0;
-      for (list<PExpr*>::const_iterator cur = p.begin()
-		 ; cur != p.end() ; ++cur) {
-	    parms_[idx] = *cur;
-	    idx += 1;
-      }
-}
-
-PEAssignPattern::~PEAssignPattern()
-{
-}
-
 PEBinary::PEBinary(char op, PExpr*l, PExpr*r)
 : op_(op), left_(l), right_(r)
 {
@@ -124,41 +75,17 @@ PEBinary::~PEBinary()
 {
 }

-void PEBinary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      if (left_) left_->declare_implicit_nets(scope, type);
-      if (right_) right_->declare_implicit_nets(scope, type);
-}
-
 bool PEBinary::has_aa_term(Design*des, NetScope*scope) const
 {
      assert(left_ && right_);
      return left_->has_aa_term(des, scope) || right_->has_aa_term(des, scope);
 }

-PECastSize::PECastSize(PExpr*si, PExpr*b)
-: size_(si), base_(b)
-{
-}
-
-PECastSize::~PECastSize()
-{
-}
-
-PECastType::PECastType(data_type_t*t, PExpr*b)
-: target_(t), base_(b)
-{
-}
-
-PECastType::~PECastType()
-{
-}
-
 PEBComp::PEBComp(char op, PExpr*l, PExpr*r)
 : PEBinary(op, l, r)
 {
-      l_width_ = 0;
-      r_width_ = 0;
+      left_width_ = 0;
+      right_width_ = 0;
 }

 PEBComp::~PEBComp()
@@ -168,7 +95,7 @@ PEBComp::~PEBComp()
 PEBLogic::PEBLogic(char op, PExpr*l, PExpr*r)
 : PEBinary(op, l, r)
 {
-      assert(op == 'a' || op == 'o' || op == 'q' || op == 'Q');
+      assert(op == 'a' || op == 'o');
 }

 PEBLogic::~PEBLogic()
@@ -203,12 +130,7 @@ PEBShift::~PEBShift()
 }

 PECallFunction::PECallFunction(const pform_name_t&n, const vector<PExpr *> &parms)
-: package_(0), path_(n), parms_(parms), is_overridden_(false)
-{
-}
-
-PECallFunction::PECallFunction(PPackage*pkg, const pform_name_t&n, const vector<PExpr *> &parms)
-: package_(pkg), path_(n), parms_(parms), is_overridden_(false)
+: path_(n), parms_(parms)
 {
 }

@@ -220,58 +142,31 @@ static pform_name_t pn_from_ps(perm_string n)
      return tmp;
 }

-PECallFunction::PECallFunction(PPackage*pkg, perm_string n, const list<PExpr *> &parms)
-: package_(pkg), path_(pn_from_ps(n)), parms_(parms.size()), is_overridden_(false)
-{
-      int tmp_idx = 0;
-      assert(parms_.size() == parms.size());
-      for (list<PExpr*>::const_iterator idx = parms.begin()
-		 ; idx != parms.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
-}
-
 PECallFunction::PECallFunction(perm_string n, const vector<PExpr*>&parms)
-: package_(0), path_(pn_from_ps(n)), parms_(parms), is_overridden_(false)
+: path_(pn_from_ps(n)), parms_(parms)
 {
 }

 PECallFunction::PECallFunction(perm_string n)
-: package_(0), path_(pn_from_ps(n)), is_overridden_(false)
+: path_(pn_from_ps(n))
 {
 }

 // NOTE: Anachronism. Try to work all use of svector out.
-PECallFunction::PECallFunction(const pform_name_t&n, const list<PExpr *> &parms)
-: package_(0), path_(n), parms_(parms.size()), is_overridden_(false)
+PECallFunction::PECallFunction(const pform_name_t&n, const svector<PExpr *> &parms)
+: path_(n), parms_(vector_from_svector(parms))
 {
-      int tmp_idx = 0;
-      assert(parms_.size() == parms.size());
-      for (list<PExpr*>::const_iterator idx = parms.begin()
-		 ; idx != parms.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
 }

-PECallFunction::PECallFunction(perm_string n, const list<PExpr*>&parms)
-: package_(0), path_(pn_from_ps(n)), parms_(parms.size()), is_overridden_(false)
+PECallFunction::PECallFunction(perm_string n, const svector<PExpr*>&parms)
+: path_(pn_from_ps(n)), parms_(vector_from_svector(parms))
 {
-      int tmp_idx = 0;
-      assert(parms_.size() == parms.size());
-      for (list<PExpr*>::const_iterator idx = parms.begin()
-		 ; idx != parms.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
 }

 PECallFunction::~PECallFunction()
 {
 }

-void PECallFunction::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx]->declare_implicit_nets(scope, type);
-      }
-}
-
 bool PECallFunction::has_aa_term(Design*des, NetScope*scope) const
 {
      bool flag = false;
@@ -281,17 +176,9 @@ bool PECallFunction::has_aa_term(Design*des, NetScope*scope) const
      return flag;
 }

-PEConcat::PEConcat(const list<PExpr*>&p, PExpr*r)
-: parms_(p.size()), width_modes_(SIZED, p.size()), repeat_(r)
+PEConcat::PEConcat(const svector<PExpr*>&p, PExpr*r)
+: parms_(p), tested_widths_(p.count()), repeat_(r)
 {
-      int tmp_idx = 0;
-      assert(parms_.size() == p.size());
-      for (list<PExpr*>::const_iterator idx = p.begin()
-		 ; idx != p.end() ; ++idx)
-	    parms_[tmp_idx++] = *idx;
-
-      tested_scope_ = 0;
-      repeat_count_ = 1;
 }

 PEConcat::~PEConcat()
@@ -299,17 +186,10 @@ PEConcat::~PEConcat()
      delete repeat_;
 }

-void PEConcat::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx]->declare_implicit_nets(scope, type);
-      }
-}
-
 bool PEConcat::has_aa_term(Design*des, NetScope*scope) const
 {
      bool flag = false;
-      for (unsigned idx = 0 ; idx < parms_.size() ; idx += 1) {
+      for (unsigned idx = 0 ; idx < parms_.count() ; idx += 1) {
 	    flag = parms_[idx]->has_aa_term(des, scope) || flag;
      }
      if (repeat_)
@@ -343,14 +223,6 @@ PExpr* PEEvent::expr() const
      return expr_;
 }

-PENull::PENull(void)
-{
-}
-
-PENull::~PENull()
-{
-}
-
 PEFNumber::PEFNumber(verireal*v)
 : value_(v)
 {
@@ -367,69 +239,19 @@ const verireal& PEFNumber::value() const
 }

 PEIdent::PEIdent(const pform_name_t&that)
-: package_(0), path_(that), no_implicit_sig_(false)
+: path_(that)
 {
 }

-PEIdent::PEIdent(perm_string s, bool no_implicit_sig)
-: package_(0), no_implicit_sig_(no_implicit_sig)
+PEIdent::PEIdent(perm_string s)
 {
      path_.push_back(name_component_t(s));
 }

-PEIdent::PEIdent(PPackage*pkg, const pform_name_t&that)
-: package_(pkg), path_(that), no_implicit_sig_(true)
-{
-}
-
 PEIdent::~PEIdent()
 {
 }

-void PEIdent::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-        /* We create an implicit wire if:
-	   - this is a simple identifier
-           - an identifier of that name has not already been declared in
-             any enclosing scope.
-	   - this is not an implicit named port connection */
-     if (no_implicit_sig_)
-	    return;
-     if ((path_.size() == 1) && (path_.front().index.size() == 0)) {
-            perm_string name = path_.front().name;
-            LexicalScope*ss = scope;
-            while (ss) {
-                  if (ss->wires.find(name) != ss->wires.end())
-                        return;
-                  if (ss->localparams.find(name) != ss->localparams.end())
-                        return;
-                  if (ss->parameters.find(name) != ss->parameters.end())
-                        return;
-                  if (ss->genvars.find(name) != ss->genvars.end())
-                        return;
-                  if (ss->events.find(name) != ss->events.end())
-                        return;
-                  /* Strictly speaking, we should also check for name clashes
-                     with tasks, functions, named blocks, module instances,
-                     and generate blocks. However, this information is not
-                     readily available. As these names would not be legal in
-                     this context, we can declare implicit nets here and rely
-                     on later checks for name clashes to report the error. */
-
-                  ss = ss->parent_scope();
-            }
-            PWire*net = new PWire(name, type, NetNet::NOT_A_PORT, IVL_VT_LOGIC);
-            net->set_file(get_file());
-            net->set_lineno(get_lineno());
-            net->set_range_scalar(SR_NET);
-            scope->wires[name] = net;
-            if (warn_implicit) {
-                  cerr << get_fileline() << ": warning: implicit "
-                       "definition of wire '" << name << "'." << endl;
-            }
-      }
-}
-
 bool PEIdent::has_aa_term(Design*des, NetScope*scope) const
 {
      NetNet*       net = 0;
@@ -438,7 +260,7 @@ bool PEIdent::has_aa_term(Design*des, NetScope*scope) const

      const NetExpr*ex1, *ex2;

-      scope = symbol_search(this, des, scope, path_, net, par, eve, ex1, ex2);
+      scope = symbol_search(0, des, scope, path_, net, par, eve, ex1, ex2);

      if (scope)
            return scope->is_auto();
@@ -446,43 +268,6 @@ bool PEIdent::has_aa_term(Design*des, NetScope*scope) const
            return false;
 }

-PENewArray::PENewArray(PExpr*size_expr, PExpr*init_expr)
-: size_(size_expr), init_(init_expr)
-{
-}
-
-PENewArray::~PENewArray()
-{
-      delete size_;
-}
-
-PENewClass::PENewClass(void)
-{
-}
-
-PENewClass::PENewClass(const list<PExpr*>&p)
-: parms_(p.size())
-{
-      size_t tmp_idx = 0;
-      for (list<PExpr*>::const_iterator cur = p.begin()
-		 ; cur != p.end() ; ++ cur) {
-	    parms_[tmp_idx++] = *cur;
-      }
-}
-
-PENewClass::~PENewClass()
-{
-}
-
-PENewCopy::PENewCopy(PExpr*src)
-: src_(src)
-{
-}
-
-PENewCopy::~PENewCopy()
-{
-}
-
 PENumber::PENumber(verinum*vp)
 : value_(vp)
 {
@@ -532,14 +317,6 @@ PETernary::~PETernary()
 {
 }

-void PETernary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      assert(expr_ && tru_ && fal_);
-      expr_->declare_implicit_nets(scope, type);
-      tru_->declare_implicit_nets(scope, type);
-      fal_->declare_implicit_nets(scope, type);
-}
-
 bool PETernary::has_aa_term(Design*des, NetScope*scope) const
 {
      assert(expr_ && tru_ && fal_);
@@ -548,15 +325,6 @@ bool PETernary::has_aa_term(Design*des, NetScope*scope) const
           || fal_->has_aa_term(des, scope);
 }

-PETypename::PETypename(data_type_t*dt)
-: data_type_(dt)
-{
-}
-
-PETypename::~PETypename()
-{
-}
-
 PEUnary::PEUnary(char op, PExpr*ex)
 : op_(op), expr_(ex)
 {
@@ -566,22 +334,8 @@ PEUnary::~PEUnary()
 {
 }

-void PEUnary::declare_implicit_nets(LexicalScope*scope, NetNet::Type type)
-{
-      assert(expr_);
-      expr_->declare_implicit_nets(scope, type);
-}
-
 bool PEUnary::has_aa_term(Design*des, NetScope*scope) const
 {
      assert(expr_);
      return expr_->has_aa_term(des, scope);
 }
-
-PEVoid::PEVoid()
-{
-}
-
-PEVoid::~PEVoid()
-{
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,26 +14,30 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
-# include "PTask.h"
-# include "Statement.h"
-# include <cassert>
-# include "ivl_assert.h"

-PFunction::PFunction(perm_string name, LexicalScope*parent, bool is_auto__)
-: PTaskFunc(name, parent), statement_(0)
+#include "PTask.h"
+
+PFunction::PFunction(perm_string name, PScope*parent, bool is_auto__)
+: PScope(name, parent), ports_(0), statement_(0)
 {
      is_auto_ = is_auto__;
-      return_type_ = 0;
+      return_type_.type = PTF_NONE;
 }

 PFunction::~PFunction()
 {
 }

+void PFunction::set_ports(svector<PWire *>*p)
+{
+      assert(ports_ == 0);
+      ports_ = p;
+}
+
 void PFunction::set_statement(Statement*s)
 {
      assert(s != 0);
@@ -41,51 +45,7 @@ void PFunction::set_statement(Statement*s)
      statement_ = s;
 }

-void PFunction::push_statement_front(Statement*stmt)
-{
-        // This should not be possible.
-      ivl_assert(*this, statement_);
-
-	// Get the PBlock of the statement. If it is not a PBlock,
-	// then create one to wrap the existing statement and the new
-	// statement that we're pushing.
-      PBlock*blk = dynamic_cast<PBlock*> (statement_);
-      if (blk == 0) {
-	    PBlock*tmp = new PBlock(PBlock::BL_SEQ);
-	    tmp->set_line(*this);
-	    vector<Statement*>tmp_list(1);
-	    tmp_list[0] = statement_;
-	    tmp->set_statement(tmp_list);
-
-	    statement_ = tmp;
-	    blk = tmp;
-      }
-
-	// Now do the push.
-      blk->push_statement_front(stmt);
-}
-
-void PFunction::set_return(data_type_t*t)
+void PFunction::set_return(PTaskFuncArg t)
 {
      return_type_ = t;
 }
-
-PChainConstructor* PFunction::extract_chain_constructor()
-{
-      PChainConstructor*res = 0;
-
-      if ((res = dynamic_cast<PChainConstructor*> (statement_))) {
-	    statement_ = new PBlock(PBlock::BL_SEQ);
-	    statement_->set_line(*this);
-
-      } else if (PBlock*blk = dynamic_cast<PBlock*>(statement_)) {
-	    res = blk->extract_chain_constructor();
-      }
-
-      return res;
-}
-
-PNamedItem::SymbolType PFunction::symbol_type() const
-{
-      return FUNCTION;
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -24,66 +24,53 @@
 # include  "verinum.h"
 # include  <cassert>

-void PGate::set_pins_(list<PExpr*>*pins)
+PGate::PGate(perm_string name,
+	     svector<PExpr*>*pins,
+	     const svector<PExpr*>*del)
+: name_(name), pins_(pins)
 {
-      assert(pins);
-      assert(pins->size() == pins_.size());
-
-      for (size_t idx = 0 ; idx < pins_.size() ; idx += 1) {
-	    pins_[idx] = pins->front();
-	    pins->pop_front();
-      }
-
-      assert(pins->empty());
-      delete pins;
-}
-
-PGate::PGate(perm_string name, list<PExpr*>*pins, const list<PExpr*>*del)
-: name_(name), pins_(pins? pins->size() : 0)
-{
-      if (pins) set_pins_(pins);
      if (del) delay_.set_delays(del);
-      str0_ = IVL_DR_STRONG;
-      str1_ = IVL_DR_STRONG;
+      str0_ = STRONG;
+      str1_ = STRONG;
 }

-PGate::PGate(perm_string name, list<PExpr*>*pins, PExpr*del)
-: name_(name), pins_(pins? pins->size() : 0)
+PGate::PGate(perm_string name,
+	     svector<PExpr*>*pins,
+	     PExpr*del)
+: name_(name), pins_(pins)
 {
-      if (pins) set_pins_(pins);
      if (del) delay_.set_delay(del);
-      str0_ = IVL_DR_STRONG;
-      str1_ = IVL_DR_STRONG;
+      str0_ = STRONG;
+      str1_ = STRONG;
 }

-PGate::PGate(perm_string name, list<PExpr*>*pins)
-: name_(name), pins_(pins? pins->size() : 0)
+PGate::PGate(perm_string name, svector<PExpr*>*pins)
+: name_(name), pins_(pins)
 {
-      if (pins) set_pins_(pins);
-      str0_ = IVL_DR_STRONG;
-      str1_ = IVL_DR_STRONG;
+      str0_ = STRONG;
+      str1_ = STRONG;
 }

 PGate::~PGate()
 {
 }

-ivl_drive_t PGate::strength0() const
+PGate::strength_t PGate::strength0() const
 {
      return str0_;
 }

-void PGate::strength0(ivl_drive_t s)
+void PGate::strength0(PGate::strength_t s)
 {
      str0_ = s;
 }

-ivl_drive_t PGate::strength1() const
+PGate::strength_t PGate::strength1() const
 {
      return str1_;
 }

-void PGate::strength1(ivl_drive_t s)
+void PGate::strength1(PGate::strength_t s)
 {
      str1_ = s;
 }
@@ -112,26 +99,16 @@ void PGate::eval_delays(Design*des, NetScope*scope,
 			 as_net_flag);
 }

-unsigned PGate::delay_count() const
-{
-      return delay_.delay_count();
-}
-
-PNamedItem::SymbolType PGate::symbol_type() const
-{
-      return INSTANCE;
-}
-
-PGAssign::PGAssign(list<PExpr*>*pins)
+PGAssign::PGAssign(svector<PExpr*>*pins)
 : PGate(perm_string(), pins)
 {
-      assert(pin_count() == 2);
+      assert(pins->count() == 2);
 }

-PGAssign::PGAssign(list<PExpr*>*pins, list<PExpr*>*dels)
+PGAssign::PGAssign(svector<PExpr*>*pins, svector<PExpr*>*dels)
 : PGate(perm_string(), pins, dels)
 {
-      assert(pin_count() == 2);
+      assert(pins->count() == 2);
 }

 PGAssign::~PGAssign()
@@ -139,14 +116,14 @@ PGAssign::~PGAssign()
 }

 PGBuiltin::PGBuiltin(Type t, perm_string name,
-		     list<PExpr*>*pins,
-		     list<PExpr*>*del)
+		     svector<PExpr*>*pins,
+		     svector<PExpr*>*del)
 : PGate(name, pins, del), type_(t), msb_(0), lsb_(0)
 {
 }

 PGBuiltin::PGBuiltin(Type t, perm_string name,
-		     list<PExpr*>*pins,
+		     svector<PExpr*>*pins,
 		     PExpr*del)
 : PGate(name, pins, del), type_(t), msb_(0), lsb_(0)
 {
@@ -166,128 +143,26 @@ void PGBuiltin::set_range(PExpr*msb, PExpr*lsb)
      lsb_ = lsb;
 }

-const char* PGBuiltin::gate_name() const
-{
-      switch(type_) {
-	case AND:
-	    return "AND";
-	    break;
-	case NAND:
-	    return "NAND";
-	    break;
-
-	case OR:
-	    return "OR";
-	    break;
-	case NOR:
-	    return "NOR";
-	    break;
-
-	case XOR:
-	    return "XOR";
-	    break;
-	case XNOR:
-	    return "XNOR";
-	    break;
-
-	case BUF:
-	    return "BUF";
-	    break;
-	case NOT:
-	    return "NOT";
-	    break;
-
-	case BUFIF0:
-	    return "BUFIF0";
-	    break;
-	case NOTIF0:
-	    return "NOTIF0";
-	    break;
-
-	case BUFIF1:
-	    return "BUFIF1";
-	    break;
-	case NOTIF1:
-	    return "NOTIF1";
-	    break;
-
-	case NMOS:
-	    return "NMOS";
-	    break;
-	case RNMOS:
-	    return "RNMOS";
-	    break;
-
-	case PMOS:
-	    return "PMOS";
-	    break;
-	case RPMOS:
-	    return "RPMOS";
-	    break;
-
-	case TRAN:
-	    return "TRAN";
-	    break;
-	case RTRAN:
-	    return "RTRAN";
-	    break;
-
-	case TRANIF0:
-	    return "TRANIF0";
-	    break;
-	case RTRANIF0:
-	    return "RTRANIF0";
-	    break;
-
-	case TRANIF1:
-	    return "TRANIF1";
-	    break;
-	case RTRANIF1:
-	    return "RTRANIF1";
-	    break;
-
-	case CMOS:
-	    return "CMOS";
-	    break;
-	case RCMOS:
-	    return "RCMOS";
-	    break;
-
-	case PULLUP:
-	    return "PULLUP";
-	    break;
-	case PULLDOWN:
-	    return "PULLDOWN";
-	    break;
-      }
-
-      return "<unknown>";
-}
-
-PGModule::PGModule(perm_string type, perm_string name, list<PExpr*>*pins)
-: PGate(name, pins), bound_type_(0), type_(type), overrides_(0), pins_(0),
+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), bound_type_(0), type_(type), overrides_(0), pins_(pins),
+: PGate(name, 0), overrides_(0), pins_(pins),
  npins_(npins), parms_(0), nparms_(0), msb_(0), lsb_(0)
 {
-}
-
-PGModule::PGModule(Module*type, perm_string name)
-: PGate(name, 0), bound_type_(type), overrides_(0), pins_(0),
-  npins_(0), parms_(0), nparms_(0), msb_(0), lsb_(0)
-{
+      type_ = type;
 }

 PGModule::~PGModule()
 {
 }

-void PGModule::set_parameters(list<PExpr*>*o)
+void PGModule::set_parameters(svector<PExpr*>*o)
 {
      assert(overrides_ == 0);
      overrides_ = o;
@@ -310,7 +185,7 @@ void PGModule::set_range(PExpr*msb, PExpr*lsb)
      lsb_ = lsb;
 }

-perm_string PGModule::get_type() const
+perm_string PGModule::get_type()
 {
      return type_;
 }
@@ -1,7 +1,7 @@
-#ifndef IVL_PGate_H
-#define IVL_PGate_H
+#ifndef __PGate_H
+#define __PGate_H
 /*
- * Copyright (c) 1998-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,18 +16,16 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "svector.h"
 # include  "StringHeap.h"
 # include  "named.h"
-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "PDelays.h"
 # include  "netlist.h"
 # include  <map>
-# include  <list>
-# include  <vector>
 # include  <string>
 class PExpr;
 class PUdp;
@@ -47,16 +45,18 @@ class Module;
 * single strength pair. There is a strength of the 0 drive, and a
 * strength of the 1 drive.
 */
-class PGate : public PNamedItem {
+class PGate : public LineInfo {

    public:
-      explicit PGate(perm_string name, list<PExpr*>*pins,
-		     const list<PExpr*>*del);
+      enum strength_t { HIGHZ, WEAK, PULL, STRONG, SUPPLY };

-      explicit PGate(perm_string name, list<PExpr*>*pins,
+      explicit PGate(perm_string name, svector<PExpr*>*pins,
+		     const svector<PExpr*>*del);
+
+      explicit PGate(perm_string name, svector<PExpr*>*pins,
 		     PExpr*del);

-      explicit PGate(perm_string name, list<PExpr*>*pins);
+      explicit PGate(perm_string name, svector<PExpr*>*pins);

      virtual ~PGate();

@@ -70,16 +70,14 @@ class PGate : public PNamedItem {
 		       NetExpr*&decay_time,
 		       bool as_net_flag =false) const;

-      unsigned delay_count() const;
+      unsigned pin_count() const { return pins_? pins_->count() : 0; }
+      PExpr*pin(unsigned idx) const { return (*pins_)[idx]; }

-      unsigned pin_count() const { return pins_.size(); }
-      PExpr*pin(unsigned idx) const { return pins_[idx]; }
+      strength_t strength0() const;
+      strength_t strength1() const;

-      ivl_drive_t strength0() const;
-      ivl_drive_t strength1() const;
-
-      void strength0(ivl_drive_t);
-      void strength1(ivl_drive_t);
+      void strength0(strength_t);
+      void strength1(strength_t);

      map<perm_string,PExpr*> attributes;

@@ -88,10 +86,8 @@ class PGate : public PNamedItem {
      virtual void elaborate_scope(Design*des, NetScope*sc) const;
      virtual bool elaborate_sig(Design*des, NetScope*scope) const;

-      SymbolType symbol_type() const;
-
    protected:
-      const vector<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;
@@ -99,11 +95,9 @@ class PGate : public PNamedItem {
    private:
      perm_string name_;
      PDelays delay_;
-      vector<PExpr*>pins_;
+      svector<PExpr*>*pins_;

-      ivl_drive_t str0_, str1_;
-
-      void set_pins_(list<PExpr*>*pins);
+      strength_t str0_, str1_;

    private: // not implemented
      PGate(const PGate&);
@@ -117,8 +111,8 @@ class PGate : public PNamedItem {
 class PGAssign  : public PGate {

    public:
-      explicit PGAssign(list<PExpr*>*pins);
-      explicit PGAssign(list<PExpr*>*pins, list<PExpr*>*dels);
+      explicit PGAssign(svector<PExpr*>*pins);
+      explicit PGAssign(svector<PExpr*>*pins, svector<PExpr*>*dels);
      ~PGAssign();

      void dump(ostream&out, unsigned ind =4) const;
@@ -126,7 +120,6 @@ class PGAssign  : public PGate {
      virtual bool elaborate_sig(Design*des, NetScope*scope) const;

    private:
-      void elaborate_unpacked_array_(Design*des, NetScope*scope, NetNet*lval) const;
 };


@@ -150,15 +143,14 @@ class PGBuiltin  : public PGate {

    public:
      explicit PGBuiltin(Type t, perm_string name,
-			 list<PExpr*>*pins,
-			 list<PExpr*>*del);
+			 svector<PExpr*>*pins,
+			 svector<PExpr*>*del);
      explicit PGBuiltin(Type t, perm_string name,
-			 list<PExpr*>*pins,
+			 svector<PExpr*>*pins,
 			 PExpr*del);
      ~PGBuiltin();

      Type type() const { return type_; }
-      const char * gate_name() const;
      void set_range(PExpr*msb, PExpr*lsb);

      virtual void dump(ostream&out, unsigned ind =4) const;
@@ -176,8 +168,6 @@ class PGBuiltin  : public PGate {
 				       perm_string gate_name,
 				       unsigned instance_width) const;

-      bool check_delay_count(Design*des) const;
-
      Type type_;
      PExpr*msb_;
      PExpr*lsb_;
@@ -197,30 +187,25 @@ class PGModule  : public PGate {
 	// If the binding of ports is by position, this constructor
 	// builds everything all at once.
      explicit PGModule(perm_string type, perm_string name,
-			list<PExpr*>*pins);
+			svector<PExpr*>*pins);

 	// 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);

-	// If the module type is known by design, then use this
-	// constructor.
-      explicit PGModule(Module*type, perm_string name);

      ~PGModule();

 	// Parameter overrides can come as an ordered list, or a set
 	// of named expressions.
-      void set_parameters(list<PExpr*>*o);
+      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);

-      map<perm_string,PExpr*> attributes;
-
      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;
@@ -228,12 +213,11 @@ class PGModule  : public PGate {

 	// This returns the module name of this module. It is a
 	// permallocated string.
-      perm_string get_type() const;
+      perm_string get_type();

    private:
-      Module*bound_type_;
      perm_string type_;
-      list<PExpr*>*overrides_;
+      svector<PExpr*>*overrides_;
      named<PExpr*>*pins_;
      unsigned npins_;

@@ -248,20 +232,14 @@ class PGModule  : public PGate {
      friend class delayed_elaborate_scope_mod_instances;
      void elaborate_mod_(Design*, Module*mod, NetScope*scope) const;
      void elaborate_udp_(Design*, PUdp  *udp, NetScope*scope) const;
-      unsigned calculate_instance_count_(Design*, NetScope*,
-                                         long&high, long&low,
-                                         perm_string name) const;
      void elaborate_scope_mod_(Design*des, Module*mod, NetScope*sc) const;
      void elaborate_scope_mod_instances_(Design*des, Module*mod, NetScope*sc) const;
      bool elaborate_sig_mod_(Design*des, NetScope*scope, Module*mod) const;
-	// Not currently used.
-#if 0
      bool elaborate_sig_udp_(Design*des, NetScope*scope, PUdp*udp) const;
-#endif

      NetNet*resize_net_to_port_(Design*des, NetScope*scope,
 				 NetNet*sig, unsigned port_wid,
 				 NetNet::PortType dir, bool as_signed) const;
 };

-#endif /* IVL_PGate_H */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2020 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2006,2009 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
@@ -14,22 +14,19 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "PGenerate.h"
 # include  "PWire.h"
 # include  "ivl_assert.h"

-PGenerate::PGenerate(LexicalScope*parent, unsigned id)
-: LexicalScope(parent), id_number(id)
+PGenerate::PGenerate(unsigned id)
+: id_number(id)
 {
      direct_nested_ = false;
-      scheme_type = GS_NONE;
-      local_index = false;
-      loop_init = 0;
-      loop_test = 0;
-      loop_step = 0;
+      parent = 0;
+      lexical_scope = 0;
 }

 PGenerate::~PGenerate()
@@ -51,18 +48,18 @@ void PGenerate::probe_for_direct_nesting_(void)
 	// cannot be direct nested.
      if (scope_name[0] != '$') return;

-      if (! tasks.empty()) return;
-      if (! funcs.empty()) return;
-      if (! gates.empty()) return;
-      if (! parameters.empty()) return;
-      if (! localparams.empty()) return;
-      if (! events.empty()) return;
-      if (! wires.empty()) return;
-      if (! genvars.empty()) return;
-      if (! behaviors.empty()) return;
-      if (! analog_behaviors.empty()) return;
+      if (tasks.size() > 0) return;
+      if (funcs.size() > 0) return;
+      if (gates.size() > 0) return;
+      if (parameters.size() > 0) return;
+      if (localparams.size() > 0) return;
+      if (events.size() > 0) return;
+      if (wires.size() > 0) return;
+      if (genvars.size() > 0) return;
+      if (behaviors.size() > 0) return;
+      if (analog_behaviors.size() > 0) return;

-      if (generate_schemes.empty()) return;
+      if (generate_schemes.size() == 0) return;

      switch (generate_schemes.size()) {
 	  case 1: {
@@ -113,8 +110,3 @@ ostream& operator << (ostream&out, PGenerate::scheme_t type)
      }
      return out;
 }
-
-PNamedItem::SymbolType PGenerate::symbol_type() const
-{
-      return GENBLOCK;
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_PGenerate_H
-#define IVL_PGenerate_H
+#ifndef __PGenerate_H
+#define __PGenerate_H
 /*
- * Copyright (c) 2006-2020 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2006-2009 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,10 +16,10 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  "HName.h"
 # include  "PScope.h"
@@ -50,10 +50,10 @@ class PWire;
 *    The parent points to the GS_CASE that contains this item.
 *    the loop_test is compared with the parent->loop_test expression.
 */
-class PGenerate : public PNamedItem, public LexicalScope {
+class PGenerate : public LineInfo, public LexicalScope {

    public:
-      explicit PGenerate(LexicalScope*parent, unsigned id_number);
+      explicit PGenerate(unsigned id_number);
      ~PGenerate();

 	// Generate schemes have an ID number, for when the scope is
@@ -63,7 +63,7 @@ class PGenerate : public PNamedItem, public LexicalScope {

 	// This is used during parsing to stack lexical scopes within
 	// this generate scheme.
-//      LexicalScope*lexical_scope;
+      PScope*lexical_scope;

      enum scheme_t {GS_NONE, GS_LOOP, GS_CONDIT, GS_ELSE,
 		     GS_CASE, GS_CASE_ITEM, GS_NBLOCK};
@@ -71,9 +71,6 @@ class PGenerate : public PNamedItem, public LexicalScope {

 	// generate loops have an index variable and three
 	// expressions: for (index = <init>; <test>; index=<step>)
-	// the index is local if it was declared in the init expression,
-	// e.g. for (genvar index = <init>; <test>; index=<step>)
-      bool local_index;
      perm_string loop_index;
      PExpr*loop_init;
      PExpr*loop_test;
@@ -83,10 +80,6 @@ class PGenerate : public PNamedItem, public LexicalScope {
 	// test value.
      std::valarray<PExpr*> item_test;

-	// defparam assignments found in this scope.
-      typedef pair<pform_name_t,PExpr*> named_expr_t;
-      list<named_expr_t>defparms;
-
      list<PGate*> gates;
      void add_gate(PGate*);

@@ -94,9 +87,12 @@ class PGenerate : public PNamedItem, public LexicalScope {
      map<perm_string,PTask*> tasks;
      map<perm_string,PFunction*>funcs;

+	// genvars declared within this scheme.
+      map<perm_string,LineInfo*> genvars;
+
 	// Generate schemes can contain further generate schemes.
      list<PGenerate*> generate_schemes;
-//      PGenerate*parent;
+      PGenerate*parent;

 	// This method is called by the elaboration of a module to
 	// generate scopes. the container is the scope that is to
@@ -110,8 +106,6 @@ class PGenerate : public PNamedItem, public LexicalScope {

      void dump(ostream&out, unsigned indent) const;

-      SymbolType symbol_type() const;
-
    private:
      bool generate_scope_loop_(Design*des, NetScope*container);
      bool generate_scope_condit_(Design*des, NetScope*container, bool else_flag);
@@ -144,4 +138,4 @@ class PGenerate : public PNamedItem, public LexicalScope {

 extern std::ostream& operator << (std::ostream&, PGenerate::scheme_t);

-#endif /* IVL_PGenerate_H */
+#endif
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2015-2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include "config.h"
-
-# include  "PModport.h"
-
-PModport::PModport(perm_string n)
-: name_(n)
-{
-}
-
-PModport::~PModport()
-{
-}
-
-PNamedItem::SymbolType PModport::symbol_type() const
-{
-      return MODPORT;
-}
@@ -1,54 +0,0 @@
-#ifndef IVL_PModport_H
-#define IVL_PModport_H
-/*
- * Copyright (c) 2015-2019 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PNamedItem.h"
-# include  "PScope.h"
-# include  "StringHeap.h"
-# include  "netlist.h"
-# include  <vector>
-
-/*
- * The PModport class represents a parsed SystemVerilog modport list.
- */
-class PModport : public PNamedItem {
-
-    public:
-	// The name is a perm-allocated string. It is the simple name
-	// of the modport, without any scope.
-      explicit PModport(perm_string name);
-      ~PModport();
-
-      perm_string name() const { return name_; }
-
-      typedef pair <NetNet::PortType,PExpr*> simple_port_t;
-      map<perm_string,simple_port_t> simple_ports;
-
-      SymbolType symbol_type() const;
-
-    private:
-      perm_string name_;
-
-    private: // not implemented
-      PModport(const PModport&);
-      PModport& operator= (const PModport&);
-};
-
-#endif /* IVL_PModport_H */
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2019 Martin Whitaker (icarus@martin-whitaker.me.uk)
- *
- *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PNamedItem.h"
-# include  <ostream>
-
-PNamedItem::PNamedItem()
-{
-}
-
-PNamedItem::~PNamedItem()
-{
-}
-
-PNamedItem::SymbolType PNamedItem::symbol_type() const
-{
-      return ANY;
-}
-
-std::ostream& operator << (std::ostream&o, PNamedItem::SymbolType st)
-{
-      switch (st) {
-          case PNamedItem::ANY:
-            o << "a symbol";
-            break;
-          case PNamedItem::PARAM:
-            o << "a parameter";
-            break;
-          case PNamedItem::NET:
-            o << "a net";
-            break;
-          case PNamedItem::VAR:
-            o << "a variable";
-            break;
-          case PNamedItem::GENVAR:
-            o << "a genvar";
-            break;
-          case PNamedItem::EVENT:
-            o << "an event";
-            break;
-          case PNamedItem::TYPE:
-            o << "a type";
-            break;
-          case PNamedItem::ENUM:
-            o << "an enum type or value";
-            break;
-          case PNamedItem::CLASS:
-            o << "a class";
-            break;
-          case PNamedItem::FUNCTION:
-            o << "a function";
-            break;
-          case PNamedItem::TASK:
-            o << "a task";
-            break;
-          case PNamedItem::BLOCK:
-            o << "a named block";
-            break;
-          case PNamedItem::GENBLOCK:
-            o << "a generate block";
-            break;
-          case PNamedItem::MODPORT:
-            o << "a modport";
-            break;
-          case PNamedItem::PACKAGE:
-            o << "a package";
-            break;
-          case PNamedItem::MODULE:
-            o << "a module";
-            break;
-          case PNamedItem::PROGRAM:
-            o << "a program";
-            break;
-          case PNamedItem::INTERFACE:
-            o << "an interface";
-            break;
-          case PNamedItem::PRIMITIVE:
-            o << "a primitive";
-            break;
-          case PNamedItem::INSTANCE:
-            o << "an instance name";
-            break;
-          default:
-            break;
-      }
-      return o;
-}
-
-PGenvar::PGenvar()
-{
-}
-
-PGenvar::~PGenvar()
-{
-}
-
-PNamedItem::SymbolType PGenvar::symbol_type() const
-{
-      return GENVAR;
-}
@@ -1,57 +0,0 @@
-#ifndef IVL_PNamedItem_H
-#define IVL_PNamedItem_H
-/*
- * Copyright (c) 2019 Martin Whitaker (icarus@martin-whitaker.me.uk)
- *
- *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "LineInfo.h"
-
-/*
- * The PNamedItem class is the base class for all items that can be added
- * to a scope's local symbol map.
- */
-class PNamedItem : virtual public LineInfo {
-
-    public:
-      enum SymbolType { ANY, PARAM, NET, VAR, GENVAR, EVENT, TYPE, ENUM,
-                        CLASS, FUNCTION, TASK, BLOCK, GENBLOCK, MODPORT,
-                        PACKAGE, MODULE, PROGRAM, INTERFACE, PRIMITIVE,
-                        INSTANCE };
-
-      explicit PNamedItem();
-      virtual ~PNamedItem();
-
-      virtual SymbolType symbol_type() const;
-};
-
-extern std::ostream& operator << (std::ostream&, PNamedItem::SymbolType);
-
-/*
- * The PGenvar class represents a genvar. This is only used to represent
- * genvar in a scope's local symbol map.
- */
-class PGenvar : public PNamedItem {
-
-    public:
-      explicit PGenvar();
-      virtual ~PGenvar();
-
-      SymbolType symbol_type() const;
-};
-
-#endif /* IVL_PNamedItem_H */
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2012 Stephen Williams (steve@icarus.com)
- * Copyright CERN 2013 / 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PPackage.h"
-
-PPackage::PPackage(perm_string name, LexicalScope*parent)
-: PScopeExtra(name, parent)
-{
-}
-
-PPackage::~PPackage()
-{
-}
@@ -1,47 +0,0 @@
-#ifndef IVL_PPackage_H
-#define IVL_PPackage_H
-/*
- * Copyright (c) 2012-2014 Stephen Williams (steve@icarus.com)
- * Copyright CERN 2013 / 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PScope.h"
-# include  "LineInfo.h"
-# include  "StringHeap.h"
-# include  <iostream>
-
-/*
- * SystemVerilog supports class declarations with their own lexical
- * scope, etc. The parser arranges for these to be created and
- * collected.
- */
-
-class PPackage : public PScopeExtra, public LineInfo {
-
-    public:
-      explicit PPackage (perm_string name, LexicalScope*parent);
-      ~PPackage();
-
-      bool elaborate_scope(Design*des, NetScope*scope);
-      bool elaborate_sig(Design*des, NetScope*scope) const;
-      bool elaborate(Design*des, NetScope*scope) const;
-
-      void pform_dump(std::ostream&out) const;
-};
-
-#endif /* IVL_PPackage_H */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,14 +14,23 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "PScope.h"

-bool LexicalScope::var_init_needs_explicit_lifetime() const
+PScope::PScope(perm_string n, PScope*parent)
+: name_(n), parent_(parent)
+{
+}
+
+PScope::PScope(perm_string n)
+: name_(n), parent_(0)
+{
+}
+
+PScope::~PScope()
 {
-      return false;
 }

 PWire* LexicalScope::wires_find(perm_string name)
@@ -32,35 +41,3 @@ PWire* LexicalScope::wires_find(perm_string name)
      else
 	    return (*cur).second;
 }
-
-PNamedItem::SymbolType LexicalScope::param_expr_t::symbol_type() const
-{
-      return PARAM;
-}
-
-PScope::PScope(perm_string n, LexicalScope*parent)
-: LexicalScope(parent), name_(n)
-{
-      time_unit = 0;
-      time_precision = 0;
-      time_unit_is_default = true;
-      time_prec_is_default = true;
-}
-
-PScope::~PScope()
-{
-    for(map<perm_string, data_type_t*>::iterator it = typedefs.begin();
-        it != typedefs.end(); ++it)
-        delete it->second;
-}
-
-PScopeExtra::PScopeExtra(perm_string n, LexicalScope*parent)
-: PScope(n, parent)
-{
-      time_unit_is_local = false;
-      time_prec_is_local = false;
-}
-
-PScopeExtra::~PScopeExtra()
-{
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_PScope_H
-#define IVL_PScope_H
+#ifndef __PScope_H
+#define __PScope_H
 /*
- * Copyright (c) 2008-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,27 +16,20 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

-# include  "PNamedItem.h"
+# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  "pform_types.h"
 # include  "ivl_target.h"
 # include  <map>
-# include  <set>
-# include  <vector>

 class PEvent;
 class PExpr;
-class PFunction;
-class PPackage;
 class AProcess;
 class PProcess;
-class PClass;
-class PTask;
 class PWire;
-class Statement;

 class Design;
 class NetScope;
@@ -53,32 +46,10 @@ class NetScope;
 class LexicalScope {

    public:
-      enum lifetime_t { INHERITED, STATIC, AUTOMATIC };
-
-      explicit LexicalScope(LexicalScope*parent) : default_lifetime(INHERITED), parent_(parent) { }
+      explicit LexicalScope()  { }
 	// A virtual destructor is so that dynamic_cast can work.
      virtual ~LexicalScope() { }

-      lifetime_t default_lifetime;
-
-	// Symbols that are defined or declared in this scope.
-      std::map<perm_string,PNamedItem*>local_symbols;
-
-	// Symbols that are explicitly imported. Bind the imported name
-	// to the package from which the name is imported.
-      std::map<perm_string,PPackage*>explicit_imports;
-
-	// Packages that are wildcard imported. When identifiers from
-	// these packages are referenced, they will be added to the
-	// explicit imports (IEEE 1800-2012 26.3).
-      std::set<PPackage*>potential_imports;
-
-	// A task or function call may reference a task or function defined
-	// later in the scope. So here we stash the potential imports for
-	// task and function calls. They will be added to the explicit
-	// imports if we don't find a local definition.
-      std::map<perm_string,PPackage*>possible_imports;
-
      struct range_t {
 	      // True if this is an exclude
 	    bool exclude_flag;
@@ -97,7 +68,7 @@ class LexicalScope {
 	/* The scope has parameters that are evaluated when the scope
 	   is elaborated. During parsing, I put the parameters into
 	   this map. */
-      struct param_expr_t : public PNamedItem {
+      struct param_expr_t : public LineInfo {
 	    param_expr_t() : type(IVL_VT_NO_TYPE), msb(0), lsb(0), signed_flag(false), expr(0), range(0) { }
 	      // Type information
 	    ivl_variable_type_t type;
@@ -108,14 +79,9 @@ class LexicalScope {
 	    PExpr*expr;
 	      // If there are range constraints, list them here
 	    range_t*range;
-
-	    SymbolType symbol_type() const;
      };
-      map<perm_string,param_expr_t*>parameters;
-      map<perm_string,param_expr_t*>localparams;
-
-	// Defined types in the scope.
-      map<perm_string,data_type_t*>typedefs;
+      map<perm_string,param_expr_t>parameters;
+      map<perm_string,param_expr_t>localparams;

 	// Named events in the scope.
      map<perm_string,PEvent*>events;
@@ -124,44 +90,20 @@ class LexicalScope {
      map<perm_string,PWire*>wires;
      PWire* wires_find(perm_string name);

-        // Genvars in the scope. These will only be present in module
-        // scopes, but are listed here to allow them to be found when
-        // creating implicit nets.
-      map<perm_string,LineInfo*> genvars;
-
-	// Variable initializations in this scope
-      vector<Statement*> var_inits;
-
 	// Behaviors (processes) in this scope
      list<PProcess*> behaviors;
      list<AProcess*> analog_behaviors;

-	// Enumeration sets.
-      std::set<enum_type_t*> enum_sets;
-
-      LexicalScope* parent_scope() const { return parent_; }
-
-      virtual bool var_init_needs_explicit_lifetime() const;
-
    protected:
-      void dump_typedefs_(ostream&out, unsigned indent) const;
-
      void dump_parameters_(ostream&out, unsigned indent) const;

      void dump_localparams_(ostream&out, unsigned indent) const;

-      void dump_enumerations_(ostream&out, unsigned indent) const;
-
      void dump_events_(ostream&out, unsigned indent) const;

      void dump_wires_(ostream&out, unsigned indent) const;

-      void dump_var_inits_(ostream&out, unsigned indent) const;
-
-      bool elaborate_var_inits_(Design*des, NetScope*scope) const;
-
    private:
-      LexicalScope*parent_;
 };

 class PScope : public LexicalScope {
@@ -175,23 +117,12 @@ class PScope : public LexicalScope {
 	// modules do not nest in Verilog, the parent must be nil for
 	// modules. Scopes for tasks and functions point to their
 	// containing module.
-      explicit PScope(perm_string name, LexicalScope*parent =0);
+      PScope(perm_string name, PScope*parent);
+      PScope(perm_string name);
      virtual ~PScope();

      perm_string pscope_name() const { return name_; }
-
-	/* These are the timescale for this scope. The value is
-	   set by the `timescale directive or, in SystemVerilog,
-	   by timeunit and timeprecision statements. */
-      int time_unit, time_precision;
-
-	/* Flags used to support warnings about timescales. */
-      bool time_unit_is_default;
-      bool time_prec_is_default;
-
-      bool has_explicit_timescale() const {
-	     return !(time_unit_is_default || time_prec_is_default);
-	   }
+      PScope* pscope_parent() { return parent_; }

    protected:
      bool elaborate_sig_wires_(Design*des, NetScope*scope) const;
@@ -200,36 +131,7 @@ class PScope : public LexicalScope {

    private:
      perm_string name_;
+      PScope*parent_;
 };

-/*
- * Some scopes can carry definitions. These include Modules and PClass
- * scopes. These derive from PScopeExtra so that they hold the maps of
- * extra definitions.
- */
-class PScopeExtra : public PScope {
-
-    public:
-      explicit PScopeExtra(perm_string, LexicalScope*parent =0);
-      ~PScopeExtra();
-
-	/* Task definitions within this module */
-      std::map<perm_string,PTask*> tasks;
-      std::map<perm_string,PFunction*> funcs;
-	/* Class definitions within this module. */
-      std::map<perm_string,PClass*> classes;
-	/* This is the lexical order of the classes, and is used by
-	   elaboration to choose an elaboration order. */
-      std::vector<PClass*> classes_lexical;
-
-	/* Flags used to support warnings about timescales. */
-      bool time_unit_is_local;
-      bool time_prec_is_local;
-
-    protected:
-      void dump_classes_(ostream&out, unsigned indent) const;
-      void dump_tasks_(ostream&out, unsigned indent) const;
-      void dump_funcs_(ostream&out, unsigned indent) const;
-};
-
-#endif /* IVL_PScope_H */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2011 Stephen Williams <steve@icarus.com>
+ * Copyright (c) 2006 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
@@ -14,19 +14,16 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "PSpec.h"

-PSpecPath::PSpecPath(unsigned src_cnt, unsigned dst_cnt, char polarity,
-                     bool full_flag)
+PSpecPath::PSpecPath(unsigned src_cnt, unsigned dst_cnt)
 : conditional(false), condition(0), edge(0),
  src(src_cnt), dst(dst_cnt),
  data_source_expression(0)
 {
-      full_flag_ = full_flag;
-      polarity_ = polarity;
 }

 PSpecPath::~PSpecPath()
@@ -1,7 +1,7 @@
-#ifndef IVL_PSpec_H
-#define IVL_PSpec_H
+#ifndef __PSpec_H
+#define __PSpec_H
 /*
- * Copyright (c) 2006-2014 Stephen Williams <steve@icarus.com>
+ * Copyright (c) 2006 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "LineInfo.h"
@@ -46,18 +46,11 @@ class PExpr;
 *
 * If data_source_expression != nil, then the path is edge sensitive
 * and the edge might not be 0.
-*
-* The full flag is used to verify that only vectors of the same size
-* are used in a parallel connection. Icarus always creates a full
-* connection between the source and destination. The polarity is for
-* informational (display) purposes only. The polarity is either '+',
-* '-' or 0.
 */
 class PSpecPath  : public LineInfo {

    public:
-      PSpecPath(unsigned src_cnt, unsigned dst_cnt, char polarity,
-                bool full_flag);
+      PSpecPath(unsigned src_cnt, unsigned dst_cnt);
      ~PSpecPath();

      void elaborate(class Design*des, class NetScope*scope) const;
@@ -70,10 +63,6 @@ class PSpecPath  : public LineInfo {
      class PExpr* condition;
 	// Edge specification (-1==negedge, 0 = no edge, 1==posedge)
      int edge;
-	// Is this a full connection.
-      bool full_flag_;
-	// What is the polarity of the connection.
-      char polarity_;
 	// Ordered set of source nodes of a path
      std::vector<perm_string> src;
 	// Ordered set of destination nodes of a path
@@ -84,4 +73,4 @@ class PSpecPath  : public LineInfo {
      std::vector<class PExpr*>delays;
 };

-#endif /* IVL_PSpec_H */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,52 +14,15 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
+
 # include  "PTask.h"
-# include  <cassert>

-PTaskFunc::PTaskFunc(perm_string n, LexicalScope*p)
-: PScope(n,p), this_type_(0), ports_(0)
-{
-}
-
-PTaskFunc::~PTaskFunc()
-{
-}
-
-bool PTaskFunc::var_init_needs_explicit_lifetime() const
-{
-      return default_lifetime == STATIC;
-}
-
-void PTaskFunc::set_ports(vector<pform_tf_port_t>*p)
-{
-      assert(ports_ == 0);
-      ports_ = p;
-}
-
-void PTaskFunc::set_this(class_type_t*type, PWire*this_wire)
-{
-      assert(this_type_ == 0);
-      this_type_ = type;
-
-	// Push a synthesis argument that is the "this" value.
-      if (ports_==0)
-	    ports_ = new vector<pform_tf_port_t>;
-
-      size_t use_size = ports_->size();
-      ports_->resize(use_size + 1);
-      for (size_t idx = use_size ; idx > 0 ; idx -= 1)
-	    ports_->at(idx) = ports_->at(idx-1);
-
-      ports_->at(0) = pform_tf_port_t(this_wire);
-}
-
-PTask::PTask(perm_string name, LexicalScope*parent, bool is_auto__)
-: PTaskFunc(name, parent), statement_(0)
+PTask::PTask(perm_string name, PScope*parent, bool is_auto__)
+: PScope(name, parent), ports_(0), statement_(0)
 {
      is_auto_ = is_auto__;
 }
@@ -68,13 +31,14 @@ 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;
 }
-
-PNamedItem::SymbolType PTask::symbol_type() const
-{
-      return TASK;
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_PTask_H
-#define IVL_PTask_H
+#ifndef __PTask_H
+#define __PTask_H
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,71 +16,45 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

+# include  "LineInfo.h"
 # include  "PScope.h"
-# include  "PNamedItem.h"
+# include  "svector.h"
 # include  "StringHeap.h"
 # include  <string>
-# include  <vector>
-# include  <list>
 class Design;
-class NetExpr;
-class NetNet;
 class NetScope;
-class PChainConstructor;
 class PWire;
 class Statement;
 class PExpr;

+enum PTaskFuncEnum {
+      PTF_NONE,
+      PTF_REG,
+      PTF_REG_S,
+      PTF_INTEGER,
+      PTF_REAL,
+      PTF_REALTIME,
+      PTF_TIME
+};

-class PTaskFunc : public PScope, public PNamedItem {
-
-    public:
-      PTaskFunc(perm_string name, LexicalScope*parent);
-      ~PTaskFunc();
-
-      bool var_init_needs_explicit_lifetime() const;
-
-      void set_ports(std::vector<pform_tf_port_t>*p);
-
-      void set_this(class_type_t*use_type, PWire*this_wire);
-
-	// If this task is a method of a class, this returns a pointer
-	// to the class type.
-      inline class_type_t* method_of() const { return this_type_; }
-
-
-      virtual void elaborate_sig(Design*des, NetScope*scope) const =0;
-      virtual void elaborate(Design*des, NetScope*scope) const =0;
-
-      virtual void dump(std::ostream&, unsigned) const =0;
-
-    protected:
-	// Elaborate the ports list. Write into the ports vector the
-	// NetNet pointers for the ports, and write into the pdefs the
-	// default value expressions, if any.
-      void elaborate_sig_ports_(Design*des, NetScope*scope,
-				std::vector<NetNet*>&ports,
-				std::vector<NetExpr*>&pdefs) const;
-
-      void dump_ports_(std::ostream&out, unsigned ind) const;
-
-    private:
-      class_type_t*this_type_;
-      std::vector<pform_tf_port_t>*ports_;
+struct PTaskFuncArg {
+      PTaskFuncEnum type;
+      svector<PExpr*>*range;
 };

 /*
 * The PTask holds the parsed definitions of a task.
 */
-class PTask  : public PTaskFunc {
+class PTask  : public PScope, public LineInfo {

    public:
-      explicit PTask(perm_string name, LexicalScope*parent, bool is_auto);
+      explicit PTask(perm_string name, PScope*parent, bool is_auto);
      ~PTask();

+      void set_ports(svector<PWire *>*p);
      void set_statement(Statement *s);

 	// Tasks introduce scope, to need to be handled during the
@@ -99,9 +73,8 @@ class PTask  : public PTaskFunc {

      void dump(ostream&, unsigned) const;

-      SymbolType symbol_type() const;
-
    private:
+      svector<PWire*>*ports_;
      Statement*statement_;
      bool is_auto_;

@@ -117,26 +90,15 @@ class PTask  : public PTaskFunc {
 *
 * The output value is not elaborated until elaborate_sig.
 */
-class PFunction : public PTaskFunc {
+class PFunction : public PScope, public LineInfo {

    public:
-      explicit PFunction(perm_string name, LexicalScope*parent, bool is_auto);
+      explicit PFunction(perm_string name, PScope*parent, bool is_auto);
      ~PFunction();

+      void set_ports(svector<PWire *>*p);
      void set_statement(Statement *s);
-      void set_return(data_type_t*t);
-
-      inline Statement* get_statement() { return statement_; }
-
-	// Push this statement to the front of the existing
-	// definition. If the statement is a simple statement, make a
-	// block to contain the statements.
-      void push_statement_front(Statement*stmt);
-
-	// This is only used if this function is a constructor. In
-	// that case, this method looks for a PChainConstructor in the
-	// statement and extracts it if found.
-      PChainConstructor*extract_chain_constructor();
+      void set_return(PTaskFuncArg t);

      void elaborate_scope(Design*des, NetScope*scope) const;

@@ -150,12 +112,11 @@ class PFunction : public PTaskFunc {

      void dump(ostream&, unsigned) const;

-      SymbolType symbol_type() const;
-
    private:
-      data_type_t* return_type_;
+      PTaskFuncArg return_type_;
+      svector<PWire *> *ports_;
      Statement *statement_;
      bool is_auto_;
 };

-#endif /* IVL_PTask_H */
+#endif
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "PUdp.h"
@@ -1,7 +1,7 @@
-#ifndef IVL_PUdp_H
-#define IVL_PUdp_H
+#ifndef __PUdp_H
+#define __PUdp_H
 /*
- * Copyright (c) 1998-2014 Stephen Williams (steve@picturel.com)
+ * Copyright (c) 1998-2004 Stephen Williams (steve@picturel.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,11 +16,10 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <map>
-# include  "LineInfo.h"
 # include  "StringHeap.h"
 # include  "svector.h"
 # include  "verinum.h"
@@ -29,7 +28,7 @@ class PExpr;

 /*
 * This class represents a parsed UDP. This is a much simpler object
- * than a module or macromodule.
+ * then a module or macromodule.
 *
 *   - all ports are scalar,
 *   - pin 0 (the first port) is always output,
@@ -48,7 +47,7 @@ class PExpr;
 * 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.
 */
-class PUdp : public LineInfo {
+class PUdp {

    public:
      explicit PUdp(perm_string n, unsigned nports);
@@ -76,4 +75,4 @@ class PUdp : public LineInfo {
      PUdp& operator= (const PUdp&);
 };

-#endif /* IVL_PUdp_H */
+#endif
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2011 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -28,9 +28,9 @@ PWire::PWire(perm_string n,
 	     ivl_variable_type_t dt)
 : name_(n), type_(t), port_type_(pt), data_type_(dt),
  signed_(false), isint_(false),
-  port_set_(false), net_set_(false), is_scalar_(false),
-  error_cnt_(0), uarray_type_(0), set_data_type_(0),
-  discipline_(0)
+  port_msb_(0), port_lsb_(0), port_set_(false),
+  net_msb_(0), net_lsb_(0), net_set_(false), is_scalar_(false),
+  error_cnt_(0), lidx_(0), ridx_(0), discipline_(0)
 {
      if (t == NetNet::INTEGER) {
 	    type_ = NetNet::REG;
@@ -67,7 +67,6 @@ bool PWire::set_wire_type(NetNet::Type t)
 		  isint_ = true;
 		  return true;
 	    }
-	    if (t == NetNet::IMPLICIT_REG) return true;
 	    return false;
 	  case NetNet::REG:
 	    if (t == NetNet::INTEGER) {
@@ -121,7 +120,6 @@ bool PWire::set_data_type(ivl_variable_type_t dt)

      assert(data_type_ == IVL_VT_NO_TYPE);
      data_type_ = dt;
-
      return true;
 }

@@ -142,14 +140,7 @@ bool PWire::get_signed() const

 bool PWire::get_isint() const
 {
-      if (isint_)
-	    return true;
-
-      if (vector_type_t*tmp = dynamic_cast<vector_type_t*>(set_data_type_)) {
-	    return tmp->integer_flag;
-      }
-
-      return false;
+      return isint_;
 }

 bool PWire::get_scalar() const
@@ -157,9 +148,8 @@ bool PWire::get_scalar() const
      return is_scalar_;
 }

-void PWire::set_range_scalar(PWSRType type)
+void PWire::set_range(PExpr*m, PExpr*l, PWSRType type, bool is_scalar)
 {
-      is_scalar_ = true;
      switch (type) {
 	  case SR_PORT:
 	    if (port_set_) {
@@ -167,7 +157,10 @@ void PWire::set_range_scalar(PWSRType type)
 		       << "'' has already been declared a port." << endl;
 		  error_cnt_ += 1;
 	    } else {
+		  port_msb_ = m;
+		  port_lsb_ = l;
 		  port_set_ = true;
+		  is_scalar_ = is_scalar;
 	    }
 	    return;

@@ -177,7 +170,10 @@ void PWire::set_range_scalar(PWSRType type)
 		       << "'' has already been declared." << endl;
 		  error_cnt_ += 1;
 	    } else {
+		  net_msb_ = m;
+		  net_lsb_ = l;
 		  net_set_ = true;
+		  is_scalar_ = is_scalar;
 	    }
 	    return;

@@ -194,82 +190,27 @@ void PWire::set_range_scalar(PWSRType type)
 		        error_cnt_ += 1;
 		  }
 	    } else {
+		  port_msb_ = m;
+		  port_lsb_ = l;
 		  port_set_ = true;
+		  net_msb_ = m;
+		  net_lsb_ = l;
 		  net_set_ = true;
+		  is_scalar_ = is_scalar;
 	    }
 	    return;
      }
 }

-void PWire::set_range(const list<pform_range_t>&rlist, PWSRType type)
+void PWire::set_memory_idx(PExpr*ldx, PExpr*rdx)
 {
-      switch (type) {
-	  case SR_PORT:
-	    if (port_set_) {
-		  cerr << get_fileline() << ": error: Port ``" << name_
-		       << "'' has already been declared a port." << endl;
-		  error_cnt_ += 1;
-	    } else {
-		  port_ = rlist;
-		  port_set_ = true;
-		  is_scalar_ = false;
-	    }
-	    return;
-
-	  case SR_NET:
-	    if (net_set_) {
-		  cerr << get_fileline() << ": error: Net ``" << name_
-		       << "'' has already been declared." << endl;
-		  error_cnt_ += 1;
-	    } else {
-		  net_ = rlist;
-		  net_set_ = true;
-		  is_scalar_ = false;
-	    }
-	    return;
-
-	  case SR_BOTH:
-	    if (port_set_ || net_set_) {
-		  if (port_set_) {
-		        cerr << get_fileline() << ": error: Port ``" << name_
-		             << "'' has already been declared a port." << endl;
-		        error_cnt_ += 1;
-		  }
-		  if (net_set_) {
-		        cerr << get_fileline() << ": error: Net ``" << name_
-		             << "'' has already been declared." << endl;
-		        error_cnt_ += 1;
-		  }
-	    } else {
-		  port_ = rlist;
-		  port_set_ = true;
-		  net_ = rlist;
-		  net_set_ = true;
-		  is_scalar_ = false;
-	    }
-	    return;
-      }
-}
-
-void PWire::set_unpacked_idx(const list<pform_range_t>&ranges)
-{
-      if (! unpacked_.empty()) {
+      if (lidx_ != 0 || ridx_ != 0) {
 	    cerr << get_fileline() << ": error: Array ``" << name_
 	         << "'' has already been declared." << endl;
 	    error_cnt_ += 1;
      } else {
-	    unpacked_ = ranges;
-      }
-}
-
-void PWire::set_data_type(data_type_t*type)
-{
-      assert(set_data_type_ == 0);
-      set_data_type_ = type;
-
-      if (vector_type_t*tmp = dynamic_cast<vector_type_t*>(type)) {
-	    if (tmp->integer_flag)
-		  isint_ = true;
+            lidx_ = ldx;
+            ridx_ = rdx;
      }
 }

@@ -283,15 +224,3 @@ ivl_discipline_t PWire::get_discipline(void) const
 {
      return discipline_;
 }
-
-PNamedItem::SymbolType PWire::symbol_type() const
-{
-      switch (type_) {
-          case NetNet::IMPLICIT_REG:
-          case NetNet::INTEGER:
-          case NetNet::REG:
-            return VAR;
-          default:
-            return NET;
-    }
-}
@@ -1,7 +1,7 @@
-#ifndef IVL_PWire_H
-#define IVL_PWire_H
+#ifndef __PWire_H
+#define __PWire_H
 /*
- * Copyright (c) 1998-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2009 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,13 +16,13 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "netlist.h"
-# include  "PNamedItem.h"
-# include  <list>
+# include  "LineInfo.h"
 # include  <map>
+# include  "svector.h"
 # include  "StringHeap.h"

 #ifdef HAVE_IOSFWD
@@ -33,7 +33,6 @@ class ostream;

 class PExpr;
 class Design;
-class netdarray_t;

 /*
 * The different type of PWire::set_range() calls.
@@ -51,7 +50,7 @@ enum PWSRType {SR_PORT, SR_NET, SR_BOTH};
 * from that perspective, sub-scopes within the module are a part of
 * the wire name.
 */
-class PWire : public PNamedItem {
+class PWire : public LineInfo {

    public:
      PWire(perm_string name,
@@ -76,13 +75,9 @@ class PWire : public PNamedItem {
      bool set_data_type(ivl_variable_type_t dt);
      ivl_variable_type_t get_data_type() const;

-      void set_range_scalar(PWSRType type);
-      void set_range(const std::list<pform_range_t>&ranges, PWSRType type);
+      void set_range(PExpr*msb, PExpr*lsb, PWSRType type, bool is_scalar);

-      void set_unpacked_idx(const std::list<pform_range_t>&ranges);
-      void set_uarray_type(uarray_type_t*type) { uarray_type_ = type; }
-
-      void set_data_type(data_type_t*type);
+      void set_memory_idx(PExpr*ldx, PExpr*rdx);

      void set_discipline(ivl_discipline_t);
      ivl_discipline_t get_discipline(void) const;
@@ -94,8 +89,6 @@ class PWire : public PNamedItem {

      NetNet* elaborate_sig(Design*, NetScope*scope) const;

-      SymbolType symbol_type() const;
-
    private:
      perm_string name_;
      NetNet::Type type_;
@@ -105,26 +98,20 @@ class PWire : public PNamedItem {
      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. If they
-	// do exist, they represent the packed dimensions of the
-	// bit. The first item in the list is the first range, and so
-	// on. For example "reg [3:0][7:0] ..." will contains the
-	// range_t object for [3:0] first and [7:0] last.
-      std::list<pform_range_t>port_;
+	// wire. If they do not exist, the wire is 1 bit wide.
+      PExpr*port_msb_;
+      PExpr*port_lsb_;
      bool port_set_;
-      std::list<pform_range_t>net_;
+      PExpr*net_msb_;
+      PExpr*net_lsb_;
      bool net_set_;
      bool is_scalar_;
      unsigned error_cnt_;

 	// If this wire is actually a memory, these indices will give
-	// me the size and address ranges of the memory.
-      std::list<pform_range_t>unpacked_;
-      uarray_type_t*uarray_type_;
-
-	// This is the complex type of the wire. the data_type_ may
-	// modify how this is interpreted.
-      data_type_t*set_data_type_;
+	// me the size and address range of the memory.
+      PExpr*lidx_;
+      PExpr*ridx_;

      ivl_discipline_t discipline_;

@@ -133,4 +120,4 @@ class PWire : public PNamedItem {
      PWire& operator= (const PWire&);
 };

-#endif /* IVL_PWire_H */
+#endif
@@ -1,14 +1,14 @@
 		THE ICARUS VERILOG COMPILATION SYSTEM
-		Copyright 2000-2019 Stephen Williams
+		Copyright 2000-2004 Stephen Williams


 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 behavioural
+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://iverilog.icarus.com/>.
+home page at <http://www.icarus.com/eda/verilog>.

 Icarus Verilog is not aimed at being a simulator in the traditional
 sense, but a compiler that generates code employed by back-end
@@ -20,13 +20,13 @@ tools.

 2.0 Building/Installing Icarus Verilog From Source

-If you are starting from the source, the build process is designed to be
+If you are starting from source, the build process is designed to be
 as simple as practical. Someone basically familiar with the target
 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 on Windows, see the mingw.txt file.
+If you are building for Windows, see the mingw.txt file.

 2.1 Compile Time Prerequisites

@@ -46,12 +46,8 @@ on a UNIX-like system:
 	  to work. MSVC++ 5 and 6 are known to definitely *not* work.

 	- bison and flex
-          OSX note: bison 2.3 shipped with MacOS including Catalina generates
-          broken code, but bison 3+ works. We recommend using the Fink
-          project version of bison and flex (finkproject.org), brew version
-          works fine either.

-	- gperf 3.0 or later
+	- 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
@@ -60,18 +56,18 @@ on a UNIX-like system:
 	  A version problem with this program is the most common cause
 	  of difficulty. See the Icarus Verilog FAQ.

-	- readline 4.2 or later
+	- 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.
+	  The readline library in turn uses termcap.

-If you are building from git, you will also need software to generate
+If you are building from CVS, you will also need software to generate
 the configure scripts.

-	- autoconf 2.53 or later
+	- 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.
@@ -79,21 +75,15 @@ the configure scripts.
 2.2 Compilation

 Unpack the tar-ball and cd into the verilog-######### directory
-(presumably, that is how you got to this README) and compile the source
+(presumably that is how you got to this README) and compile the source
 with the commands:

  ./configure
  make

-If you are building from git, you have to run the command below before
-compiling the source. This will generate the "configure" file, which is
-automatically done when building from tarball.
-
-  sh autoconf.sh
-
 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 behaviour:
+configure script that modify its behavior:

 	--prefix=<root>
 	    The default is /usr/local, which causes the tool suite to
@@ -116,12 +106,6 @@ configure script that modify its behaviour:
 	    with the same prefix but different suffix are guaranteed
 	    to not interfere with each other.

-	--host=<host-type>
-	    Compile iverilog for a different platform. You can use:
-                x64_64-w64-mingw32 for building 64-bit Windows executables
-                i686-w64-mingw32 for building 32-bit Windows executables
-            Both options require installing the required mingw-w64 packages.
-
 2.3 (Optional) Testing

 To run a simple test before installation, execute
@@ -171,7 +155,7 @@ output of the parse is a list of Module objects in "pform". The pform
 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
+One can see a human readable version of the final pform by using the
 ``-P <path>'' flag to the ``ivl'' subcommand. This will cause ivl
 to dump the pform into the file named <path>. (Note that this is not
 normally done, unless debugging the ``ivl'' subcommand.)
@@ -183,26 +167,27 @@ This phase takes the pform and generates a netlist. The driver selects
 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 behavioural descriptions, as well as gates and wires.
+includes all the behavioral descriptions, as well as gates and wires.

 The elaborate() function performs the elaboration.

-One can see a human-readable version of the final, elaborated and
+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
 before code generation) will be dumped into the file named <path>.

-Elaboration is performed in two steps: scopes and parameters
-first, followed by the structural and behavioural elaboration.
+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 file contains most of the code for handling this phase.
+elab_scope.cc and elab_pexpr.cc files contain most of the code for
+handling this phase.

-The tail of the elaborate_scope behaviour (after the pform is
+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.
@@ -211,14 +196,14 @@ the defparam overrides are applied to the parameters.

 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 behavioural netlist. Parameters are
+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 a collection of processing steps that perform
+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

@@ -236,7 +221,7 @@ 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 the need arises
+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
@@ -244,7 +229,7 @@ command line.

 3.6 ATTRIBUTES

-    NOTE: The $attribute syntax will soon be deprecated in favour of the
+    NOTE: The $attribute syntax will soon be deprecated in favor of the
    Verilog-2001 attribute syntax, which is cleaner and standardized.

 The parser accepts, as an extension to Verilog, the $attribute module
@@ -253,7 +238,7 @@ item. The syntax of the $attribute item is:
 	$attribute (<identifier>, <key>, <value>);

 The $attribute keyword looks like a system task invocation. The
-difference here is that the parameters are more restricted than those
+difference here is that the parameters are more restricted then those
 of a system task. The <identifier> must be an identifier. This will be
 the item to get an attribute. The <key> and <value> are strings, not
 expressions, that give the key and the value of the attribute to be
@@ -267,7 +252,7 @@ Attributes can also be applied to gate types. When this is done, the
 attribute is given to every instantiation of the primitive. The syntax
 for the attribute statement is the same, except that the <identifier>
 names a primitive earlier in the compilation unit and the statement is
-placed in the global scope, instead of within a module. The semicolon is
+placed in global scope, instead of within a module. The semicolon is
 not part of a type attribute.

 Note that attributes are also occasionally used for communication
@@ -326,7 +311,7 @@ by the compiler. See the iverilog(1) man page.

 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
+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
@@ -355,7 +340,7 @@ constructs.
 5.1 Nonstandard Constructs or Behaviors

 Icarus Verilog includes some features that are not part of the
-IEEE1364 standard, but have well-defined meaning, and also sometimes
+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.
@@ -372,7 +357,7 @@ more details.
 	function is undefined if the argument doesn't have a
 	self-determined size.

-	The $sizeof function is deprecated in favour of $bits, which is
+	The $sizeof function is deprecated in favor of $bits, which is
 	the same thing, but included in the SystemVerilog definition.

    $simtime
@@ -398,8 +383,8 @@ more details.

    Builtin system functions

-	Certain of the system functions have well-defined meanings, so
-	can theoretically be evaluated at compile-time, instead of
+	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
@@ -418,8 +403,8 @@ more details.

 	Icarus Verilog does preprocess modules that are loaded from
 	libraries via the -y mechanism. However, the only macros
-	defined during the compilation of that file are those that it
-	defines itself (or includes) or that are defined in the
+	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.

 	Specifically, macros defined in the non-library source files
@@ -436,7 +421,7 @@ more details.
 	Standard Verilog does not allow width fields in the %t formats
 	of display strings. For example, this is illegal:

-		$display("Time is %0t", $time);
+		$display("Time is %0t", %time);

 	Standard Verilog instead relies on the $timeformat to
 	completely specify the format.
@@ -460,7 +445,7 @@ more details.

    time 0 race resolution.

-	Combinational logic is routinely modelled using always
+	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
@@ -471,7 +456,7 @@ more details.

    Nets with Types

-	Icarus Verilog supports an extended syntax that allows nets
+	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:
@@ -488,6 +473,7 @@ more details.
 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 guidance, and especially testing from many people. Testers in
+particular include a larger community of people interested in a GPL
 Verilog for Linux.
+
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,14 +14,13 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"

 # include  "Statement.h"
 # include  "PExpr.h"
-# include  "ivl_assert.h"

 Statement::~Statement()
 {
@@ -52,27 +51,22 @@ PAssign_::~PAssign_()
 }

 PAssign::PAssign(PExpr*lval__, PExpr*ex)
-: PAssign_(lval__, ex, false), op_(0)
-{
-}
-
-PAssign::PAssign(PExpr*lval__, char op, PExpr*ex)
-: PAssign_(lval__, ex, false), op_(op)
+: PAssign_(lval__, ex, false)
 {
 }

 PAssign::PAssign(PExpr*lval__, PExpr*d, PExpr*ex)
-: PAssign_(lval__, d, ex), op_(0)
+: PAssign_(lval__, d, ex)
 {
 }

 PAssign::PAssign(PExpr*lval__, PExpr*cnt, PEventStatement*d, PExpr*ex)
-: PAssign_(lval__, cnt, d, ex), op_(0)
+: PAssign_(lval__, cnt, d, ex)
 {
 }

 PAssign::PAssign(PExpr*lval__, PExpr*ex, bool is_constant)
-: PAssign_(lval__, ex, is_constant), op_(0)
+: PAssign_(lval__, ex, is_constant)
 {
 }

@@ -99,7 +93,7 @@ PAssignNB::~PAssignNB()
 {
 }

-PBlock::PBlock(perm_string n, LexicalScope*parent, BL_TYPE t)
+PBlock::PBlock(perm_string n, PScope*parent, BL_TYPE t)
 : PScope(n, parent), bl_type_(t)
 {
 }
@@ -111,89 +105,23 @@ PBlock::PBlock(BL_TYPE t)

 PBlock::~PBlock()
 {
-      for (unsigned idx = 0 ;  idx < list_.size() ;  idx += 1)
+      for (unsigned idx = 0 ;  idx < list_.count() ;  idx += 1)
 	    delete list_[idx];
 }

-bool PBlock::var_init_needs_explicit_lifetime() const
-{
-      return default_lifetime == STATIC;
-}
-
-PChainConstructor* PBlock::extract_chain_constructor()
-{
-      if (list_.empty())
-	    return 0;
-
-      if (PChainConstructor*res = dynamic_cast<PChainConstructor*> (list_[0])) {
-	    for (size_t idx = 0 ; idx < list_.size()-1 ; idx += 1)
-		  list_[idx] = list_[idx+1];
-	    list_.resize(list_.size()-1);
-	    return res;
-      }
-
-      return 0;
-}
-
-void PBlock::set_join_type(PBlock::BL_TYPE type)
-{
-      assert(bl_type_ == BL_PAR);
-      assert(type==BL_PAR || type==BL_JOIN_NONE || type==BL_JOIN_ANY);
-      bl_type_ = type;
-}
-
-void PBlock::set_statement(const vector<Statement*>&st)
+void PBlock::set_statement(const svector<Statement*>&st)
 {
      list_ = st;
 }

-void PBlock::push_statement_front(Statement*that)
+PCallTask::PCallTask(const pform_name_t&n, const svector<PExpr*>&p)
+: path_(n), parms_(p)
 {
-      ivl_assert(*this, bl_type_==BL_SEQ);
-
-      list_.resize(list_.size()+1);
-      for (size_t idx = list_.size()-1 ; idx > 0 ; idx -= 1)
-	    list_[idx] = list_[idx-1];
-
-      list_[0] = that;
 }

-PNamedItem::SymbolType PBlock::symbol_type() const
+PCallTask::PCallTask(perm_string n, const svector<PExpr*>&p)
+: parms_(p)
 {
-      return BLOCK;
-}
-
-PCallTask::PCallTask(const pform_name_t&n, const list<PExpr*>&p)
-: package_(0), path_(n), parms_(p.size())
-{
-      list<PExpr*>::const_iterator cur = p.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == p.end());
-}
-
-PCallTask::PCallTask(PPackage*pkg, const pform_name_t&n, const list<PExpr*>&p)
-: package_(pkg), path_(n), parms_(p.size())
-{
-      list<PExpr*>::const_iterator cur = p.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == p.end());
-}
-
-PCallTask::PCallTask(perm_string n, const list<PExpr*>&p)
-: package_(0), parms_(p.size())
-{
-      list<PExpr*>::const_iterator cur = p.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == p.end());
      path_.push_back(name_component_t(n));
 }

@@ -206,8 +134,8 @@ const pform_name_t& PCallTask::path() const
      return path_;
 }

-PCase::PCase(ivl_case_quality_t q, NetCase::TYPE t, PExpr*ex, svector<PCase::Item*>*l)
-: quality_(q), type_(t), expr_(ex), items_(l)
+PCase::PCase(NetCase::TYPE t, PExpr*ex, svector<PCase::Item*>*l)
+: type_(t), expr_(ex), items_(l)
 {
 }

@@ -231,21 +159,6 @@ PCAssign::~PCAssign()
      delete expr_;
 }

-PChainConstructor::PChainConstructor(const list<PExpr*>&parms)
-: parms_(parms.size())
-{
-      list<PExpr*>::const_iterator cur = parms.begin();
-      for (size_t idx = 0 ; idx < parms_.size() ; idx += 1) {
-	    parms_[idx] = *cur;
-	    ++cur;
-      }
-      assert(cur == parms.end());
-}
-
-PChainConstructor::~PChainConstructor()
-{
-}
-
 PCondit::PCondit(PExpr*ex, Statement*i, Statement*e)
 : expr_(ex), if_(i), else_(e)
 {
@@ -287,32 +200,21 @@ PDisable::~PDisable()
 {
 }

-PDoWhile::PDoWhile(PExpr*ex, Statement*st)
-: cond_(ex), statement_(st)
-{
-}
-
-PDoWhile::~PDoWhile()
-{
-      delete cond_;
-      delete statement_;
-}
-
 PEventStatement::PEventStatement(const svector<PEEvent*>&ee)
-: expr_(ee), statement_(0), always_sens_(false)
+: expr_(ee), statement_(0)
 {
      assert(expr_.count() > 0);
 }


 PEventStatement::PEventStatement(PEEvent*ee)
-: expr_(1), statement_(0), always_sens_(false)
+: expr_(1), statement_(0)
 {
      expr_[0] = ee;
 }

-PEventStatement::PEventStatement(bool always_sens)
-: statement_(0), always_sens_(always_sens)
+PEventStatement::PEventStatement(void)
+: statement_(0)
 {
 }

@@ -346,20 +248,6 @@ PForce::~PForce()
      delete expr_;
 }

-PForeach::PForeach(perm_string av, const list<perm_string>&ix, Statement*s)
-: array_var_(av), index_vars_(ix.size()), statement_(s)
-{
-      size_t idx = 0;
-      for (list<perm_string>::const_iterator cur = ix.begin()
-		 ; cur != ix.end() ; ++cur)
-	    index_vars_[idx++] = *cur;
-}
-
-PForeach::~PForeach()
-{
-      delete statement_;
-}
-
 PForever::PForever(Statement*s)
 : statement_(s)
 {
@@ -371,8 +259,9 @@ PForever::~PForever()
 }

 PForStatement::PForStatement(PExpr*n1, PExpr*e1, PExpr*cond,
-			     Statement*step, Statement*st)
-: name1_(n1), expr1_(e1), cond_(cond), step_(step), statement_(st)
+			     PExpr*n2, PExpr*e2, Statement*st)
+: name1_(n1), expr1_(e1), cond_(cond), name2_(n2), expr2_(e2),
+  statement_(st)
 {
 }

@@ -406,18 +295,8 @@ PRepeat::~PRepeat()
      delete statement_;
 }

-PReturn::PReturn(PExpr*e)
-: expr_(e)
-{
-}
-
-PReturn::~PReturn()
-{
-      delete expr_;
-}
-
-PTrigger::PTrigger(PPackage*pkg, const pform_name_t&e)
-: package_(pkg), event_(e)
+PTrigger::PTrigger(const pform_name_t&e)
+: event_(e)
 {
 }

@@ -425,8 +304,8 @@ PTrigger::~PTrigger()
 {
 }

-PWhile::PWhile(PExpr*ex, Statement*st)
-: cond_(ex), statement_(st)
+PWhile::PWhile(PExpr*e1, Statement*st)
+: cond_(e1), statement_(st)
 {
 }

@@ -1,7 +1,7 @@
-#ifndef IVL_Statement_H
-#define IVL_Statement_H
+#ifndef __Statement_H
+#define __Statement_H
 /*
- * Copyright (c) 1998-2020 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,12 +16,10 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <string>
-# include  <vector>
-# include  <list>
 # include  "ivl_target.h"
 # include  "svector.h"
 # include  "StringHeap.h"
@@ -31,8 +29,6 @@
 # include  "HName.h"
 # include  "LineInfo.h"
 class PExpr;
-class PChainConstructor;
-class PPackage;
 class Statement;
 class PEventStatement;
 class Design;
@@ -44,9 +40,9 @@ class NetScope;

 /*
 * The PProcess is the root of a behavioral process. Each process gets
- * one of these, which contains its type (initial, always, or final)
- * and a pointer to the single statement that is the process. A module
- * may have several concurrent processes.
+ * one of these, which contains its type (initial or always) and a
+ * pointer to the single statement that is the process. A module may
+ * have several concurrent processes.
 */
 class PProcess : public LineInfo {

@@ -75,7 +71,7 @@ class PProcess : public LineInfo {
 * fact, the Statement class is abstract and represents all the
 * possible kinds of statements that exist in Verilog.
 */
-class Statement : virtual public LineInfo {
+class Statement : public LineInfo {

    public:
      Statement() { }
@@ -106,14 +102,8 @@ class PAssign_  : public Statement {

    protected:
      NetAssign_* elaborate_lval(Design*, NetScope*scope) const;
-      NetExpr* elaborate_rval_(Design*, NetScope*, ivl_type_t lv_net_type,
-			       ivl_variable_type_t lv_type,
-			       unsigned lv_width,
-			       bool force_unsigned =false) const;
-      NetExpr* elaborate_rval_(Design*, NetScope*, ivl_type_t ntype) const;
-
-      NetExpr* elaborate_rval_obj_(Design*, NetScope*,
-				   ivl_variable_type_t type) const;
+      NetExpr* elaborate_rval_(Design*, NetScope*, unsigned lv_width,
+			       ivl_variable_type_t type) const;

      PExpr* delay_;
      PEventStatement*event_;
@@ -128,12 +118,7 @@ class PAssign_  : public Statement {
 class PAssign  : public PAssign_ {

    public:
-	// lval  - assignment l-value
-	// ex    - assignment r-value
-	// op    - compressed assignment operator (i.e. '+', '-', ...)
-	// de    - delayed assignment delay expression
      explicit PAssign(PExpr*lval, PExpr*ex);
-      explicit PAssign(PExpr*lval, char op, PExpr*ex);
      explicit PAssign(PExpr*lval, PExpr*de, PExpr*ex);
      explicit PAssign(PExpr*lval, PExpr*cnt, PEventStatement*de, PExpr*ex);
      explicit PAssign(PExpr*lval, PExpr*ex, bool is_constant);
@@ -143,8 +128,6 @@ class PAssign  : public PAssign_ {
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;

    private:
-      NetProc* elaborate_compressed_(Design*des, NetScope*scope) const;
-      char op_;
 };

 class PAssignNB  : public PAssign_ {
@@ -170,58 +153,52 @@ class PAssignNB  : public PAssign_ {
 * statements before constructing this object, so it knows a priori
 * what is contained.
 */
-class PBlock  : public PScope, public Statement, public PNamedItem {
+class PBlock  : public PScope, public Statement {

    public:
-      enum BL_TYPE { BL_SEQ, BL_PAR, BL_JOIN_NONE, BL_JOIN_ANY };
+      enum BL_TYPE { BL_SEQ, BL_PAR };

 	// If the block has a name, it is a scope and also has a parent.
-      explicit PBlock(perm_string n, LexicalScope*parent, BL_TYPE t);
+      explicit PBlock(perm_string n, PScope*parent, BL_TYPE t);
 	// If it doesn't have a name, it's not a scope
      explicit PBlock(BL_TYPE t);
      ~PBlock();

      BL_TYPE bl_type() const { return bl_type_; }

-      bool var_init_needs_explicit_lifetime() const;
-
-	// This is only used if this block is the statement list for a
-	// constructor. We look for a PChainConstructor as the first
-	// statement, and if it is there, extract it.
-      PChainConstructor*extract_chain_constructor();
-
-	// If the bl_type() is BL_PAR, it is possible to replace it
-	// with JOIN_NONE or JOIN_ANY. This is to help the parser.
-      void set_join_type(BL_TYPE);
-
-      void set_statement(const std::vector<Statement*>&st);
-
-	// Copy the statement from that block to the front of this
-	// block.
-      void push_statement_front(Statement*that);
+      void set_statement(const svector<Statement*>&st);

      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void elaborate_scope(Design*des, NetScope*scope) const;
      virtual void elaborate_sig(Design*des, NetScope*scope) const;

-      SymbolType symbol_type() const;
-
    private:
-      BL_TYPE bl_type_;
-      std::vector<Statement*>list_;
+      const BL_TYPE bl_type_;
+      svector<Statement*>list_;
 };

 class PCallTask  : public Statement {

    public:
-      explicit PCallTask(PPackage*pkg, const pform_name_t&n, const list<PExpr*>&parms);
-      explicit PCallTask(const pform_name_t&n, const list<PExpr*>&parms);
-      explicit PCallTask(perm_string n, const list<PExpr*>&parms);
+      explicit PCallTask(const pform_name_t&n, const svector<PExpr*>&parms);
+      explicit PCallTask(perm_string n, const svector<PExpr*>&parms);
      ~PCallTask();

      const pform_name_t& path() const;

+      unsigned nparms() const { return parms_.count(); }
+
+      PExpr*&parm(unsigned idx)
+	    { assert(idx < parms_.count());
+	      return parms_[idx];
+	    }
+
+      PExpr* parm(unsigned idx) const
+	    { assert(idx < parms_.count());
+	      return parms_[idx];
+	    }
+
      virtual void dump(ostream&out, unsigned ind) const;
      virtual NetProc* elaborate(Design*des, NetScope*scope) const;

@@ -229,38 +206,19 @@ class PCallTask  : public Statement {
      NetProc* elaborate_sys(Design*des, NetScope*scope) const;
      NetProc* elaborate_usr(Design*des, NetScope*scope) const;

-      NetProc*elaborate_method_(Design*des, NetScope*scope,
-                                bool add_this_flag = false) const;
-      NetProc*elaborate_function_(Design*des, NetScope*scope) const;
-      NetProc*elaborate_void_function_(Design*des, NetScope*scope,
-				       NetFuncDef*def) const;
-
-      NetProc*elaborate_build_call_(Design*des, NetScope*scope,
-				    NetScope*task, NetExpr*use_this) const;
-      NetProc*elaborate_sys_task_method_(Design*des, NetScope*scope,
-					 NetNet*net,
-					 perm_string method_name,
-					 const char*sys_task_name) const;
-      NetProc*elaborate_queue_method_(Design*des, NetScope*scope,
-				      NetNet*net,
-				      perm_string method_name,
-				      const char*sys_task_name) const;
-      bool test_task_calls_ok_(Design*des, NetScope*scope) const;
-
-      PPackage*package_;
      pform_name_t path_;
-      vector<PExpr*> parms_;
+      svector<PExpr*> parms_;
 };

 class PCase  : public Statement {

    public:
      struct Item {
-	    list<PExpr*>expr;
+	    svector<PExpr*>expr;
 	    Statement*stat;
      };

-      PCase(ivl_case_quality_t, NetCase::TYPE, PExpr*ex, svector<Item*>*);
+      PCase(NetCase::TYPE, PExpr*ex, svector<Item*>*);
      ~PCase();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
@@ -269,7 +227,6 @@ class PCase  : public Statement {
      virtual void dump(ostream&out, unsigned ind) const;

    private:
-      ivl_case_quality_t quality_;
      NetCase::TYPE type_;
      PExpr*expr_;

@@ -294,26 +251,6 @@ class PCAssign  : public Statement {
      PExpr*expr_;
 };

-/*
- * This represents the syntax "super.new(...)". This is not really an
- * executable statement, but the elaborator will handle these
- * specially and will remove them from the statement stream. If any
- */
-class PChainConstructor : public Statement {
-    public:
-      explicit PChainConstructor(const list<PExpr*>&parms);
-      ~PChainConstructor();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-      inline const std::vector<PExpr*>& chain_args(void) const
-      { return parms_; }
-
-    private:
-      std::vector<PExpr*> parms_;
-};
-
 class PCondit  : public Statement {

    public:
@@ -381,22 +318,6 @@ class PDisable  : public Statement {
      pform_name_t scope_;
 };

-class PDoWhile  : public Statement {
-
-    public:
-      PDoWhile(PExpr*ex, Statement*st);
-      ~PDoWhile();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*cond_;
-      Statement*statement_;
-};
-
 /*
 * The event statement represents the event delay in behavioral
 * code. It comes from such things as:
@@ -411,9 +332,8 @@ class PEventStatement  : public Statement {

      explicit PEventStatement(const svector<PEEvent*>&ee);
      explicit PEventStatement(PEEvent*ee);
-	// Make an @* statement or make a special @* version with the items
-	// from functions added and outputs removed for always_comb/latch.
-      explicit PEventStatement(bool always_sens = false);
+	// Make an @* statement.
+      explicit PEventStatement(void);

      ~PEventStatement();

@@ -434,12 +354,10 @@ class PEventStatement  : public Statement {
      NetProc* elaborate_st(Design*des, NetScope*scope, NetProc*st) const;

      NetProc* elaborate_wait(Design*des, NetScope*scope, NetProc*st) const;
-      NetProc* elaborate_wait_fork(Design*des, NetScope*scope) const;

    private:
      svector<PEEvent*>expr_;
      Statement*statement_;
-      bool always_sens_;
 };

 ostream& operator << (ostream&o, const PEventStatement&obj);
@@ -458,26 +376,6 @@ class PForce  : public Statement {
      PExpr*expr_;
 };

-class PForeach : public Statement {
-    public:
-      explicit PForeach(perm_string var, const std::list<perm_string>&ix, Statement*stmt);
-      ~PForeach();
-
-      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void elaborate_scope(Design*des, NetScope*scope) const;
-      virtual void elaborate_sig(Design*des, NetScope*scope) const;
-      virtual void dump(ostream&out, unsigned ind) const;
-
-    private:
-      NetProc* elaborate_static_array_(Design*des, NetScope*scope,
-				       const std::vector<netrange_t>&dims) const;
-
-    private:
-      perm_string array_var_;
-      std::vector<perm_string> index_vars_;
-      Statement*statement_;
-};
-
 class PForever : public Statement {
    public:
      explicit PForever(Statement*s);
@@ -496,7 +394,7 @@ class PForStatement  : public Statement {

    public:
      PForStatement(PExpr*n1, PExpr*e1, PExpr*cond,
-		    Statement*step, Statement*body);
+		    PExpr*n2, PExpr*e2, Statement*st);
      ~PForStatement();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
@@ -510,7 +408,8 @@ class PForStatement  : public Statement {

      PExpr*cond_;

-      Statement*step_;
+      PExpr* name2_;
+      PExpr* expr2_;

      Statement*statement_;
 };
@@ -550,19 +449,6 @@ class PRelease  : public Statement {
      PExpr*lval_;
 };

-class PReturn  : public Statement {
-
-    public:
-      explicit PReturn(PExpr*e);
-      ~PReturn();
-
-      NetProc* elaborate(Design*des, NetScope*scope) const;
-      virtual void dump(std::ostream&out, unsigned ind) const;
-
-    private:
-      PExpr*expr_;
-};
-
 /*
 * The PTrigger statement sends a trigger to a named event. Take the
 * name here.
@@ -570,21 +456,20 @@ class PReturn  : public Statement {
 class PTrigger  : public Statement {

    public:
-      explicit PTrigger(PPackage*pkg, const pform_name_t&ev);
+      explicit PTrigger(const pform_name_t&ev);
      ~PTrigger();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
      virtual void dump(ostream&out, unsigned ind) const;

    private:
-      PPackage*package_;
      pform_name_t event_;
 };

 class PWhile  : public Statement {

    public:
-      PWhile(PExpr*ex, Statement*st);
+      PWhile(PExpr*e1, Statement*st);
      ~PWhile();

      virtual NetProc* elaborate(Design*des, NetScope*scope) const;
@@ -597,4 +482,4 @@ class PWhile  : public Statement {
      Statement*statement_;
 };

-#endif /* IVL_Statement_H */
+#endif
@@ -14,28 +14,24 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "StringHeap.h"
-# include  <iostream>
 # include  <cstdlib>
 # include  <cstring>
 # include  <cassert>

 #ifdef CHECK_WITH_VALGRIND
-# include  "ivl_alloc.h"
 static char **string_pool = NULL;
 static unsigned string_pool_count = 0;
 #endif

-static const unsigned DEFAULT_CELL_SIZE = 0x10000;
-
-
 StringHeap::StringHeap()
 {
      cell_base_ = 0;
-      cell_ptr_  = 0;
+      cell_ptr_ = HEAPCELL;
+      cell_count_ = 0;
 }

 StringHeap::~StringHeap()
@@ -47,53 +43,28 @@ StringHeap::~StringHeap()
 const char* StringHeap::add(const char*text)
 {
      unsigned len = strlen(text);
-      unsigned rem = cell_base_==0? 0 : (DEFAULT_CELL_SIZE - cell_ptr_);
+      assert((len+1) <= HEAPCELL);

-	// Special case: huge items get their own allocation.
-      if ( (len+1) >= DEFAULT_CELL_SIZE ) {
-	    char*buf = strdup(text);
-#ifdef CHECK_WITH_VALGRIND
-	    string_pool_count += 1;
-	    string_pool = (char**)realloc(string_pool,
-					  string_pool_count*sizeof(char**));
-	    string_pool[string_pool_count-1] = buf;
-#endif
-	    return buf;
-      }
-
-	// If the current cell that I'm working through cannot hold
-	// the current string, then set it aside and get another cell
-	// to put the string into.
+      unsigned rem = HEAPCELL - cell_ptr_;
      if (rem < (len+1)) {
-	      // release any unused memory. This assumes that a
-	      // realloc shrink of the memory region will return the
-	      // same pointer.
-	    if (rem > 0) {
-		  char*old = cell_base_;
-		  cell_base_ = (char*)realloc(cell_base_, cell_ptr_);
-		  assert(cell_base_ != 0);
-		  assert(cell_base_ == old);
-	    }
-	      // start new cell
-	    cell_base_ = (char*)malloc(DEFAULT_CELL_SIZE);
-	    cell_ptr_  = 0;
-	    rem = DEFAULT_CELL_SIZE;
-	    assert(cell_base_ != 0);
+	    cell_base_ = (char*)malloc(HEAPCELL);
 #ifdef CHECK_WITH_VALGRIND
 	    string_pool_count += 1;
 	    string_pool = (char **) realloc(string_pool,
 	                                    string_pool_count*sizeof(char **));
 	    string_pool[string_pool_count-1] = cell_base_;
 #endif
+	    cell_ptr_ = 0;
+	    cell_count_ += 1;
+	    assert(cell_base_ != 0);
      }

-      assert( (len+1) <= rem );
      char*res = cell_base_ + cell_ptr_;
      memcpy(res, text, len);
      cell_ptr_ += len;
      cell_base_[cell_ptr_++] = 0;

-      assert(cell_ptr_ <= DEFAULT_CELL_SIZE);
+      assert(cell_ptr_ <= HEAPCELL);

      return res;
 }
@@ -228,14 +199,3 @@ bool operator < (perm_string a, perm_string b)

      return false;
 }
-
-ostream& operator << (ostream&out, perm_string that)
-{
-      if (that.nil())
-	    out << "<nil>";
-      else
-	    out << that.str();
-      return out;
-}
-
-const perm_string empty_perm_string = perm_string::literal("");
@@ -1,7 +1,7 @@
-#ifndef IVL_StringHeap_H
-#define IVL_StringHeap_H
+#ifndef __StringHeap_H
+#define __StringHeap_H
 /*
- * Copyright (c) 2002-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2002-2009 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -16,9 +16,10 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

+# include  "config.h"
 # include  <string>

 using namespace std;
@@ -30,8 +31,6 @@ class perm_string {
      perm_string(const perm_string&that) : text_(that.text_) { }
      ~perm_string() { }

-      inline bool nil() const { return text_ == 0; }
-
      perm_string& operator = (const perm_string&that)
      { text_ = that.text_; return *this; }

@@ -46,13 +45,12 @@ class perm_string {
    private:
      friend class StringHeap;
      friend class StringHeapLex;
-      explicit perm_string(const char*t) : text_(t) { };
+      perm_string(const char*t) : text_(t) { };

    private:
      const char*text_;
 };

-extern const perm_string empty_perm_string;
 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);
@@ -61,7 +59,6 @@ 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);
-extern ostream& operator << (ostream&out, perm_string that);

 /*
 * The string heap is a way to permanently allocate strings
@@ -78,8 +75,11 @@ class StringHeap {
      perm_string make(const char*);

    private:
+      enum { HEAPCELL = 0x10000 };
+
      char*cell_base_;
      unsigned cell_ptr_;
+      unsigned cell_count_;

    private: // not implemented
      StringHeap(const StringHeap&);
@@ -118,4 +118,4 @@ class StringHeapLex  : private StringHeap {
      StringHeapLex& operator= (const StringHeapLex&);
 };

-#endif /* IVL_StringHeap_H */
+#endif
@@ -1,7 +1,7 @@
-#ifndef PLI_TYPES_H
-#define PLI_TYPES_H
+#ifndef PLI_TYPES
+#define PLI_TYPES
 /*
- * Copyright (c) 2003-2014 Stephen Williams ([email protected])
+ * 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
@@ -16,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # undef HAVE_INTTYPES_H
@@ -85,4 +85,4 @@ typedef char           PLI_BYTE8;
 typedef unsigned char  PLI_UBYTE8;
 #endif

-#endif /* PLI_TYPES_H */
+#endif
@@ -1,7 +1,7 @@
-#ifndef ACC_USER_H
-#define ACC_USER_H
+#ifndef __acc_user_H
+#define __acc_user_H
 /*
- * Copyright (c) 2002-2014 Stephen Williams (steve@icarus.com)
+ * 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
@@ -16,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
@@ -228,9 +228,8 @@ 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_paramtype(handle obj);
 extern PLI_INT32 acc_fetch_range(handle object, int *msb, int *lsb);
-extern const char* acc_fetch_type_str(PLI_INT32 type);
+extern char*     acc_fetch_type_str(PLI_INT32 type);

 extern char* acc_fetch_value(handle obj, const char*fmt, s_acc_value*value);

@@ -271,4 +270,4 @@ extern char* acc_version(void);

 EXTERN_C_END

-#endif /* ACC_USER_H */
+#endif
@@ -10,7 +10,7 @@ AC_DEFUN([AX_ENABLE_SUFFIX],
                                        [Use/set the installation command suffix])],
               [true],[enable_suffix=no])
 if test X$enable_suffix = Xyes; then
-  install_suffix='-0.10'
+  install_suffix='-0.9'
 elif test X$enable_suffix = Xno; then
  install_suffix=''
 else
@@ -23,13 +23,11 @@ AC_SUBST(install_suffix)
 # ------------------------------
 # 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 or an equivalent is available, and its name
-#     is defined by the $NM variable.
+#   - 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([AC_LANG_SOURCE([void underscore(void){}])],
-[AS_IF([$NM conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
+[AS_IF([nm conftest.$ac_objext|grep $1 >/dev/null 2>/dev/null],[$2],[$3])],
 [AC_MSG_ERROR([underscore test crashed])]
 )])

@@ -220,16 +218,24 @@ AC_SUBST(strip_dynamic)
 # 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

 # AX_C99_STRTOD
 # -------------
 AC_DEFUN([AX_C99_STRTOD],
 [# On MinGW we need to jump through hoops to get a C99 compliant strtod().
- # mingw-w64 doesn't need this, and the 64-bit version doesn't support it.
 case "${host}" in
-    x86_64-w64-mingw32)
-        ;;
-    *-*-mingw32)
+    *-*-mingw*)
        LDFLAGS+=" -Wl,--undefined=___strtod,--wrap,strtod,--defsym,___wrap_strtod=___strtod"
        ;;
 esac
@@ -248,130 +254,3 @@ _config_header=$1
 _stamp_name=stamp-`expr //$_config_header : '.*/\([[^./]]*\)\.[[^./]]*$'`-h
 echo "timestamp for $_config_header" > `AS_DIRNAME(["$_config_header"])`/[]$_stamp_name
 ]) #_AC_AM_CONFIG_HEADER_HOOK
-
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_CC_FOR_BUILD
-#
-# DESCRIPTION
-#
-#   This macro searches for a C compiler that generates native executables,
-#   that is a C compiler that surely is not a cross-compiler. This can be
-#   useful if you have to generate source code at compile-time like for
-#   example GCC does.
-#
-#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
-#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
-#   The value of these variables can be overridden by the user by specifying
-#   a compiler with an environment variable (like you do for standard CC).
-#
-#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
-#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
-#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
-#   substituted in the Makefile.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Paolo Bonzini <[email protected]>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
-AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-dnl Use the standard macros, but make them use other variable names
-dnl
-pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
-pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
-pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
-pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
-pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
-pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
-pushdef([ac_cv_objext], ac_cv_build_objext)dnl
-pushdef([ac_exeext], ac_build_exeext)dnl
-pushdef([ac_objext], ac_build_objext)dnl
-pushdef([CC], CC_FOR_BUILD)dnl
-pushdef([CPP], CPP_FOR_BUILD)dnl
-pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
-pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
-pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
-pushdef([host], build)dnl
-pushdef([host_alias], build_alias)dnl
-pushdef([host_cpu], build_cpu)dnl
-pushdef([host_vendor], build_vendor)dnl
-pushdef([host_os], build_os)dnl
-pushdef([ac_cv_host], ac_cv_build)dnl
-pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
-pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
-pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
-pushdef([ac_cv_host_os], ac_cv_build_os)dnl
-pushdef([ac_cpp], ac_build_cpp)dnl
-pushdef([ac_compile], ac_build_compile)dnl
-pushdef([ac_link], ac_build_link)dnl
-
-save_cross_compiling=$cross_compiling
-save_ac_tool_prefix=$ac_tool_prefix
-cross_compiling=no
-ac_tool_prefix=
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_EXEEXT
-
-ac_tool_prefix=$save_ac_tool_prefix
-cross_compiling=$save_cross_compiling
-
-dnl Restore the old definitions
-dnl
-popdef([ac_link])dnl
-popdef([ac_compile])dnl
-popdef([ac_cpp])dnl
-popdef([ac_cv_host_os])dnl
-popdef([ac_cv_host_vendor])dnl
-popdef([ac_cv_host_cpu])dnl
-popdef([ac_cv_host_alias])dnl
-popdef([ac_cv_host])dnl
-popdef([host_os])dnl
-popdef([host_vendor])dnl
-popdef([host_cpu])dnl
-popdef([host_alias])dnl
-popdef([host])dnl
-popdef([LDFLAGS])dnl
-popdef([CPPFLAGS])dnl
-popdef([CFLAGS])dnl
-popdef([CPP])dnl
-popdef([CC])dnl
-popdef([ac_objext])dnl
-popdef([ac_exeext])dnl
-popdef([ac_cv_objext])dnl
-popdef([ac_cv_exeext])dnl
-popdef([ac_cv_prog_cc_g])dnl
-popdef([ac_cv_prog_cc_cross])dnl
-popdef([ac_cv_prog_cc_works])dnl
-popdef([ac_cv_prog_gcc])dnl
-popdef([ac_cv_prog_CPP])dnl
-
-dnl Finally, set Makefile variables
-dnl
-BUILD_EXEEXT=$ac_build_exeext
-BUILD_OBJEXT=$ac_build_objext
-AC_SUBST(BUILD_EXEEXT)dnl
-AC_SUBST(BUILD_OBJEXT)dnl
-AC_SUBST([CFLAGS_FOR_BUILD])dnl
-AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
-AC_SUBST([LDFLAGS_FOR_BUILD])dnl
-])
-
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -50,8 +50,8 @@ bool NetEvWait::is_asynchronous()
 	   level sensitive, but the nex_async_ method takes care of
 	   that test. */
      NexusSet*sense = new NexusSet;
-      for (unsigned idx = 0 ;  idx < events_.size() ;  idx += 1) {
-	    NexusSet*tmp = events_[idx]->nex_async_();
+      for (unsigned idx = 0 ;  idx < nevents_ ;  idx += 1) {
+	    NexusSet*tmp = event(idx)->nex_async_();
 	    if (tmp == 0) {
 		  delete sense;
 		  return false;
@@ -82,7 +82,7 @@ bool NetProc::is_asynchronous()
      return false;
 }

-bool NetProcTop::is_asynchronous() const
+bool NetProcTop::is_asynchronous()
 {
      if (type_ == IVL_PR_INITIAL)
 	    return false;
@@ -2,15 +2,12 @@

 #
 # This shell script exists to run autoconf on source distributions
-# that are pulled from git The configure script is not included
-# in git, so it is easiest to just run this script whenever needed
-# to generate the configure script.
+# 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

 echo "Precompiling lexor_keyword.gperf"
-gperf -o -i 7 -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc
-
-echo "Precompiling vhdlpp/lexor_keyword.gperf"
-(cd vhdlpp ; gperf -o -i 7 --ignore-case -C -k 1-4,6,9,\$ -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc )
+gperf -o -i 7 -C -k 1-4,\$ -L ANSI-C -H keyword_hash -N check_identifier -t ./lexor_keyword.gperf > lexor_keyword.cc
@@ -12,8 +12,9 @@
 #
 #    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., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
 #
 SHELL = /bin/sh

@@ -36,34 +37,19 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -I..
-else
-INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/..
-endif
-
-CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
+CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
 LDFLAGS = @LDFLAGS@

-O = cadpli.o
+SHARED = @shared@
+
+all:

 all: dep cadpli.vpl $(ALL32)

+# No specific check operations.
 check: all

-clean:
-	rm -rf *.o dep cadpli.vpl
-
-distclean: clean
-	rm -f Makefile config.log
-
-cppcheck: $(O:.o=.c)
-	cppcheck --enable=all --std=posix --std=c99 --std=c++03 -f $(INCLUDE_PATH) $^
-
-Makefile: $(srcdir)/Makefile.in ../config.status
-	cd ..; ./config.status --file=cadpli/$@
-
 dep:
 	mkdir dep

@@ -71,19 +57,28 @@ dep:
 	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $<
 	mv $*.d dep

-SYSTEM_VPI_LDFLAGS = -L../vpi -lvpi
+O = cadpli.o
+
+Makefile: $(srcdir)/Makefile.in ../config.status
+	cd ..; ./config.status --file=cadpli/$@
+
+SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi
 ifeq (@MINGW32@,yes)
    SYSTEM_VPI_LDFLAGS += @EXTRALIBS@
 endif

-cadpli.vpl: $O ../vpi/libvpi.a ../libveriuser/libveriuser.o
-	$(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
+cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
+	$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)

-install: all installdirs installfiles
+clean:
+	rm -rf *.o dep cadpli.vpl

-F = ./cadpli.vpl
+distclean: clean
+	rm -f Makefile config.log

-installfiles: $(F) | installdirs
+install: all installdirs $(vpidir)/cadpli.vpl
+
+$(vpidir)/cadpli.vpl: ./cadpli.vpl
 	$(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl"

 installdirs: $(srcdir)/../mkinstalldirs
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <vpi_user.h>
@@ -24,7 +24,6 @@
 # include  <assert.h>
 # include  "config.h"
 # include  "ivl_dlfcn.h"
-# include  "ivl_alloc.h"

 typedef void* (*funcvp)(void);

@@ -79,7 +78,7 @@ static void thunker_register(void)
      }
 }

-void (*vlog_startup_routines[])(void) = {
+void (*vlog_startup_routines[])() = {
      thunker_register,
      0
 };
@@ -1,7 +1,7 @@
-#ifndef IVL_ivl_dlfcn_H
-#define IVL_ivl_dlfcn_H
+#ifndef __ivl_dlfcn_H
+#define __ivl_dlfcn_H
 /*
- * Copyright (c) 2001-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2001 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 #if defined(__MINGW32__)
@@ -91,4 +91,4 @@ static __inline__ const char*dlerror(void)
 { return strerror( errno ); }
 #endif

-#endif /* IVL_ivl_dlfcn_H */
+#endif
@@ -1,7 +1,7 @@
-#ifndef IVL_compiler_H
-#define IVL_compiler_H
+#ifndef __compiler_H
+#define __compiler_H
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2009 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <list>
@@ -36,11 +36,6 @@
 */
 extern unsigned integer_width;

-/*
- * The width_cap is the width limit for unsized expressions.
- */
-extern unsigned width_cap;
-
 /*
 * This is the maximum number of recursive module loops allowed within
 * a generate block.
@@ -79,10 +74,7 @@ extern unsigned recursive_mod_limit;

 /* Implicit definitions of wires. */
 extern bool warn_implicit;
-
-/* Warn if dimensions of port or var/net are implicitly taken from
-   the input/output/inout declaration. */
-extern bool warn_implicit_dimensions;
+extern bool error_implicit;

 /* inherit timescales across files. */
 extern bool warn_timescale;
@@ -101,45 +93,19 @@ extern bool warn_inf_loop;
 extern bool warn_sens_entire_vec;
 extern bool warn_sens_entire_arr;

-/* Warn about level-appropriate anachronisms. */
-extern bool warn_anachronisms;
-
-/* Warn about nets that are references but not driven. */
-extern bool warn_floating_nets;
-
 /* 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_emit;
+extern bool debug_elab_pexpr;
 extern bool debug_synth2;
 extern bool debug_optimizer;

-/* Ignore errors about missing modules */
-extern bool ignore_missing_modules;
-
-/* Treat each source file as a separate compilation unit (as defined
-   by SystemVerilog). */
-extern bool separate_compilation;
-
-/* Control evaluation of functions at compile time:
- *   0 = only for functions in constant expressions
- *   1 = only for automatic functions
- *   2 = for all functions
- * Level 2 should only be used if the user can guarantee that a
- * function's local variables are never accessed from outside the
- * function. */
-extern unsigned opt_const_func;
-
 /* Possibly temporary flag to control virtualization of pin arrays */
 extern bool disable_virtual_pins;

-/* The vlog95 code generator does not want the compiler to generate concat-Z
- * LPM objects so this flag is used to block them from being generated. */
-extern bool disable_concatz_generation;
-
 /* Limit to size of devirtualized arrays */
 extern unsigned long array_size_limit;

@@ -152,16 +118,12 @@ 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. Note that the compiler often assumes
-   this is an ordered list. */
+   specific language features. */
 enum generation_t {
      GN_VER1995  = 1,
      GN_VER2001_NOCONFIG  = 2,
      GN_VER2001  = 3,
      GN_VER2005  = 4,
-      GN_VER2005_SV  = 5,
-      GN_VER2009  = 6,
-      GN_VER2012  = 7,
      GN_DEFAULT  = 4
 };

@@ -177,13 +139,6 @@ extern bool gn_icarus_misc_flag;
   is false, then skip elaboration of specify behavior. */
 extern bool gn_specify_blocks_flag;

-/* If this flag is true, then elaborate supported assertion statements. If
-   this flag is false, then stub out supported assertion statements. */
-extern bool gn_supported_assertions_flag;
-/* If this flag is true, then error on unsupported assertion statements. If
-   this flag is false, then stub out unsupported assertion statements. */
-extern bool gn_unsupported_assertions_flag;
-
 /* If this flag is true, then support/elaborate Verilog-AMS. */
 extern bool gn_verilog_ams_flag;

@@ -196,35 +151,6 @@ extern bool gn_io_range_error_flag;
   re-evaluated. */
 extern bool gn_strict_ca_eval_flag;

-/* If this flag is true, then force strict conformance to the IEEE
-   standard expression width rules. */
-extern bool gn_strict_expr_width_flag;
-
-/* If this flag is true, then don't add a for-loop control variable
-   to an implicit event_expression list if it is only used inside the
-   loop. */
-extern bool gn_shared_loop_index_flag;
-
-static inline bool gn_system_verilog(void)
-{
-      if (generation_flag >= GN_VER2005_SV)
-	    return true;
-      return false;
-}
-
-/* If variables can be converted to uwires by a continuous assignment
-   (assuming no procedural assign), then return true. This will be true
-   for SystemVerilog */
-static inline bool gn_var_can_be_uwire(void)
-{
-      return gn_system_verilog();
-}
-
-static inline bool gn_modules_nest(void)
-{
-      return gn_system_verilog();
-}
-
 /* The bits of these GN_KEYWORDS_* constants define non-intersecting
   sets of keywords. The compiler enables groups of keywords by setting
   lexor_keyword_mask with the OR of the bits for the keywords to be
@@ -235,8 +161,6 @@ enum { GN_KEYWORDS_1364_1995        = 0x0001,
       GN_KEYWORDS_1364_2005        = 0x0008,
       GN_KEYWORDS_VAMS_2_3         = 0x0010,
       GN_KEYWORDS_1800_2005        = 0x0020,
-       GN_KEYWORDS_1800_2009        = 0x0040,
-       GN_KEYWORDS_1800_2012        = 0x0080,
       GN_KEYWORDS_ICARUS           = 0x8000
 };
 extern int lexor_keyword_mask;
@@ -259,12 +183,7 @@ extern map<perm_string,bool> library_file_map;
 * much sense to use a StringHeapLex to hold them.
 */
 extern StringHeapLex lex_strings;
-
-/*
- * The ivl_target.h API in a variety of places keeps strings of
- * bits. Manage these as perm_string in a StringHeap.
- */
-extern StringHeapLex bits_strings;
+extern StringHeap misc_strings;

 /*
 * The filename_strings are perm_strings for file names. They are put
@@ -286,26 +205,11 @@ struct sfunc_return_type {
      const char*   name;
      ivl_variable_type_t type;
      unsigned      wid;
-      bool          signed_flag;
-      bool          override_flag;
+      int           signed_flag;
 };

-extern void add_sys_func(const struct sfunc_return_type&ret_type);
 extern const struct sfunc_return_type* lookup_sys_func(const char*name);
 extern int load_sys_func_table(const char*path);
 extern void cleanup_sys_func_table();
-/*
- * This temporarily loads a VPI module, to determine the return values
- * of system functions provided by that module, and adds the return values
- * to the system function table.
- */
-extern bool load_vpi_module(const char*path);

-/*
- * In system Verilog it is allowed with a warning to call a function
- * as a task. You can even cast the return value away and have no
- * warning message.
- */
-extern ivl_sfunc_as_task_t def_sfunc_as_task;
-
-#endif /* IVL_compiler_H */
+#endif
@@ -1,7 +1,7 @@
-#ifndef IVL_config_H                                           /* -*- c++ -*- */
-#define IVL_config_H
+#ifndef __config_H                                           /* -*- c++ -*- */
+#define __config_H
 /*
- * Copyright (c) 2001-2015 Stephen Williams ([email protected])
+ * Copyright (c) 2001-2010 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 #if defined(__cplusplus)
@@ -42,7 +42,6 @@
 # undef HAVE_LIBREADLINE
 # undef HAVE_LIBZ
 # undef HAVE_LIBBZ2
-# undef HAVE_LROUND
 # undef HAVE_SYS_WAIT_H
 # undef WORDS_BIGENDIAN

@@ -53,9 +52,6 @@
 /* These two are needed by the lxt and lxt2 files (copied from GTKWave). */
 # undef HAVE_ALLOCA_H
 # undef HAVE_FSEEKO
-/* And this is needed by the fst files (copied from GTKWave). */
-# undef HAVE_LIBPTHREAD
-# undef HAVE_REALPATH

 /*
 * Define this if you want to compile vvp with memory freeing and
@@ -63,4 +59,4 @@
 */
 # undef CHECK_WITH_VALGRIND

-#endif /* IVL_config_H */
+#endif /* __config_H */
@@ -1,40 +1,44 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.

-timestamp='2015-03-08'
+timestamp='2009-04-17'

-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it 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.
+# 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, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.


-# Please send patches to <[email protected]>.
+# Please send patches to <[email protected]>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.

-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -68,7 +72,8 @@ Report bugs and patches to <[email protected]>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -115,18 +120,13 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
@@ -149,13 +149,10 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
-	-bluegene*)
-		os=-cnk
-		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -170,10 +167,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
-	-chorusrdb)
-		os=-chorusrdb
+ 	-chorusrdb)
+ 		os=-chorusrdb
 		basic_machine=$1
-		;;
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -218,12 +215,6 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -248,28 +239,20 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
-	| c4x | c8051 | clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| e2k | epiphany \
-	| fido | fr30 | frv | ft32 \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| k1om \
-	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -283,55 +266,36 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| open8 | or1k | or1knd | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| riscv32 | riscv64 \
-	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| visium \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	leon|leon[3-9])
-		basic_machine=sparc-$basic_machine
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -341,21 +305,6 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;

-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -370,31 +319,25 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
-	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
-	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| e2k-* | elxsi-* \
+	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| k1om-* \
-	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -408,42 +351,32 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| visium-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -468,7 +401,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
+    	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -518,9 +451,6 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
-		basic_machine=asmjs-unknown
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -537,24 +467,11 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-	cegcc)
+        cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -586,7 +503,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16 | cr16-*)
+	cr16)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -744,6 +661,7 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -782,9 +700,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	leon-*|leon[3-9]-*)
-		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
-		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -804,15 +719,8 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
 	mingw32)
-		basic_machine=i686-pc
+		basic_machine=i386-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -840,10 +748,6 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
-	moxiebox)
-		basic_machine=moxie-unknown
-		os=-moxiebox
-		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -851,18 +755,10 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -927,12 +823,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1015,10 +905,9 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+	ppc)	basic_machine=powerpc-unknown
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1043,11 +932,7 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
+	rdos)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1116,9 +1001,6 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1175,8 +1057,20 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tile*)
-		basic_machine=$basic_machine-unknown
+		basic_machine=tile-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1246,9 +1140,6 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1346,12 +1237,9 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1372,31 +1260,30 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1435,7 +1322,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
+        -os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1484,7 +1371,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
+        -tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1520,14 +1407,15 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
+	-kaos*)
+		os=-kaos
+		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
-	-nacl*)
-		;;
 	-none)
 		;;
 	*)
@@ -1550,10 +1438,10 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
-	score-*)
+        score-*)
 		os=-elf
 		;;
-	spu-*)
+        spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1565,23 +1453,8 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	c8051-*)
-		os=-elf
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
+        c4x-* | tic4x-*)
+        	os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1601,11 +1474,14 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-	mep-*)
+        mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1632,7 +1508,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
+    	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1737,7 +1613,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@@ -2,27 +2,25 @@ 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_CONFIG_HEADER(vhdlpp/vhdlpp_config.h)
 AC_CONFIG_HEADER(vvp/config.h)
 AC_CONFIG_HEADER(vpi/vpi_config.h)
 AC_CONFIG_HEADER(libveriuser/config.h)
 AC_CONFIG_HEADER(tgt-vvp/vvp_config.h)
 AC_CONFIG_HEADER(tgt-vhdl/vhdl_config.h)
-AC_CONFIG_HEADER(tgt-pcb/pcb_config.h)

 AC_CANONICAL_HOST
 dnl Checks for programs.
 AC_PROG_CC
 # AC_PROG_CC_C99 is only available in autoconf version 2.60 and later.
+# If you must use an older version then comment out the following two
+# lines, but be warned that there could be issues with finding the
+# nan(), etc. functions. It is really best to upgrade to a supported
+# version of autoconf.
 AC_PREREQ([2.60])
 AC_PROG_CC_C99
 AC_PROG_CXX
 AC_PROG_RANLIB
-AC_CHECK_TOOL(LD, ld, false)
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 AC_CHECK_TOOL(STRIP, strip, true)
-AC_CHECK_TOOL(WINDRES,windres,false)
 AC_CHECK_PROGS(XGPERF,gperf,none)
 AC_CHECK_PROGS(MAN,man,none)
 AC_CHECK_PROGS(PS2PDF,ps2pdf,none)
@@ -32,7 +30,7 @@ then
 	echo ""
        echo "*** Warning: No suitable gperf found. ***"
 	echo "    The gperf package is essential for building ivl from"
-	echo "    git sources, or modifying the parse engine of ivl itself."
+	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 ""
@@ -54,10 +52,6 @@ then
        exit 1
 fi

-if test "x$NM" = "x"; then
-	NM=nm
-fi
-
 AC_EXEEXT
 AC_SUBST(EXEEXT)

@@ -73,39 +67,13 @@ if test ${using_sunpro_c} = 1
 then
 AC_SUBST(DEPENDENCY_FLAG, [-xMMD])
 AC_SUBST(WARNING_FLAGS, [""])
-AC_SUBST(WARNING_FLAGS_CXX, [""])
 else
-# Check to see if -Wextra is supported.
-iverilog_temp_cflags="$CFLAGS"
-CFLAGS="-Wextra $CFLAGS"
-AC_MSG_CHECKING(if gcc supports -Wextra)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-   [[iverilog_wextra_flag="-Wextra";] AC_MSG_RESULT(yes)],
-   [[iverilog_wextra_flag="-W";] AC_MSG_RESULT(no)])
-CFLAGS="$iverilog_temp_cflags"
-
 AC_SUBST(DEPENDENCY_FLAG, [-MD])
-AC_SUBST(WARNING_FLAGS, ["-Wall $iverilog_wextra_flag -Wshadow"])
-AC_SUBST(WARNING_FLAGS_CC, ["-Wstrict-prototypes"])
-AC_SUBST(WARNING_FLAGS_CXX, [""])
+AC_SUBST(WARNING_FLAGS, ["-Wall -Wshadow"])
 fi

 AC_LANG(C++)

-AC_ARG_WITH([m32], [AC_HELP_STRING([--with-m32], [Compile 32-bit on x86_64])],
-            [ with_m32=yes ],[ with_m32=no ])
-
-AS_IF( [test "x$with_m32" = xyes],
-    [ AC_MSG_NOTICE([Compiling for 32-bit environment - needs gcc on x86_64])
-      LDTARGETFLAGS="-m elf_i386"
-      CTARGETFLAGS="-m32"
-    ],
-    [])
-
-CFLAGS="$CTARGETFLAGS $CFLAGS"
-CXXFLAGS="$CTARGETFLAGS $CXXFLAGS"
-LDFLAGS="$CTARGETFLAGS $LDFLAGS"
-
 # Check that we are using either the GNU compilers or the Sun compilers
 # but not a mixture of the two (not currently supported).
 AC_CHECK_DECL(__SUNPRO_CC, using_sunpro_cc=1, using_sunpro_cc=0)
@@ -126,11 +94,7 @@ else
  fi
 fi

-iverilog_temp_cxxflags="$CXXFLAGS"
-CXXFLAGS="-DHAVE_DECL_BASENAME $CXXFLAGS"
-
 AC_CHECK_HEADERS(getopt.h inttypes.h libiberty.h iosfwd sys/wait.h)
-CXXFLAGS="$iverilog_temp_cxxflags"

 AC_CHECK_SIZEOF(unsigned long long)
 AC_CHECK_SIZEOF(unsigned long)
@@ -139,18 +103,11 @@ AC_CHECK_SIZEOF(unsigned)
 # vvp uses these...
 AC_CHECK_LIB(termcap, tputs)
 AC_CHECK_LIB(readline, readline)
-AC_CHECK_LIB(readline, add_history, NEED_LIBHISTORY=no, NEED_LIBHISTORY=yes)
-if test "$NEED_LIBHISTORY" = "yes"; then
 AC_CHECK_LIB(history, add_history)
-else
-# libreadline includes libhistory functions
-AC_DEFINE(HAVE_LIBHISTORY, 1)
-fi
 AC_CHECK_HEADERS(readline/readline.h readline/history.h sys/resource.h)
 case "${host}" in *linux*) AC_DEFINE([LINUX], [1], [Host operating system is Linux.]) ;; esac

 # vpi uses these
-AC_CHECK_LIB(pthread, pthread_create)
 AC_CHECK_LIB(z, gzwrite)
 AC_CHECK_LIB(z, gzwrite, HAVE_LIBZ=yes, HAVE_LIBZ=no)
 AC_SUBST(HAVE_LIBZ)
@@ -203,11 +160,6 @@ if test -z "$DLLIB" ; then
 AC_CHECK_LIB(dld,shl_load,[DLLIB=-ldld])
 fi
 AC_SUBST(DLLIB)
-AC_SUBST(LDRELOCFLAGS)
-
-AC_SUBST(CTARGETFLAGS)
-AC_SUBST(LDTARGETFLAGS)
-

 AC_PROG_INSTALL

@@ -224,6 +176,9 @@ AX_LD_EXTRALIBS
 # CFLAGS inherited by cadpli/Makefile?
 AX_C_PICFLAG

+# may modify CPPFLAGS and CFLAGS
+AX_CPP_PRECOMP
+
 # may modify LDFLAGS
 AX_C99_STRTOD

@@ -233,10 +188,6 @@ case "${host}" in
 	CPPFLAGS="-mieee $CPPFLAGS"
 	CFLAGS="-mieee $CFLAGS"
 	;;
-    *-*-mingw*)
-	CXXFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CXXFLAGS"
-	CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CFLAGS"
-	;;
 esac

 # Do some more operating system specific setup. We put the file64_support
@@ -252,9 +203,6 @@ case "${host}" in
 esac
 AC_SUBST(file64_support)

-# fstapi.c (from GTKWave) needs this define.
-AC_CHECK_FUNCS(realpath)
-
 # Check that these functions exist. They are mostly C99
 # functions that older compilers may not yet support.
 AC_CHECK_FUNCS(fopen64)
@@ -335,5 +283,7 @@ then
 AC_MSG_ERROR(cannot configure white space in libdir: $libdir)
 fi
 AC_MSG_RESULT(ok)
-AX_PROG_CC_FOR_BUILD
-AC_OUTPUT(Makefile ivlpp/Makefile vhdlpp/Makefile vvp/Makefile vpi/Makefile driver/Makefile driver-vpi/Makefile cadpli/Makefile libveriuser/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-vvp/Makefile tgt-vhdl/Makefile tgt-fpga/Makefile tgt-verilog/Makefile tgt-pal/Makefile tgt-vlog95/Makefile tgt-pcb/Makefile tgt-blif/Makefile tgt-sizer/Makefile)
+
+# XXX disable tgt-fpga for the moment
+
+AC_OUTPUT(Makefile ivlpp/Makefile vvp/Makefile vpi/Makefile driver/Makefile driver-vpi/Makefile cadpli/Makefile libveriuser/Makefile tgt-null/Makefile tgt-stub/Makefile tgt-vvp/Makefile tgt-vhdl/Makefile tgt-fpga/Makefile tgt-verilog/Makefile tgt-pal/Makefile)
@@ -1,619 +0,0 @@
-// These are correct and are used to find the base (zero) pin.
-thisSubtraction:netlist.h:5126
-thisSubtraction:netlist.h:5135
-
-// These are the functions that the compiler exports to the targets.
-//ivl_branch_island()
-unusedFunction:t-dll-api.cc:39
-//ivl_branch_terminal()
-unusedFunction:t-dll-api.cc:45
-
-//ivl_const_bits()
-unusedFunction:t-dll-api.cc:196
-//ivl_const_delay()
-unusedFunction:t-dll-api.cc:214
-//ivl_const_file()
-unusedFunction:t-dll-api.cc:221
-//ivl_const_lineno()
-unusedFunction:t-dll-api.cc:227
-//ivl_const_nex()
-unusedFunction:t-dll-api.cc:233
-//ivl_const_real()
-unusedFunction:t-dll-api.cc:239
-//ivl_const_scope()
-unusedFunction:t-dll-api.cc:246
-//ivl_const_signed()
-unusedFunction:t-dll-api.cc:252
-//ivl_const_type()
-unusedFunction:t-dll-api.cc:190
-//ivl_const_width()
-unusedFunction:t-dll-api.cc:258
-
-//ivl_design_const()
-unusedFunction:t-dll-api.cc:127
-//ivl_design_consts()
-unusedFunction:t-dll-api.cc:121
-//ivl_design_delay_sel()
-unusedFunction:t-dll-api.cc:52
-//ivl_design_discipline()
-unusedFunction:t-dll-api.cc:140
-//ivl_design_disciplines()
-unusedFunction:t-dll-api.cc:134
-//ivl_design_flag()
-unusedFunction:t-dll-api.cc:59
-//ivl_design_process()
-unusedFunction:t-dll-api.cc:66
-//ivl_design_root()
-unusedFunction:t-dll-api.cc:80
-//ivl_design_roots()
-unusedFunction:t-dll-api.cc:89
-//ivl_design_time_precision()
-unusedFunction:t-dll-api.cc:115
-
-//ivl_discipline_domain()
-unusedFunction:t-dll-api.cc:147
-//ivl_discipline_flow()
-unusedFunction:t-dll-api.cc:153
-//ivl_discipline_name()
-unusedFunction:t-dll-api.cc:159
-//ivl_discipline_potential()
-unusedFunction:t-dll-api.cc:165
-
-//ivl_enum_bits()
-unusedFunction:t-dll-api.cc:277
-//ivl_enum_file()
-unusedFunction:t-dll-api.cc:302
-//ivl_enum_lineno()
-unusedFunction:t-dll-api.cc:308
-//ivl_enum_name()
-unusedFunction:t-dll-api.cc:270
-//ivl_enum_names()
-unusedFunction:t-dll-api.cc:264
-//ivl_enum_signed()
-unusedFunction:t-dll-api.cc:296
-//ivl_enum_type()
-unusedFunction:t-dll-api.cc:284
-//ivl_enum_width()
-unusedFunction:t-dll-api.cc:290
-
-//ivl_event_any()
-unusedFunction:t-dll-api.cc:369
-//ivl_event_file()
-unusedFunction:t-dll-api.cc:345
-//ivl_event_lineno()
-unusedFunction:t-dll-api.cc:351
-//ivl_event_name()
-unusedFunction:t-dll-api.cc:314
-//ivl_event_nany()
-unusedFunction:t-dll-api.cc:363
-//ivl_event_neg()
-unusedFunction:t-dll-api.cc:382
-//ivl_event_nneg()
-unusedFunction:t-dll-api.cc:376
-//ivl_event_npos()
-unusedFunction:t-dll-api.cc:389
-//ivl_event_pos()
-unusedFunction:t-dll-api.cc:395
-//ivl_event_scope()
-unusedFunction:t-dll-api.cc:357
-
-//ivl_expr_bits()
-unusedFunction:t-dll-api.cc:402
-//ivl_expr_branch()
-unusedFunction:t-dll-api.cc:409
-//ivl_expr_def()
-unusedFunction:t-dll-api.cc:416
-//ivl_expr_delay_val()
-unusedFunction:t-dll-api.cc:432
-//ivl_expr_dvalue()
-unusedFunction:t-dll-api.cc:439
-//ivl_expr_enumtype()
-unusedFunction:t-dll-api.cc:446
-//ivl_expr_event()
-unusedFunction:t-dll-api.cc:656
-//ivl_expr_file()
-unusedFunction:t-dll-api.cc:178
-//ivl_expr_lineno()
-unusedFunction:t-dll-api.cc:184
-//ivl_expr_name()
-unusedFunction:t-dll-api.cc:459
-//ivl_expr_nature()
-unusedFunction:t-dll-api.cc:483
-//ivl_expr_net_type()
-unusedFunction:t-dll-api.cc:453
-//ivl_expr_opcode()
-unusedFunction:t-dll-api.cc:490
-//ivl_expr_oper1()
-unusedFunction:t-dll-api.cc:506
-//ivl_expr_oper2()
-unusedFunction:t-dll-api.cc:544
-//ivl_expr_oper3()
-unusedFunction:t-dll-api.cc:570
-//ivl_expr_parameter()
-unusedFunction:t-dll-api.cc:584
-//ivl_expr_parm()
-unusedFunction:t-dll-api.cc:599
-//ivl_expr_parms()
-unusedFunction:t-dll-api.cc:626
-//ivl_expr_repeat()
-unusedFunction:t-dll-api.cc:649
-//ivl_expr_scope()
-unusedFunction:t-dll-api.cc:670
-//ivl_expr_sel_type()
-unusedFunction:t-dll-api.cc:677
-//ivl_expr_signed()
-unusedFunction:t-dll-api.cc:702
-//ivl_expr_sized()
-unusedFunction:t-dll-api.cc:708
-//ivl_expr_string()
-unusedFunction:t-dll-api.cc:714
-//ivl_expr_type()
-unusedFunction:t-dll-api.cc:171
-//ivl_expr_uvalue()
-unusedFunction:t-dll-api.cc:721
-//ivl_expr_value()
-unusedFunction:t-dll-api.cc:747
-//ivl_expr_width()
-unusedFunction:t-dll-api.cc:753
-
-//ivl_file_table_index()
-unusedFunction:t-dll-api.cc:795
-//ivl_file_table_item()
-unusedFunction:t-dll-api.cc:785
-//ivl_file_table_size()
-unusedFunction:t-dll-api.cc:813
-
-//ivl_island_flag_set()
-unusedFunction:t-dll-api.cc:822
-//ivl_island_flag_test()
-unusedFunction:t-dll-api.cc:837
-
-//ivl_logic_attr()
-unusedFunction:t-dll-api.cc:864
-//ivl_logic_attr_cnt()
-unusedFunction:t-dll-api.cc:880
-//ivl_logic_attr_val()
-unusedFunction:t-dll-api.cc:886
-//ivl_logic_basename()
-unusedFunction:t-dll-api.cc:935
-//ivl_logic_delay()
-unusedFunction:t-dll-api.cc:974
-//ivl_logic_drive0()
-unusedFunction:t-dll-api.cc:894
-//ivl_logic_drive1()
-unusedFunction:t-dll-api.cc:911
-//ivl_logic_file()
-unusedFunction:t-dll-api.cc:846
-//ivl_logic_is_cassign()
-unusedFunction:t-dll-api.cc:858
-//ivl_logic_lineno()
-unusedFunction:t-dll-api.cc:852
-//ivl_logic_name()
-unusedFunction:t-dll-api.cc:928
-//ivl_logic_pins()
-unusedFunction:t-dll-api.cc:953
-//ivl_logic_scope()
-unusedFunction:t-dll-api.cc:941
-//ivl_logic_type()
-unusedFunction:t-dll-api.cc:947
-//ivl_logic_udp()
-unusedFunction:t-dll-api.cc:966
-//ivl_logic_width()
-unusedFunction:t-dll-api.cc:981
-
-//ivl_lpm_array()
-unusedFunction:t-dll-api.cc:1109
-//ivl_lpm_aset_value()
-unusedFunction:t-dll-api.cc:1160
-//ivl_lpm_async_clr()
-unusedFunction:t-dll-api.cc:1054
-//ivl_lpm_async_set()
-unusedFunction:t-dll-api.cc:1085
-//ivl_lpm_base()
-unusedFunction:t-dll-api.cc:1121
-//ivl_lpm_basename()
-unusedFunction:t-dll-api.cc:1048
-//ivl_lpm_clk()
-unusedFunction:t-dll-api.cc:1148
-//ivl_lpm_data()
-unusedFunction:t-dll-api.cc:1221
-//ivl_lpm_datab()
-unusedFunction:t-dll-api.cc:1321
-//ivl_lpm_define()
-unusedFunction:t-dll-api.cc:1183
-//ivl_lpm_delay()
-unusedFunction:t-dll-api.cc:1078
-//ivl_lpm_drive0()
-unusedFunction:t-dll-api.cc:1453
-//ivl_lpm_drive1()
-unusedFunction:t-dll-api.cc:1470
-//ivl_lpm_enable()
-unusedFunction:t-dll-api.cc:1195
-//ivl_lpm_file()
-unusedFunction:t-dll-api.cc:1209
-//ivl_lpm_lineno()
-unusedFunction:t-dll-api.cc:1215
-//ivl_lpm_name()
-unusedFunction:t-dll-api.cc:1355
-//ivl_lpm_negedge()
-unusedFunction:t-dll-api.cc:1136
-//ivl_lpm_select()
-unusedFunction:t-dll-api.cc:1493
-//ivl_lpm_selects()
-unusedFunction:t-dll-api.cc:1510
-//ivl_lpm_signed()
-unusedFunction:t-dll-api.cc:1528
-//ivl_lpm_size()
-unusedFunction:t-dll-api.cc:1587
-//ivl_lpm_sset_value()
-unusedFunction:t-dll-api.cc:1171
-//ivl_lpm_string()
-unusedFunction:t-dll-api.cc:1640
-//ivl_lpm_sync_clr()
-unusedFunction:t-dll-api.cc:1066
-//ivl_lpm_sync_set()
-unusedFunction:t-dll-api.cc:1097
-//ivl_lpm_trigger()
-unusedFunction:t-dll-api.cc:1659
-//ivl_lpm_type()
-unusedFunction:t-dll-api.cc:1647
-//ivl_lpm_width()
-unusedFunction:t-dll-api.cc:1653
-
-//ivl_lval_idx()
-unusedFunction:t-dll-api.cc:1681
-//ivl_lval_mux()
-unusedFunction:t-dll-api.cc:1676
-//ivl_lval_nest()
-unusedFunction:t-dll-api.cc:1726
-//ivl_lval_part_off()
-unusedFunction:t-dll-api.cc:1690
-//ivl_lval_property_idx()
-unusedFunction:t-dll-api.cc:1708
-//ivl_lval_sel_type()
-unusedFunction:t-dll-api.cc:1696
-//ivl_lval_sig()
-unusedFunction:t-dll-api.cc:1714
-
-//ivl_nature_name()
-unusedFunction:t-dll-api.cc:1735
-
-//ivl_nexus_get_private()
-unusedFunction:t-dll-api.cc:1756
-//ivl_nexus_name()
-unusedFunction:t-dll-api.cc:1745
-//ivl_nexus_ptr_branch()
-unusedFunction:t-dll-api.cc:1799
-//ivl_nexus_ptr_con()
-unusedFunction:t-dll-api.cc:1808
-//ivl_nexus_ptr_sig()
-unusedFunction:t-dll-api.cc:1835
-//ivl_nexus_ptr_switch()
-unusedFunction:t-dll-api.cc:1844
-//ivl_nexus_set_private()
-unusedFunction:t-dll-api.cc:1762
-
-//ivl_parameter_basename()
-unusedFunction:t-dll-api.cc:1853
-//ivl_parameter_expr()
-unusedFunction:t-dll-api.cc:1896
-//ivl_parameter_file()
-unusedFunction:t-dll-api.cc:1902
-//ivl_parameter_lineno()
-unusedFunction:t-dll-api.cc:1908
-//ivl_parameter_local()
-unusedFunction:t-dll-api.cc:1859
-//ivl_parameter_lsb()
-unusedFunction:t-dll-api.cc:1877
-//ivl_parameter_msb()
-unusedFunction:t-dll-api.cc:1871
-//ivl_parameter_scope()
-unusedFunction:t-dll-api.cc:1914
-//ivl_parameter_signed()
-unusedFunction:t-dll-api.cc:1865
-//ivl_parameter_width()
-unusedFunction:t-dll-api.cc:1887
-
-//ivl_path_condit()
-unusedFunction:t-dll-api.cc:1920
-//ivl_path_delay()
-unusedFunction:t-dll-api.cc:1932
-//ivl_path_is_condit()
-unusedFunction:t-dll-api.cc:1926
-//ivl_path_scope()
-unusedFunction:t-dll-api.cc:1938
-//ivl_path_source()
-unusedFunction:t-dll-api.cc:1945
-//ivl_path_source_negedge()
-unusedFunction:t-dll-api.cc:1957
-//ivl_path_source_posedge()
-unusedFunction:t-dll-api.cc:1951
-
-//ivl_process_analog()
-unusedFunction:t-dll-api.cc:1981
-//ivl_process_attr_cnt()
-unusedFunction:t-dll-api.cc:1999
-//ivl_process_attr_val()
-unusedFunction:t-dll-api.cc:2005
-//ivl_process_file()
-unusedFunction:t-dll-api.cc:1963
-//ivl_process_lineno()
-unusedFunction:t-dll-api.cc:1969
-//ivl_process_scope()
-unusedFunction:t-dll-api.cc:1987
-//ivl_process_stmt()
-unusedFunction:t-dll-api.cc:1993
-//ivl_process_type()
-unusedFunction:t-dll-api.cc:1975
-
-//ivl_scope_attr_cnt()
-unusedFunction:t-dll-api.cc:2013
-//ivl_scope_attr_val()
-unusedFunction:t-dll-api.cc:2019
-//ivl_scope_basename()
-unusedFunction:t-dll-api.cc:2027
-//ivl_scope_child()
-unusedFunction:t-dll-api.cc:2054
-//ivl_scope_children()
-unusedFunction:t-dll-api.cc:2033
-//ivl_scope_childs()
-unusedFunction:t-dll-api.cc:2047
-//ivl_scope_class()
-unusedFunction:t-dll-api.cc:2061
-//ivl_scope_classes()
-unusedFunction:t-dll-api.cc:2068
-//ivl_scope_def()
-unusedFunction:t-dll-api.cc:2075
-//ivl_scope_def_file()
-unusedFunction:t-dll-api.cc:2081
-//ivl_scope_def_lineno()
-unusedFunction:t-dll-api.cc:2087
-//ivl_scope_enumerate()
-unusedFunction:t-dll-api.cc:2099
-//ivl_scope_enumerates()
-unusedFunction:t-dll-api.cc:2093
-//ivl_scope_event()
-unusedFunction:t-dll-api.cc:2112
-//ivl_scope_events()
-unusedFunction:t-dll-api.cc:2106
-//ivl_scope_file()
-unusedFunction:t-dll-api.cc:2119
-//ivl_scope_func_signed
-unusedFunction:t-dll-api.cc:2132
-//ivl_scope_func_type
-unusedFunction:t-dll-api.cc:2125
-//ivl_scope_func_width
-unusedFunction:t-dll-api.cc:2140
-//ivl_scope_is_auto()
-unusedFunction:t-dll-api.cc:2148
-//ivl_scope_is_cell()
-unusedFunction:t-dll-api.cc:2154
-//ivl_scope_lineno()
-unusedFunction:t-dll-api.cc:2160
-//ivl_scope_log()
-unusedFunction:t-dll-api.cc:2172
-//ivl_scope_logs()
-unusedFunction:t-dll-api.cc:2166
-//ivl_scope_lpm()
-unusedFunction:t-dll-api.cc:2185
-//ivl_scope_lpms()
-unusedFunction:t-dll-api.cc:2179
-//ivl_scope_mod_module_port_name()
-unusedFunction:t-dll-api.cc:2264
-//ivl_scope_mod_module_port_type()
-unusedFunction:t-dll-api.cc:2273
-//ivl_scope_mod_module_port_width()
-unusedFunction:t-dll-api.cc:2285
-//ivl_scope_mod_module_ports()
-unusedFunction:t-dll-api.cc:2257
-//ivl_scope_mod_port()
-unusedFunction:t-dll-api.cc:2310
-//ivl_scope_param()
-unusedFunction:t-dll-api.cc:2243
-//ivl_scope_params()
-unusedFunction:t-dll-api.cc:2237
-//ivl_scope_parent()
-unusedFunction:t-dll-api.cc:2250
-//ivl_scope_port()
-unusedFunction:t-dll-api.cc:2301
-//ivl_scope_ports()
-unusedFunction:t-dll-api.cc:2292
-//ivl_scope_sig()
-unusedFunction:t-dll-api.cc:2324
-//ivl_scope_sigs()
-unusedFunction:t-dll-api.cc:2318
-//ivl_scope_switch()
-unusedFunction:t-dll-api.cc:2337
-//ivl_scope_switches()
-unusedFunction:t-dll-api.cc:2331
-//ivl_scope_time_precision()
-unusedFunction:t-dll-api.cc:2344
-//ivl_scope_time_units()
-unusedFunction:t-dll-api.cc:2350
-//ivl_scope_tname()
-unusedFunction:t-dll-api.cc:2362
-//ivl_scope_type()
-unusedFunction:t-dll-api.cc:2356
-
-//ivl_signal_array_addr_swapped()
-unusedFunction:t-dll-api.cc:2380
-//ivl_signal_array_base()
-unusedFunction:t-dll-api.cc:2368
-//ivl_signal_array_count()
-unusedFunction:t-dll-api.cc:2374
-//ivl_signal_attr()
-unusedFunction:t-dll-api.cc:2398
-//ivl_signal_attr_cnt()
-unusedFunction:t-dll-api.cc:2414
-//ivl_signal_attr_val()
-unusedFunction:t-dll-api.cc:2420
-//ivl_signal_basename()
-unusedFunction:t-dll-api.cc:2427
-//ivl_signal_data_type()
-unusedFunction:t-dll-api.cc:2578
-//ivl_signal_dimensions()
-unusedFunction:t-dll-api.cc:2386
-//ivl_signal_discipline()
-unusedFunction:t-dll-api.cc:2392
-//ivl_signal_file()
-unusedFunction:t-dll-api.cc:2555
-//ivl_signal_forced_net()
-unusedFunction:t-dll-api.cc:2549
-//ivl_signal_integer()
-unusedFunction:t-dll-api.cc:2567
-//ivl_signal_lineno()
-unusedFunction:t-dll-api.cc:2561
-//ivl_signal_local()
-unusedFunction:t-dll-api.cc:2536
-//ivl_signal_lsb()
-unusedFunction:t-dll-api.cc:2501
-//ivl_signal_module_port_index()
-unusedFunction:t-dll-api.cc:2530
-//ivl_signal_msb()
-unusedFunction:t-dll-api.cc:2491
-//ivl_signal_name()
-unusedFunction:t-dll-api.cc:2433
-//ivl_signal_nex()
-unusedFunction:t-dll-api.cc:2454
-//ivl_signal_npath()
-unusedFunction:t-dll-api.cc:2591
-//ivl_signal_packed_dimensions()
-unusedFunction:t-dll-api.cc:2471
-//ivl_signal_packed_lsb()
-unusedFunction:t-dll-api.cc:2484
-//ivl_signal_packed_msb()
-unusedFunction:t-dll-api.cc:2477
-//ivl_signal_path()
-unusedFunction:t-dll-api.cc:2597
-//ivl_signal_port()
-unusedFunction:t-dll-api.cc:2524
-//ivl_signal_scope()
-unusedFunction:t-dll-api.cc:2511
-//ivl_signal_signed()
-unusedFunction:t-dll-api.cc:2542
-//ivl_signal_width()
-unusedFunction:t-dll-api.cc:2517
-
-//ivl_statement_type()
-unusedFunction:t-dll-api.cc:2610
-
-//ivl_stmt_block_count()
-unusedFunction:t-dll-api.cc:2643
-//ivl_stmt_block_scope()
-unusedFunction:t-dll-api.cc:2628
-//ivl_stmt_block_stmt()
-unusedFunction:t-dll-api.cc:2658
-//ivl_stmt_call()
-unusedFunction:t-dll-api.cc:2674
-//ivl_stmt_case_count()
-unusedFunction:t-dll-api.cc:2695
-//ivl_stmt_case_expr()
-unusedFunction:t-dll-api.cc:2710
-//ivl_stmt_case_stmt()
-unusedFunction:t-dll-api.cc:2727
-//ivl_stmt_cond_expr()
-unusedFunction:t-dll-api.cc:2744
-//ivl_stmt_cond_false()
-unusedFunction:t-dll-api.cc:2771
-//ivl_stmt_cond_true()
-unusedFunction:t-dll-api.cc:2781
-//ivl_stmt_delay_expr()
-unusedFunction:t-dll-api.cc:2791
-//ivl_stmt_delay_val()
-unusedFunction:t-dll-api.cc:2808
-//ivl_stmt_events()
-unusedFunction:t-dll-api.cc:2834
-//ivl_stmt_file()
-unusedFunction:t-dll-api.cc:2616
-//ivl_stmt_lexp()
-unusedFunction:t-dll-api.cc:2862
-//ivl_stmt_lineno()
-unusedFunction:t-dll-api.cc:2622
-//ivl_stmt_lval()
-unusedFunction:t-dll-api.cc:2874
-//ivl_stmt_lvals()
-unusedFunction:t-dll-api.cc:2893
-//ivl_stmt_lwidth()
-unusedFunction:t-dll-api.cc:2911
-//ivl_stmt_name()
-unusedFunction:t-dll-api.cc:2944
-//ivl_stmt_nevent()
-unusedFunction:t-dll-api.cc:2815
-//ivl_stmt_opcode()
-unusedFunction:t-dll-api.cc:2957
-//ivl_stmt_parm()
-unusedFunction:t-dll-api.cc:2969
-//ivl_stmt_parm_count()
-unusedFunction:t-dll-api.cc:2983
-//ivl_stmt_rval()
-unusedFunction:t-dll-api.cc:2995
-//ivl_stmt_sfunc_as_task()
-unusedFunction:t-dll-api.cc:3013
-//ivl_stmt_sub_stmt()
-unusedFunction:t-dll-api.cc:3026
-
-//ivl_switch_a()
-unusedFunction:t-dll-api.cc:3067
-//ivl_switch_b()
-unusedFunction:t-dll-api.cc:3073
-//ivl_switch_basename()
-unusedFunction:t-dll-api.cc:3049
-//ivl_switch_delay()
-unusedFunction:t-dll-api.cc:3103
-//ivl_switch_enable()
-unusedFunction:t-dll-api.cc:3079
-//ivl_switch_file()
-unusedFunction:t-dll-api.cc:3110
-//ivl_switch_island()
-unusedFunction:t-dll-api.cc:3116
-//ivl_switch_lineno()
-unusedFunction:t-dll-api.cc:3122
-//ivl_switch_offset()
-unusedFunction:t-dll-api.cc:3097
-//ivl_switch_part()
-unusedFunction:t-dll-api.cc:3091
-//ivl_switch_scope()
-unusedFunction:t-dll-api.cc:3055
-//ivl_switch_type()
-unusedFunction:t-dll-api.cc:3061
-//ivl_switch_width()
-unusedFunction:t-dll-api.cc:3085
-
-//ivl_type_base()
-unusedFunction:t-dll-api.cc:3128
-//ivl_type_element()
-unusedFunction:t-dll-api.cc:3134
-//ivl_type_name()
-unusedFunction:t-dll-api.cc:3166
-//ivl_type_packed_dimensions()
-unusedFunction:t-dll-api.cc:3143
-//ivl_type_packed_lsb()
-unusedFunction:t-dll-api.cc:3150
-//ivl_type_packed_msb()
-unusedFunction:t-dll-api.cc:3158
-//ivl_type_prop_type()
-unusedFunction:t-dll-api.cc:3191
-//ivl_type_properties()
-unusedFunction:t-dll-api.cc:3174
-//ivl_type_signed()
-unusedFunction:t-dll-api.cc:3199
-
-//ivl_udp_file()
-unusedFunction:t-dll-api.cc:1036
-//ivl_udp_init()
-unusedFunction:t-dll-api.cc:999
-//ivl_udp_lineno()
-unusedFunction:t-dll-api.cc:1042
-//ivl_udp_name()
-unusedFunction:t-dll-api.cc:1029
-//ivl_udp_nin()
-unusedFunction:t-dll-api.cc:993
-//ivl_udp_port()
-unusedFunction:t-dll-api.cc:1005
-//ivl_udp_row()
-unusedFunction:t-dll-api.cc:1014
-//ivl_udp_rows()
-unusedFunction:t-dll-api.cc:1023
-// ivl_udp_sequ()
-unusedFunction:t-dll-api.cc:987
-
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "discipline.h"
@@ -1,7 +1,7 @@
-#ifndef IVL_discipline_H
-#define IVL_discipline_H
+#ifndef __discipline_H
+#define __discipline_H
 /*
- * Copyright (c) 2008-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2008-2010 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
@@ -74,4 +74,4 @@ extern map<perm_string,ivl_discipline_t> disciplines;
  // Map access function name to the nature that it accesses.
 extern map<perm_string,ivl_nature_t> access_function_nature;

-#endif /* IVL_discipline_H */
+#endif
@@ -14,12 +14,12 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
 * This is a simple program to make a dosified copy of the
- * original. That is, it converts Unix style line ends to DOS
+ * 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
@@ -12,8 +12,9 @@
 #
 #    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., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
 #
 SHELL = /bin/sh

@@ -36,25 +37,14 @@ mandir = @mandir@
 dllib=@DLLIB@

 CC = @CC@
-HOSTCC := @CC@
-WINDRES = @WINDRES@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -I..
-else
-INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/..
-endif
-
-CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
-CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
+CPPFLAGS = -I. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
 LDFLAGS = @LDFLAGS@

-O = main.o res.o
-
 all: iverilog-vpi@EXEEXT@

 check: all
@@ -65,12 +55,11 @@ clean:
 distclean: clean
 	rm -f Makefile config.log

-cppcheck: main.c
-	cppcheck --enable=all --std=posix --std=c99 --std=c++03 -f $(INCLUDE_PATH) $^
-
 Makefile: $(srcdir)/Makefile.in ../config.status
 	cd ..; ./config.status --file=driver-vpi/$@

+O = main.o res.o
+
 iverilog-vpi@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@

@@ -82,31 +71,21 @@ config.h: $(srcdir)/config.h.in Makefile
 	sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \
 	    -e 's;@SUFFIX@;$(suffix);g' \
 	    -e 's;@IVLCFLAGS@;$(CFLAGS);' \
-	    -e 's;@IVLCXXFLAGS@;$(CXXFLAGS);' \
 	    -e 's;@SHARED@;@shared@;' $< > $@

 # Windows specific...
 res.rc: $(srcdir)/res.rc.in ../version.exe
-	sed -e 's;@PRODUCTVERSION@;'`../version.exe '%M,%n,0,0'`';' \
+	sed -e 's;@PRODUCTVERSION@;'`../version.exe '%M,%m,%n,0'`';' \
 	$(srcdir)/res.rc.in > $@

 res.o: res.rc
-	$(WINDRES) -i res.rc -o res.o
+	windres -i res.rc -o res.o
 #

-install: all installdirs installfiles
+install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@

-F = ./iverilog-vpi@EXEEXT@
-
-installfiles: $(F) | installdirs
+$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@
 	$(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@"
-ifeq (@WIN32@,yes)
-ifneq ($(HOSTCC),$(CC))
-	$(INSTALL_PROGRAM) $(shell $(HOSTCC) --print-file-name=libwinpthread-1.dll) "$(DESTDIR)$(bindir)"
-	$(INSTALL_PROGRAM) $(shell $(HOSTCC) --print-file-name=libgcc_s_sjlj-1.dll) "$(DESTDIR)$(bindir)"
-	$(INSTALL_PROGRAM) $(shell $(HOSTCC) --print-file-name=libstdc++-6.dll) "$(DESTDIR)$(bindir)"
-endif
-endif

 installdirs: $(srcdir)/../mkinstalldirs
 	$(srcdir)/../mkinstalldirs "$(bindir)"
@@ -4,7 +4,6 @@
 #define IVERILOG_VPI_CC        "@IVLCC@"
 #define IVERILOG_VPI_CXX       "@IVLCXX@"
 #define IVERILOG_VPI_CFLAGS    " @IVLCFLAGS@"
-#define IVERILOG_VPI_CXXFLAGS  " @IVLCXXFLAGS@"
 #define IVERILOG_VPI_LDFLAGS   "@SHARED@"
 #define IVERILOG_VPI_LDLIBS    "-lveriuser@SUFFIX@ -lvpi@SUFFIX@"
 #define IVERILOG_SUFFIX        "@SUFFIX@"
@@ -1,6 +1,5 @@
 /*
 * Copyright (c) 2002 Gus Baldauf (gus@picturel.com)
- * Copyright (c) 2015 Martin Whitaker
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -15,13 +14,13 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    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 Windows
+ *	this program provides the functionality of iverilog-vpi.sh under Win32
 */

 #include <stdio.h>
@@ -33,7 +32,7 @@

 #include <windows.h>

-static void setup_ivl_environment(void);
+static void setup_ivl_environment();
 static void assign(char **ptr, char *str);

 /* The compile options: compiler, flags, etc. are in here */
@@ -44,17 +43,16 @@ static void assign(char **ptr, char *str);
 static struct global_strings {
 	char *pCCSRC;		/* list of C source files (*.c) */
 	char *pCXSRC;		/* list of C++ source files (*.cc, *.cpp) */
-	char *pOBJ;		/* list of object files */
-	char *pLIB;		/* list of library files */
-	char *pINCS;		/* list of include directories */
-	char *pDEFS;		/* list of definitions */
-	char *pOUT;		/* output file name (.vpi extension), if 0 length then no source files specified */
+	char *pOBJ;			/* list of object files */
+	char *pLIB;			/* list of library files */
+	char *pINCS;			/* list of include directories */
+	char *pDEFS;			/* list of definitions */
+	char *pOUT;			/* output file name (.vpi extension), if 0 length then no source files specified */
 	char *pMINGW;		/* path to MinGW directory */
-	char *pIVL;		/* path to IVL directory */
-	char *pCCFLAGS;		/* compiler flags for compiling C source files */
-	char *pCXFLAGS;		/* compiler flags for compiling C++ source files */
-	char *pLDLIBS;		/* linker flags for final linking stage */
-	char *pCCNAME;		/* base name of compiler */
+	char *pIVL;			/* path to IVL directory */
+	char *pCFLAGS;		/* CFLAGS option */
+	char *pLDLIBS;		/* LDLIBS option */
+	char *pNewPath;		/* new PATH environment variable setting */
 	char *pLD;		/* what to use for a linker */
 } gstr;

@@ -77,21 +75,21 @@ static void myExit(int exitVal)
 	deInitDynString(gstr.pOUT);
 	deInitDynString(gstr.pMINGW);
 	deInitDynString(gstr.pIVL);
-	deInitDynString(gstr.pCCFLAGS);
-	deInitDynString(gstr.pCXFLAGS);
+	deInitDynString(gstr.pCFLAGS);
 	deInitDynString(gstr.pLDLIBS);
-	deInitDynString(gstr.pCCNAME);
-	deInitDynString(gstr.pLD);
+	deInitDynString(gstr.pNewPath);
+	free(gstr.pLD);

 	exit(exitVal);
 }

 /* display usage summary and exit */

-static void usage(void)
+static void usage()
 {
-	fprintf(stderr, "usage: iverilog-vpi" IVERILOG_SUFFIX " [options] [src and obj files]...\n");
-	fprintf(stderr, "   or  iverilog-vpi" IVERILOG_SUFFIX " -mingw=dir\n");
+	fprintf(stderr,"usage: iverilog-vpi" IVERILOG_SUFFIX " [src and obj files]...\n");
+	fprintf(stderr,"   or  iverilog-vpi" IVERILOG_SUFFIX " -mingw=dir\n");
+	fprintf(stderr,"   or  iverilog-vpi" IVERILOG_SUFFIX " -ivl=dir\n");
 	myExit(1);
 }

@@ -100,7 +98,7 @@ static void initDynString(char **str)
 	*str = (char *) malloc(1);

 	if (!*str) {
-		fprintf(stderr, "error: out of memory\n");
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}

@@ -109,10 +107,8 @@ static void initDynString(char **str)

 /* initialize dynamic memory buffers */

-static void init(void)
+static void init()
 {
-	char *ptr;
-
 	initDynString(&gstr.pCCSRC);
 	initDynString(&gstr.pCXSRC);
 	initDynString(&gstr.pOBJ);
@@ -122,17 +118,9 @@ static void init(void)
 	initDynString(&gstr.pOUT);
 	initDynString(&gstr.pMINGW);
 	initDynString(&gstr.pIVL);
-	initDynString(&gstr.pCCFLAGS);
-	initDynString(&gstr.pCXFLAGS);
+	initDynString(&gstr.pCFLAGS);
 	initDynString(&gstr.pLDLIBS);
-	initDynString(&gstr.pCCNAME);
-	initDynString(&gstr.pLD);
-
-	  /* Get the base name of the C compiler. */
-	assign(&gstr.pCCNAME, IVERILOG_VPI_CC);
-	ptr = strchr(gstr.pCCNAME, ' ');
-	if (ptr != NULL) *ptr = '\0';
-
+	initDynString(&gstr.pNewPath);
 	  /* By default use the C compiler to link the programs. */
 	assign(&gstr.pLD, IVERILOG_VPI_CC);
 }
@@ -148,7 +136,7 @@ static int endsIn (char *end, char *str)

 	ext = str + (strlen(str) - strlen(end));

-	return stricmp(end, ext) ? 0 : 1;
+	return stricmp(end,ext) ? 0 : 1;
 }

 /* return true if "str" begins with "prefix", case insensitive */
@@ -158,35 +146,32 @@ static int startsWith (char *prefix, char *str)
 	if (strlen(prefix) >= strlen(str))
 		return 0;

-	return strnicmp(prefix, str, strlen(prefix)) ? 0 : 1;
+	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, size_t count)
+static void appendn (char **ptr, char *app, int count)
 {
-	char *nptr = (char *) realloc(*ptr, strlen(*ptr) +
-                                            (count ? count : strlen(app)) + 1);
+	*ptr = (char *) realloc(*ptr,strlen(*ptr)+(count?count:strlen(app))+1);

-	if (nptr == NULL) {
-		fprintf(stderr, "error: out of memory\n");
-		free(*ptr);
+	if (*ptr == NULL) {
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
-	*ptr = nptr;

 	if (count)
-		strncat(*ptr, app, count);
+		strncat(*ptr,app,count);
 	else
-		strcat(*ptr, app);
+		strcat(*ptr,app);
 }

 /* append "app" to "ptr", allocating memory as needed    */

 static void append (char **ptr, char *app)
 {
-	appendn(ptr, app, 0);
+	appendn(ptr,app,0);
 }

 /* if the string does not end with a backslash, add one */
@@ -194,36 +179,34 @@ static void append (char **ptr, char *app)
 static void appendBackSlash(char **str)
 {
 	if ((*str)[strlen(*str)-1] != '\\')
-		append(str, "\\");
+		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, size_t count)
+static void assignn (char **ptr, char *str, int count)
 {
-	char *nptr = (char *) realloc(*ptr, (count ? count : strlen(str)) + 1);
+	*ptr = (char *) realloc(*ptr,(count?count:strlen(str))+1);

-	if (nptr == NULL) {
-		fprintf(stderr, "error: out of memory\n");
-		free(*ptr);
+	if (*ptr == NULL) {
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
-	*ptr = nptr;

 	if (count) {
-		strncpy(*ptr, str, count);
+		strncpy(*ptr,str,count);
 		(*ptr)[count] = 0;
 	}
 	else
-		strcpy(*ptr, str);
+		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);
+	assignn(ptr,str,0);
 }

 /* get a copy of a Icarus Verilog registry string key */
@@ -235,11 +218,11 @@ static int GetRegistryKey(char *key, char **value)
 	char *regKeyBuffer;
 	DWORD regKeyType, regKeySize;

-	lrv = RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\Icarus Verilog", 0, KEY_QUERY_VALUE, &hkKey);
+	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);
+	lrv = RegQueryValueEx(hkKey,key,NULL,&regKeyType,NULL,&regKeySize);
 	if ((lrv != ERROR_SUCCESS) || (regKeyType != REG_SZ) || (!regKeySize)) {
 		lrv = RegCloseKey(hkKey);
 		return 0;
@@ -248,7 +231,7 @@ static int GetRegistryKey(char *key, char **value)
 	regKeyBuffer = (char *) malloc(regKeySize+1);
 	if (!regKeyBuffer) {
 		lrv = RegCloseKey(hkKey);
-		fprintf(stderr, "error: out of memory\n");
+		fprintf(stderr,"error: out of memory\n");
 		myExit(4);
 	}
 	regKeyBuffer[regKeySize] = 0;		/* makes sure there is a trailing NULL */
@@ -264,7 +247,7 @@ static int GetRegistryKey(char *key, char **value)

 	RegCloseKey(hkKey);

-	assign(value, regKeyBuffer);
+	assign(value,regKeyBuffer);
 	free(regKeyBuffer);

 	return 1;
@@ -274,30 +257,27 @@ static int GetRegistryKey(char *key, char **value)

 static void SetRegistryKey(char *key, char *value)
 {
-	long lrv;
 	HKEY hkKey;
 	DWORD res;

-	lrv = RegCreateKeyEx(HKEY_LOCAL_MACHINE, "Software\\Icarus Verilog", 0, "",
-			     REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkKey, &res);
-	if (lrv != ERROR_SUCCESS) {
-		char message[1024];
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, lrv, LANG_USER_DEFAULT,
-			      message, sizeof(message), NULL);
-		fprintf(stderr, "error: couldn't write to registry - %s\n", message);
-		if (lrv == ERROR_ACCESS_DENIED) {
-			fprintf(stderr, "       try running as administrator\n");
-		}
-		return;
-	}
+	if (RegCreateKeyEx(
+		HKEY_LOCAL_MACHINE,
+		"Software\\Icarus Verilog",
+		0,
+		"",
+		REG_OPTION_NON_VOLATILE,
+		KEY_ALL_ACCESS,NULL,
+		&hkKey,
+		&res) != ERROR_SUCCESS)
+			return;

 	/* This needs an unsigned char *, but for MinGW the char is signed. */
 	RegSetValueEx(hkKey, key, 0, REG_SZ, (unsigned char *) 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);
+	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 */
@@ -314,6 +294,7 @@ static int parse(int argc, char *argv[])
 	char lib_option[]   = "-l";
 	char inc_option[]   = "-I";
 	char mingw_option[] = "-mingw=";
+	char ivl_option[]   = "-ivl=";
 	char def_option[]   = "-D";

 	if (argc == 1) return 0;
@@ -353,7 +334,7 @@ static int parse(int argc, char *argv[])
 		  /* Check for compiled object files */
 		else if (endsIn(dot_o_ext, argv[idx])) {
 			++srcFileCnt;
-			append(&gstr.pOBJ, " ");
+			append(&gstr.pOBJ," ");
 			append(&gstr.pOBJ, argv[idx]);
 			if (!*gstr.pOUT)
 			   assignn(&gstr.pOUT, argv[idx],
@@ -363,6 +344,10 @@ static int parse(int argc, char *argv[])
 		else if (startsWith(mingw_option, argv[idx]))
 			assignn(&gstr.pMINGW, argv[idx]+sizeof(mingw_option)-1,
 			        strlen(argv[idx])-(sizeof(mingw_option)-1));
+		  /* Check for the -ivl   option */
+		else if (startsWith(ivl_option, argv[idx]))
+			assignn(&gstr.pIVL, argv[idx]+sizeof(ivl_option)-1,
+			        strlen(argv[idx])-(sizeof(ivl_option)-1));
 		  /* Check for the --name option */
 		else if (startsWith(name_option, argv[idx])) {
 			assignn(&gstr.pOUT, argv[idx]+sizeof(name_option)-1,
@@ -386,7 +371,7 @@ static int parse(int argc, char *argv[])
 		  /* Check for the --cflags option */
 		else if (stricmp("--cflags", argv[idx]) == 0) {
 			setup_ivl_environment();
-			printf("%s\n", gstr.pCCFLAGS);
+			printf("%s\n", gstr.pCFLAGS);
 			myExit(0);
 		}
 		  /* Check for the --ldflags option */
@@ -403,7 +388,7 @@ static int parse(int argc, char *argv[])
 		  /* Check for the --install-dir option */
 		else if (stricmp("--install-dir", argv[idx]) == 0) {
 			setup_ivl_environment();
-			printf("%s\\lib\\ivl" IVERILOG_SUFFIX "\\.\n", gstr.pIVL);
+			printf("%s\\\\lib\\\\ivl" IVERILOG_SUFFIX "\\\\.\n", gstr.pIVL);
 			myExit(0);
 		}
 		  /* This is different than iverilog-vpi.sh, we don't
@@ -412,16 +397,15 @@ static int parse(int argc, char *argv[])
 	}

 	  /* In case there is a --name without source/object files */
-	if (0 == srcFileCnt) assign(&gstr.pOUT, "");
+	if (0 == srcFileCnt) assign(&gstr.pOUT,"");

-	if (*gstr.pOUT) {
+	  /* Normally it's an error if there are no source or object files */
+	  /* Unless we are setting the IVL or MinGW registry entries */
+	if (!*gstr.pOUT) {
+		if (!*gstr.pMINGW && !*gstr.pIVL) return 0;
+	} else
 		  /* We have a valid result file so add the .vpi extension */
 		append(&gstr.pOUT, ".vpi");
-	} else {
-		  /* Unless we are setting the MinGW registry entry, it's
-		     an error if there are no source or object files */
-		if (!*gstr.pMINGW) return 0;
-	}

 	return 1;
 }
@@ -432,126 +416,127 @@ static void checkMingwDir(char *root)
 {
 	int irv;
 	struct _stat stat_buf;
-	char *path;

+	char *path, *comp, *cp;
 	initDynString(&path);
-	assign(&path, gstr.pMINGW);
+	assign(&path,gstr.pMINGW);
 	appendBackSlash(&path);
-	append(&path, "bin\\");
-        append(&path, gstr.pCCNAME);
-	append(&path, ".exe");
+	append(&path,"bin\\");
+	/* Get just the compiler name (the first word) */
+	comp = strdup(IVERILOG_VPI_CC);
+	cp = strchr(comp, ' ');
+	if (cp != NULL) *cp = '\0';
+        append(&path, comp);
+	append(&path,".exe");
+        free(comp);

 	irv = _stat(path,&stat_buf);
 	deInitDynString(path);

 	if (irv) {
-		fprintf(stderr, "error: %s\n", root);
-		fprintf(stderr, "       does not appear to be the valid root directory of\n");
-		fprintf(stderr, "       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");
+		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" IVERILOG_SUFFIX ".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" IVERILOG_SUFFIX " 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(void)
+static void setup_mingw_environment()
 {
-	char buffer[1];		/* doesn't matter how big this is, as we don't use the result */
-	char *path;
+	char *pOldPATH = getenv("PATH");		/* get current path */

 	if (*gstr.pMINGW) {
 		checkMingwDir(gstr.pMINGW);
-		if (!*gstr.pOUT) SetRegistryKey(IVL_REGKEY_MINGW, gstr.pMINGW);
-
-	} else if (GetRegistryKey(IVL_REGKEY_MINGW, &gstr.pMINGW)) {
-		checkMingwDir(gstr.pMINGW);
-
-	} else if (SearchPath(NULL, gstr.pCCNAME, ".exe", sizeof(buffer), buffer, NULL)) {
-		return;
-
-	} else {
-		fprintf(stderr, "error: cannot locate the MinGW C compiler - either add its location\n");
-		fprintf(stderr, "       to the PATH environment variable or 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);
-	}
+		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);
+		}

 	  /* Create new path with MinGW in it */
-	initDynString(&path);
-	assign(&path, "PATH=");
-	append(&path, gstr.pMINGW);
-	appendBackSlash(&path);
-	append(&path, "bin;");
-	append(&path, getenv("PATH"));
+	assign(&gstr.pNewPath,"PATH=");
+	append(&gstr.pNewPath,gstr.pMINGW);
+	appendBackSlash(&gstr.pNewPath);
+	append(&gstr.pNewPath, "\\");
+	append(&gstr.pNewPath,"bin;");
+	append(&gstr.pNewPath,pOldPATH);

 	  /* Place new path in environment */
-	_putenv(path);
-	deInitDynString(path);
+	_putenv(gstr.pNewPath);
 }

-/* find the iverilog root and initialise the compiler options */
+/* see if we can find iverilog root */

-static void setup_ivl_environment(void)
+#define IVL_REGKEY_IVL   "InstallDir"
+
+static void setup_ivl_environment()
 {
-	char path[4096];
-	char *ptr;
+	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" IVERILOG_SUFFIX " 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);
+		}

-	  /* Extract the Icarus Verilog root directory from the path to the
-	     command. The command path will look something like this:
-
-		C:\iverilog\bin\iverilog-vpi.exe
-
-	     The corresponding root directory is
-
-		C:\iverilog
-
-	     so we chop off the file name and the last directory. */
-	GetModuleFileName(NULL, path, sizeof(path));
-	ptr = strrchr(path, '\\');
-	if (!ptr) {
-		fprintf(stderr, "error: couldn't find start of program name in command path '%s'\n", path);
-		myExit(6);
-	}
-	*ptr = 0;
-	ptr = strrchr(path, '\\');
-	if (!ptr) {
-		fprintf(stderr, "error: couldn't find start of bin directory in command path '%s'\n", path);
-		myExit(6);
-	}
-	*ptr = 0;
-	assign(&gstr.pIVL, path);
-
-	  /* Build up the CCFLAGS option string */
-	assign(&gstr.pCCFLAGS, IVERILOG_VPI_CFLAGS " -I\"");
-	append(&gstr.pCCFLAGS, gstr.pIVL);
-	appendBackSlash(&gstr.pCCFLAGS);
-	append(&gstr.pCCFLAGS, "include\\iverilog\"" IVERILOG_SUFFIX);
-
-	  /* Build up the CXFLAGS option string */
-	assign(&gstr.pCXFLAGS, IVERILOG_VPI_CXXFLAGS " -I\"");
-	append(&gstr.pCXFLAGS, gstr.pIVL);
-	appendBackSlash(&gstr.pCXFLAGS);
-	append(&gstr.pCXFLAGS, "include\\iverilog\"" IVERILOG_SUFFIX);
+	  /* Build up the CFLAGS option string */
+	assign(&gstr.pCFLAGS,IVERILOG_VPI_CFLAGS " -I\"");
+	append(&gstr.pCFLAGS,gstr.pIVL);
+	appendBackSlash(&gstr.pCFLAGS);
+	append(&gstr.pCFLAGS,"\\include\\\\iverilog\"" IVERILOG_SUFFIX);

 	  /* Build up the LDFLAGS option string */
-	assign(&gstr.pLDLIBS, "-L\"");
-	append(&gstr.pLDLIBS, gstr.pIVL);
+	assign(&gstr.pLDLIBS,"-L\"");
+	append(&gstr.pLDLIBS,gstr.pIVL);
 	appendBackSlash(&gstr.pLDLIBS);
-	append(&gstr.pLDLIBS, "lib\" " IVERILOG_VPI_LDLIBS);
+	append(&gstr.pLDLIBS,"\\lib\" " IVERILOG_VPI_LDLIBS);
 }

 /* compile source modules */

-static void compile(char *pSource, char *pFlags, char **pObject, int *compile_errors, char *compiler)
+static void compile(char *pSource, char **pObject, int *compile_errors, char *compiler)
 {
 	char *ptr1 = pSource;
 	char *ptr2 = strchr(ptr1, ' ');
@@ -578,7 +563,7 @@ static void compile(char *pSource, char *pFlags, char **pObject, int *compile_er
 		append(&buf, " ");
 		append(&buf, gstr.pDEFS);
 		append(&buf, " ");
-		append(&buf, pFlags);
+		append(&buf, gstr.pCFLAGS);
 		append(&buf, " ");
 		append(&buf, gstr.pINCS);
 		append(&buf, " ");
@@ -603,22 +588,27 @@ static void compile(char *pSource, char *pFlags, char **pObject, int *compile_er

 /* using the global strings, compile and link */

-static void compile_and_link(void)
+static void compile_and_link()
 {
 	char *buf=0;
 	int iRet, compile_errors = 0;

 	  /* To make the output match iverilog-vpi.sh do not print out the
 	   * root directories */
+
 //	printf("MinGW root directory:  %s.\n", gstr.pMINGW);
+	checkMingwDir(gstr.pMINGW);
+
+//	printf("Icarus Verilog root directory:  %s.\n", gstr.pIVL);
+	checkIvlDir(gstr.pIVL);

 	  /* compile the C source files (*.c) */
-	compile(gstr.pCCSRC, gstr.pCCFLAGS, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CC );
+	compile(gstr.pCCSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CC );
 	  /* compile the C++ source files (*.cc, *.cpp) */
-	compile(gstr.pCXSRC, gstr.pCXFLAGS, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CXX);
+	compile(gstr.pCXSRC, &gstr.pOBJ, &compile_errors, IVERILOG_VPI_CXX);

 	if (compile_errors) {
-		fprintf(stderr, "iverilog-vpi: %d file(s) failed to compile.\n",
+		fprintf(stderr,"iverilog-vpi: %d file(s) failed to compile.\n",
 		        compile_errors);
 		myExit(2);
 	}
@@ -649,7 +639,7 @@ int main(int argc, char *argv[])
 {
 	init();

-	if (!parse(argc, argv)) usage();
+	if (!parse(argc,argv)) usage();

 	setup_mingw_environment();
 	setup_ivl_environment();
@@ -12,8 +12,9 @@
 #
 #    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., 51 Franklin Street, Fifth Floor,
-#    Boston, MA 02110-1301, USA.
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
 #
 SHELL = /bin/sh

@@ -42,18 +43,10 @@ YACC = @YACC@
 MAN = @MAN@
 PS2PDF = @PS2PDF@

-ifeq (@srcdir@,.)
-INCLUDE_PATH = -I. -I..
-else
-INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/..
-endif
-
-CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@
-CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
+CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
+CFLAGS = @WARNING_FLAGS@ @CFLAGS@
 LDFLAGS = @LDFLAGS@

-O = main.o substit.o cflexor.o cfparse.o
-
 all: dep iverilog@EXEEXT@ iverilog.man

 check: all
@@ -66,35 +59,29 @@ clean:
 distclean: clean
 	rm -f Makefile config.log

-cppcheck: $(O:.o=.c)
-	cppcheck --enable=all --std=posix --std=c99 --std=c++03 -f \
-	         -UYY_USER_INIT \
-	         -UYYPARSE_PARAM -UYYPRINT -Ushort -Uyyoverflow \
-	         -UYYTYPE_INT8 -UYYTYPE_INT16 -UYYTYPE_UINT8 -UYYTYPE_UINT16 \
-	         $(INCLUDE_PATH) $^
-
 Makefile: $(srcdir)/Makefile.in ../config.status
 	cd ..; ./config.status --file=driver/$@

-dep:
-	mkdir dep
+O = main.o substit.o cflexor.o cfparse.o

 iverilog@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o iverilog@EXEEXT@ @EXTRALIBS@

-cflexor.c: $(srcdir)/cflexor.lex
-	$(LEX) -s -t $< > $@
+cflexor.c: cflexor.lex
+	$(LEX) -s -Pcf -ocflexor.c $(srcdir)/cflexor.lex

-# Use pattern rules to avoid parallel build issues (see pr3462585)
-cfparse%c cfparse%h: $(srcdir)/cfparse%y
-	$(YACC) --verbose -t -p cf -d -o cfparse.c $<
+cfparse.h cfparse.c: cfparse.y
+	$(YACC) --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y
+
+dep:
+	mkdir dep

 %.o: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
 	mv $*.d dep

 main.o: main.c globals.h $(srcdir)/../version_base.h ../version_tag.h Makefile
-	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"'  -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c
 	mv $*.d dep

 cflexor.o: cflexor.c cfparse.h
@@ -111,35 +98,32 @@ iverilog.pdf: iverilog.ps

 ifeq (@MINGW32@,yes)
 ifeq ($(MAN),none)
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
 else
 ifeq ($(PS2PDF),none)
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
 else
-INSTALL_DOC = installpdf installman
+INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1
 all: iverilog.pdf
 endif
 endif
 INSTALL_DOCDIR = $(mandir)/man1
 else
-INSTALL_DOC = installman
+INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1
 INSTALL_DOCDIR = $(mandir)/man1
 endif

-install: all installdirs installfiles
+install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC)

-F = ./iverilog@EXEEXT@ \
-	$(INSTALL_DOC)
+$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@
+	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"

-installman: iverilog.man installdirs
+$(mandir)/man1/iverilog$(suffix).1: iverilog.man
 	$(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1"

-installpdf: iverilog.pdf installdirs
+$(prefix)/iverilog$(suffix).pdf: iverilog.pdf
 	$(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf"

-installfiles: $(F) | installdirs
-	$(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@"
-
 installdirs: $(srcdir)/../mkinstalldirs
 	$(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)"

@@ -1,10 +1,10 @@
-%option prefix="cf"
+
 %option nounput
 %option noinput

 %{
 /*
- * Copyright (c) 2001-2017 Stephen Williams ([email protected])
+ * Copyright (c) 2001-2010 Stephen Williams ([email protected])
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -19,16 +19,14 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

-# include  "cfparse_misc.h"
 # include  "cfparse.h"
+# include  "cfparse_misc.h"
 # include  "globals.h"
 # include  <string.h>

-char *current_file = NULL;
-
 static int comment_enter;
 static char* trim_trailing_white(char*txt, int trim);

@@ -86,16 +84,8 @@ int cmdfile_stack_ptr = 0;

 "+libext+" { BEGIN(PLUS_ARGS); return TOK_LIBEXT; }

-"+parameter+" { BEGIN(PLUS_ARGS); return TOK_PARAMETER; }
-
 "+timescale+" { BEGIN(PLUS_ARGS); return TOK_TIMESCALE; }

-"+vhdl-work+" { BEGIN(PLUS_ARGS); return TOK_VHDL_WORK; }
-
-"+vhdl-libdir+" { BEGIN(PLUS_ARGS); return TOK_VHDL_LIBDIR; }
-
-"+width-cap+" { BEGIN(PLUS_ARGS); return TOK_WIDTH_CAP; }
-
  /* If it is not any known plus-flag, return the generic form. */
 "+"[^\n \t\b\f\r+]* {
      cflval.text = strdup(yytext);
@@ -126,8 +116,7 @@ int cmdfile_stack_ptr = 0;
 "-c" { return TOK_Dc; }
 "-f" { return TOK_Dc; }

-  /* Notice the -l or -v flag. */
-"-l" { return TOK_Dv; }
+  /* Notice the -v flag. */
 "-v" { return TOK_Dv; }

  /* Notice the -y flag. */
@@ -200,6 +189,7 @@ int yywrap()
 void switch_to_command_file(const char *file)
 {
      char path[4096];
+      char *cp;

      if (cmdfile_stack_ptr >= MAX_CMDFILE_DEPTH) {
 	    fprintf(stderr, "Error: command files nested too deeply (%d) "
@@ -217,7 +207,6 @@ void switch_to_command_file(const char *file)
         * file name.
         */
      if (file[0] != '/') {
-	    char *cp;
 	    strcpy(path, current_file);
 	    cp = strrchr(path, '/');
 	    if (cp == 0) strcpy(path, file);  /* A base file. */
@@ -250,11 +239,11 @@ void cfreset(FILE*fd, const char*path)
 /*
 * Modern version of flex (>=2.5.9) can clean up the scanner data.
 */
-void destroy_lexor(void)
+void destroy_lexor()
 {
 # ifdef FLEX_SCANNER
 #   if YY_FLEX_MAJOR_VERSION >= 2 && YY_FLEX_MINOR_VERSION >= 5
-#     if YY_FLEX_MINOR_VERSION > 5 || defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION >= 9
+#     if defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION >= 9
    yylex_destroy();
 #     endif
 #   endif
@@ -1,6 +1,6 @@
 %{
 /*
- * Copyright (c) 2001-2014 Stephen Williams ([email protected])
+ * Copyright (c) 2001-2010 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
@@ -15,7 +15,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "globals.h"
@@ -24,7 +24,6 @@
 # include  <stdlib.h>
 # include  <stdio.h>
 # include  <string.h>
-# include "ivl_alloc.h"


 /*
@@ -60,8 +59,7 @@ static void translate_file_name(char*text)

 %token TOK_Da TOK_Dc TOK_Dv TOK_Dy
 %token TOK_DEFINE TOK_INCDIR TOK_INTEGER_WIDTH TOK_LIBDIR TOK_LIBDIR_NOCASE
-%token TOK_LIBEXT TOK_PARAMETER TOK_TIMESCALE TOK_VHDL_WORK TOK_VHDL_LIBDIR
-%token TOK_WIDTH_CAP
+%token TOK_LIBEXT TOK_TIMESCALE
 %token <text> TOK_PLUSARG TOK_PLUSWORD TOK_STRING

 %%
@@ -138,17 +136,8 @@ item
 		  free(tmp);
 		}

-        | TOK_PARAMETER TOK_PLUSARG
-                { char*tmp = substitutions($2);
-		  process_parameter(tmp);
-		  free($2);
-		  free(tmp);
-		}
-
-  /* The +timescale token is used to set the default timescale for
-     the simulator. */
        | TOK_TIMESCALE TOK_PLUSARG
-                { char*tmp = substitutions($2);
+		{ char*tmp = substitutions($2);
 		  process_timescale(tmp);
 		  free($2);
 		  free(tmp);
@@ -159,20 +148,6 @@ item
 		  free($2);
 		}

-        | TOK_VHDL_WORK TOK_PLUSARG
-	        { char*tmp = substitutions($2);
-	          vhdlpp_work = tmp;
-		  free($2);
-		}
-
-        | TOK_VHDL_LIBDIR TOK_PLUSARG
-	        { char*tmp = substitutions($2);
-		  vhdlpp_libdir = realloc(vhdlpp_libdir, (vhdlpp_libdir_cnt+1)*sizeof(char*));
-	          vhdlpp_libdir[vhdlpp_libdir_cnt] = tmp;
-		  vhdlpp_libdir_cnt += 1;
-		  free($2);
-		}
-
  /* The +incdir token introduces a list of +<path> arguments that are
     the include directories to search. */

@@ -192,13 +167,6 @@ item
 		  free(tmp);
 		}

-	| TOK_WIDTH_CAP TOK_PLUSARG
-                { char*tmp = substitutions($2);
-		  free($2);
-		  width_cap = strtoul(tmp,0,10);
-		  free(tmp);
-		}
-
  /* The +<word> tokens that are not otherwise matched, are
     ignored. The skip_args rule arranges for all the argument words
     to be consumed. */
@@ -221,7 +189,7 @@ item
 		}

 	| error
-		{ fprintf(stderr, "Error: unable to parse line %u in "
+		{ fprintf(stderr, "Error: unable to parse line %d in "
 		          "%s.\n", cflloc.first_line, current_file);
 		  return 1;
 		}
@@ -270,6 +238,5 @@ skip_arg : TOK_PLUSARG

 int yyerror(const char*msg)
 {
-	(void)msg; /* Parameter is not used. */
 	return 0;
 }
@@ -1,7 +1,7 @@
-#ifndef IVL_cfparse_misc_H
-#define IVL_cfparse_misc_H
+#ifndef __cfparse_misc_H
+#define __cfparse_misc_H
 /*
- * Copyright (c) 2001-2014 Picture Elements, Inc.
+ * Copyright (c) 2001-2009 Picture Elements, Inc.
 *    Stephen Williams (steve@picturel.com)
 *
 *    This source code is free software; you can redistribute it
@@ -17,7 +17,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
@@ -38,7 +38,7 @@ int cflex(void);
 int cferror(const char *);
 int cfparse(void);
 void switch_to_command_file(const char *);
-void destroy_lexor(void);
-extern char *current_file;
+void destroy_lexor();
+char *current_file;

-#endif /* IVL_cfparse_misc_H */
+#endif
@@ -1,7 +1,7 @@
-#ifndef IVL_globals_H
-#define IVL_globals_H
+#ifndef __globals_H
+#define __globals_H
 /*
- * Copyright (c) 2000-2014 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2010 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,7 +16,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <stddef.h>
@@ -24,13 +24,6 @@
  /* This is the integer-width argument that will be passed to ivl. */
 extern unsigned integer_width;

-  /* This is the width-cap argument that will be passed to ivl. */
-extern unsigned width_cap;
-
-extern const char*vhdlpp_work;
-extern const char**vhdlpp_libdir;
-extern unsigned vhdlpp_libdir_cnt;
-
  /* Perform variable substitutions on the string. */
 extern char* substitutions(const char*str);

@@ -48,10 +41,7 @@ extern void process_include_dir(const char*name);
  /* Add a new -D define. */
 extern void process_define(const char*name);

-  /* Add a new parameter definition */
-extern void process_parameter(const char*name);
-
  /* Set the default timescale for the simulator. */
 extern void process_timescale(const char*ts_string);

-#endif /* IVL_globals_H */
+#endif
@@ -1,16 +1,13 @@
-.TH iverilog 1 "Aug 10th, 2020" "" "Version %M.%n%E"
+.TH iverilog 1 "January 22nd, 2010" "" "Version %M.%m.%n %E"
 .SH NAME
 iverilog - Icarus Verilog compiler

 .SH SYNOPSIS
 .B iverilog
-[\-EiSuVv] [\-Bpath] [\-ccmdfile|\-fcmdfile] [\-Dmacro[=defn]]
-[\-Pparameter=value] [\-pflag=value] [\-dname]
-[\-g1995\:|\-g2001\:|\-g2005\:|\-g2005-sv\:|\-g2009\:|\-g2012\:|\-g<feature>]
-[\-Iincludedir] [\-Lmoduledir] [\-mmodule] [\-M[mode=]file] [\-Nfile]
-[\-ooutputfilename] [\-stopmodule] [\-ttype] [\-Tmin/typ/max] [\-Wclass]
-[\-ypath] [\-lfile]
-sourcefile
+[\-ESVv] [\-Bpath] [\-ccmdfile|\-fcmdfile] [\-Dmacro[=defn]] [\-pflag=value]
+[\-dname] [\-g1995|\-g2001|\-g2005|\-g<feature>]
+[\-Iincludedir] [\-mmodule] [\-Mfile] [\-Nfile] [\-ooutputfilename]
+[\-stopmodule] [\-ttype] [\-Tmin/typ/max] [\-Wclass] [\-ypath] sourcefile

 .SH DESCRIPTION
 .PP
@@ -32,7 +29,7 @@ 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 -f\fIfile\fP
-These flags specify an input file that contains a list of Verilog
+These flags specifies an input file that contains a list of Verilog
 source files. This is similar to the \fIcommand file\fP of other
 Verilog simulators, in that it is a file that contains the file names
 instead of taking them on the command line. See \fBCommand Files\fP below.
@@ -45,12 +42,6 @@ Verilog source.
 .B -D\fImacro=defn\fP
 Defines macro \fImacro\fP as \fIdefn\fP.
 .TP 8
-.B -P\fIparameter=value\fP
-Override (i.e. defparam) a parameter in a root module. This allows the
-user to override at compile time (defparam) a parameter in a root
-module instance. For example, \fB\-Pmain.foo=2\fP overrides the
-parameter foo in the root instance main with the value 2.
-.TP 8
 .B -d\fIname\fP
 Activate a class of compiler debugging messages. The \fB\-d\fP switch may
 be used as often as necessary to activate all the desired messages.
@@ -63,30 +54,19 @@ 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 -g1995\fI|\fP-g2001\fI|\fP-g2001-noconfig\fI|\fP-g2005\fI|\fP-g2005-sv\fI|\fP-g2009\fI|\fP-g2012
-Select the Verilog language \fIgeneration\fP to support in the compiler.
-This selects between \fIIEEE1364\-1995\fP, \fIIEEE1364\-2001\fP,
-\fIIEEE1364\-2005\fP, \fIIEEE1800\-2005\fP, \fIIEEE1800\-2009\fP, or
-\fIIEEE1800\-2012\fP.
-Icarus Verilog currently defaults to the \fIIEEE1364\-2005\fP generation
-of the language. This flag is used to restrict the language to a set of
-keywords/features, this allows simulation of older Verilog code that may
-use newer keywords and for compatibility with other tools. Much of the
-\fIIEEE1800\fP generations functionality is not currently supported.
-The \fIIEEE1800\fP generations do parse all the keywords, so they can
-be used to verify that \fIIEEE1364\fP compliant Verilog code does not
-use any of the new \fIIEEE1800\fP keywords.
+.B -g1995\fI|\fP-g2001\fI|\fP-g2001-noconfig\fI|\fP-g2005
+Select the Verilog language \fIgeneration\fP to support in the
+compiler. This selects between \fIIEEE1364\-1995\fP,
+\fIIEEE1364\-2001\fP, or \fIIEEE1364\-2005\fP. Normally,
+Icarus Verilog defaults to the latest known generation of the
+language. This flag is most useful to restrict the language to a set
+supported by tools of specific generations, for compatibility with
+other tools.
 .TP 8
 .B -gverilog-ams\fI|\fP-gno-verilog-ams
 Enable or disable (default) support for Verilog\-AMS.
 Very little Verilog\-AMS specific functionality is currently supported.
 .TP 8
-.B -gassertions\fI|\fP-gsupported-assertions\fI|\fP-gno-assertions
-Enable (default) or disable SystemVerilog assertions. When enabled,
-assertion statements are elaborated. When disabled, assertion statements
-are parsed but ignored. The \fB\-gsupported-assertions\fP option only
-enables assertions that are currently supported by the compiler.
-.TP 8
 .B -gspecify\fI|\fP-gno-specify
 Enable or disable (default) specify block support. When enabled,
 specify block code is elaborated. When disabled, specify blocks are
@@ -131,79 +111,28 @@ default, parts of the expression that do not depend on the changed
 input value(s) are not re-evaluated. If an expression contains a call
 to a function that doesn't depend solely on its input values or that
 has side effects, the resulting behavior will differ from that
-required by the standard. Using \fB\-gstrict\-ca\-eval\fP will force
+required by the standard. Using \fI\-gstrict\-ca\-eval\fP will force
 standard compliant behavior (with some loss in performance).
 .TP 8
-.B -gstrict-expr-width\fI|\fP-gno-strict-expr-width
-Enable or disable (default) strict compliance with the standard rules
-for determining expression bit lengths. When disabled, the RHS of a
-parameter assignment is evaluated as a lossless expression, as is any
-expression containing an unsized constant number, and unsized constant
-numbers are not truncated to integer width.
-.TP 8
-.B -gshared-loop-index\fI|\fP-gno-shared-loop-index
-Enable (default) or disable the exclusion of for-loop control variables
-from implicit event_expression lists. When enabled, if a for-loop control
-variable (loop index) is only used inside the for-loop statement, the
-compiler will not include it in an implicit event_expression list it
-calculates for that statement or any enclosing statement. This allows
-the same control variable to be used in multiple processes without risk
-of entering an infinite loop caused by each process triggering all other
-processes that use the same varaible. For strict compliance with the
-standards, this behaviour should be disabled.
-.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 -i
-Ignore missing modules. Normally it is an error if a module instantiation
-refers to an undefined module. This option causes the compiler to skip
-over that instantiation. It will also stop the compiler returning an
-error if there are no top level modules. This allows the compiler to be
-used to check incomplete designs for errors.
-.TP 8
-.B -L\fIpath\fP
-This flag adds a directory to the path list used to locate VPI
-modules. The default path includes only the install directory for the
-system.vpi module, but this flag can add other directories. Multiple
-paths are allowed, and the paths will be searched in order.
-.TP 8
-.B -l\fIfile\fP
-Add the specified file to the list of source files to be compiled,
-but mark it as a library file. All modules contained within that
-file will be treated as library modules, and only elaborated if
-they are instantiated by other modules in the design.
-.TP 8
 .B -M\fIpath\fP
-This is equivalent to \fB\-Mall=path\fP. Preserved for backwards
-compatibility.
-.TP 8
-.B -M\fImode=path\fP
-Write into the file specified by path a list of files that contribute to
-the compilation of the design. If \fBmode\fP is \fBall\fP or \fBprefix\fP,
-this includes files that are included by include directives and files
-that are automatically loaded by library support as well as the files
-explicitly specified by the user. If \fBmode\fP is \fBinclude\fP, only
-files that are included by include directives are listed. If \fBmode\fP
-is \fBmodule\fP, only files that are specified by the user or that are
-automatically loaded by library support are listed. The output is one
-file name per line, with no leading or trailing space. If \fBmode\fP
-is \fBprefix\fP, files that are included by include directives are
-prefixed by "I " and other files are prefixed by "M ".
+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
-(and loaded last).
-
-If the specified name includes at least one directory character, it is
-assumed to be prefixed by the path to the module, otherwise the module
-is searched for in the paths specified by preceding \fB-L\fP options,
-and if not found there, in the \fIiverilog\fP base directory.
+the order specified. The system module is implicit and always included.
+If a System Function Table file (<module>.sft) exists for the module it
+will be loaded automatically.
 .TP 8
 .B -N\fIpath\fP
 This is used for debugging the compiler proper. Dump the final netlist
@@ -246,12 +175,6 @@ will suppress the warning that the compiler is making a choice.
 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 -u
-Treat each source file as a separate compilation unit (as defined in
-SystemVerilog). If compiling for an \fIIEEE1364\fP generation, this
-will just reset all compiler directives (including macro definitions)
-before each new file is processed.
-.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
@@ -261,12 +184,6 @@ 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.
-
-If the selected target is \fIvvp\fP, the \fB\-v\fP switch is appended
-to the shebang line in the compiler output file, so directly executing
-the compiler output file will turn on verbose messages in \fIvvp\fP.
-This extra verbosity can be avoided by using the \fIvvp\fP command to
-indirectly execute the compiler output file.
 .TP 8
 .B -V
 Print the version of the compiler, and exit.
@@ -294,7 +211,7 @@ 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, then tries
+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
@@ -315,12 +232,7 @@ checking the syntax of the Verilog source.
 .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. The -pfileline=1 option
-can be used to add procedural statement debugging opcodes to the
-generated code. These opcodes are also used to generate file and
-line information for procedural warning/error messages. To enable
-the debug command tracing us the trace command (trace on) from
-the vvp interactive prompt.
+but must be run by the \fBvvp\fP command.
 .TP 8
 .B fpga
 This is a synthesis target that supports a variety of fpga devices,
@@ -343,14 +255,8 @@ after a \fB\-Wall\fP argument to suppress isolated warning types.

 .TP 8
 .B all
-This enables the anachronisms, implicit, macro-replacement, portbind,
-select\-range, timescale, and sensitivity\-entire\-array warning
-categories.
-
-.TP 8
-.B anachronisms
-This enables warnings for use of features that have been deprecated
-or removed in the selected generation of the Verilog language.
+This enables the implicit, portbind, select\-range, timescale, and
+sensitivity\-entire\-array warning categories.

 .TP 8
 .B implicit
@@ -358,13 +264,6 @@ 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 macro-redefinition\fI | \fPmacro-replacement
-This enables preprocessor warnings when a macro is being redefined.
-The first variant prints a warning any time a macro is redefined.
-The second variant only prints a warning if the macro text changes.
-Use \fBno-macro-redefinition\fP to turn off all warnings of this type.
-
 .TP 8
 .B portbind
 This enables warnings for ports of module instantiations that are not
@@ -416,23 +315,13 @@ sensitivity list. Although this behaviour is prescribed by the IEEE
 standard, it is not what might be expected and can have performance
 implications if the array is large.

-.SH "VPI MODULES"
-If the source file name has a \fB.vpi\fP or \fB.vpl\fP suffix, then it
-is taken to be a VPI module. VPI modules supplied by the user are scanned
-to determine the return types of any system functions they provide. This
+.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. The module path/name is
-passed on to the target to allow the VPI module to be automatically loaded
-at the start of simulation.
-
-VPI modules may also be supplied using the \fB-L\fP and \fB-m\fP options.
-
-.SH "SYSTEM FUNCTION TABLE FILES [deprecated]"
-If the source file name has a \fB.sft\fP suffix, then it is taken to be a
-system function table file. A system function table file is the old method
-used to describe to the compiler the return types for system functions.
-Users are encouraged to switch to the new method of simply supplying the
-VPI module.
+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
@@ -453,11 +342,6 @@ The function returns an integer.
 The function returns a vector with the given width, and is signed or
 unsigned according to the flag.

-.TP 8
-.B vpiSysFuncString
-The function returns a string. This is an Icarus-specific extension, not
-available in the VPI standard.
-
 .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
@@ -476,15 +360,6 @@ A \fB\-c\fP or \fB\-f\fP token prefixes a command file, exactly like it
 does on the command line. The cmdfile may be on the same line or the
 next non-comment line.

-.TP 8
-.B -l\ \fIfile\fP -v\ \fIfile\fP
-A \fB\-l\fP token prefixes a library file in the command file,
-exactly like it does on the command line. The parameter to the \fB\-l\fP
-flag may be on the same line or the next non-comment line. \fB\-v\fP is
-an alias for \fB\-l\fP, provided for compatibility with other simulators.
-
-Variables in the \fIfile\fP are substituted.
-
 .TP 8
 .B -y\ \fIlibdir\fP
 A \fB\-y\fP token prefixes a library directory in the command file,
@@ -505,7 +380,7 @@ Variables in the \fIincludedir\fP are substituted.

 .TP 8
 .B +libext+\fIext\fP
-The \fB+libext\fP token in command files lists file extensions to try
+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.
@@ -527,11 +402,6 @@ letters are correct. For example, "foo" matches "Foo.v" but not
 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 +parameter+\fINAME\fP=\fIvalue\fP
-The \fB+parameter+\fP token is the same as the \fB\-P\fP option on the
-command line.
-
 .TP 8
 .B +timescale+\fIvalue\fP
 The \fB+timescale+\fP token is used to set the default timescale for
@@ -556,12 +426,6 @@ This allows the programmer to select the width for integer variables
 in the Verilog source. The default is 32, the value can be any desired
 integer value.

-.TP 8
-.B +width-cap+\fIvalue\fP
-This allows the programmer to select the width cap for unsized expressions.
-If the calculated width for an unsized expression exceeds this value, the
-compiler will issue a warning and limit the expression width to this value.
-
 .SH "VARIABLES IN COMMAND FILES"

 In certain cases, iverilog supports variables in command files. These
@@ -586,24 +450,6 @@ This is always defined when compiling with Icarus Verilog.
 .B __VAMS_ENABLE__ = 1
 This is defined if Verilog\-AMS is enabled.

-.SH ENVIRONMENT
-.PP
-\fIiverilog\fP also accepts some environment variables that control
-its behavior. These can be used to make semi-permanent changes.
-
-.TP 8
-.B IVERILOG_ICONFIG=\fIfile-name\fP
-This sets the name used for the temporary file that passes parameters
-to the compiler proper, and prevents that file being deleted after the
-compiler has exited.
-
-.TP 8
-.B IVERILOG_VPI_MODULE_PATH=\fI/some/path:/some/other/path\fP
-This adds additional components to the VPI module search path. Paths
-specified in this way are searched after paths specified with \fB-L\fP,
-but before the default search path. Multiple paths can be separated with
-colons (semicolons if using Windows).
-
 .SH EXAMPLES
 These examples assume that you have a Verilog source file called hello.v in
 the current directory
@@ -626,14 +472,14 @@ Steve Williams ([email protected])

 .SH SEE ALSO
 vvp(1),
-.BR "<http://iverilog.icarus.com/>"
+.BR "<http://www.icarus.com/eda/verilog/>"

 Tips on using, debugging, and developing the compiler can be found at
 .BR "<http://iverilog.wikia.com/>"

 .SH COPYRIGHT
 .nf
-Copyright \(co  2002\-2020 Stephen Williams
+Copyright \(co  2002\-2010 Stephen Williams

 This document can be freely redistributed according to the terms of the
 GNU General Public License version 2.0
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2020 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2000-2011 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -38,13 +38,12 @@ const char NOTICE[] =
 ;

 const char HELP[] =
-"Usage: iverilog [-EiSuvV] [-B base] [-c cmdfile|-f cmdfile]\n"
-"                [-g1995|-g2001|-g2005|-g2005-sv|-g2009|-g2012] [-g<feature>]\n"
-"                [-D macro[=defn]] [-I includedir] [-L moduledir]\n"
-"                [-M [mode=]depfile] [-m module]\n"
+"Usage: iverilog [-ESvV] [-B base] [-c cmdfile|-f cmdfile]\n"
+"                [-g1995|-g2001|-g2005] [-g<feature>]\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] [-l file] source_file(s)\n"
+"                [-W class] [-y dir] [-Y suf] source_file(s)\n"
 "\n"
 "See the man page for details.";

@@ -63,15 +62,13 @@ const char HELP[] =
 #endif

 #ifdef __MINGW32__
-# include  <windows.h>
-# include  <io.h>
+#include <windows.h>
 #ifdef HAVE_LIBIBERTY_H
-# include  <libiberty.h>
+#include <libiberty.h>
 #endif
 #endif
-#include  <fcntl.h>

-#ifdef HAVE_GETOPT_H
+#if HAVE_GETOPT_H
 #include <getopt.h>
 #endif

@@ -95,44 +92,31 @@ extern const char*optarg;

 # include  "globals.h"
 #include "cfparse_misc.h"   /* cfparse() */
-#include "ivl_alloc.h"

 #ifdef __MINGW32__
 const char sep = '\\';
-const char path_sep = ';';
 #else
 const char sep = '/';
-const char path_sep = ':';
 #endif

 extern void cfreset(FILE*fd, const char*path);

 const char*base = 0;
-const char*vpi_dir = 0;
-const char*ivlpp_dir = 0;
-const char*vhdlpp_dir= 0;
-const char*vhdlpp_work = 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**vhdlpp_libdir = 0;
-unsigned vhdlpp_libdir_cnt = 0;
-
-char depmode = 'a';
-
 const char*generation = "2005";
 const char*gen_specify = "no-specify";
-const char*gen_assertions = "assertions";
 const char*gen_xtypes = "xtypes";
 const char*gen_icarus = "icarus-misc";
 const char*gen_io_range_error = "io-range-error";
 const char*gen_strict_ca_eval = "no-strict-ca-eval";
-const char*gen_strict_expr_width = "no-strict-expr-width";
-const char*gen_shared_loop_index = "shared-loop-index";
 const char*gen_verilog_ams = "no-verilog-ams";
+const char*gen_system_verilog = "no-system-verilog";

 /* Boolean: true means use a default include dir, false means don't */
 int gen_std_include = 1;
@@ -141,17 +125,10 @@ int gen_std_include = 1;
   of the include list. */
 int gen_relative_include = 0;

-char warning_flags[17] = "n";
-
-int separate_compilation_flag = 0;
-
-/* Boolean: true means ignore errors about missing modules */
-int ignore_missing_modules = 0;
+char warning_flags[16] = "";

 unsigned integer_width = 32;

-unsigned width_cap = 65536;
-
 char*mod_list = 0;
 char*command_filename = 0;

@@ -172,12 +149,6 @@ char*compiled_defines_path = 0;

 static char iconfig_common_path[4096] = "";

-static const char**vpi_path_list = 0;
-static unsigned vpi_path_list_size = 0;
-
-static const char**env_vpi_path_list = 0;
-static unsigned env_vpi_path_list_size = 0;
-
 int synth_flag = 0;
 int verbose_flag = 0;

@@ -196,14 +167,8 @@ typedef struct t_command_file {
 p_command_file cmd_file_head = NULL;  /* The FIFO head */
 p_command_file cmd_file_tail = NULL;  /* The FIFO tail */

-/* Temporarily store parameter definition from command line and
- * parse it after we have dealt with command file
- */
-static const char** defparm_base = 0;
-static int defparm_size = 0;
-
 /* Function to add a command file name to the FIFO. */
-static void add_cmd_file(const char* filename)
+void add_cmd_file(const char* filename)
 {
      p_command_file new;

@@ -220,7 +185,7 @@ static void add_cmd_file(const char* filename)
 }

 /* Function to return the top command file name from the FIFO. */
-static char *get_cmd_file(void)
+char *get_cmd_file()
 {
      char *filename;

@@ -237,6 +202,8 @@ static char *get_cmd_file(void)
 }

 #ifdef __MINGW32__
+# include  <io.h>
+# include  <fcntl.h>
 static FILE*fopen_safe(const char*path)
 {
      FILE*file = 0;
@@ -249,6 +216,7 @@ static FILE*fopen_safe(const char*path)
      return file;
 }
 #else
+# include  <fcntl.h>
 static FILE*fopen_safe(const char*path)
 {
      FILE*file = 0;
@@ -327,7 +295,7 @@ static int t_version_only(void)
      free(source_path);

      fflush(0);
-      snprintf(tmp, sizeof tmp, "%s%civlpp -V", ivlpp_dir, sep);
+      snprintf(tmp, sizeof tmp, "%s%civlpp -V", pbase, sep);
      rc = system(tmp);
      if (rc != 0) {
 	    fprintf(stderr, "Unable to get version from \"%s\"\n", tmp);
@@ -355,15 +323,10 @@ static int t_version_only(void)

 static void build_preprocess_command(int e_flag)
 {
-      snprintf(tmp, sizeof tmp, "%s%civlpp %s%s%s -F\"%s\" -f\"%s\" -p\"%s\"%s",
-	       ivlpp_dir, sep,
-               verbose_flag ? " -v" : "",
-	       e_flag ? "" : " -L",
-               strchr(warning_flags, 'r') ? " -Wredef-all " :
-               strchr(warning_flags, 'R') ? " -Wredef-chg " : "",
-               defines_path, source_path,
-	       compiled_defines_path,
-	       e_flag ? "" : " | ");
+      snprintf(tmp, sizeof tmp, "%s%civlpp %s%s -F\"%s\" -f\"%s\" -p\"%s\" ",
+	       pbase, sep, verbose_flag?" -v":"",
+	       e_flag?"":" -L", defines_path, source_path,
+	       compiled_defines_path);
 }

 static int t_preprocess_only(void)
@@ -422,16 +385,12 @@ static int t_preprocess_only(void)
 * 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_compile(void)
+static int t_compile()
 {
      unsigned rc;

-	/* Start by building the preprocess command line, if required.
-	   This pipes into the main ivl command. */
-      if (!separate_compilation_flag)
-	    build_preprocess_command(0);
-      else
-	    strcpy(tmp, "");
+	/* Start by building the preprocess command line. */
+      build_preprocess_command(0);

      size_t ncmd = strlen(tmp);
      char*cmd = malloc(ncmd + 1);
@@ -441,8 +400,8 @@ static int t_compile(void)
      int rtn;
 #endif

-	/* Build the ivl command. */
-      snprintf(tmp, sizeof tmp, "%s%civl", base, sep);
+	/* Build the ivl command and pipe it to the preprocessor. */
+      snprintf(tmp, sizeof tmp, " | %s%civl", base, sep);
      rc = strlen(tmp);
      cmd = realloc(cmd, ncmd+rc+1);
      strcpy(cmd+ncmd, tmp);
@@ -470,16 +429,7 @@ static int t_compile(void)
      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;
-
-      if (separate_compilation_flag)
-	    snprintf(tmp, sizeof tmp, " -F\"%s\"", source_path);
-      else
-	    snprintf(tmp, sizeof tmp, " -- -");
+      snprintf(tmp, sizeof tmp, " -C\"%s\" -- -", iconfig_common_path);
      rc = strlen(tmp);
      cmd = realloc(cmd, ncmd+rc+1);
      strcpy(cmd+ncmd, tmp);
@@ -527,32 +477,14 @@ static int t_compile(void)
 static void process_warning_switch(const char*name)
 {
      if (strcmp(name,"all") == 0) {
-	    process_warning_switch("anachronisms");
 	    process_warning_switch("implicit");
-	    process_warning_switch("implicit-dimensions");
-	    process_warning_switch("macro-replacement");
 	    process_warning_switch("portbind");
 	    process_warning_switch("select-range");
 	    process_warning_switch("timescale");
 	    process_warning_switch("sensitivity-entire-array");
-      } else if (strcmp(name,"anachronisms") == 0) {
-	    if (! strchr(warning_flags, 'n'))
-		  strcat(warning_flags, "n");
-      } else if (strcmp(name,"floating-nets") == 0) {
-	    if (! strchr(warning_flags, 'f'))
-		  strcat(warning_flags, "f");
      } else if (strcmp(name,"implicit") == 0) {
 	    if (! strchr(warning_flags, 'i'))
 		  strcat(warning_flags, "i");
-      } else if (strcmp(name,"implicit-dimensions") == 0) {
-	    if (! strchr(warning_flags, 'd'))
-		  strcat(warning_flags, "d");
-      } else if (strcmp(name,"macro-redefinition") == 0) {
-	  if (! strchr(warning_flags, 'r'))
-		  strcat(warning_flags, "r");
-      } else if (strcmp(name,"macro-replacement") == 0) {
-	  if (! strchr(warning_flags, 'R'))
-		  strcat(warning_flags, "R");
      } else if (strcmp(name,"portbind") == 0) {
 	    if (! strchr(warning_flags, 'p'))
 		  strcat(warning_flags, "p");
@@ -573,41 +505,12 @@ static void process_warning_switch(const char*name)
      } else if (strcmp(name,"sensitivity-entire-array") == 0) {
 	    if (! strchr(warning_flags, 'a'))
 		  strcat(warning_flags, "a");
-      } else if (strcmp(name,"no-anachronisms") == 0) {
-	    char*cp = strchr(warning_flags, 'n');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
-      } else if (strcmp(name,"no-floating-nets") == 0) {
-	    char*cp = strchr(warning_flags, 'f');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
      } else if (strcmp(name,"no-implicit") == 0) {
 	    char*cp = strchr(warning_flags, 'i');
 	    if (cp) while (*cp) {
 		  cp[0] = cp[1];
 		  cp += 1;
 	    }
-      } else if (strcmp(name,"no-implicit-dimensions") == 0) {
-	    char*cp = strchr(warning_flags, 'd');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
-      } else if (strcmp(name,"no-macro-redefinition") == 0) {
-	    char*cp = strchr(warning_flags, 'r');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
-	    cp = strchr(warning_flags, 'R');
-	    if (cp) while (*cp) {
-		  cp[0] = cp[1];
-		  cp += 1;
-	    }
      } else if (strcmp(name,"no-portbind") == 0) {
 	    char*cp = strchr(warning_flags, 'p');
 	    if (cp) while (*cp) {
@@ -638,9 +541,6 @@ static void process_warning_switch(const char*name)
 		  cp[0] = cp[1];
 		  cp += 1;
 	    }
-      } else {
-	    fprintf(stderr, "Ignoring unknown warning class "
-		    "%s\n", name);
      }
 }

@@ -669,11 +569,6 @@ void process_define(const char*name)
      fprintf(defines_file,"D:%s\n", name);
 }

-void process_parameter(const char*name)
-{
-      fprintf(iconfig_file,"defparam:%s\n", name);
-}
-
 void process_timescale(const char*ts_string)
 {
      fprintf(iconfig_file, "timescale:%s\n", ts_string);
@@ -682,19 +577,14 @@ void process_timescale(const char*ts_string)
 /*
 * 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 or .vpi suffix, and if so pass that as a sys_func or module
- * file. Otherwise, it is a Verilog source file to be written into the
- * file list.
+ * .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, int lib_flag)
 {
      if (strlen(name) > 4 && strcasecmp(".sft", name+strlen(name)-4) == 0) {
-	    fprintf(stderr, "SFT files are deprecated. Please pass the VPI module instead.\n");
 	    fprintf(iconfig_file,"sys_func:%s\n", name);

-      } else if (strlen(name) > 4 && strcasecmp(".vpi", name+strlen(name)-4) == 0) {
-	    fprintf(iconfig_file,"module:%s\n", name);
-
      } else {
 	    fprintf(source_file, "%s\n", name);
 	    source_count += 1;
@@ -703,7 +593,7 @@ void process_file_name(const char*name, int lib_flag)
      }
 }

-static int process_generation(const char*name)
+int process_generation(const char*name)
 {
      if (strcmp(name,"1995") == 0)
 	    generation = "1995";
@@ -717,15 +607,6 @@ static int process_generation(const char*name)
      else if (strcmp(name,"2005") == 0)
 	    generation = "2005";

-      else if (strcmp(name,"2005-sv") == 0)
-	    generation = "2005-sv";
-
-      else if (strcmp(name,"2009") == 0)
-	    generation = "2009";
-
-      else if (strcmp(name,"2012") == 0)
-	    generation = "2012";
-
      else if (strcmp(name,"1") == 0) { /* Deprecated: use 1995 */
 	    generation = "1995";
 	    gen_xtypes = "no-xtypes";
@@ -759,15 +640,6 @@ static int process_generation(const char*name)
      else if (strcmp(name,"no-specify") == 0)
 	    gen_specify = "no-specify";

-      else if (strcmp(name,"assertions") == 0)
-	    gen_assertions = "assertions";
-
-      else if (strcmp(name,"supported-assertions") == 0)
-	    gen_assertions = "supported-assertions";
-
-      else if (strcmp(name,"no-assertions") == 0)
-	    gen_assertions = "no-assertions";
-
      else if (strcmp(name,"std-include") == 0)
 	     gen_std_include = 1;

@@ -792,36 +664,23 @@ static int process_generation(const char*name)
      else if (strcmp(name,"no-strict-ca-eval") == 0)
 	    gen_strict_ca_eval = "no-strict-ca-eval";

-      else if (strcmp(name,"strict-expr-width") == 0)
-	    gen_strict_expr_width = "strict-expr-width";
-
-      else if (strcmp(name,"no-strict-expr-width") == 0)
-	    gen_strict_expr_width = "no-strict-expr-width";
-
-      else if (strcmp(name,"shared-loop-index") == 0)
-	    gen_shared_loop_index = "shared-loop-index";
-
-      else if (strcmp(name,"no-shared-loop-index") == 0)
-	    gen_shared_loop_index = "no-shared-loop-index";
-
      else if (strcmp(name,"verilog-ams") == 0)
 	    gen_verilog_ams = "verilog-ams";

      else if (strcmp(name,"no-verilog-ams") == 0)
 	    gen_verilog_ams = "no-verilog-ams";

+      else if (strcmp(name,"system-verilog") == 0)
+	    gen_system_verilog = "system-verilog";
+
      else {
 	    fprintf(stderr, "Unknown/Unsupported Language generation "
 		    "%s\n\n", name);
 	    fprintf(stderr, "Supported generations are:\n");
-	    fprintf(stderr, "    1995    -- IEEE1364-1995\n"
-		            "    2001    -- IEEE1364-2001\n"
-		            "    2005    -- IEEE1364-2005\n"
-		            "    2005-sv -- IEEE1800-2005\n"
-		            "    2009    -- IEEE1800-2009\n"
-		            "    2012    -- IEEE1800-2012\n"
+	    fprintf(stderr, "    1995 -- IEEE1364-1995\n"
+		            "    2001 -- IEEE1364-2001\n"
+		            "    2005 -- IEEE1364-2005\n"
 		            "Other generation flags:\n"
-		            "    assertions | supported-assertions | no-assertions\n"
 		            "    specify | no-specify\n"
 		            "    verilog-ams | no-verilog-ams\n"
 		            "    std-include | no-std-include\n"
@@ -830,269 +689,78 @@ static int process_generation(const char*name)
 		            "    icarus-misc | no-icarus-misc\n"
 		            "    io-range-error | no-io-range-error\n"
 		            "    strict-ca-eval | no-strict-ca-eval\n"
-		            "    strict-expr-width | no-strict-expr-width\n"
-		            "    shared-loop-index | no-shared-loop-index\n");
-
+					"    system-verilog\n");
 	    return 1;
      }

      return 0;
 }

-static int process_depfile(const char*name)
-{
-      const char*cp = strchr(name, '=');
-      if (cp) {
-            int match_length = (int)(cp - name) + 1;
-            if (strncmp(name, "all=", match_length) == 0) {
-                  depmode = 'a';
-            } else if (strncmp(name, "include=", match_length) == 0) {
-                  depmode = 'i';
-            } else if (strncmp(name, "module=", match_length) == 0) {
-                  depmode = 'm';
-            } else if (strncmp(name, "prefix=", match_length) == 0) {
-                  depmode = 'p';
-            } else {
-                  fprintf(stderr, "Unknown dependency file mode '%.*s'\n\n",
-                          match_length - 1, name);
-                  fprintf(stderr, "Supported modes are:\n");
-                  fprintf(stderr, "    all\n");
-                  fprintf(stderr, "    include\n");
-                  fprintf(stderr, "    module\n");
-                  fprintf(stderr, "    prefix\n");
-                  return -1;
-	    }
-            depfile = cp + 1;
-      } else {
-            depmode = 'a';
-            depfile = name;
-      }
-      return 0;
-}
-
-static void add_env_vpi_module_path(const char*path)
-{
-      env_vpi_path_list_size += 1;
-      env_vpi_path_list = (const char**)realloc(env_vpi_path_list,
-					  env_vpi_path_list_size*sizeof(char*));
-      env_vpi_path_list[env_vpi_path_list_size-1] = path;
-}
-
-static void get_env_vpi_module_paths(void)
-{
-      char *var = getenv("IVERILOG_VPI_MODULE_PATH");
-      char *ptr, *end;
-
-      if (!var)
-	    return;
-
-      var = strdup(var);
-#ifdef __MINGW32__
-      convert_to_MS_path(var);
-#endif
-      ptr = var;
-      end = var+strlen(var);
-      int len = 0;
-      while (ptr <= end) {
-	    if (*ptr == 0 || *ptr == path_sep) {
-		  *ptr = 0;
-		  if (len > 0) {
-		       add_env_vpi_module_path(var);
-		  }
-		  len = 0;
-		  var = ptr+1;
-	    } else {
-		  len++;
-	    }
-	    ptr++;
-      }
-}
-
-static void add_vpi_module_path(const char*path)
-{
-#ifdef __MINGW32__
-      char*tmp_path = strdup(path);
-      convert_to_MS_path(tmp_path);
-      path = tmp_path;
-#endif
-      vpi_path_list_size += 1;
-      vpi_path_list = (const char**)realloc(vpi_path_list,
-				      vpi_path_list_size*sizeof(char*));
-      vpi_path_list[vpi_path_list_size-1] = path;
-}
-
-static int probe_for_vpi_module(const char*base_path, const char*name,
-				char*path, unsigned path_size)
-{
-      snprintf(path, path_size, "%s%c%s.vpi", base_path, sep, name);
-      if (access(path, R_OK) == 0)
-	    return 1;
-
-      snprintf(path, path_size, "%s%c%s.vpl", base_path, sep, name);
-      if (access(path, R_OK) == 0)
-	    return 1;
-
-      return 0;
-}
-
 /*
- * If it exists add the VPI file for the given module.
+ * If it exists add the SFT file for the given module.
 */
-static void add_vpi_file(const char *name)
+void add_sft_file(const char *module)
 {
-      const char*base_dir = vpi_dir ? vpi_dir : base;
+      char *file;

-      char path[4096];
-
-#ifdef __MINGW32__
-      char*tmp_name = strdup(name);
-      convert_to_MS_path(tmp_name);
-      name = tmp_name;
-#endif
-
-      int found = 0;
-      if (strchr(name, sep)) {
-	      /* If the name has at least one directory character in it
-		 then assume it is a complete name, maybe including any
-		 possible .vpi or .vpl suffix. */
-	    found = access(name, R_OK) == 0;
-	    if (!found) {
-		  snprintf(path, sizeof(path), "%s.vpi", name);
-		  found = access(path, R_OK) == 0;
-		  if (!found) {
-			snprintf(path, sizeof(path), "%s.vpl", name);
-			found = access(path, R_OK) == 0;
-		  }
-	    } else {
-		  strncpy(path, name, sizeof(path) - 1);
-	    }
-      } else {
-	    for (unsigned idx = 0; !found && (idx < vpi_path_list_size); idx += 1) {
-		  found = probe_for_vpi_module(vpi_path_list[idx], name,
-					       path, sizeof(path));
-	    }
-	    for (unsigned idx = 0; !found && (idx < env_vpi_path_list_size); idx += 1) {
-		  found = probe_for_vpi_module(env_vpi_path_list[idx], name,
-					       path, sizeof(path));
-	    }
-	    if (!found) {
-		  found = probe_for_vpi_module(base_dir, name,
-					       path, sizeof(path));
-	    }
-      }
-      if (found) {
-	    fprintf(iconfig_file, "module:%s\n", path);
-      } else {
-	    fprintf(stderr, "Unable to find VPI module '%s'\n", name);
-      }
-#ifdef __MINGW32__
-      free(tmp_name);
-#endif
-}
-
-static void find_ivl_root_failed(const char *reason)
-{
-      fprintf(stderr, "Cannot locate IVL modules : %s\n", reason);
-      exit(1);
-}
-
-static void find_ivl_root(void)
-{
-#ifdef __MINGW32__
-      const char *ivl_lib_prefix = "\\lib";
-      const char *ivl_lib_suffix = "\\ivl" IVL_SUFFIX;
-#else
-      const char *ivl_lib_prefix = IVL_LIB;
-      const char *ivl_lib_suffix = "/ivl" IVL_SUFFIX;
-#endif
-      ssize_t len = 0;
-      char *s;
-
-#ifndef __MINGW32__
-	/* First try the location specified in the build process. */
-      if (access(IVL_ROOT, F_OK) != -1) {
-	    assert(strlen(IVL_ROOT) < sizeof ivl_root);
-	    strcpy(ivl_root, IVL_ROOT);
-	    return;
-      }
-#endif
-	/* If that fails, calculate the ivl_root from the path to the
-	   command. This is always necessary on Windows because of the
-	   installation process, but may also be necessary on other OSs
-	   if the package has been relocated.
-
-	   On Windows we know the command path is formed like this:
-
-		$(prefix)\bin\iverilog.exe
-
-	   The module path in a Windows installation is the path:
-
-		$(prefix)\lib\ivl$(suffix)
-
-	   so we chop the file name and the last directory by
-	   turning the last two \ characters to null. Then we append
-	   the lib\ivl$(suffix) to finish.
-
-	   On other OSs, we expect the command path to be:
-
-		$(prefix)/bin/iverilog
-
-	   and the module path to be:
-
-		$(prefix)/$(lib)/ivl$(suffix)
-
-	   so we extract the $(prefix) from the command location as for
-	   Windows and the $(lib) from IVL_LIB. This will of course fail
-	   if the user has overridden $(bindir) or $(libdir), but there's
-	   not a lot we can do in that case.
- */
-#ifdef __MINGW32__
-      char tmppath[MAXSIZE];
-      len = GetModuleFileName(NULL, tmppath, sizeof tmppath);
-      if (len >= (ssize_t) sizeof ivl_root) {
-	    find_ivl_root_failed("command path exceeds size of string buffer.");
-      }
-	/* Convert to a short name to remove any embedded spaces. */
-      len = GetShortPathName(tmppath, ivl_root, sizeof ivl_root);
-#else
-      len = readlink("/proc/self/exe", ivl_root, sizeof ivl_root);
-#endif
-      if (len >= (ssize_t) sizeof ivl_root) {
-	    find_ivl_root_failed("command path exceeds size of string buffer.");
-      }
-      if (len <= 0) {
-	    find_ivl_root_failed("couldn't get command path from OS.");
-      }
-      s = strrchr(ivl_root, sep);
-      if (s == 0) {
-	    find_ivl_root_failed("missing first separator in command path.");
-      }
-      *s = 0;
-      s = strrchr(ivl_root, sep);
-      if (s == 0) {
-	    find_ivl_root_failed("missing second separator in command path.");
-      }
-      *s = 0;
-      len = s - ivl_root;
-      s = strrchr(ivl_lib_prefix, sep);
-      assert(s);
-      if (len + strlen(s) + strlen(ivl_lib_suffix) >= (ssize_t) sizeof ivl_root) {
-	    find_ivl_root_failed("module path exceeds size of string buffer.");
-      }
-      strcat(ivl_root, s);
-      strcat(ivl_root, ivl_lib_suffix);
+      file = (char *) malloc(strlen(base)+1+strlen(module)+4+1);
+      sprintf(file, "%s%c%s.sft", base, sep, module);
+      if (access(file, R_OK) == 0)
+            fprintf(iconfig_file, "sys_func:%s\n", file);
+      free(file);
 }

 int main(int argc, char **argv)
 {
      int e_flag = 0;
      int version_flag = 0;
-      int opt;
+      int opt, idx;
+
+#ifdef __MINGW32__
+	/* Calculate the ivl_root from the path to the command. This
+	   is necessary because of the installation process on
+	   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 module path in a Windows installation is the path:
+
+		D:\iverilog\lib\ivl$(suffix)
+
+	   so we chop the file name and the last directory by
+	   turning the last two \ characters to null. Then we append
+	   the lib\ivl$(suffix) to finish. */
+      char *s;
+      char tmppath[MAXSIZE];
+      GetModuleFileName(NULL, tmppath, sizeof tmppath);
+	/* Convert to a short name to remove any embedded spaces. */
+      GetShortPathName(tmppath, ivl_root, sizeof ivl_root);
+      s = strrchr(ivl_root, sep);
+      if (s) *s = 0;
+      else {
+	    fprintf(stderr, "%s: Missing first %c in exe path!\n",
+	                    argv[0], sep);
+	    exit(1);
+      }
+      s = strrchr(ivl_root, sep);
+      if (s) *s = 0;
+      else {
+	    fprintf(stderr, "%s: Missing second %c in exe path!\n",
+	                    argv[0], sep);
+	    exit(1);
+      }
+      strcat(ivl_root, "\\lib\\ivl" IVL_SUFFIX);

-      find_ivl_root();
      base = ivl_root;

-      get_env_vpi_module_paths();
+#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. */
@@ -1154,27 +822,18 @@ int main(int argc, char **argv)
 	}
      }

-      while ((opt = getopt(argc, argv, "B:c:D:d:Ef:g:hl:I:iL:M:m:N:o:P:p:Ss:T:t:uvVW:y:Y:")) != EOF) {
+      while ((opt = getopt(argc, argv, "B:c:D:d:Ef:g:hI:M:m:N::o:p:Ss:T:t:vVW:y:Y:")) != EOF) {

 	    switch (opt) {
 		case 'B':
-		    /* The individual components can be located by a
-		       single base, or by individual bases. The first
-		       character of the path indicates which path the
-		       user is specifying. */
-		  switch (optarg[0]) {
-		      case 'M': /* Path for the VPI modules */
-			vpi_dir = optarg+1;
-			break;
-		      case 'P': /* Path for the ivlpp preprocessor */
-			ivlpp_dir = optarg+1;
-			break;
-		      case 'V': /* Path for the vhdlpp VHDL processor */
-			vhdlpp_dir = optarg+1;
-			break;
-		      default: /* Otherwise, this is a default base. */
+		    /* 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;
 		  }
 		  break;
 		case 'c':
@@ -1187,12 +846,6 @@ int main(int argc, char **argv)
 		case 'E':
 		  e_flag = 1;
 		  break;
-		case 'P':
-		  defparm_size += 1;
-		  defparm_base = (const char**)realloc(defparm_base,
-		                                   defparm_size*sizeof(char*));
-		  defparm_base[defparm_size-1] = optarg;
-		  break;
 		case 'p':
 		  fprintf(iconfig_file, "flag:%s\n", optarg);
 		  break;
@@ -1212,25 +865,13 @@ int main(int argc, char **argv)
 		  process_include_dir(optarg);
 		  break;

-		case 'i':
-		  ignore_missing_modules = 1;
-		  break;
-
-		case 'L':
-		  add_vpi_module_path(optarg);
-		  break;
-
-		case 'l':
-		  process_file_name(optarg, 1);
-		  break;
-
 		case 'M':
-		  if (process_depfile(optarg) != 0)
-                        return -1;
+		  depfile = optarg;
 		  break;

 		case 'm':
-		  add_vpi_file(optarg);
+		  fprintf(iconfig_file, "module:%s\n", optarg);
+		  add_sft_file(optarg);
 		  break;

 		case 'N':
@@ -1263,9 +904,6 @@ int main(int argc, char **argv)
 		case 't':
 		  targ = optarg;
 		  break;
-		case 'u':
-		  separate_compilation_flag = 1;
-		  break;
 		case 'v':
 		  verbose_flag = 1;
 		  break;
@@ -1301,19 +939,24 @@ int main(int argc, char **argv)
 	    }
      }

-      if (vpi_dir == 0)
-	    vpi_dir = base;
-      if (ivlpp_dir == 0)
-	    ivlpp_dir = base;
-      if (vhdlpp_dir == 0)
-	    vhdlpp_dir = base;
+      if (pbase == 0)
+	    pbase = base;

      if (version_flag || verbose_flag) {
 	    printf("Icarus Verilog version " VERSION " (" VERSION_TAG ")\n\n");
-	    printf("Copyright 1998-2020 Stephen Williams\n\n");
+	    printf("Copyright 1998-2010 Stephen Williams\n\n");
 	    puts(NOTICE);
      }

+      if (synth_flag) {
+	    fprintf(stderr, "Warning: Synthesis is not currently being "
+	                    "maintained and may not\n");
+	    fprintf(stderr, "         function correctly. V0.8 was the "
+	                    "last release branch to\n");
+	    fprintf(stderr, "         have active synthesis development "
+	                    "and support!\n");
+      }
+
 	/* Make a common conf file path to reflect the target. */
      snprintf(iconfig_common_path, sizeof iconfig_common_path, "%s%c%s%s.conf",
 	      base, sep, targ, synth_flag? "-s" : "");
@@ -1321,52 +964,39 @@ int main(int argc, char **argv)
 	/* Write values to the iconfig file. */
      fprintf(iconfig_file, "basedir:%s\n", base);

-	/* Tell the core where to find the system VPI modules. */
-      fprintf(iconfig_file, "module:%s%csystem.vpi\n", vpi_dir, sep);
-      fprintf(iconfig_file, "module:%s%cvhdl_sys.vpi\n", vpi_dir, sep);
-      fprintf(iconfig_file, "module:%s%cvhdl_textio.vpi\n", vpi_dir, sep);
+	/* 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 verilog-2005/09/12 is enabled or icarus-misc or verilog-ams,
+	/* If verilog-2005 is enabled or icarus-misc or verilog-ams,
 	 * then include the v2005_math library. */
      if (strcmp(generation, "2005") == 0 ||
-          strcmp(generation, "2009") == 0 ||
-          strcmp(generation, "2012") == 0 ||
          strcmp(gen_icarus, "icarus-misc") == 0 ||
          strcmp(gen_verilog_ams, "verilog-ams") == 0) {
-	    fprintf(iconfig_file, "module:%s%cv2005_math.vpi\n", vpi_dir, sep);
+	    fprintf(iconfig_file, "sys_func:%s%cv2005_math.sft\n", base, sep);
+	    fprintf(iconfig_file, "module:v2005_math\n");
      }
 	/* If verilog-ams or icarus_misc is enabled, then include the
 	 * va_math module as well. */
      if (strcmp(gen_verilog_ams,"verilog-ams") == 0 ||
          strcmp(gen_icarus, "icarus-misc") == 0) {
-	    fprintf(iconfig_file, "module:%s%cva_math.vpi\n", vpi_dir, sep);
-      }
-      /* If verilog-2009 (SystemVerilog) is enabled, then include the
-         v2009 module. */
-      if (strcmp(generation, "2005-sv") == 0 ||
-          strcmp(generation, "2009") == 0 ||
-          strcmp(generation, "2012") == 0) {
-	    fprintf(iconfig_file, "module:%s%cv2009.vpi\n", vpi_dir, sep);
+	    fprintf(iconfig_file, "sys_func:%s%cva_math.sft\n", base, sep);
+	    fprintf(iconfig_file, "module:va_math\n");
      }

      if (mtm != 0) fprintf(iconfig_file, "-T:%s\n", mtm);
      fprintf(iconfig_file, "generation:%s\n", generation);
      fprintf(iconfig_file, "generation:%s\n", gen_specify);
-      fprintf(iconfig_file, "generation:%s\n", gen_assertions);
      fprintf(iconfig_file, "generation:%s\n", gen_xtypes);
      fprintf(iconfig_file, "generation:%s\n", gen_io_range_error);
      fprintf(iconfig_file, "generation:%s\n", gen_strict_ca_eval);
-      fprintf(iconfig_file, "generation:%s\n", gen_strict_expr_width);
-      fprintf(iconfig_file, "generation:%s\n", gen_shared_loop_index);
      fprintf(iconfig_file, "generation:%s\n", gen_verilog_ams);
      fprintf(iconfig_file, "generation:%s\n", gen_icarus);
+      fprintf(iconfig_file, "generation:%s\n", gen_system_verilog);
      fprintf(iconfig_file, "warnings:%s\n", warning_flags);
-      fprintf(iconfig_file, "ignore_missing_modules:%s\n", ignore_missing_modules ? "true" : "false");
      fprintf(iconfig_file, "out:%s\n", opath);
-      if (depfile) {
-            fprintf(iconfig_file, "depfile:%s\n", depfile);
-            fprintf(iconfig_file, "depmode:%c\n", depmode);
-      }
+      if (depfile) fprintf(iconfig_file, "depfile:%s\n", depfile);

      while ( (command_filename = get_cmd_file()) ) {
 	    int rc;
@@ -1390,28 +1020,12 @@ int main(int argc, char **argv)
      destroy_lexor();

      if (depfile) {
-	    fprintf(defines_file, "M%c:%s\n", depmode, depfile);
+	    fprintf(defines_file, "M:%s\n", depfile);
      }

-      if (vhdlpp_work == 0)
-	    vhdlpp_work = "ivl_vhdl_work";
-      fprintf(defines_file, "vhdlpp:%s%cvhdlpp\n", vhdlpp_dir, sep);
-      fprintf(defines_file, "vhdlpp-work:%s\n", vhdlpp_work);
-      for (unsigned idx = 0 ; idx < vhdlpp_libdir_cnt ; idx += 1)
-	    fprintf(defines_file, "vhdlpp-libdir:%s\n", vhdlpp_libdir[idx]);
-
-    /* Process parameter definition from command line. The last
-       defined would override previous ones. */
-      int pitr;
-      for (pitr = 0; pitr < defparm_size; pitr++)
-        process_parameter(defparm_base[pitr]);
-      free(defparm_base);
-      defparm_base = 0;
-      defparm_size = 0;
-
 	/* Finally, process all the remaining words on the command
 	   line as file names. */
-      for (int idx = optind ;  idx < argc ;  idx += 1)
+      for (idx = optind ;  idx < argc ;  idx += 1)
 	    process_file_name(argv[idx], 0);

 	/* If the use of a default include directory is not
@@ -1438,12 +1052,8 @@ int main(int argc, char **argv)
 	   will append to the file, so this is necessary to make sure
 	   it starts out empty. */
      if (depfile) {
-            FILE *fd = fopen(depfile, "w");
-            if (!fd) {
-                  fprintf(stderr, "%s: can't open %s file.\n\n%s\n", argv[0], depfile, HELP);
-                  return 1;
-            }
-            fclose(fd);
+	    FILE*fd = fopen(depfile, "w");
+	    fclose(fd);
      }

      if (source_count == 0 && !version_flag) {
@@ -1453,17 +1063,11 @@ int main(int argc, char **argv)

      fprintf(iconfig_file, "iwidth:%u\n", integer_width);

-      fprintf(iconfig_file, "widthcap:%u\n", width_cap);
-
 	/* Write the preprocessor command needed to preprocess a
 	   single file. This may be used to preprocess library
 	   files. */
-      fprintf(iconfig_file, "ivlpp:%s%civlpp %s -L -F\"%s\" -P\"%s\"\n",
-	      ivlpp_dir, sep,
-              strchr(warning_flags, 'r') ? "-Wredef-all" :
-              strchr(warning_flags, 'R') ? "-Wredef-chg" : "",
-              defines_path, compiled_defines_path
-      );
+      fprintf(iconfig_file, "ivlpp:%s%civlpp -L -F\"%s\" -P\"%s\"\n",
+	      pbase, sep, defines_path, compiled_defines_path);

 	/* Done writing to the iconfig file. Close it now. */
      fclose(iconfig_file);
@@ -14,14 +14,12 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  <string.h>
 # include  <stdlib.h>
 # include  <stdio.h>
-# include  "ivl_alloc.h"
-# include  "globals.h"


 char* substitutions(const char*str)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2019 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2010 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -32,122 +32,19 @@ NetEAccess* NetEAccess::dup_expr() const
      return tmp;
 }

-NetEArrayPattern*NetEArrayPattern::dup_expr() const
-{
-      vector<NetExpr*>tmp (items_.size());
-      for (size_t idx = 0 ; idx < tmp.size() ; idx += 1)
-	    tmp[idx] = items_[idx]->dup_expr();
-
-      NetEArrayPattern*res = new NetEArrayPattern(net_type(), tmp);
-      res->set_line(*this);
-      return res;
-}
-
-NetEBinary* NetEBinary::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetEBAdd* NetEBAdd::dup_expr() const
-{
-      NetEBAdd*tmp = new NetEBAdd(op_, left_->dup_expr(), right_->dup_expr(),
-                                  expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBBits* NetEBBits::dup_expr() const
-{
-      NetEBBits*tmp = new NetEBBits(op_, left_->dup_expr(), right_->dup_expr(),
-                                    expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
 NetEBComp* NetEBComp::dup_expr() const
 {
-      NetEBComp*tmp = new NetEBComp(op_, left_->dup_expr(), right_->dup_expr());
-      ivl_assert(*this, tmp);
+      NetEBComp*tmp = new NetEBComp(op_, left_->dup_expr(),
+				    right_->dup_expr());
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }

-NetEBDiv* NetEBDiv::dup_expr() const
-{
-      NetEBDiv*tmp = new NetEBDiv(op_, left_->dup_expr(), right_->dup_expr(),
-                                  expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBLogic* NetEBLogic::dup_expr() const
-{
-      NetEBLogic*tmp = new NetEBLogic(op_, left_->dup_expr(), right_->dup_expr());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBMult* NetEBMult::dup_expr() const
-{
-      NetEBMult*tmp = new NetEBMult(op_, left_->dup_expr(), right_->dup_expr(),
-                                    expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBPow* NetEBPow::dup_expr() const
-{
-      NetEBPow*tmp = new NetEBPow(op_, left_->dup_expr(), right_->dup_expr(),
-                                  expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEBShift* NetEBShift::dup_expr() const
-{
-      NetEBShift*tmp = new NetEBShift(op_, left_->dup_expr(), right_->dup_expr(),
-                                      expr_width(), has_sign());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEConcat* NetEConcat::dup_expr() const
-{
-      NetEConcat*dup = new NetEConcat(parms_.size(), repeat_, expr_type_);
-      ivl_assert(*this, dup);
-      dup->set_line(*this);
-      for (unsigned idx = 0 ;  idx < parms_.size() ;  idx += 1)
-	    if (parms_[idx]) {
-		  NetExpr*tmp = parms_[idx]->dup_expr();
-                  ivl_assert(*this, tmp);
-		  dup->parms_[idx] = tmp;
-	    }
-
-      dup->expr_width(expr_width());
-
-      return dup;
-}
-
 NetEConst* NetEConst::dup_expr() const
 {
      NetEConst*tmp = new NetEConst(value_);
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetEConstEnum* NetEConstEnum::dup_expr() const
-{
-      NetEConstEnum*tmp = new NetEConstEnum(scope_, name_, enum_set_, value());
-      ivl_assert(*this, tmp);
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -155,15 +52,7 @@ NetEConstEnum* NetEConstEnum::dup_expr() const
 NetEConstParam* NetEConstParam::dup_expr() const
 {
      NetEConstParam*tmp = new NetEConstParam(scope_, name_, value());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetECReal* NetECReal::dup_expr() const
-{
-      NetECReal*tmp = new NetECReal(value_);
-      ivl_assert(*this, tmp);
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -171,52 +60,20 @@ NetECReal* NetECReal::dup_expr() const
 NetECRealParam* NetECRealParam::dup_expr() const
 {
      NetECRealParam*tmp = new NetECRealParam(scope_, name_, value());
-      ivl_assert(*this, tmp);
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }

 NetEEvent* NetEEvent::dup_expr() const
 {
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetELast* NetELast::dup_expr() const
-{
-      NetELast*tmp = new NetELast(sig_);
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetENetenum* NetENetenum::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetENew* NetENew::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetENull* NetENull::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
-NetEProperty* NetEProperty::dup_expr() const
-{
-      ivl_assert(*this, 0);
+      assert(0);
      return 0;
 }

 NetEScope* NetEScope::dup_expr() const
 {
-      ivl_assert(*this, 0);
+      assert(0);
      return 0;
 }

@@ -224,21 +81,20 @@ NetESelect* NetESelect::dup_expr() const
 {
      NetESelect*tmp = new NetESelect(expr_->dup_expr(),
 			              base_? base_->dup_expr() : 0,
-			              expr_width(), sel_type_);
-      ivl_assert(*this, tmp);
-      tmp->cast_signed(has_sign());
+			              expr_width());
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }

 NetESFunc* NetESFunc::dup_expr() const
 {
-      NetESFunc*tmp = new NetESFunc(name_, type_, expr_width(), nparms(), is_overridden_);
-      ivl_assert(*this, tmp);
+      NetESFunc*tmp = new NetESFunc(name_, type_, expr_width(), nparms());
+      assert(tmp);

      tmp->cast_signed(has_sign());
      for (unsigned idx = 0 ;  idx < nparms() ;  idx += 1) {
-	    ivl_assert(*this, parm(idx));
+	    assert(parm(idx));
 	    tmp->parm(idx, parm(idx)->dup_expr());
      }

@@ -246,18 +102,11 @@ NetESFunc* NetESFunc::dup_expr() const
      return tmp;
 }

-NetEShallowCopy* NetEShallowCopy::dup_expr() const
-{
-      ivl_assert(*this, 0);
-      return 0;
-}
-
 NetESignal* NetESignal::dup_expr() const
 {
      NetESignal*tmp = new NetESignal(net_, word_);
-      ivl_assert(*this, tmp);
+      assert(tmp);
      tmp->expr_width(expr_width());
-      tmp->cast_signed(has_sign());
      tmp->set_line(*this);
      return tmp;
 }
@@ -266,10 +115,8 @@ NetETernary* NetETernary::dup_expr() const
 {
      NetETernary*tmp = new NetETernary(cond_->dup_expr(),
 					true_val_->dup_expr(),
-					false_val_->dup_expr(),
-                                        expr_width(),
-                                        has_sign());
-      ivl_assert(*this, tmp);
+					false_val_->dup_expr());
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -277,33 +124,32 @@ NetETernary* NetETernary::dup_expr() const
 NetEUFunc* NetEUFunc::dup_expr() const
 {
      NetEUFunc*tmp;
-      vector<NetExpr*> tmp_parms (parms_.size());
+      svector<NetExpr*> tmp_parms (parms_.count());

-      for (unsigned idx = 0 ;  idx < tmp_parms.size() ;  idx += 1) {
-	    ivl_assert(*this, parms_[idx]);
+      for (unsigned idx = 0 ;  idx < tmp_parms.count() ;  idx += 1) {
+	    assert(parms_[idx]);
 	    tmp_parms[idx] = parms_[idx]->dup_expr();
      }

-      tmp = new NetEUFunc(scope_, func_, result_sig_->dup_expr(), tmp_parms,
-                          need_const_);
+      tmp = new NetEUFunc(scope_, func_, result_sig_->dup_expr(), tmp_parms);

-      ivl_assert(*this, tmp);
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }

 NetEUBits* NetEUBits::dup_expr() const
 {
-      NetEUBits*tmp = new NetEUBits(op_, expr_->dup_expr(), expr_width(), has_sign());
-      ivl_assert(*this, tmp);
+      NetEUBits*tmp = new NetEUBits(op_, expr_->dup_expr());
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }

 NetEUnary* NetEUnary::dup_expr() const
 {
-      NetEUnary*tmp = new NetEUnary(op_, expr_->dup_expr(), expr_width(), has_sign());
-      ivl_assert(*this, tmp);
+      NetEUnary*tmp = new NetEUnary(op_, expr_->dup_expr());
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -311,15 +157,7 @@ NetEUnary* NetEUnary::dup_expr() const
 NetEUReduce* NetEUReduce::dup_expr() const
 {
      NetEUReduce*tmp = new NetEUReduce(op_, expr_->dup_expr());
-      ivl_assert(*this, tmp);
-      tmp->set_line(*this);
-      return tmp;
-}
-
-NetECast* NetECast::dup_expr() const
-{
-      NetECast*tmp = new NetECast(op_, expr_->dup_expr(), expr_width(), has_sign());
-      ivl_assert(*this, tmp);
+      assert(tmp);
      tmp->set_line(*this);
      return tmp;
 }
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 1999-2014 Stephen Williams (steve@icarus.com)
- * Copyright CERN 2012 / Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1999-2011 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
@@ -15,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -23,8 +22,6 @@
 # include  "PExpr.h"
 # include  "netlist.h"
 # include  "netmisc.h"
-# include  "netstruct.h"
-# include  "netvector.h"
 # include  "compiler.h"

 # include  <cstdlib>
@@ -44,7 +41,7 @@ NetNet* PEConcat::elaborate_lnet_common_(Design*des, NetScope*scope,
 {
      assert(scope);

-      svector<NetNet*>nets (parms_.size());
+      svector<NetNet*>nets (parms_.count());
      unsigned width = 0;
      unsigned errors = 0;

@@ -99,12 +96,12 @@ NetNet* PEConcat::elaborate_lnet_common_(Design*des, NetScope*scope,
 	   concat operator from most significant to least significant,
 	   which is the order they are given in the concat list. */

-      netvector_t*tmp2_vec = new netvector_t(nets[0]->data_type(),width-1,0);
      NetNet*osig = new NetNet(scope, scope->local_symbol(),
-			       NetNet::IMPLICIT, tmp2_vec);
+			       NetNet::IMPLICIT, width);

 	/* Assume that the data types of the nets are all the same, so
 	   we can take the data type of any, the first will do. */
+      osig->data_type(nets[0]->data_type());
      osig->local_flag(true);
      osig->set_line(*this);

@@ -155,6 +152,8 @@ NetNet* PEConcat::elaborate_lnet_common_(Design*des, NetScope*scope,
 	    assert(width == 0);
      }

+      osig->data_type(nets[0]->data_type());
+      osig->local_flag(true);
      return osig;
 }

@@ -177,7 +176,7 @@ bool PEConcat::is_collapsible_net(Design*des, NetScope*scope) const
            return false;

 	// Test the operands of the concatenation.
-      for (unsigned idx = 0 ;  idx < parms_.size() ;  idx += 1) {
+      for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {

              // Empty expressions are not allowed in concatenations
 	    if (parms_[idx] == 0)
@@ -190,6 +189,29 @@ bool PEConcat::is_collapsible_net(Design*des, NetScope*scope) const
      return true;
 }

+/*
+ * A private method to create an implicit net.
+ */
+NetNet* PEIdent::make_implicit_net_(Design*des, NetScope*scope) const
+{
+      NetNet::Type nettype = scope->default_nettype();
+      assert(nettype != NetNet::NONE);
+
+      NetNet*sig = new NetNet(scope, peek_tail_name(path_),
+			      nettype, 1);
+      sig->set_line(*this);
+	/* Implicit nets are always scalar logic. */
+      sig->data_type(IVL_VT_LOGIC);
+
+      if (warn_implicit) {
+	    cerr << get_fileline() << ": warning: implicit "
+		  "definition of wire logic " << scope_path(scope)
+		 << "." << peek_tail_name(path_) << "." << endl;
+      }
+
+      return sig;
+}
+
 /*
 * This private method evaluates the part selects (if any) for the
 * signal. The sig argument is the NetNet already located for the
@@ -200,15 +222,11 @@ bool PEConcat::is_collapsible_net(Design*des, NetScope*scope) const
 bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 				long&midx, long&lidx) const
 {
-      list<long> prefix_indices;
-      bool rc = calculate_packed_indices_(des, scope, sig, prefix_indices);
-      ivl_assert(*this, rc);
-
      const name_component_t&name_tail = path_.back();
 	// Only treat as part/bit selects any index that is beyond the
 	// word selects for an array. This is not an array, then
 	// dimensions==0 and any index is treated as a select.
-      if (name_tail.index.size() <= sig->unpacked_dimensions()) {
+      if (name_tail.index.size() <= sig->array_dimensions()) {
 	    midx = sig->vector_width()-1;
 	    lidx = 0;
 	    return true;
@@ -227,7 +245,9 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,

 	  case index_component_t::SEL_IDX_DO:
 	  case index_component_t::SEL_IDX_UP: {
-		NetExpr*tmp_ex = elab_and_eval(des, scope, index_tail.msb, -1, true);
+		need_constant_expr = true;
+		NetExpr*tmp_ex = elab_and_eval(des, scope, index_tail.msb, -1);
+		need_constant_expr = false;
 		NetEConst*tmp = dynamic_cast<NetEConst*>(tmp_ex);
 		if (!tmp) {
 		      cerr << get_fileline() << ": error: indexed part select of "
@@ -247,7 +267,7 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 		      if (warn_ob_select) {
 			    cerr << get_fileline() << ": warning: "
 			         << sig->name();
-			    if (sig->unpacked_dimensions() > 0) cerr << "[]";
+			    if (sig->array_dimensions() > 0) cerr << "[]";
 			    cerr << "['bx";
 			    if (index_tail.sel ==
 			        index_component_t::SEL_IDX_UP) {
@@ -255,20 +275,20 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 			    } else {
 				  cerr << "-:";
 			    }
-			    cerr << wid << "] is always outside the vector."
+			    cerr << wid << "] is always outside vector."
 			         << endl;
 		      }
 		      return false;
 		}

 		long midx_val = tmp->value().as_long();
-		midx = sig->sb_to_idx(prefix_indices, midx_val);
+		midx = sig->sb_to_idx(midx_val);
 		delete tmp_ex;

 		if (index_tail.sel == index_component_t::SEL_IDX_UP)
-		      lidx = sig->sb_to_idx(prefix_indices, midx_val+wid-1);
+		      lidx = sig->sb_to_idx(midx_val+wid-1);
 		else
-		      lidx = sig->sb_to_idx(prefix_indices, midx_val-wid+1);
+		      lidx = sig->sb_to_idx(midx_val-wid+1);

 		if (midx < lidx) {
 		      long tmpx = midx;
@@ -279,7 +299,7 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 		  /* Warn about an indexed part select that is out of range. */
 		if (warn_ob_select && (lidx < 0)) {
 		      cerr << get_fileline() << ": warning: " << sig->name();
-		      if (sig->unpacked_dimensions() > 0) cerr << "[]";
+		      if (sig->array_dimensions() > 0) cerr << "[]";
 		      cerr << "[" << midx_val;
 		      if (index_tail.sel == index_component_t::SEL_IDX_UP) {
 			    cerr << "+:";
@@ -290,7 +310,7 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 		}
 		if (warn_ob_select && (midx >= (long)sig->vector_width())) {
 		      cerr << get_fileline() << ": warning: " << sig->name();
-		      if (sig->unpacked_dimensions() > 0) {
+		      if (sig->array_dimensions() > 0) {
 			    cerr << "[]";
 		      }
 		      cerr << "[" << midx_val;
@@ -315,120 +335,74 @@ bool PEIdent::eval_part_select_(Design*des, NetScope*scope, NetNet*sig,
 		long msb, lsb;
 		bool part_defined_flag;
 		/* bool flag = */ calculate_parts_(des, scope, msb, lsb, part_defined_flag);
+		ivl_assert(*this, part_defined_flag);

-		  /* We have an undefined index and that is out of range. */
-		if (!part_defined_flag) {
-		      if (warn_ob_select) {
-			    cerr << get_fileline() << ": warning: "
-			         << sig->name();
-			    if (sig->unpacked_dimensions() > 0) cerr << "[]";
-			    cerr << "['bx] is always outside the vector."
-			         << endl;
+		long lidx_tmp = sig->sb_to_idx(lsb);
+		long midx_tmp = sig->sb_to_idx(msb);
+		  /* Detect reversed indices of a part select. */
+		if (lidx_tmp > midx_tmp) {
+		      cerr << get_fileline() << ": error: Part select "
+			   << sig->name() << "[" << msb << ":"
+			   << lsb << "] indices reversed." << endl;
+		      cerr << get_fileline() << ":      : Did you mean "
+			   << sig->name() << "[" << lsb << ":"
+			   << msb << "]?" << endl;
+		      long tmp = midx_tmp;
+		      midx_tmp = lidx_tmp;
+		      lidx_tmp = tmp;
+		      des->errors += 1;
+		}
+
+		  /* Warn about a part select that is out of range. */
+		if (midx_tmp >= (long)sig->vector_width() || lidx_tmp < 0) {
+		      cerr << get_fileline() << ": warning: Part select "
+			   << sig->name();
+		      if (sig->array_dimensions() > 0) {
+			    cerr << "[]";
 		      }
+		      cerr << "[" << msb << ":" << lsb
+			   << "] is out of range." << endl;
+#if 0
+		      midx_tmp = sig->vector_width() - 1;
+		      lidx_tmp = 0;
+		      des->errors += 1;
+#endif
+		}
+		  /* This is completely out side the signal so just skip it. */
+		if (lidx_tmp >= (long)sig->vector_width() || midx_tmp < 0) {
 		      return false;
 		}

-		if (prefix_indices.size()+1 < sig->packed_dims().size()) {
-		      // Here we have a slice that doesn't have enough indices
-		      // to get to a single slice. For example:
-		      //    wire [9:0][5:1] foo
-		      //      ... foo[4:3] ...
-		      // Make this work by finding the indexed slices and
-		      // creating a generated slice that spans the whole
-		      // range.
-		      long loff, moff;
-		      unsigned long lwid, mwid;
-		      bool lrc;
-		      lrc = sig->sb_to_slice(prefix_indices, lsb, loff, lwid);
-		      ivl_assert(*this, lrc);
-		      lrc = sig->sb_to_slice(prefix_indices, msb, moff, mwid);
-		      ivl_assert(*this, lrc);
-		      ivl_assert(*this, lwid == mwid);
-
-		      if (moff > loff) {
-			    lidx = loff;
-			    midx = moff + mwid - 1;
-		      } else {
-			    lidx = moff;
-			    midx = loff + lwid - 1;
-		      }
-		} else {
-		      long lidx_tmp = sig->sb_to_idx(prefix_indices, lsb);
-		      long midx_tmp = sig->sb_to_idx(prefix_indices, msb);
-
-		        /* Detect reversed indices of a part select. */
-		      if (lidx_tmp > midx_tmp) {
-			    cerr << get_fileline() << ": error: Part select "
-			        << sig->name() << "[" << msb << ":"
-			        << lsb << "] indices reversed." << endl;
-			    cerr << get_fileline() << ":      : Did you mean "
-			        << sig->name() << "[" << lsb << ":"
-			        << msb << "]?" << endl;
-			    long tmp = midx_tmp;
-			    midx_tmp = lidx_tmp;
-			    lidx_tmp = tmp;
-			    des->errors += 1;
-		      }
-
-		        /* Warn about a part select that is out of range. */
-		      if (midx_tmp >= (long)sig->vector_width() || lidx_tmp < 0) {
-			    cerr << get_fileline() << ": warning: Part select "
-			         << sig->name();
-			    if (sig->unpacked_dimensions() > 0) {
-				cerr << "[]";
-			    }
-			    cerr << "[" << msb << ":" << lsb
-			         << "] is out of range." << endl;
-		}
-		        /* This is completely out side the signal so just skip it. */
-		      if (lidx_tmp >= (long)sig->vector_width() || midx_tmp < 0) {
-			    return false;
-		      }
-
-		      midx = midx_tmp;
-		      lidx = lidx_tmp;
-		}
+		midx = midx_tmp;
+		lidx = lidx_tmp;
 		break;
 	  }

 	  case index_component_t::SEL_BIT:
-	    if (name_tail.index.size() > sig->unpacked_dimensions()) {
-		  long msb;
-		  bool bit_defined_flag;
-		  /* bool flag = */ calculate_bits_(des, scope, msb, bit_defined_flag);
-
-		  /* We have an undefined index and that is out of range. */
-		  if (!bit_defined_flag) {
-			if (warn_ob_select) {
-			      cerr << get_fileline() << ": warning: "
-			           << sig->name();
-			      if (sig->unpacked_dimensions() > 0) cerr << "[]";
-			      cerr << "['bx] is always outside the vector."
-			           << endl;
-			}
+	    if (name_tail.index.size() > sig->array_dimensions()) {
+		  verinum*mval = index_tail.msb->eval_const(des, scope);
+		  if (mval == 0) {
+			cerr << get_fileline() << ": error: Index of " << path_ <<
+			      " needs to be constant in this context." <<
+			      endl;
+			cerr << get_fileline() << ":      : Index expression is: "
+			     << *index_tail.msb << endl;
+			cerr << get_fileline() << ":      : Context scope is: "
+			     << scope_path(scope) << endl;
+			des->errors += 1;
 			return false;
 		  }
+		  assert(mval);

-
-		  if (prefix_indices.size()+2 <= sig->packed_dims().size()) {
-			long tmp_loff;
-			unsigned long tmp_lwid;
-			bool rcl = sig->sb_to_slice(prefix_indices, msb,
-						    tmp_loff, tmp_lwid);
-			ivl_assert(*this, rcl);
-			midx = tmp_loff + tmp_lwid - 1;
-			lidx = tmp_loff;
-		  } else {
-			midx = sig->sb_to_idx(prefix_indices, msb);
-			if (midx >= (long)sig->vector_width()) {
-			      cerr << get_fileline() << ": error: Index " << sig->name()
-				   << "[" << msb << "] is out of range."
-				   << endl;
-			      des->errors += 1;
-			      midx = 0;
-			}
-			lidx = midx;
+		  midx = sig->sb_to_idx(mval->as_long());
+		  if (midx >= (long)sig->vector_width()) {
+			cerr << get_fileline() << ": error: Index " << sig->name()
+			     << "[" << mval->as_long() << "] is out of range."
+			     << endl;
+			des->errors += 1;
+			midx = 0;
 		  }
+		  lidx = midx;

 	    } else {
 		  cerr << get_fileline() << ": internal error: "
@@ -456,7 +430,6 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
      NetNet*       sig = 0;
      const NetExpr*par = 0;
      NetEvent*     eve = 0;
-      perm_string method_name;

      symbol_search(this, des, scope, path_, sig, par, eve);

@@ -468,35 +441,6 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 	    return 0;
      }

-	// Break the path_ into the tail name and the prefix. For
-	// example, a name "a.b.c" is broken into name_tail="c" and
-	// path_prefix="a.b".
-      const name_component_t&path_tail = path_.back();
-      pform_name_t path_prefix = path_;
-      path_prefix.pop_back();
-
-	/* If the signal is not found, check to see if this is a
-	   member of a struct. Take the name of the form "a.b.member",
-	   remove the member and store it into method_name, and retry
-	   the search with "a.b". */
-      if (sig == 0 && path_.size() >= 2) {
-	    if (debug_elaborate) {
-		  cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-			"Symbol not found, try again with path_prefix=" << path_prefix
-		       << " and method_name=" << path_tail.name << endl;
-	    }
-	    method_name = path_tail.name;
-	    symbol_search(this, des, scope, path_prefix, sig, par, eve);
-
-	      // Whoops, not a struct signal, so give up on this avenue.
-	    if (sig && sig->struct_type() == 0) {
-		  cerr << get_fileline() << ": XXXXX: sig=" << sig->name()
-		       << " is found, but not a struct with member " << method_name << endl;
-		  method_name = perm_string();
-		  sig = 0;
-	    }
-      }
-
      if (sig == 0) {
 	    cerr << get_fileline() << ": error: Net " << path_
 		 << " is not defined in this context." << endl;
@@ -506,15 +450,6 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,

      assert(sig);

-	/* If this is SystemVerilog and the variable is not yet
-	   assigned by anything, then convert it to an unresolved
-	   wire. */
-      if (gn_var_can_be_uwire()
-	  && (sig->type() == NetNet::REG)
-	  && (sig->peek_lref() == 0) ) {
-	    sig->type(NetNet::UNRESOLVED_WIRE);
-      }
-
 	/* Don't allow registers as assign l-values. */
      if (sig->type() == NetNet::REG) {
 	    cerr << get_fileline() << ": error: reg " << sig->name()
@@ -528,193 +463,67 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
      unsigned midx = sig->vector_width()-1, lidx = 0;
 	// The default word select is the first.
      long widx = 0;
-	// Set this to true if we calculate the word index. This is
-	// used to distinguish between unpacked array assignment and
-	// array word assignment.
-      bool widx_flag = false;
+	// The widx_val is the word select as entered in the source
+	// code. It's used for error messages.
+      long widx_val = 0;

-      list<long> unpacked_indices_const;
+      const name_component_t&name_tail = path_.back();

-      const netstruct_t*struct_type = 0;
-      if ((struct_type = sig->struct_type()) && !method_name.nil()) {
+      if (sig->array_dimensions() > 0) {

-	      // Detect the variable is a structure and there was a
-	      // method name detected. We've already found that
-	      // the path_ is <>.sig.method_name and signal
-	      // (NetNet). We also know that sig is struct_type(), so
-	      // look for a method named method_name.
-	    if (debug_elaborate)
-		  cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-		       << "Signal " << sig->name() << " is a structure, "
-		       << "try to match member " << method_name << endl;
-
-	    unsigned long member_off = 0;
-	    const struct netstruct_t::member_t*member = struct_type->packed_member(method_name, member_off);
-	    ivl_assert(*this, member);
-
-	    if (debug_elaborate) {
-		  cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-		       << "Member " << method_name
-		       << " has type " << *member->net_type << "." << endl;
-		  cerr << get_fileline() << ":                                : "
-		       << "Tail name has " << path_tail.index.size() << " indices." << endl;
-	    }
-
-	      // Rewrite a member select of a packed structure as a
-	      // part select of the base variable.
-	    lidx = member_off;
-	    midx = lidx + member->net_type->packed_width() - 1;
-
-	      // The dimensions of the tail of the prefix must match
-	      // the dimensions of the signal at this point. (The sig
-	      // has a packed dimension for the packed struct size.)
-	      // For example, if the path_=a[<m>][<n>].member, then
-	      // sig must have 3 packed dimensions: one for the struct
-	      // members and two actual packed dimensions.
-	    ivl_assert(*this, path_prefix.back().index.size()+1 == sig->packed_dimensions());
-
-	      // Elaborate an expression from the packed indices and
-	      // the member offset (into the structure) to get a
-	      // canonical expression into the packed signal vector.
-	    NetExpr*packed_base = 0;
-	    if (sig->packed_dimensions() > 1) {
-		  list<index_component_t>tmp_index = path_prefix.back().index;
-		  index_component_t member_select;
-		  member_select.sel = index_component_t::SEL_BIT;
-		  member_select.msb = new PENumber(new verinum(member_off));
-		  tmp_index.push_back(member_select);
-		  packed_base = collapse_array_indices(des, scope, sig, tmp_index);
-
-		  if (debug_elaborate) {
-			cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-			     << "packed_base=" << *packed_base
-			     << ", member_off=" << member_off << endl;
-		  }
-	    }
-
-	    long tmp;
-	    if (packed_base && eval_as_long(tmp, packed_base)) {
-		  lidx = tmp;
-		  midx = lidx + member->net_type->packed_width() - 1;
-		  delete packed_base;
-		  packed_base = 0;
-	    }
-
-	      // Currently, only support const dimensions here.
-	    ivl_assert(*this, packed_base == 0);
-
-	      // Now the lidx/midx values get us to the member. Next
-	      // up, deal with bit/part selects from the member
-	      // itself.
-	      //XXXXivl_assert(*this, member->packed_dims.size() <= 1);
-	    ivl_assert(*this, path_tail.index.size() <= 1);
-	    if (! path_tail.index.empty()) {
-		  long tmp_off;
-		  unsigned long tmp_wid;
-		  const index_component_t&tail_sel = path_tail.index.back();
-		  ivl_assert(*this, tail_sel.sel == index_component_t::SEL_PART || tail_sel.sel == index_component_t::SEL_BIT);
-		  bool rc = calculate_part(this, des, scope, tail_sel, tmp_off, tmp_wid);
-		  ivl_assert(*this, rc);
-		  if (debug_elaborate)
-			cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-			     << "tmp_off=" << tmp_off << ", tmp_wid=" << tmp_wid << endl;
-		  lidx += tmp_off;
-		  midx = lidx + tmp_wid - 1;
-	    }
-
-      } else if (gn_system_verilog() && sig->unpacked_dimensions() > 0 && path_tail.index.empty()) {
-
-	      // In this case, we are doing a continuous assignment to
-	      // an unpacked array. The NetNet representation is a
-	      // NetNet with a pin for each array element, so there is
-	      // nothing more needed here.
-	      //
-	      // This can come up from code like this:
-	      //   logic [...] data [0:3];
-	      //   assign data = ...;
-	      // In this case, "sig" is "data", and sig->pin_count()
-	      // is 4 to account for the unpacked size.
-	    if (debug_elaborate) {
-		  cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-		       << "Net assign to unpacked array \"" << sig->name()
-		       << "\" with " << sig->pin_count() << " elements." << endl;
-	    }
-
-      } else if (sig->unpacked_dimensions() > 0) {
-
-	      // Make sure there are enough indices to address an array element.
-	    if (path_tail.index.size() < sig->unpacked_dimensions()) {
-		  cerr << get_fileline() << ": error: Array " << path()
-		       << " needs " << sig->unpacked_dimensions() << " indices,"
-		       << " but got only " << path_tail.index.size() << ". (net)" << endl;
+	    if (name_tail.index.empty()) {
+		  cerr << get_fileline() << ": error: array " << sig->name()
+		       << " must be used with an index." << endl;
 		  des->errors += 1;
 		  return 0;
 	    }

-	      // Evaluate all the index expressions into an
-	      // "unpacked_indices" array.
-	    list<NetExpr*>unpacked_indices;
-	    indices_flags flags;
-	    indices_to_expressions(des, scope, this,
-				   path_tail.index, sig->unpacked_dimensions(),
-				   true,
-				   flags,
-				   unpacked_indices,
-				   unpacked_indices_const);
-
-	    if (flags.invalid) {
-		  return 0;
-
-	    } else if (flags.variable) {
-		  cerr << get_fileline() << ": error: array '" << sig->name()
-		       << "' index must be a constant in this context." << endl;
+	    const index_component_t&index_head = name_tail.index.front();
+	    if (index_head.sel == index_component_t::SEL_PART) {
+		  cerr << get_fileline() << ": error: cannot perform a part "
+		       << "select on array " << sig->name() << "." << endl;
 		  des->errors += 1;
 		  return 0;
+	    }
+	    ivl_assert(*this, index_head.sel == index_component_t::SEL_BIT);

-	    } else if (flags.undefined) {
-		  cerr << get_fileline() << ": warning: "
-		       << "ignoring undefined l-value array access "
-		       << sig->name() << as_indices(unpacked_indices)
-		       << "." << endl;
+	      // These are not used, but they need to have a default value.
+	    ivl_variable_type_t expr_type_tmp = IVL_VT_NO_TYPE;
+	    bool unsized_flag_tmp = false;
+	    index_head.msb->test_width(des, scope,
+	                               integer_width, integer_width,
+	                               expr_type_tmp, unsized_flag_tmp);
+	    need_constant_expr = true;
+	    NetExpr*tmp_ex = elab_and_eval(des, scope, index_head.msb, -1);
+	    need_constant_expr = false;
+	    NetEConst*tmp = dynamic_cast<NetEConst*>(tmp_ex);
+	    if (!tmp) {
+		  cerr << get_fileline() << ": error: array " << sig->name()
+		       << " index must be a constant in this context." << endl;
+		  des->errors += 1;
+		  return 0;
+	    }
+
+	    widx_val = tmp->value().as_long();
+	    if (sig->array_index_is_valid(widx_val))
+		  widx = sig->array_index_to_address(widx_val);
+	    else
 		  widx = -1;
-		  widx_flag = true;
-
-	    } else {
-		  NetExpr*canon_index = 0;
-		  ivl_assert(*this, unpacked_indices_const.size() == sig->unpacked_dimensions());
-		  canon_index = normalize_variable_unpacked(sig, unpacked_indices_const);
-
-		  if (canon_index == 0) {
-			cerr << get_fileline() << ": warning: "
-			     << "ignoring out of bounds l-value array access "
-			     << sig->name() << as_indices(unpacked_indices_const)
-			     << "." << endl;
-			widx = -1;
-			widx_flag = true;
-
-		  } else {
-			NetEConst*canon_const = dynamic_cast<NetEConst*>(canon_index);
-			ivl_assert(*this, canon_const);
-
-			widx = canon_const->value().as_long();
-			widx_flag = true;
-			delete canon_index;
-		  }
-	    }
+	    delete tmp_ex;

 	    if (debug_elaborate)
 		  cerr << get_fileline() << ": debug: Use [" << widx << "]"
 		       << " to index l-value array." << endl;

 	      /* The array has a part/bit select at the end. */
-	    if (path_tail.index.size() > sig->unpacked_dimensions()) {
+	    if (name_tail.index.size() > sig->array_dimensions()) {
 		  if (sig->get_scalar()) {
 		        cerr << get_fileline() << ": error: "
 		             << "can not select part of ";
 			if (sig->data_type() == IVL_VT_REAL) cerr << "real";
 			else cerr << "scalar";
 			cerr << " array word: " << sig->name()
-			     << as_indices(unpacked_indices_const) << endl;
+			     << "[" << widx_val << "]" << endl;
 		        des->errors += 1;
 		        return 0;
 		  }
@@ -733,18 +542,7 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 		  midx = midx_tmp;
 		  lidx = lidx_tmp;
 	    }
-
-      } else if (!path_tail.index.empty()) {
-	    if (debug_elaborate) {
-		  cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
-		       << "path_tail.index.size()=" << path_tail.index.size()
-		       << endl;
-	    }
-
-	      // There are index expressions on the name, so this is a
-	      // bit/slice select of the name. Calculate a canonical
-	      // part select.
-
+      } else if (!name_tail.index.empty()) {
 	    if (sig->get_scalar()) {
 		  cerr << get_fileline() << ": error: "
 		       << "can not select part of ";
@@ -772,46 +570,27 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,

      unsigned subnet_wid = midx-lidx+1;

-	/* Check if the l-value bits are double-driven. */
-      if (sig->type() == NetNet::UNRESOLVED_WIRE && sig->test_and_set_part_driver(midx,lidx, widx_flag? widx : 0)) {
-	    cerr << get_fileline() << ": error: Unresolved net/uwire "
-	         << sig->name() << " cannot have multiple drivers." << endl;
-	    if (debug_elaborate) {
-		  cerr << get_fileline() << ":      : Overlap in "
-		       << "[" << midx << ":" << lidx << "] (canonical)"
-		       << ", widx=" << (widx_flag? widx : 0)
-		       << ", vector width=" << sig->vector_width()
-		       << endl;
-	    }
-	    des->errors += 1;
-	    return 0;
-      }
-
-      if (sig->pin_count() > 1 && widx_flag) {
-	    if (widx < 0 || widx >= (long) sig->pin_count())
+      if (sig->pin_count() > 1) {
+	    if (widx < 0 || widx >= (long) sig->pin_count()) {
+		  cerr << get_fileline() << ": warning: ignoring out of "
+		          "bounds l-value array access "
+		       << sig->name() << "[" << widx_val << "]." << endl;
 		  return 0;
+	    }

-	    netvector_t*tmp2_vec = new netvector_t(sig->data_type(),
-						   sig->vector_width()-1,0);
 	    NetNet*tmp = new NetNet(scope, scope->local_symbol(),
-				    sig->type(), tmp2_vec);
+				    sig->type(), sig->vector_width());
 	    tmp->set_line(*this);
 	    tmp->local_flag(true);
+	    tmp->data_type( sig->data_type() );
 	    connect(sig->pin(widx), tmp->pin(0));
 	    sig = tmp;
-
-      } else if (sig->pin_count() > 1) {
-
-	      // If this turns out to be an l-value unpacked array,
-	      // then let the caller handle it. It will probably be
-	      // converted into an array of assignments.
-	    return sig;
      }

-	/* If the desired l-value vector is narrower than the
+	/* If the desired l-value vector is narrower then the
 	   signal itself, then use a NetPartSelect node to
 	   arrange for connection to the desired bits. All this
-	   can be skipped if the desired width matches the
+	   can be skipped if the desired with matches the
 	   original vector. */

      if (subnet_wid != sig->vector_width()) {
@@ -827,11 +606,10 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 		       << " wid=" << subnet_wid <<"]"
 		       << endl;

-	    netvector_t*tmp2_vec = new netvector_t(sig->data_type(),
-						   subnet_wid-1,0);
 	    NetNet*subsig = new NetNet(sig->scope(),
 				       sig->scope()->local_symbol(),
-				       NetNet::WIRE, tmp2_vec);
+				       NetNet::WIRE, subnet_wid);
+	    subsig->data_type( sig->data_type() );
 	    subsig->local_flag(true);
 	    subsig->set_line(*this);

@@ -851,7 +629,6 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
 		  des->add_node(sub);
 		  sub->set_line(*this);
 		  connect(sub->pin(0), subsig->pin(0));
-		  collapse_partselect_pv_to_concat(des, sig);
 	    }
 	    sig = subsig;
      }
@@ -881,9 +658,8 @@ NetNet* PEIdent::elaborate_bi_net(Design*des, NetScope*scope) const
 * instantiation (PGModule::elaborate_mod_) to get NetNet objects for
 * the port.
 */
-NetNet* PEIdent::elaborate_subport(Design*des, NetScope*scope) const
+NetNet* PEIdent::elaborate_port(Design*des, NetScope*scope) const
 {
-      ivl_assert(*this, scope->type() == NetScope::MODULE);
      NetNet*sig = des->find_signal(scope, path_);
      if (sig == 0) {
 	    cerr << get_fileline() << ": error: no wire/reg " << path_
@@ -898,7 +674,6 @@ NetNet* PEIdent::elaborate_subport(Design*des, NetScope*scope) const
 	  case NetNet::PINPUT:
 	  case NetNet::POUTPUT:
 	  case NetNet::PINOUT:
-	  case NetNet::PREF:
 	    break;

 	      /* If the name matches, but the signal is not a port,
@@ -928,33 +703,6 @@ NetNet* PEIdent::elaborate_subport(Design*des, NetScope*scope) const
      long midx;
      long lidx;

-      if (debug_elaborate) {
-	    cerr << get_fileline() << ": PEIdent::elaborate_subport: "
-		 << "path_ = \"" << path_
-		 << "\", unpacked_dimensions=" << sig->unpacked_dimensions()
-		 << ", port_type()=" << sig->port_type() << endl;
-      }
-
-      if (sig->unpacked_dimensions() && !gn_system_verilog()) {
-	    cerr << get_fileline() << ": error: "
-		 << "Ports cannot be unpacked arrays. Try enabling SystemVerilog support." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-
-	// There cannot be parts to an unpacked array, so process this
-	// simply as an unpacked array.
-      if (sig->unpacked_dimensions()) {
-	    if (debug_elaborate) {
-		  cerr << get_fileline() << ": PEIdent::elaborate_subport: "
-		       << "path_=\"" << path_
-		       << "\" is an unpacked array with " << sig->pin_count()
-		       << " elements." << endl;
-	    }
-	    scope->add_module_port_net(sig);
-	    return sig;
-      }
-
 	/* Evaluate the part/bit select expressions, to get the part
 	   select of the signal that attaches to the port. Also handle
 	   range and direction checking here. */
@@ -964,20 +712,17 @@ NetNet* PEIdent::elaborate_subport(Design*des, NetScope*scope) const

 	/* If this is a part select of the entire signal (or no part
 	   select at all) then we're done. */
-      if ((lidx == 0) && (midx == (long)sig->vector_width()-1)) {
-	    scope->add_module_port_net(sig);
+      if ((lidx == 0) && (midx == (long)sig->vector_width()-1))
 	    return sig;
-      }

      unsigned swid = abs(midx - lidx) + 1;
      ivl_assert(*this, swid > 0 && swid < sig->vector_width());

-      netvector_t*tmp2_vec = new netvector_t(sig->data_type(),swid-1,0);
      NetNet*tmp = new NetNet(scope, scope->local_symbol(),
-			      NetNet::WIRE, tmp2_vec);
+			      NetNet::WIRE, swid);
      tmp->port_type(sig->port_type());
+      tmp->data_type(sig->data_type());
      tmp->set_line(*this);
-      tmp->local_flag(true);
      NetNode*ps = 0;
      switch (sig->port_type()) {

@@ -993,9 +738,6 @@ NetNet* PEIdent::elaborate_subport(Design*des, NetScope*scope) const
 	    sig = tmp;
 	    break;

-	  case NetNet::PREF:
-	      // For the purposes of module ports, treat ref ports
-	      // just like inout ports.
 	  case NetNet::PINOUT:
 	    ps = new NetTran(scope, scope->local_symbol(), sig->vector_width(),
 			     swid, lidx);
@@ -1012,21 +754,6 @@ NetNet* PEIdent::elaborate_subport(Design*des, NetScope*scope) const
      ps->set_line(*this);
      des->add_node(ps);

-      scope->add_module_port_net(sig);
-      return sig;
-}
-
-NetNet*PEIdent::elaborate_unpacked_net(Design*des, NetScope*scope) const
-{
-      NetNet*       sig = 0;
-      const NetExpr*par = 0;
-      NetEvent*     eve = 0;
-      perm_string method_name;
-
-      symbol_search(this, des, scope, path_, sig, par, eve);
-
-      ivl_assert(*this, sig);
-
      return sig;
 }

@@ -1048,18 +775,6 @@ bool PEIdent::is_collapsible_net(Design*des, NetScope*scope) const

      assert(sig);

-	/* If this is SystemVerilog and the variable is not yet
-	   assigned by anything, then convert it to an unresolved
-	   wire. */
-      if (gn_var_can_be_uwire()
-	  && (sig->type() == NetNet::REG)
-	  && (sig->peek_eref() == 0) ) {
-	    sig->type(NetNet::UNRESOLVED_WIRE);
-      }
-
-      if (sig->type() == NetNet::UNRESOLVED_WIRE && sig->pin(0).is_linked())
-            return false;
-
      if (sig->type() == NetNet::REG)
            return false;

@@ -0,0 +1,514 @@
+/*
+ * Copyright (c) 2000-2010 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
+ */
+
+# include "config.h"
+
+# include  "PExpr.h"
+# include  "compiler.h"
+# include  "util.h"
+# include  "netmisc.h"
+
+# include  <cstdlib>
+# include  <iostream>
+# include  "ivl_assert.h"
+
+NetExpr*PExpr::elaborate_pexpr(Design*des, NetScope*sc) const
+{
+      cerr << get_fileline() << ": 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;
+      }
+
+      NetExpr*tmp = elaborate_expr_base_(des, lp, rp, -2, true);
+      return tmp;
+}
+
+NetExpr*PEBComp::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;
+      }
+
+      NetEBComp*tmp = new NetEBComp(op_, lp, rp);
+      tmp->set_line(*this);
+      bool flag = tmp->set_width(1);
+      if (flag == false) {
+	    cerr << get_fileline() << ": internal error: "
+		  "expression bit width of comparison != 1." << endl;
+	    des->errors += 1;
+      }
+
+      return tmp;
+}
+
+NetExpr*PEBLeftWidth::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;
+      }
+
+      NetExpr*tmp = elaborate_expr_leaf(des, lp, rp, -2);
+      return tmp;
+}
+
+NetExpr*PEBLogic::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;
+      }
+
+      NetEBLogic*tmp = new NetEBLogic(op_, lp, rp);
+      tmp->set_line(*this);
+      bool flag = tmp->set_width(1);
+      if (flag == false) {
+	    cerr << get_fileline() << ": internal error: "
+		  "expression bit width of comparison != 1." << endl;
+	    des->errors += 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_fileline() << ": error: "
+			"concatenation repeat expression cannot be evaluated."
+		       << endl;
+		  des->errors += 1;
+		  return 0;
+	    }
+
+	      /* 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. */
+      bool fail = false;
+      for (unsigned idx = 0 ;  idx < parms_.count() ;  idx += 1) {
+	    assert(parms_[idx]);
+	    NetExpr*ex = parms_[idx]->elaborate_pexpr(des, scope);
+	    if (ex == 0) continue;
+
+	    if (ex->expr_type() == IVL_VT_REAL) {
+		  cerr << ex->get_fileline() << ": error: concatenation "
+		       << "operand can not be real: " << *ex << endl;
+		  des->errors += 1;
+		  fail = true;
+		  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_fileline() << ": error: operand of "
+		       << "concatenation has indefinite width: "
+		       << *ex << endl;
+		  des->errors += 1;
+		  fail = true;
+		  continue;
+	    }
+
+	    tmp->set(idx, ex);
+      }
+
+      if (fail) {
+	    delete tmp;
+	    return 0;
+      }
+
+      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
+{
+      pform_name_t oldpath = path_;
+      name_component_t name_tail = path_.back();
+      oldpath.pop_back();
+
+      if (path_.size() > 1) {
+	    cerr << get_fileline() << ": error: parameter r-value expression "
+	            "does not support hierarchical references `" << path_
+	         << "`." << endl;
+	    des->errors += 1;
+	    return 0;
+      }
+
+      NetScope*pscope = scope;
+      if (path_.size() > 0) {
+	    list<hname_t> tmp = eval_scope_path(des, scope, oldpath);
+	    pscope = des->find_scope(scope, tmp);
+      }
+
+      const NetExpr*ex_msb;
+      const NetExpr*ex_lsb;
+      const NetExpr*ex = 0;
+	// Look up the parameter name in the current scope. If the
+	// name is not found in the pscope, look in containing scopes,
+	// but do not go outside the containing module instance.
+      for (;;) {
+	    ex = pscope->get_parameter(name_tail.name, ex_msb, ex_lsb);
+	    if (ex != 0)
+		  break;
+	    if (pscope->type() == NetScope::MODULE)
+		  break;
+	    pscope = pscope->parent();
+	    ivl_assert(*this, pscope);
+      }
+      if (ex == 0) {
+	    cerr << get_fileline() << ": error: identifier `"
+	         << name_tail.name << "` is not a parameter in "
+	         << scope_path(scope)<< "." << endl;
+	    des->errors += 1;
+	    return 0;
+      }
+
+      NetExpr*res = new NetEParam(des, pscope, name_tail.name);
+      res->set_line(*this);
+      assert(res);
+
+      index_component_t::ctype_t use_sel = index_component_t::SEL_NONE;
+      if (!name_tail.index.empty())
+	    use_sel = name_tail.index.back().sel;
+
+      switch (use_sel) {
+	  case index_component_t::SEL_NONE:
+	    break;
+
+	  default:
+	  case index_component_t::SEL_PART:
+	    cerr << get_fileline() << ": sorry: Cannot part select "
+		    "bits of parameters." << endl;
+	    des->errors += 1;
+	    delete res;
+	    return 0;
+
+	  case index_component_t::SEL_BIT:
+
+	      /* We have here a bit select. Insert a NetESelect node
+		 to handle it. */
+	    NetExpr*tmp = name_tail.index.back().msb->elaborate_pexpr(des, scope);
+	    if (tmp == 0) {
+		  delete res;
+		  return 0;
+	    }
+	    if (debug_elaborate)
+		  cerr << get_fileline() << ": debug: "
+		       << "Bit select [" << *tmp << "]"
+		       << " in parameter expression." << endl;
+
+	    res = new NetESelect(res, tmp, 1);
+	    res->set_line(*this);
+	    break;
+      }
+
+      return res;
+}
+
+/*
+ * 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 || t == 0 || f == 0) return 0;
+
+      NetETernary*tmp = new NetETernary(c, t, f);
+      tmp->set_line(*this);
+      return tmp;
+}
+
+NetExpr*PEUnary::elaborate_pexpr (Design*des, NetScope*scope) const
+{
+      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;
+}
+
+NetExpr* PECallFunction::elaborate_pexpr(Design*des, NetScope*scope) const
+{
+	/* Only $clog2 and the builtin mathematical functions can
+	 * be a constant system function. */
+      perm_string nm = peek_tail_name(path_);
+      if (nm[0] == '$' && (generation_flag >= GN_VER2005 ||
+                           gn_icarus_misc_flag || gn_verilog_ams_flag)) {
+	    if (nm == "$clog2" ||
+	        nm == "$ln" ||
+	        nm == "$log10" ||
+	        nm == "$exp" ||
+	        nm == "$sqrt" ||
+	        nm == "$floor" ||
+	        nm == "$ceil" ||
+	        nm == "$sin" ||
+	        nm == "$cos" ||
+	        nm == "$tan" ||
+	        nm == "$asin" ||
+	        nm == "$acos" ||
+	        nm == "$atan" ||
+	        nm == "$sinh" ||
+	        nm == "$cosh" ||
+	        nm == "$tanh" ||
+	        nm == "$asinh" ||
+	        nm == "$acosh" ||
+	        nm == "$atanh") {
+		  if (parms_.size() != 1 || parms_[0] == 0) {
+			cerr << get_fileline() << ": error: " << nm
+			     << " takes a single argument." << endl;
+			des->errors += 1;
+			return 0;
+		  }
+		  NetExpr*arg = parms_[0]->elaborate_pexpr(des, scope);
+		  if (arg == 0) return 0;
+		  NetESFunc*rtn;
+		  if (nm == "$clog2") {
+			rtn = new NetESFunc(nm, IVL_VT_BOOL, integer_width, 1);
+		  } else {
+			rtn = new NetESFunc(nm, IVL_VT_REAL, 1, 1);
+		  }
+		  rtn->set_line(*this);
+		  rtn->cast_signed(true);
+		  rtn->parm(0, arg);
+		  return rtn;
+	    }
+
+	    if (nm == "$pow" ||
+	        nm == "$atan2" ||
+	        nm == "$hypot") {
+		  if (parms_.size() != 2 || parms_[0] == 0 || parms_[1] == 0) {
+			cerr << get_fileline() << ": error: " << nm
+			     << " takes two arguments." << endl;
+			des->errors += 1;
+			return 0;
+		  }
+		  NetExpr*arg0 = parms_[0]->elaborate_pexpr(des, scope);
+		  NetExpr*arg1 = parms_[1]->elaborate_pexpr(des, scope);
+		  if (arg0 == 0 || arg1 == 0) return 0;
+		  NetESFunc*rtn = new NetESFunc(nm, IVL_VT_REAL, 1, 2);
+		  rtn->set_line(*this);
+		  rtn->cast_signed(true);
+		  rtn->parm(0, arg0);
+		  rtn->parm(1, arg1);
+		  return rtn;
+	    }
+
+	      /* This is only available with verilog-ams or icarus-misc. */
+	    if ((gn_icarus_misc_flag || gn_verilog_ams_flag) &&
+	        (nm == "$abs")) {
+		  if (parms_.size() != 1 || parms_[0] == 0) {
+			cerr << get_fileline() << ": error: " << nm
+			     << " takes a single argument." << endl;
+			des->errors += 1;
+			return 0;
+		  }
+		  NetExpr*arg = parms_[0]->elaborate_pexpr(des, scope);
+		  if (arg == 0) return 0;
+		  NetESFunc*rtn;
+		    /* This can return either a real or an arbitrary
+		     * width vector, so set things to fail if this
+		     * does not get replaced with a constant during
+		     * elaboration. */
+		  rtn = new NetESFunc(nm, IVL_VT_NO_TYPE, 0, 1);
+		  rtn->set_line(*this);
+		  rtn->cast_signed(true);
+		  rtn->parm(0, arg);
+		  return rtn;
+	    }
+	    if ((gn_icarus_misc_flag || gn_verilog_ams_flag) &&
+	        (nm == "$min" || nm == "$max")) {
+		  if (parms_.size() != 2 || parms_[0] == 0 || parms_[1] == 0) {
+			cerr << get_fileline() << ": error: " << nm
+			     << " takes two arguments." << endl;
+			des->errors += 1;
+			return 0;
+		  }
+		  NetExpr*arg0 = parms_[0]->elaborate_pexpr(des, scope);
+		  NetExpr*arg1 = parms_[1]->elaborate_pexpr(des, scope);
+		  if (arg0 == 0 || arg1 == 0) return 0;
+		    /* See $abs above for why this has no type or width. */
+		  NetESFunc*rtn = new NetESFunc(nm, IVL_VT_NO_TYPE, 0, 2);
+		  rtn->set_line(*this);
+		  rtn->cast_signed(true);
+		  rtn->parm(0, arg0);
+		  rtn->parm(1, arg1);
+		  return rtn;
+	    }
+
+	    cerr << get_fileline() << ": error: " << nm << "() is not a "
+	            "constant system function." << endl;
+	    des->errors += 1;
+	    return 0;
+      }
+
+	/* Constant user function code goes here. */
+      cerr << get_fileline() << ": sorry: constant user functions are not "
+                                "currently supported: " << nm << "()." << endl;
+      des->errors += 1;
+      return 0;
+}
+
+void NetExpr::resolve_pexpr_type(void)
+{
+}
+
+void NetEBinary::resolve_pexpr_type(void)
+{
+      if (debug_elab_pexpr) {
+	    cerr << get_fileline() << ": debug: "
+		 << "Resolve_pexpr_type for binary " << human_readable_op(op_)
+		 << "." << endl;
+      }
+
+      left_->resolve_pexpr_type();
+      right_->resolve_pexpr_type();
+
+      switch (op_) {
+	  case '+':
+	  case '-':
+	  case '*':
+	  case '/':
+	    suppress_binary_operand_sign_if_needed(left_, right_);
+	    cast_signed_base_(left_->has_sign() && right_->has_sign());
+	    break;
+	  default:
+	    break;
+      }
+}
+
+void NetEParam::resolve_pexpr_type(void)
+{
+      if (debug_elab_pexpr) {
+	    cerr << get_fileline() << ": debug: "
+		 << "Resolve_pexpr_type for parameter " << reference_->first
+		 << "." << endl;
+      }
+
+      if (reference_->second.signed_flag) {
+	    cast_signed_base_(true);
+
+      } else if (reference_->second.expr) {
+	    cast_signed_base_( reference_->second.expr->has_sign() );
+      }
+}
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2012-2020 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-# include  "PExpr.h"
-# include  "pform_types.h"
-# include  "netlist.h"
-# include  "netclass.h"
-# include  "netdarray.h"
-# include  "netenum.h"
-# include  "netqueue.h"
-# include  "netparray.h"
-# include  "netscalar.h"
-# include  "netstruct.h"
-# include  "netvector.h"
-# include  "netmisc.h"
-# include  <typeinfo>
-# include  "ivl_assert.h"
-
-using namespace std;
-
-/*
- * Some types have a list of ranges that need to be elaborated. This
- * function elaborates the ranges referenced by "dims" into the vector
- * "ranges".
- */
-static void elaborate_array_ranges(Design*des, NetScope*scope,
-				   vector<netrange_t>&ranges,
-				   const list<pform_range_t>*dims)
-{
-      if (dims == 0)
-	    return;
-
-      for (list<pform_range_t>::const_iterator cur = dims->begin()
-		 ; cur != dims->end() ; ++ cur) {
-
-	    NetExpr*me = elab_and_eval(des, scope, cur->first, 0, true);
-
-	    NetExpr*le = elab_and_eval(des, scope, cur->second, 0, true);
-
-	      /* If elaboration failed for either expression, we
-		 should have already reported the error, so just
-		 skip the following evaluation to recover. */
-
-	    long mnum = 0, lnum = 0;
-	    if ( me && ! eval_as_long(mnum, me) ) {
-		  assert(0);
-		  des->errors += 1;
-	    }
-
-	    if ( le && ! eval_as_long(lnum, le) ) {
-		  assert(0);
-		  des->errors += 1;
-	    }
-
-	    ranges.push_back(netrange_t(mnum, lnum));
-      }
-}
-
-/*
- * Elaborations of types may vary depending on the scope that it is
- * done in, so keep a per-scope cache of the results.
- */
-ivl_type_s* data_type_t::elaborate_type(Design*des, NetScope*scope)
-{
-	// User-defined types must be elaborated in the context
-	// where they were defined.
-      if (!name.nil())
-	    scope = scope->find_typedef_scope(des, this);
-
-      ivl_assert(*this, scope);
-      Definitions*use_definitions = scope;
-
-      map<Definitions*,ivl_type_s*>::iterator pos = cache_type_elaborate_.lower_bound(use_definitions);
-	  if (pos != cache_type_elaborate_.end() && pos->first == use_definitions)
-	     return pos->second;
-
-      ivl_type_s*tmp = elaborate_type_raw(des, scope);
-      cache_type_elaborate_.insert(pos, pair<NetScope*,ivl_type_s*>(scope, tmp));
-      return tmp;
-}
-
-ivl_type_s* data_type_t::elaborate_type_raw(Design*des, NetScope*) const
-{
-      cerr << get_fileline() << ": internal error: "
-	   << "Elaborate method not implemented for " << typeid(*this).name()
-	   << "." << endl;
-      des->errors += 1;
-      return 0;
-}
-
-ivl_type_s* atom2_type_t::elaborate_type_raw(Design*des, NetScope*) const
-{
-      switch (type_code) {
-	  case 64:
-	    if (signed_flag)
-		  return &netvector_t::atom2s64;
-	    else
-		  return &netvector_t::atom2u64;
-
-	  case 32:
-	    if (signed_flag)
-		  return &netvector_t::atom2s32;
-	    else
-		  return &netvector_t::atom2u32;
-
-	  case 16:
-	    if (signed_flag)
-		  return &netvector_t::atom2s16;
-	    else
-		  return &netvector_t::atom2u16;
-
-	  case 8:
-	    if (signed_flag)
-		  return &netvector_t::atom2s8;
-	    else
-		  return &netvector_t::atom2u8;
-
-	  default:
-	    cerr << get_fileline() << ": internal error: "
-		 << "atom2_type_t type_code=" << type_code << "." << endl;
-	    des->errors += 1;
-	    return 0;
-      }
-}
-
-ivl_type_s* class_type_t::elaborate_type_raw(Design*, NetScope*) const
-{
-      ivl_assert(*this, save_elaborated_type);
-      return save_elaborated_type;
-}
-
-/*
- * elaborate_type_raw for enumerations is actually mostly performed
- * during scope elaboration so that the enumeration literals are
- * available at the right time. At that time, the netenum_t* object is
- * stashed in the scope so that I can retrieve it here.
- */
-ivl_type_s* enum_type_t::elaborate_type_raw(Design*, NetScope*scope) const
-{
-      ivl_assert(*this, scope);
-      ivl_type_s*tmp = scope->enumeration_for_key(this);
-      if (tmp == 0 && scope->unit()) {
-	    tmp = scope->unit()->enumeration_for_key(this);
-}
-      return tmp;
-}
-
-ivl_type_s* vector_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      vector<netrange_t> packed;
-      elaborate_array_ranges(des, scope, packed, pdims.get());
-
-      netvector_t*tmp = new netvector_t(packed, base_type);
-      tmp->set_signed(signed_flag);
-      tmp->set_isint(integer_flag);
-
-      return tmp;
-}
-
-ivl_type_s* real_type_t::elaborate_type_raw(Design*, NetScope*) const
-{
-      switch (type_code) {
-	  case REAL:
-	    return &netreal_t::type_real;
-	  case SHORTREAL:
-	    return &netreal_t::type_shortreal;
-      }
-      return 0;
-}
-
-ivl_type_s* string_type_t::elaborate_type_raw(Design*, NetScope*) const
-{
-      return &netstring_t::type_string;
-}
-
-ivl_type_s* parray_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      vector<netrange_t>packed;
-      elaborate_array_ranges(des, scope, packed, dims.get());
-
-      ivl_type_t etype = base_type->elaborate_type(des, scope);
-
-      return new netparray_t(packed, etype);
-}
-
-netstruct_t* struct_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-      netstruct_t*res = new netstruct_t;
-
-      res->packed(packed_flag);
-
-      if (union_flag)
-	    res->union_flag(true);
-
-      for (list<struct_member_t*>::iterator cur = members->begin()
-		 ; cur != members->end() ; ++ cur) {
-
-	      // Elaborate the type of the member.
-	    struct_member_t*curp = *cur;
-	    ivl_type_t mem_vec = curp->type->elaborate_type(des, scope);
-	    if (mem_vec == 0)
-		  continue;
-
-	      // There may be several names that are the same type:
-	      //   <data_type> name1, name2, ...;
-	      // Process all the member, and give them a type.
-	    for (list<decl_assignment_t*>::iterator cur_name = curp->names->begin()
-		       ; cur_name != curp->names->end() ;  ++ cur_name) {
-		  decl_assignment_t*namep = *cur_name;
-
-		  netstruct_t::member_t memb;
-		  memb.name = namep->name;
-		  memb.net_type = mem_vec;
-		  res->append_member(des, memb);
-	    }
-      }
-
-      return res;
-}
-
-ivl_type_s* uarray_type_t::elaborate_type_raw(Design*des, NetScope*scope) const
-{
-
-      ivl_type_t btype = base_type->elaborate_type(des, scope);
-
-      assert(dims->size() >= 1);
-      list<pform_range_t>::const_iterator cur = dims->begin();
-
-	// Special case: if the dimension is nil:nil, this is a
-	// dynamic array. Note that we only know how to handle dynamic
-	// arrays with 1 dimension at a time.
-      if (cur->first==0 && cur->second==0) {
-	    assert(dims->size()==1);
-	    ivl_type_s*res = new netdarray_t(btype);
-	    return res;
-      }
-
-	// Special case: if the dimension is null:nil. this is a queue.
-      if (dynamic_cast<PENull*>(cur->first)) {
-	    cerr << get_fileline() << ": sorry: "
-		 << "SV queues inside classes are not yet supported." << endl;
-	    des->errors += 1;
-
-	      // FIXME: Need to set the max size if cur->second is defined
-	    ivl_type_s*res = new netqueue_t(btype, -1);
-	    return res;
-      }
-
-      vector<netrange_t> dimensions;
-      bool dimensions_ok = evaluate_ranges(des, scope, this, dimensions, *dims);
-
-      if (!dimensions_ok) {
-	    cerr << get_fileline() << " : warning: "
-		 << "Bad dimensions for type here." << endl;
-      }
-
-      ivl_assert(*this, btype);
-      ivl_type_s*res = new netuarray_t(dimensions, btype);
-      return res;
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2012 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -28,6 +28,8 @@

 NetProc* AContrib::elaborate(Design*des, NetScope*scope) const
 {
+      probe_expr_width(des, scope, lval_);
+      probe_expr_width(des, scope, rval_);
      NetExpr*lval = elab_and_eval(des, scope, lval_, -1);
      NetExpr*rval = elab_and_eval(des, scope, rval_, -1);

@@ -55,7 +57,7 @@ bool AProcess::elaborate(Design*des, NetScope*scope) const
 	// Evaluate the attributes for this process, if there
 	// are any. These attributes are to be attached to the
 	// NetProcTop object.
-      struct attrib_list_t*attrib_list;
+      struct attrib_list_t*attrib_list = 0;
      unsigned attrib_list_n = 0;
      attrib_list = evaluate_attributes(attributes, attrib_list_n, des, scope);

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2017 Stephen Williams (steve@icarus.com)
+ * Copyright (c) 1998-2008 Stephen Williams (steve@icarus.com)
 *
 *    This source code is free software; you can redistribute it
 *    and/or modify it in source code form under the terms of the GNU
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -26,14 +26,12 @@
 * target.
 */
 # include  "target.h"
-# include  "netclass.h"
 # include  "netlist.h"
-# include  "compiler.h"
 # include  <typeinfo>
 # include  <cassert>
 # include  <cstring>

-bool NetNode::emit_node(struct target_t*) const
+bool NetNode::emit_node(struct target_t*tgt) const
 {
      cerr << "EMIT: Gate type? " << typeid(*this).name() << endl;
      return false;
@@ -74,14 +72,9 @@ bool NetCaseCmp::emit_node(struct target_t*tgt) const
      return true;
 }

-bool NetCastInt2::emit_node(struct target_t*tgt) const
+bool NetCastInt::emit_node(struct target_t*tgt) const
 {
-      return tgt->lpm_cast_int2(this);
-}
-
-bool NetCastInt4::emit_node(struct target_t*tgt) const
-{
-      return tgt->lpm_cast_int4(this);
+      return tgt->lpm_cast_int(this);
 }

 bool NetCastReal::emit_node(struct target_t*tgt) const
@@ -123,12 +116,6 @@ bool NetFF::emit_node(struct target_t*tgt) const
      return true;
 }

-bool NetLatch::emit_node(struct target_t*tgt) const
-{
-      tgt->lpm_latch(this);
-      return true;
-}
-
 bool NetLiteral::emit_node(struct target_t*tgt) const
 {
      return tgt->net_literal(this);
@@ -173,11 +160,6 @@ bool NetSignExtend::emit_node(struct target_t*tgt) const
      return tgt->sign_extend(this);
 }

-bool NetSubstitute::emit_node(struct target_t*tgt) const
-{
-      return tgt->substitute(this);
-}
-
 bool NetUReduce::emit_node(struct target_t*tgt) const
 {
      return tgt->ureduce(this);
@@ -213,7 +195,7 @@ bool NetAnalogTop::emit(struct target_t*tgt) const
      return tgt->process(this);
 }

-bool NetProc::emit_proc(struct target_t*) const
+bool NetProc::emit_proc(struct target_t*tgt) const
 {
      cerr << "EMIT: Proc type? " << typeid(*this).name() << endl;
      return false;
@@ -272,17 +254,6 @@ bool NetDisable::emit_proc(struct target_t*tgt) const
      return tgt->proc_disable(this);
 }

-bool NetDoWhile::emit_proc(struct target_t*tgt) const
-{
-      tgt->proc_do_while(this);
-      return true;
-}
-
-void NetDoWhile::emit_proc_recurse(struct target_t*tgt) const
-{
-      proc_->emit_proc(tgt);
-}
-
 bool NetForce::emit_proc(struct target_t*tgt) const
 {
      return tgt->proc_force(this);
@@ -294,11 +265,6 @@ bool NetForever::emit_proc(struct target_t*tgt) const
      return true;
 }

-bool NetForLoop::emit_proc(struct target_t*tgt) const
-{
-      return tgt->proc_block(as_block_);
-}
-
 bool NetFree::emit_proc(struct target_t*tgt) const
 {
      tgt->proc_free(this);
@@ -345,11 +311,6 @@ bool NetWhile::emit_proc(struct target_t*tgt) const
      return true;
 }

-void NetWhile::emit_proc_recurse(struct target_t*tgt) const
-{
-      proc_->emit_proc(tgt);
-}
-
 void NetBlock::emit_recurse(struct target_t*tgt) const
 {
      if (last_ == 0)
@@ -412,39 +373,18 @@ void NetRepeat::emit_recurse(struct target_t*tgt) const
 	    statement_->emit_proc(tgt);
 }

-void netclass_t::emit_scope(struct target_t*tgt) const
-{
-      class_scope_->emit_scope(tgt);
-}
-
 void NetScope::emit_scope(struct target_t*tgt) const
 {
-      if (debug_emit) {
-	    cerr << "NetScope::emit_scope: "
-		 << "Emit scope " << scope_path(this) << endl;
-      }
-
      tgt->scope(this);

      for (NetEvent*cur = events_ ;  cur ;  cur = cur->snext_)
 	    tgt->event(cur);

-      for (map<perm_string,netclass_t*>::const_iterator cur = classes_.begin()
-		 ; cur != classes_.end() ; ++cur) {
-	    cur->second->emit_scope(tgt);
-	    tgt->class_type(this, cur->second);
-      }
-
-      for (map<const enum_type_t*,netenum_t*>::const_iterator cur = enum_sets_.begin()
-		 ; cur != enum_sets_.end() ;  ++cur)
-	    tgt->enumeration(this, cur->second);
-
-      for (map<hname_t,NetScope*>::const_iterator cur = children_.begin()
-		 ; cur != children_.end() ; ++ cur )
-	    cur->second->emit_scope(tgt);
+      for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_)
+	    cur->emit_scope(tgt);

      for (signals_map_iter_t cur = signals_map_.begin()
-		 ; cur != signals_map_.end() ; ++ cur ) {
+		 ; cur != signals_map_.end() ; cur ++) {
 	    tgt->signal(cur->second);
      }

@@ -454,32 +394,21 @@ void NetScope::emit_scope(struct target_t*tgt) const
 	// in the list. We can do it here because delay paths are
 	// always connected within the scope.
      for (signals_map_iter_t cur = signals_map_.begin()
-		 ; cur != signals_map_.end() ; ++ cur) {
+		 ; cur != signals_map_.end() ; cur ++) {

 	    tgt->signal_paths(cur->second);
      }

-      if (type_ == MODULE) tgt->convert_module_ports(this);
 }

 bool NetScope::emit_defs(struct target_t*tgt) const
 {
      bool flag = true;

-      if (debug_emit) {
-	    cerr << "NetScope::emit_defs: "
-		 << "Emit definitions for " << scope_path(this) << endl;
-      }
-
      switch (type_) {
-	  case PACKAGE:
 	  case MODULE:
-	    for (map<hname_t,NetScope*>::const_iterator cur = children_.begin()
-		       ; cur != children_.end() ; ++ cur )
-		  flag &= cur->second->emit_defs(tgt);
-	    for (map<perm_string,netclass_t*>::const_iterator cur = classes_.begin()
-		       ; cur != classes_.end() ; ++ cur)
-		  flag &= cur->second->emit_defs(tgt);
+	    for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_)
+		  flag &= cur->emit_defs(tgt);
 	    break;

 	  case FUNC:
@@ -489,18 +418,17 @@ bool NetScope::emit_defs(struct target_t*tgt) const
 	    tgt->task_def(this);
 	    break;
 	  default:  /* BEGIN_END and FORK_JOIN, GENERATE... */
-	    for (map<hname_t,NetScope*>::const_iterator cur = children_.begin()
-		       ; cur != children_.end() ; ++ cur )
-		  flag &= cur->second->emit_defs(tgt);
+	    for (NetScope*cur = sub_ ;  cur ;  cur = cur->sib_)
+		  flag &= cur->emit_defs(tgt);
 	    break;
      }

      return flag;
 }

-bool netclass_t::emit_defs(struct target_t*tgt) const
+void NetWhile::emit_proc_recurse(struct target_t*tgt) const
 {
-      return class_scope_->emit_defs(tgt);
+      proc_->emit_proc(tgt);
 }

 int Design::emit(struct target_t*tgt) const
@@ -510,17 +438,11 @@ int Design::emit(struct target_t*tgt) const
      if (tgt->start_design(this) == false)
 	    return -2;

-	// enumerate package scopes
-      for (map<perm_string,NetScope*>::const_iterator scope = packages_.begin()
-		 ; scope != packages_.end() ; ++ scope) {
-	    scope->second->emit_scope(tgt);
-      }
-
-	// enumerate root scopes
-      for (list<NetScope*>::const_iterator scope = root_scopes_.begin()
-		 ; scope != root_scopes_.end(); ++ scope ) {
+	// 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;
@@ -540,11 +462,8 @@ int Design::emit(struct target_t*tgt) const

 	// emit task and function definitions
      bool tasks_rc = true;
-      for (map<perm_string,NetScope*>::const_iterator scope = packages_.begin()
-		 ; scope != packages_.end() ; ++ scope )
-	    tasks_rc &= scope->second->emit_defs(tgt);
-      for (list<NetScope*>::const_iterator scope = root_scopes_.begin()
-		 ; scope != root_scopes_.end(); ++ scope )
+      for (list<NetScope*>::const_iterator scope = root_scopes_.begin();
+	   scope != root_scopes_.end(); scope++)
 	    tasks_rc &= (*scope)->emit_defs(tgt);


@@ -555,15 +474,6 @@ int Design::emit(struct target_t*tgt) const
      for (const NetAnalogTop*idx = aprocs_ ;  idx ;  idx = idx->next_)
 	    proc_rc &= idx->emit(tgt);

-      if (nodes_rc == false)
-	    tgt->errors += 1;
-      if (tasks_rc == false)
-	    tgt->errors += 1;
-      if (proc_rc == false)
-	    tgt->errors += 1;
-      if (branches_rc == false)
-	    tgt->errors += 1;
-
      rc = tgt->end_design(this);

      if (nodes_rc == false)
@@ -571,7 +481,7 @@ int Design::emit(struct target_t*tgt) const
      if (tasks_rc == false)
 	    return -2;
      if (proc_rc == false)
-	    return -3;
+	  return -3;
      if (branches_rc == false)
 	    return -4;

@@ -583,11 +493,6 @@ void NetEAccess::expr_scan(struct expr_scan_t*tgt) const
      tgt->expr_access_func(this);
 }

-void NetEArrayPattern::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_array_pattern(this);
-}
-
 void NetEBinary::expr_scan(struct expr_scan_t*tgt) const
 {
      tgt->expr_binary(this);
@@ -603,11 +508,6 @@ void NetEConst::expr_scan(struct expr_scan_t*tgt) const
      tgt->expr_const(this);
 }

-void NetEConstEnum::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_const(this);
-}
-
 void NetEConstParam::expr_scan(struct expr_scan_t*tgt) const
 {
      tgt->expr_param(this);
@@ -623,36 +523,17 @@ void NetECRealParam::expr_scan(struct expr_scan_t*tgt) const
      tgt->expr_rparam(this);
 }

+void NetEParam::expr_scan(struct expr_scan_t*tgt) const
+{
+      cerr << get_fileline() << ":internal error: unexpected NetEParam."
+	   << endl;
+}
+
 void NetEEvent::expr_scan(struct expr_scan_t*tgt) const
 {
      tgt->expr_event(this);
 }

-void NetELast::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_last(this);
-}
-
-void NetENetenum::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_netenum(this);
-}
-
-void NetENew::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_new(this);
-}
-
-void NetENull::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_null(this);
-}
-
-void NetEProperty::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_property(this);
-}
-
 void NetEScope::expr_scan(struct expr_scan_t*tgt) const
 {
      tgt->expr_scope(this);
@@ -668,21 +549,6 @@ void NetESFunc::expr_scan(struct expr_scan_t*tgt) const
      tgt->expr_sfunc(this);
 }

-void NetEShallowCopy::expr_scan(struct expr_scan_t*tgt) const
-{
-      tgt->expr_scopy(this);
-}
-
-void NetEShallowCopy::expr_scan_oper1(struct expr_scan_t*tgt) const
-{
-      arg1_->expr_scan(tgt);
-}
-
-void NetEShallowCopy::expr_scan_oper2(struct expr_scan_t*tgt) const
-{
-      arg2_->expr_scan(tgt);
-}
-
 void NetEUFunc::expr_scan(struct expr_scan_t*tgt) const
 {
      tgt->expr_ufunc(this);
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2014 Stephen Williams (steve@icarus.com)
+ * 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
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include "config.h"
@@ -44,14 +44,6 @@ verinum* PEBinary::eval_const(Design*des, NetScope*scope) const
      verinum*res;

      switch (op_) {
-	  case 'p': {
-		if (l->is_defined() && r->is_defined()) {
-		      res = new verinum(pow(*l, *r));
-		} else {
-		      res = new verinum(verinum::Vx, l->len());
-		}
-		break;
-	  }
 	  case '+': {
 		if (l->is_defined() && r->is_defined()) {
 		      res = new verinum(*l + *r);
@@ -155,7 +147,7 @@ verinum* PEConcat::eval_const(Design*des, NetScope*scope) const
      if (accum == 0)
 	    return 0;

-      for (unsigned idx = 1 ;  idx < parms_.size() ;  idx += 1) {
+      for (unsigned idx = 1 ;  idx < parms_.count() ;  idx += 1) {

 	    verinum*tmp = parms_[idx]->eval_const(des, scope);
 	    if (tmp == 0) {
@@ -269,7 +261,7 @@ verinum* PEUnary::eval_const(Design*des, NetScope*scope) const
 		for (unsigned idx = 0 ;  idx < val->len() ;  idx += 1)
 		      tmp.set(idx, val->get(idx));

-		*val = -tmp;
+		*val = v_not(tmp) + verinum(verinum::V1, 1);
 		val->has_sign(true);
 		return val;
 	  }
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 # include  "config.h"
@@ -43,7 +43,7 @@ attrib_list_t* evaluate_attributes(const map<perm_string,PExpr*>&att,
      unsigned idx = 0;

      typedef map<perm_string,PExpr*>::const_iterator iter_t;
-      for (iter_t cur = att.begin() ;  cur != att.end() ;  ++ cur , idx += 1) {
+      for (iter_t cur = att.begin() ;  cur != att.end() ;  cur ++, idx++) {
 	    table[idx].key = (*cur).first;
 	    PExpr*exp = (*cur).second;

@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
@@ -14,8 +14,11 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    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
@@ -57,3 +60,22 @@ 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.
+ *
+ */
+
@@ -14,7 +14,7 @@
 *
 *    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 */

 /*
--- a/Show More
+++ b/Show More