Version bump

Add sizeof checks on types.
Add unsupported for loops error, msg2692.
2026-10-02 16:13:34 +02:00 · 2019-01-27 21:31:05 -05:00 · 2019-01-25 18:26:14 -05:00 · 2019-01-22 19:25:00 -05:00 · 2019-01-22 18:46:47 -05:00 · 2019-01-20 14:16:09 -05:00
323 changed files with 934 additions and 5508 deletions
@@ -3,6 +3,31 @@ Revision history for Verilator
 The contributors that suggested a given feature are shown in []. Thanks!


+* Verilator 4.010 2019-01-27
+
+***   Removed --trace-lxt2, use --trace-fst instead.
+
+****  For --xml, add additional information, bug1372. [Jonathan Kimmitt]
+
+****  Add circular typedef error, bug1388.  [Al Grant]
+
+****  Add unsupported for loops error, msg2692. [Yu Sheng Lin]
+
+****  Fix FST tracing of wide arrays, bug1376. [Aleksander Osman]
+
+****  Fix error when pattern assignment has too few elements, bug1378. [Viktor Tomov]
+
+****  Fix error when no modules in $unit, bug1381. [Al Grant]
+
+****  Fix missing too many digits warning, bug1380. [Jonathan Kimmitt]
+
+****  Fix uninitialized data in verFiles and unroller, bug1385. bug1386. [Al Grant]
+
+****  Fix internal error on xrefs into unrolled functions, bug1387. [Al Grant]
+
+****  Fix DPI export void compiler error, bug1391. [Stan Sokorac]
+
+
 * Verilator 4.008 2018-12-01

 ***   Support "ref" and "const ref" pins and functions, bug1360. [Jake Longo]
@@ -3176,7 +3201,7 @@ of input ports exists for tracing.

 This uses outline mode in Emacs.  See C-h m [M-x describe-mode].

-Copyright 2001-2018 by Wilson Snyder.  This program is free software; you
+Copyright 2001-2019 by Wilson Snyder.  This program is free software; you
 can redistribute it and/or modify it under the terms of either the GNU
 Lesser General Public License Version 3 or the Perl Artistic License
 Version 2.0.
@@ -7,7 +7,7 @@
 #
 #*****************************************************************************
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -11,7 +11,7 @@ This is the Verilator package README file.

 http://www.veripool.org/verilator

-This package is Copyright 2003-2018 by Wilson Snyder.  (Report bugs to
+This package is Copyright 2003-2019 by Wilson Snyder.  (Report bugs to
 L<http://www.veripool.org/>.)

 Verilator is free software; you can redistribute it and/or modify it under
@@ -81,7 +81,7 @@ instead.)
 To use Verilator you will need the C<perl>, C<make> (or C<gmake>), and
 C<g++> (or C<clang>) packages.

-To use Verilator LXT2 or FST tracing you will need the C<gtkwave> and C<libgz> (on
+To use Verilator FST tracing you will need the C<gtkwave> and C<libgz> (on
 Ubuntu C<zlibc> C<zlib1g> C<zlib1g-dev>) packages installed.

 To compile Verilator in addition to the above you need the C<flex>,
@@ -1,6 +1,6 @@
 // DESCRIPTION: Verilator: List of To Do issues.
 //
-// Copyright 2004-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2004-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -3,7 +3,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
  if 0;
 ######################################################################
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you
 # can redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -361,7 +361,6 @@ detailed descriptions in L</"VERILATION ARGUMENTS"> for more information.
    --top-module <topname>      Name of top level input module
    --trace                     Enable waveform creation
    --trace-fst                 Enable FST waveform creation
-    --trace-lxt2                Enable LXT2 waveform creation
    --trace-depth <levels>      Depth of tracing
    --trace-max-array <depth>   Maximum bit width for tracing
    --trace-max-width <width>   Maximum array depth for tracing
@@ -417,19 +416,27 @@ Specifies the Verilog file containing the top module to be Verilated.

 =item {file.c/.cc/.cpp/.cxx}

-Specifies optional C++ files to be linked in with the Verilog code.  If any
-C++ files are specified in this way, Verilator will include a make rule
-that generates a I<module> executable.  Without any C++ files, Verilator
-will stop at the I<module>__ALL.a library, and presume you'll continue
-linking with make rules you write yourself.  See also the -CFLAGS option.
+Specifies optional C++ files to be linked in with the Verilog code.  The
+file path should either be absolute, or relative to where the make will be
+executed from, or add to your makefile's VPATH the appropriate directory to
+find the file.
+
+If any C++ files are specified in this way, Verilator will include a make
+rule that generates a I<module> executable.  Without any C++ files,
+Verilator will stop at the I<module>__ALL.a library, and presume you'll
+continue linking with make rules you write yourself.  See also the -CFLAGS
+option.

 =item {file.a/.o/.so}

 Specifies optional object or library files to be linked in with the Verilog
-code, as a shorthand for -LDFLAGS "<file>".  If any files are specified in
-this way, Verilator will include a make rule that uses these files when
-linking the I<module> executable.  This generally is only useful when used
-with the --exe option.
+code, as a shorthand for -LDFLAGS "<file>". The file path should either be
+absolute, or relative to where the make will be executed from, or add to
+your makefile's VPATH the appropriate directory to find the file.
+
+If any files are specified in this way, Verilator will include a make rule
+that uses these files when linking the I<module> executable.  This
+generally is only useful when used with the --exe option.

 =item +1364-1995ext+I<ext>

@@ -872,7 +879,7 @@ change the SystemC modules instantiated.
 Tune the inlining of modules.  The default value of 2000 specifies that up
 to 2000 new operations may be added to the model by inlining, if more than
 this number of operations would result, the module is not inlined.  Larger
-values, or a value <= 1 will inline everything, will lead to longer compile
+values, or a value < 1 will inline everything, will lead to longer compile
 times, but potentially faster runtimes.  This setting is ignored for very
 small modules; they will always be inlined, if allowed.

@@ -1269,7 +1276,7 @@ designs with only one top.
 =item --trace

 Adds waveform tracing code to the model using VCD format. This overrides
-C<--trace-fst> and C<--trace-lxt2>.
+C<--trace-fst>.

 Verilator will generate additional {prefix}__Trace*.cpp files that will
 need to be compiled.  In addition verilated_vcd_sc.cpp (for SystemC traces)
@@ -1283,13 +1290,7 @@ even when waveforms are not turned on during model execution.

 =item --trace-fst

-Enable FST waveform tracing in the model. This overrides C<--trace> and C<--trace-lxt2>.
-
-=item --trace-lxt2
-
-Enable LXT2 waveform tracing in the model. This overrides C<--trace> and
-C<--trace-fst>.  This option is deprecated in favor of FST traces and may
-be removed in the near future.
+Enable FST waveform tracing in the model. This overrides C<--trace>.

 =item --trace-depth I<levels>

@@ -4164,7 +4165,7 @@ trace file if you want all data to land in the same output file.
        ...
        Verilated::traceEverOn(true);
        VerilatedVcdC* tfp = new VerilatedVcdC;
-        topp->trace(tfp, 99);
+        topp->trace(tfp, 99);  // Trace 99 levels of hierarchy
        tfp->open("obj_dir/t_trace_ena_cc/simx.vcd");
        ...
        while (sc_time_stamp() < sim_time && !Verilated::gotFinish()) {
@@ -4200,7 +4201,7 @@ trace file if you want all data to land in the same output file.
        ...
        Verilated::traceEverOn(true);
        VerilatedVcdSc* tfp = new VerilatedVcdSc;
-        topp->trace(tfp, 99);
+        topp->trace(tfp, 99);  // Trace 99 levels of hierarchy
        tfp->open("obj_dir/t_trace_ena_cc/simx.vcd");
        ...
        sc_start(1);
@@ -4225,29 +4226,12 @@ but such requirement could be rare.
 The FST library from GTKWave does not currently support SystemC; use VCD
 format instead.

-=item How do I generate LXT2 waveforms (traces) in C++?
-
-LXT2 a format by GTKWave, which is usually 10x smaller than VCD format.
-This version provides a basic LXT2 support.
-To dump LXT2 format, add the --trace switch to Verilator and change the include path in the testbench to:
-
-    #include "verilated_lxt2_c.h"
-    VerilatedLxt2C* tfp = new VerilatedLxt2C;
-
-Note that currently supporting both LXT2 and VCD in a single simulation is impossible,
-but such requirement could be rare.
-
-=item How do I generate LXT2 waveforms (traces) in SystemC?
-
-The LXT2 library from GTKWave does not currently support SystemC; use VCD
-format instead.
-
 =item How do I view waveforms (traces)?

-Verilator makes standard VCD (Value Change Dump), LXT2 and FST files.  VCD files are viewable
+Verilator makes standard VCD (Value Change Dump) and FST files.  VCD files are viewable
 with the public domain GTKWave (recommended) or Dinotrace (legacy)
 programs, or any of the many commercial offerings;
-LXT2 and FST are supported by GTKWave only.
+FST is supported by GTKWave only.

 =item How do I reduce the size of large waveform (trace) files?

@@ -4611,7 +4595,7 @@ remain anonymous.

 The latest version is available from L<http://www.veripool.org/>.

-Copyright 2003-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2003-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify the Verilator internals under the terms of
 either the GNU Lesser General Public License Version 3 or the Perl Artistic
 License Version 2.0.
@@ -3,7 +3,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
  if 0;
 ######################################################################
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you
 # can redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -273,7 +273,7 @@ Specifies a module search directory.

 The latest version is available from L<http://www.veripool.org/>.

-Copyright 2003-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2003-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify the Verilator internals under the terms of
 either the GNU Lesser General Public License Version 3 or the Perl Artistic
 License Version 2.0.
@@ -236,7 +236,7 @@ Do not show differences in line numbering.

 The latest version is available from L<http://www.veripool.org/verilator>.

-Copyright 2005-2018 by Wilson Snyder.  This package is free software; you can
+Copyright 2005-2019 by Wilson Snyder.  This package is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -540,7 +540,7 @@ verilator_gantt.vcd.

 The latest version is available from L<http://www.veripool.org/>.

-Copyright 2018-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2018-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -3,7 +3,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
  if 0;
 # DESCRIPTION: Print include statements for each ARGV
 #
-# Copyright 2003-2018 by Wilson Snyder. This package is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This package is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU Lesser
 # General Public License Version 3 or the Perl Artistic License Version 2.0.
 ######################################################################
@@ -230,7 +230,7 @@ Displays this message and program version and exits.

 The latest version is available from L<http://www.veripool.org/>.

-Copyright 2007-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2007-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -1,12 +1,12 @@
 # DESCRIPTION: Process this file with autoconf to produce a configure script.
 #
-# Copyright 2003-2018 by Wilson Snyder. Verilator is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. Verilator is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU Lesser
 # General Public License Version 3 or the Perl Artistic License Version 2.0.

 #AC_INIT([Verilator],[#.### YYYY-MM-DD])
 #AC_INIT([Verilator],[#.### devel])
-AC_INIT([Verilator],[4.008 2018-12-01],
+AC_INIT([Verilator],[4.010 2019-01-27],
        [https://www.veripool.org/verilator],
        [verilator],[https://www.veripool.org/verilator])
 # When releasing, also update header of Changes file
@@ -5,7 +5,7 @@
 # This calls the object directory makefile.  That allows the objects to
 # be placed in the "current directory" which simplifies the Makefile.
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -5,7 +5,7 @@
 # This calls the object directory makefile.  That allows the objects to
 # be placed in the "current directory" which simplifies the Makefile.
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -5,7 +5,7 @@
 # This calls the object directory makefile.  That allows the objects to
 # be placed in the "current directory" which simplifies the Makefile.
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -5,7 +5,7 @@
 #
 # This is executed in the object directory, and called by ../Makefile
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -5,7 +5,7 @@
 # This calls the object directory makefile.  That allows the objects to
 # be placed in the "current directory" which simplifies the Makefile.
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -5,7 +5,7 @@
 #
 # This is executed in the object directory, and called by ../Makefile
 #
-# Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -95,7 +95,7 @@ int sc_main(int argc, char* argv[]) {
    if (flag && 0==strcmp(flag, "+trace")) {
        cout << "Enabling waves into logs/vlt_dump.vcd...\n";
        tfp = new VerilatedVcdSc;
-        top->trace(tfp, 99);
+        top->trace(tfp, 99);  // Trace 99 levels of hierarchy
        Verilated::mkdir("logs");
        tfp->open("logs/vlt_dump.vcd");
    }
@@ -3,7 +3,6 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */

 /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). */
-#define HAVE_ALLOCA_H 1
 #if !defined(__MINGW32__)
 # define HAVE_ALLOCA_H 1
 #endif
@@ -196,7 +196,7 @@ if(nam) /* cppcheck warning fix: nam is always defined, so this is not needed */
        dwRetVal = GetTempPath(MAX_PATH, lpTempPathBuffer);
        if((dwRetVal > MAX_PATH) || (dwRetVal == 0))
                {
-                fprintf(stderr, FST_APIMESS"GetTempPath() failed in "__FILE__" line %d, exiting.\n", __LINE__);
+                fprintf(stderr, FST_APIMESS "GetTempPath() failed in " __FILE__ " line %d, exiting.\n", __LINE__);
                exit(255);
                }
                else
@@ -204,7 +204,7 @@ if(nam) /* cppcheck warning fix: nam is always defined, so this is not needed */
                uRetVal = GetTempFileName(lpTempPathBuffer, TEXT("FSTW"), 0, szTempFileName);
                if (uRetVal == 0)
                        {
-                        fprintf(stderr, FST_APIMESS"GetTempFileName() failed in "__FILE__" line %d, exiting.\n", __LINE__);
+                        fprintf(stderr, FST_APIMESS "GetTempFileName() failed in " __FILE__ " line %d, exiting.\n", __LINE__);
                        exit(255);
                        }
                        else
@@ -808,7 +808,7 @@ if(rc<0)
        {
        xc->fseek_failed = 1;
 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
+        fprintf(stderr, FST_APIMESS "Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
        perror("Why");
 #endif
        }
@@ -1668,7 +1668,7 @@ if(zerocnt)
        /* fpos += */ fstWriterVarint(f, (zerocnt << 1)); /* scan-build */
        }
 #ifdef FST_DEBUG
-fprintf(stderr, FST_APIMESS"value chains: %d\n", cnt);
+fprintf(stderr, FST_APIMESS "value chains: %d\n", cnt);
 #endif

 xc->vchg_mem[0] = '!';
@@ -1743,7 +1743,7 @@ if(xc->dump_size_limit)
                xc2->size_limit_locked = 1;
                xc2->is_initial_time = 1; /* to trick emit value and emit time change */
 #ifdef FST_DEBUG
-                fprintf(stderr, FST_APIMESS"<< dump file size limit reached, stopping dumping >>\n");
+                fprintf(stderr, FST_APIMESS "<< dump file size limit reached, stopping dumping >>\n");
 #endif
                }
        }
@@ -2483,7 +2483,7 @@ if(xc)
 #ifndef FST_WRITER_PARALLEL
        if(xc->parallel_enabled)
                {
-                fprintf(stderr, FST_APIMESS"fstWriterSetParallelMode(), FST_WRITER_PARALLEL not enabled during compile, exiting.\n");
+                fprintf(stderr, FST_APIMESS "fstWriterSetParallelMode(), FST_WRITER_PARALLEL not enabled during compile, exiting.\n");
                exit(255);
                }
 #endif
@@ -2808,8 +2808,8 @@ if(ctx && name && literal_arr && val_arr && (elem_count != 0))
 	attr_str[pos-1] = 0;

 #ifdef FST_DEBUG
-	fprintf(stderr, FST_APIMESS"fstWriterCreateEnumTable() total_len: %d, pos: %d\n", total_len, pos);
-	fprintf(stderr, FST_APIMESS"*%s*\n", attr_str);
+	fprintf(stderr, FST_APIMESS "fstWriterCreateEnumTable() total_len: %d, pos: %d\n", total_len, pos);
+	fprintf(stderr, FST_APIMESS "*%s*\n", attr_str);
 #endif

 	fstWriterSetAttrBegin(xc, FST_AT_MISC, FST_MT_ENUMTABLE, attr_str, handle = ++xc->max_enumhandle);
@@ -2870,7 +2870,7 @@ if((xc) && (handle <= xc->maxhandle))
                                xc->vchg_mem = (unsigned char *)realloc(xc->vchg_mem, xc->vchg_alloc_siz);
                                if(!xc->vchg_mem)
                                        {
-                                        fprintf(stderr, FST_APIMESS"Could not realloc() in fstWriterEmitValueChange, exiting.\n");
+                                        fprintf(stderr, FST_APIMESS "Could not realloc() in fstWriterEmitValueChange, exiting.\n");
                                        exit(255);
                                        }
                                }
@@ -2984,7 +2984,7 @@ if((xc) && (handle <= xc->maxhandle))
                        xc->vchg_mem = (unsigned char *)realloc(xc->vchg_mem, xc->vchg_alloc_siz);
                        if(!xc->vchg_mem)
                                {
-                                fprintf(stderr, FST_APIMESS"Could not realloc() in fstWriterEmitVariableLengthValueChange, exiting.\n");
+                                fprintf(stderr, FST_APIMESS "Could not realloc() in fstWriterEmitVariableLengthValueChange, exiting.\n");
                                exit(255);
                                }
                        }
@@ -3229,7 +3229,7 @@ if(rc<0)
        {
        xc->fseek_failed = 1;
 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
+        fprintf(stderr, FST_APIMESS "Seek to #%" PRId64 " (whence = %d) failed!\n", offset, whence);
        perror("Why");
 #endif
        }
@@ -4549,7 +4549,7 @@ if(gzread_pass_status)

                                        if(rc != Z_OK)
                                                {
-                                                fprintf(stderr, FST_APIMESS"fstReaderInit(), geom uncompress rc = %d, exiting.\n", rc);
+                                                fprintf(stderr, FST_APIMESS "fstReaderInit(), geom uncompress rc = %d, exiting.\n", rc);
                                                exit(255);
                                                }

@@ -4840,7 +4840,7 @@ for(;;)
        if((sectype == EOF) || (sectype == FST_BL_SKIP))
                {
 #ifdef FST_DEBUG
-                fprintf(stderr, FST_APIMESS"<< EOF >>\n");
+                fprintf(stderr, FST_APIMESS "<< EOF >>\n");
 #endif
                break;
                }
@@ -4879,9 +4879,9 @@ for(;;)
        mem_required_for_traversal = fstReaderUint64(xc->f);
        mem_for_traversal = (unsigned char *)malloc(mem_required_for_traversal + 66); /* add in potential fastlz overhead */
 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"sec: %u seclen: %d begtim: %d endtim: %d\n",
+        fprintf(stderr, FST_APIMESS "sec: %u seclen: %d begtim: %d endtim: %d\n",
                secnum, (int)seclen, (int)beg_tim, (int)end_tim);
-        fprintf(stderr, FST_APIMESS"mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
+        fprintf(stderr, FST_APIMESS "mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
 #endif
        /* process time block */
        {
@@ -4899,7 +4899,7 @@ for(;;)
        tsec_clen = fstReaderUint64(xc->f);
        tsec_nitems = fstReaderUint64(xc->f);
 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"time section unc: %d, com: %d (%d items)\n",
+        fprintf(stderr, FST_APIMESS "time section unc: %d, com: %d (%d items)\n",
                (int)tsec_uclen, (int)tsec_clen, (int)tsec_nitems);
 #endif
        if(tsec_clen > seclen) break; /* corrupted tsec_clen: by definition it can't be larger than size of section */
@@ -4919,7 +4919,7 @@ for(;;)

                if(rc != Z_OK)
                        {
-                        fprintf(stderr, FST_APIMESS"fstReaderIterBlocks2(), tsec uncompress rc = %d, exiting.\n", rc);
+                        fprintf(stderr, FST_APIMESS "fstReaderIterBlocks2(), tsec uncompress rc = %d, exiting.\n", rc);
                        exit(255);
                        }

@@ -4995,7 +4995,7 @@ for(;;)
                                rc = uncompress(mu, &destlen, mc, sourcelen);
                                if(rc != Z_OK)
                                        {
-                                        fprintf(stderr, FST_APIMESS"fstReaderIterBlocks2(), frame uncompress rc: %d, exiting.\n", rc);
+                                        fprintf(stderr, FST_APIMESS "fstReaderIterBlocks2(), frame uncompress rc: %d, exiting.\n", rc);
                                        exit(255);
                                        }
                                free(mc);
@@ -5158,9 +5158,9 @@ for(;;)
        packtype = fgetc(xc->f);

 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
+        fprintf(stderr, FST_APIMESS "frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
                (int)frame_uclen, (int)frame_clen, (int)frame_maxhandle);
-        fprintf(stderr, FST_APIMESS"vc_maxhandle: %d, packtype: %c\n", (int)vc_maxhandle, packtype);
+        fprintf(stderr, FST_APIMESS "vc_maxhandle: %d, packtype: %c\n", (int)vc_maxhandle, packtype);
 #endif

        indx_pntr = blkpos + seclen - 24 -tsec_clen -8;
@@ -5168,7 +5168,7 @@ for(;;)
        chain_clen = fstReaderUint64(xc->f);
        indx_pos = indx_pntr - chain_clen;
 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
+        fprintf(stderr, FST_APIMESS "indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
 #endif
        chain_cmem = (unsigned char *)malloc(chain_clen);
        if(!chain_cmem) goto block_err;
@@ -5287,7 +5287,7 @@ for(;;)
                }

 #ifdef FST_DEBUG
-        fprintf(stderr, FST_APIMESS"decompressed chain idx len: %" PRIu32 "\n", idx);
+        fprintf(stderr, FST_APIMESS "decompressed chain idx len: %" PRIu32 "\n", idx);
 #endif

        mc_mem_len = 16384;
@@ -5355,7 +5355,7 @@ for(;;)

                                if(rc != Z_OK)
                                        {
-                                        fprintf(stderr, FST_APIMESS"fstReaderIterBlocks2(), fac: %d clen: %d (rc=%d), exiting.\n", (int)i, (int)val, rc);
+                                        fprintf(stderr, FST_APIMESS "fstReaderIterBlocks2(), fac: %d clen: %d (rc=%d), exiting.\n", (int)i, (int)val, rc);
                                        exit(255);
                                        }

@@ -5907,9 +5907,9 @@ mem_required_for_traversal =
        fstReaderUint64(xc->f);

 #ifdef FST_DEBUG
-fprintf(stderr, FST_APIMESS"rvat sec: %u seclen: %d begtim: %d endtim: %d\n",
+fprintf(stderr, FST_APIMESS "rvat sec: %u seclen: %d begtim: %d endtim: %d\n",
        secnum, (int)seclen, (int)beg_tim, (int)end_tim);
-fprintf(stderr, FST_APIMESS"mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
+fprintf(stderr, FST_APIMESS "mem_required_for_traversal: %d\n", (int)mem_required_for_traversal);
 #endif

 /* process time block */
@@ -5928,7 +5928,7 @@ tsec_uclen = fstReaderUint64(xc->f);
 tsec_clen = fstReaderUint64(xc->f);
 tsec_nitems = fstReaderUint64(xc->f);
 #ifdef FST_DEBUG
-fprintf(stderr, FST_APIMESS"time section unc: %d, com: %d (%d items)\n",
+fprintf(stderr, FST_APIMESS "time section unc: %d, com: %d (%d items)\n",
        (int)tsec_uclen, (int)tsec_clen, (int)tsec_nitems);
 #endif
 ucdata = (unsigned char *)malloc(tsec_uclen);
@@ -5945,7 +5945,7 @@ if(tsec_uclen != tsec_clen)

        if(rc != Z_OK)
                {
-                fprintf(stderr, FST_APIMESS"fstReaderGetValueFromHandleAtTime(), tsec uncompress rc = %d, exiting.\n", rc);
+                fprintf(stderr, FST_APIMESS "fstReaderGetValueFromHandleAtTime(), tsec uncompress rc = %d, exiting.\n", rc);
                exit(255);
                }

@@ -5993,7 +5993,7 @@ if(frame_uclen == frame_clen)
        rc = uncompress(xc->rvat_frame_data, &destlen, mc, sourcelen);
        if(rc != Z_OK)
                {
-                fprintf(stderr, FST_APIMESS"fstReaderGetValueFromHandleAtTime(), frame decompress rc: %d, exiting.\n", rc);
+                fprintf(stderr, FST_APIMESS "fstReaderGetValueFromHandleAtTime(), frame decompress rc: %d, exiting.\n", rc);
                exit(255);
                }
        free(mc);
@@ -6004,9 +6004,9 @@ xc->rvat_vc_start = ftello(xc->f);      /* points to '!' character */
 xc->rvat_packtype = fgetc(xc->f);

 #ifdef FST_DEBUG
-fprintf(stderr, FST_APIMESS"frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
+fprintf(stderr, FST_APIMESS "frame_uclen: %d, frame_clen: %d, frame_maxhandle: %d\n",
        (int)frame_uclen, (int)frame_clen, (int)xc->rvat_frame_maxhandle);
-fprintf(stderr, FST_APIMESS"vc_maxhandle: %d\n", (int)xc->rvat_vc_maxhandle);
+fprintf(stderr, FST_APIMESS "vc_maxhandle: %d\n", (int)xc->rvat_vc_maxhandle);
 #endif

 indx_pntr = blkpos + seclen - 24 -tsec_clen -8;
@@ -6014,7 +6014,7 @@ fstReaderFseeko(xc, xc->f, indx_pntr, SEEK_SET);
 chain_clen = fstReaderUint64(xc->f);
 indx_pos = indx_pntr - chain_clen;
 #ifdef FST_DEBUG
-fprintf(stderr, FST_APIMESS"indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
+fprintf(stderr, FST_APIMESS "indx_pos: %d (%d bytes)\n", (int)indx_pos, (int)chain_clen);
 #endif
 chain_cmem = (unsigned char *)malloc(chain_clen);
 fstReaderFseeko(xc, xc->f, indx_pos, SEEK_SET);
@@ -6125,7 +6125,7 @@ for(i=0;i<idx;i++)
        }

 #ifdef FST_DEBUG
-fprintf(stderr, FST_APIMESS"decompressed chain idx len: %" PRIu32 "\n", idx);
+fprintf(stderr, FST_APIMESS "decompressed chain idx len: %" PRIu32 "\n", idx);
 #endif

 xc->rvat_data_valid = 1;
@@ -6185,7 +6185,7 @@ if(!xc->rvat_chain_mem)

                if(rc != Z_OK)
                        {
-                        fprintf(stderr, FST_APIMESS"fstReaderGetValueFromHandleAtTime(), rvat decompress clen: %d (rc=%d), exiting.\n", (int)xc->rvat_chain_len, rc);
+                        fprintf(stderr, FST_APIMESS "fstReaderGetValueFromHandleAtTime(), rvat decompress clen: %d (rc=%d), exiting.\n", (int)xc->rvat_chain_len, rc);
                        exit(255);
                        }

@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2003-2012 Tony Bybell.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef DEFS_LXTW_H
-#define DEFS_LXTW_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <zlib.h>
-
-#ifndef HAVE_FSEEKO
-#define fseeko fseek
-#define ftello ftell
-#endif
-
-#include "wavealloca.h"
-
-#define LXT2_WR_HDRID (0x1380)
-#define LXT2_WR_VERSION (0x0001)
-
-#define LXT2_WR_GRANULE_SIZE (64)
-#define LXT2_WR_GRANULE_NUM (256)
-#define LXT2_WR_PARTIAL_SIZE (2048)
-
-#define LXT2_WR_GRAN_SECT_TIME 0
-#define LXT2_WR_GRAN_SECT_DICT 1
-#define LXT2_WR_GRAN_SECT_TIME_PARTIAL 2
-
-#define LXT2_WR_GZWRITE_BUFFER 4096
-#define LXT2_WR_SYMPRIME 500009
-
-typedef uint64_t lxttime_t;
-typedef  int64_t lxtstime_t;
-
-
-#ifndef _MSC_VER
-	#ifdef __MINGW32__
-		#define LXT2_WR_LLD "%I64d"
-	#else
-        	#define LXT2_WR_LLD "%lld"
-	#endif
-        #define LXT2_WR_LLDESC(x) x##LL
-        #define LXT2_WR_ULLDESC(x) x##ULL
-#else
-        #define LXT2_WR_LLD "%I64d"
-        #define LXT2_WR_LLDESC(x) x##i64
-        #define LXT2_WR_ULLDESC(x) x##i64
-#endif
-
-#if LXT2_WR_GRANULE_SIZE > 32
-typedef unsigned long long granmsk_t;
-#define LXT2_WR_GRAN_0VAL (LXT2_WR_ULLDESC(0))
-#define LXT2_WR_GRAN_1VAL (LXT2_WR_ULLDESC(1))
-#else
-typedef unsigned int granmsk_t;
-#define LXT2_WR_GRAN_0VAL (0)
-#define LXT2_WR_GRAN_1VAL (1)
-#endif
-
-
-enum LXT2_WR_Encodings {
-	LXT2_WR_ENC_0,
-	LXT2_WR_ENC_1,
-	LXT2_WR_ENC_INV,
-	LXT2_WR_ENC_LSH0,
-	LXT2_WR_ENC_LSH1,
-	LXT2_WR_ENC_RSH0,
-	LXT2_WR_ENC_RSH1,
-
-	LXT2_WR_ENC_ADD1,
-	LXT2_WR_ENC_ADD2,
-	LXT2_WR_ENC_ADD3,
-	LXT2_WR_ENC_ADD4,
-
-	LXT2_WR_ENC_SUB1,
-	LXT2_WR_ENC_SUB2,
-	LXT2_WR_ENC_SUB3,
-	LXT2_WR_ENC_SUB4,
-
-	LXT2_WR_ENC_X,
-	LXT2_WR_ENC_Z,
-
-	LXT2_WR_ENC_BLACKOUT,
-
-	LXT2_WR_DICT_START
-	};
-
-/*
- * integer splay
- */
-typedef struct lxt2_wr_ds_tree_node lxt2_wr_ds_Tree;
-struct lxt2_wr_ds_tree_node {
-    lxt2_wr_ds_Tree * left, * right;
-    granmsk_t item;
-    int val;
-    lxt2_wr_ds_Tree * next;
-};
-
-
-/*
- * string splay
- */
-typedef struct lxt2_wr_dslxt_tree_node lxt2_wr_dslxt_Tree;
-struct lxt2_wr_dslxt_tree_node {
-    lxt2_wr_dslxt_Tree * left, * right;
-    char *item;
-    unsigned int val;
-    lxt2_wr_dslxt_Tree * next;
-};
-
-
-struct lxt2_wr_trace
-{
-FILE *handle;
-gzFile zhandle;
-
-lxt2_wr_dslxt_Tree *dict;	/* dictionary manipulation */
-unsigned int num_dict_entries;
-unsigned int dict_string_mem_required;
-lxt2_wr_dslxt_Tree *dict_head;
-lxt2_wr_dslxt_Tree *dict_curr;
-
-lxt2_wr_ds_Tree *mapdict;	/* bitmap compression */
-unsigned int num_map_entries;
-lxt2_wr_ds_Tree *mapdict_head;
-lxt2_wr_ds_Tree *mapdict_curr;
-
-off_t position;
-off_t zfacname_predec_size, zfacname_size, zfacgeometry_size;
-off_t zpackcount, zpackcount_cumulative;
-off_t current_chunk, current_chunkz;
-
-struct lxt2_wr_symbol *sym[LXT2_WR_SYMPRIME];
-struct lxt2_wr_symbol **sorted_facs;
-struct lxt2_wr_symbol *symchain;
-unsigned int numfacs, numalias;
-int numfacbytes;
-int longestname;
-
-int numsections, numblock;
-off_t facname_offset, facgeometry_offset;
-
-lxttime_t mintime, maxtime;
-lxtstime_t timezero;
-unsigned int timegranule;
-int timescale;
-unsigned int timepos;
-unsigned int maxgranule;
-lxttime_t firsttime, lasttime;
-lxttime_t timetable[LXT2_WR_GRANULE_SIZE];
-
-unsigned int partial_iter;
-
-char *compress_fac_str;
-int compress_fac_len;
-
-lxttime_t flushtime;
-unsigned flush_valid : 1;
-
-unsigned do_strip_brackets : 1;
-unsigned emitted : 1;			/* gate off change field zmode changes when set */
-unsigned timeset : 1;			/* time has been modified from 0..0 */
-unsigned bumptime : 1;			/* says that must go to next time position in granule as value change exists for current time */
-unsigned granule_dirty : 1;		/* for flushing out final block */
-unsigned blackout : 1;			/* blackout on/off */
-unsigned partial : 1;			/* partial (vertical) trace support */
-unsigned partial_zip : 1;		/* partial (vertical) trace support for zip subregions */
-unsigned no_checkpoint : 1;		/* turns off interblock checkpointing */
-unsigned partial_preference : 1;	/* partial preference encountered on some facs */
-
-char initial_value;
-
-char zmode[4];				/* fills in with "wb0".."wb9" */
-unsigned int gzbufpnt;
-unsigned char gzdest[LXT2_WR_GZWRITE_BUFFER + 4];	/* enough for zlib buffering */
-
-char *lxtname;
-off_t break_size;
-off_t break_header_size;
-unsigned int break_number;
-};
-
-
-struct lxt2_wr_symbol
-{
-struct lxt2_wr_symbol *next;
-struct lxt2_wr_symbol *symchain;
-char *name;
-int namlen;
-
-int facnum;
-struct lxt2_wr_symbol *aliased_to;
-
-char *value;	/* fac's actual value */
-
-unsigned int rows;
-int msb, lsb;
-int len;
-int flags;
-
-unsigned partial_preference : 1;	/* in order to shove nets to the first partial group */
-
-unsigned int chgpos;
-granmsk_t msk;				/* must contain LXT2_WR_GRANULE_SIZE bits! */
-unsigned int chg[LXT2_WR_GRANULE_SIZE];
-};
-
-
-#define LXT2_WR_SYM_F_BITS         (0)
-#define LXT2_WR_SYM_F_INTEGER      (1<<0)
-#define LXT2_WR_SYM_F_DOUBLE       (1<<1)
-#define LXT2_WR_SYM_F_STRING       (1<<2)
-#define LXT2_WR_SYM_F_TIME         (LXT2_WR_SYM_F_STRING)      /* user must correctly format this as a string */
-#define LXT2_WR_SYM_F_ALIAS        (1<<3)
-
-#define LXT2_WR_SYM_F_SIGNED       (1<<4)
-#define LXT2_WR_SYM_F_BOOLEAN      (1<<5)
-#define LXT2_WR_SYM_F_NATURAL      ((1<<6)|(LXT2_WR_SYM_F_INTEGER))
-#define LXT2_WR_SYM_F_POSITIVE     ((1<<7)|(LXT2_WR_SYM_F_INTEGER))
-#define LXT2_WR_SYM_F_CHARACTER    (1<<8)
-
-#define LXT2_WR_SYM_F_CONSTANT     (1<<9)
-#define LXT2_WR_SYM_F_VARIABLE     (1<<10)
-#define LXT2_WR_SYM_F_SIGNAL       (1<<11)
-
-#define LXT2_WR_SYM_F_IN           (1<<12)
-#define LXT2_WR_SYM_F_OUT          (1<<13)
-#define LXT2_WR_SYM_F_INOUT        (1<<14)
-
-#define LXT2_WR_SYM_F_WIRE         (1<<15)
-#define LXT2_WR_SYM_F_REG          (1<<16)
-
-
-			/* file I/O */
-struct lxt2_wr_trace *	lxt2_wr_init(const char *name);
-void 			lxt2_wr_flush(struct lxt2_wr_trace *lt);
-void 			lxt2_wr_close(struct lxt2_wr_trace *lt);
-
-			/* for dealing with very large traces, split into multiple files approximately "siz" in length */
-void 			lxt2_wr_set_break_size(struct lxt2_wr_trace *lt, off_t siz);
-
-			/* 0 = no compression, 9 = best compression, 4 = default */
-void			lxt2_wr_set_compression_depth(struct lxt2_wr_trace *lt, unsigned int depth);
-
-			/* default is partial off, turning on makes for faster trace reads, nonzero zipmode causes vertical compression */
-void			lxt2_wr_set_partial_off(struct lxt2_wr_trace *lt);
-void			lxt2_wr_set_partial_on(struct lxt2_wr_trace *lt, int zipmode);
-void			lxt2_wr_set_partial_preference(struct lxt2_wr_trace *lt, const char *name);
-
-			/* turning off checkpointing makes for smaller files */
-void			lxt2_wr_set_checkpoint_off(struct lxt2_wr_trace *lt);
-void			lxt2_wr_set_checkpoint_on(struct lxt2_wr_trace *lt);
-
-			/* facility creation */
-void                    lxt2_wr_set_initial_value(struct lxt2_wr_trace *lt, char value);
-struct lxt2_wr_symbol *	lxt2_wr_symbol_find(struct lxt2_wr_trace *lt, const char *name);
-struct lxt2_wr_symbol *	lxt2_wr_symbol_add(struct lxt2_wr_trace *lt, const char *name, unsigned int rows, int msb, int lsb, int flags);
-struct lxt2_wr_symbol *	lxt2_wr_symbol_alias(struct lxt2_wr_trace *lt, const char *existing_name, const char *alias, int msb, int lsb);
-void			lxt2_wr_symbol_bracket_stripping(struct lxt2_wr_trace *lt, int doit);
-
-			/* each granule is LXT2_WR_GRANULE_SIZE (32 or 64) timesteps, default is 256 per section */
-void 			lxt2_wr_set_maxgranule(struct lxt2_wr_trace *lt, unsigned int maxgranule);
-
-			/* time ops */
-void 			lxt2_wr_set_timescale(struct lxt2_wr_trace *lt, int timescale);
-void 			lxt2_wr_set_timezero(struct lxt2_wr_trace *lt, lxtstime_t timeval);
-int 			lxt2_wr_set_time(struct lxt2_wr_trace *lt, unsigned int timeval);
-int 			lxt2_wr_inc_time_by_delta(struct lxt2_wr_trace *lt, unsigned int timeval);
-int 			lxt2_wr_set_time64(struct lxt2_wr_trace *lt, lxttime_t timeval);
-int 			lxt2_wr_inc_time_by_delta64(struct lxt2_wr_trace *lt, lxttime_t timeval);
-
-                        /* allows blackout regions in LXT files */
-void                    lxt2_wr_set_dumpoff(struct lxt2_wr_trace *lt);
-void                    lxt2_wr_set_dumpon(struct lxt2_wr_trace *lt);
-
-			/* left fill on bit_string uses vcd semantics (left fill with value[0] unless value[0]=='1', then use '0') */
-int 			lxt2_wr_emit_value_int(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, int value);
-int 			lxt2_wr_emit_value_double(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, double value);
-int 			lxt2_wr_emit_value_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value);
-int 			lxt2_wr_emit_value_bit_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -39,6 +39,16 @@

 #define VL_VALUE_STRING_MAX_WIDTH 8192  ///< Max static char array for VL_VALUE_STRING

+//===========================================================================
+// Static sanity checks (when get C++11 can use static_assert)
+
+typedef union {
+    char vluint8_incorrect[(sizeof(vluint8_t) == 1) ? 1:-1];
+    char vluint16_incorrect[(sizeof(vluint16_t) == 2) ? 1:-1];
+    char vluint32_incorrect[(sizeof(vluint32_t) == 4) ? 1:-1];
+    char vluint64_incorrect[(sizeof(vluint64_t) == 8) ? 1:-1];
+} vl_static_checks_t;
+
 //===========================================================================
 // Global variables

@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -78,8 +78,6 @@ class VerilatedVar;
 class VerilatedVarNameMap;
 class VerilatedVcd;
 class VerilatedVcdC;
-class VerilatedLxt2;
-class VerilatedLxt2C;
 class VerilatedFst;
 class VerilatedFstC;

@@ -2,7 +2,7 @@
 ######################################################################
 # DESCRIPTION: Makefile commands for all verilated target files
 #
-# Copyright 2003-2018 by Wilson Snyder. Verilator is free software; you can
+# Copyright 2003-2019 by Wilson Snyder. Verilator is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU Lesser
 # General Public License Version 3 or the Perl Artistic License Version 2.0.
 ######################################################################
@@ -4,7 +4,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2009-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -220,16 +220,16 @@ char* VerilatedFst::array2Str(const vluint32_t* newval, int bits) {
    int bq = bits/32, br = bits%32;
    m_valueStrBuffer.resize(bits+1);
    char* s = m_valueStrBuffer.data();
+    for (int i = 0; i < br; ++i) {
+        *s = '0' + ((newval[bq]>>(br-i-1))&1);
+        ++s;
+    }
    for (int w = bq-1; w >= 0; --w) {
        for (int i = 0; i < 32; ++i) {
            *s = '0' + ((newval[w]>>(32-i-1))&1);
            ++s;
        }
    }
-    for (int i = 0; i < br; ++i) {
-        *s = '0' + ((newval[bq]>>(br-i-1))&1);
-        ++s;
-    }
    *s = '\0';
    return m_valueStrBuffer.data();
 }
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2010-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2010-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2009-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,180 +0,0 @@
-// -*- mode: C++; c-file-style: "cc-mode" -*-
-//=============================================================================
-//
-// THIS MODULE IS PUBLICLY LICENSED
-//
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
-// you can redistribute it and/or modify it under the terms of either the GNU
-// Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
-//
-// This 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.
-//
-//=============================================================================
-///
-/// \file
-/// \brief C++ Tracing in LXT2 Format
-///
-//=============================================================================
-// SPDIFF_OFF
-
-#include "verilatedos.h"
-#include "verilated.h"
-#include "verilated_lxt2_c.h"
-
-// Include the GTKWave implementation directly
-#include "gtkwave/lxt2_write.cpp"
-
-#include <algorithm>
-#include <cerrno>
-#include <ctime>
-#include <fcntl.h>
-#include <sstream>
-#include <sys/stat.h>
-
-#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
-# include <io.h>
-#else
-# include <unistd.h>
-#endif
-
-//=============================================================================
-
-class VerilatedLxt2CallInfo {
-protected:
-    friend class VerilatedLxt2;
-    VerilatedLxt2Callback_t m_initcb;  ///< Initialization Callback function
-    VerilatedLxt2Callback_t m_fullcb;  ///< Full Dumping Callback function
-    VerilatedLxt2Callback_t m_changecb;  ///< Incremental Dumping Callback function
-    void* m_userthis;  ///< Fake "this" for caller
-    vluint32_t m_code;  ///< Starting code number
-    // CONSTRUCTORS
-    VerilatedLxt2CallInfo(VerilatedLxt2Callback_t icb, VerilatedLxt2Callback_t fcb,
-                          VerilatedLxt2Callback_t changecb,
-                          void* ut, vluint32_t code)
-        : m_initcb(icb), m_fullcb(fcb), m_changecb(changecb), m_userthis(ut), m_code(code) {};
-    ~VerilatedLxt2CallInfo() {}
-};
-
-//=============================================================================
-// VerilatedLxt2
-
-VerilatedLxt2::VerilatedLxt2(lxt2_wr_trace* lxt2)
-    : m_lxt2(lxt2),
-      m_fullDump(true),
-      m_scopeEscape('.') {}
-
-void VerilatedLxt2::open(const char* filename) VL_MT_UNSAFE {
-    m_assertOne.check();
-    m_lxt2 = lxt2_wr_init(filename);
-    for (vluint32_t ent = 0; ent< m_callbacks.size(); ent++) {
-        VerilatedLxt2CallInfo* cip = m_callbacks[ent];
-        cip->m_code = 1;
-        (cip->m_initcb)(this, cip->m_userthis, cip->m_code);
-    }
-}
-
-void VerilatedLxt2::module(const std::string& name) {
-    m_module = name;
-}
-
-//=============================================================================
-// Decl
-
-void VerilatedLxt2::declSymbol(vluint32_t code, const char* name, int arraynum, int msb, int lsb, int flags) {
-    if (msb == 0 && lsb == 0) {
-        msb = lsb = -1;
-    }
-    std::pair<Code2SymbolType::iterator, bool> p
-        = m_code2symbol.insert(std::make_pair(code, (lxt2_wr_symbol*)(NULL)));
-    std::stringstream name_ss;
-    name_ss <<m_module<<"."<<name;
-    if (arraynum >= 0) {
-        name_ss <<"("<<arraynum<<")";
-    }
-    std::string name_s = name_ss.str();
-    for (std::string::iterator it = name_s.begin(); it != name_s.end(); ++it) {
-        if (isScopeEscape(*it)) {
-            *it = '.';
-        }
-    }
-    if (p.second) {  // New
-        p.first->second = lxt2_wr_symbol_add(m_lxt2, name_s.c_str(), 0, msb, lsb, flags);
-        assert(p.first->second);
-    } else {  // Alias
-        lxt2_wr_symbol_alias(m_lxt2, p.first->second->name, name_s.c_str(), msb, lsb);
-    }
-}
-
-//=============================================================================
-// Callbacks
-
-void VerilatedLxt2::addCallback(
-    VerilatedLxt2Callback_t initcb, VerilatedLxt2Callback_t fullcb,
-    VerilatedLxt2Callback_t changecb, void* userthis) VL_MT_UNSAFE_ONE {
-    m_assertOne.check();
-    if (VL_UNLIKELY(isOpen())) {
-        std::string msg = std::string("Internal: ")+__FILE__+"::"+__FUNCTION__+" called with already open file";
-        VL_FATAL_MT(__FILE__,__LINE__,"",msg.c_str());
-    }
-    VerilatedLxt2CallInfo* vci = new VerilatedLxt2CallInfo(initcb, fullcb, changecb, userthis, 1);
-    m_callbacks.push_back(vci);
-}
-
-//=============================================================================
-// Dumping
-
-void VerilatedLxt2::dump(vluint64_t timeui) {
-    if (!isOpen()) return;
-    if (VL_UNLIKELY(m_fullDump)) {
-        m_fullDump = false;  // No need for more full dumps
-        for (vluint32_t ent = 0; ent< m_callbacks.size(); ent++) {
-            VerilatedLxt2CallInfo* cip = m_callbacks[ent];
-            (cip->m_fullcb)(this, cip->m_userthis, cip->m_code);
-        }
-        return;
-    }
-    lxt2_wr_set_time64(m_lxt2, timeui);
-    for (vluint32_t ent = 0; ent< m_callbacks.size(); ++ent) {
-        VerilatedLxt2CallInfo* cip = m_callbacks[ent];
-        (cip->m_changecb)(this, cip->m_userthis, cip->m_code);
-    }
-}
-
-//=============================================================================
-// Helpers
-
-char* VerilatedLxt2::quad2Str(vluint64_t newval, int bits) {
-    m_valueStrBuffer.resize(bits+1);
-    char* s = m_valueStrBuffer.data();
-    for (int i = 0; i < bits; ++i) {
-        *s = '0' + ((newval>>(bits-i-1))&1);
-        ++s;
-    }
-    *s = '\0';
-    return m_valueStrBuffer.data();
-}
-
-char* VerilatedLxt2::array2Str(const vluint32_t* newval, int bits) {
-    int bq = bits/32, br = bits%32;
-    m_valueStrBuffer.resize(bits+1);
-    char* s = m_valueStrBuffer.data();
-    for (int w = bq-1; w >= 0; --w) {
-        for (int i = 0; i < 32; ++i) {
-            *s = '0' + ((newval[w]>>(32-i-1))&1);
-            ++s;
-        }
-    }
-    for (int i = 0; i < br; ++i) {
-        *s = '0' + ((newval[bq]>>(br-i-1))&1);
-        ++s;
-    }
-    *s = '\0';
-    return m_valueStrBuffer.data();
-}
-
-//********************************************************************
-// Local Variables:
-// End:
@@ -1,205 +0,0 @@
-// -*- mode: C++; c-file-style: "cc-mode" -*-
-//=============================================================================
-//
-// THIS MODULE IS PUBLICLY LICENSED
-//
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
-// you can redistribute it and/or modify it under the terms of either the GNU
-// Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
-//
-// This 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.
-//
-//=============================================================================
-///
-/// \file
-/// \brief C++ Tracing in LXT2 Format
-///
-//=============================================================================
-// SPDIFF_OFF
-
-#ifndef _VERILATED_LXT2_C_H_
-#define _VERILATED_LXT2_C_H_ 1
-
-#include "verilatedos.h"
-#include "verilated.h"
-
-#include "gtkwave/lxt2_write.h"
-
-#include <map>
-#include <string>
-#include <vector>
-
-class VerilatedLxt2;
-class VerilatedLxt2CallInfo;
-typedef void (*VerilatedLxt2Callback_t)(VerilatedLxt2* vcdp, void* userthis, vluint32_t code);
-
-//=============================================================================
-// VerilatedLxt2
-/// Base class to create a Verilator LXT2 dump
-/// This is an internally used class - see VerilatedLxt2C for what to call from applications
-
-class VerilatedLxt2 {
-    typedef std::map<vluint32_t, lxt2_wr_symbol*> Code2SymbolType;
-    typedef std::vector<VerilatedLxt2CallInfo*> CallbackVec;
-private:
-    lxt2_wr_trace* m_lxt2;
-    VerilatedAssertOneThread m_assertOne;  ///< Assert only called from single thread
-    bool m_fullDump;
-    char m_scopeEscape;
-    std::string m_module;
-    CallbackVec m_callbacks;  ///< Routines to perform dumping
-    Code2SymbolType m_code2symbol;
-    // CONSTRUCTORS
-    VL_UNCOPYABLE(VerilatedLxt2);
-    void declSymbol(vluint32_t code, const char* name, int arraynum, int msb, int lsb, int flags);
-    // helpers
-    std::vector<char> m_valueStrBuffer;
-    char* quad2Str(vluint64_t newval, int bits);
-    char* array2Str(const vluint32_t *newval, int bits);
-public:
-    explicit VerilatedLxt2(lxt2_wr_trace* lxt2=NULL);
-    ~VerilatedLxt2() { if (m_lxt2 == NULL) { lxt2_wr_close(m_lxt2); } }
-    bool isOpen() const { return m_lxt2 != NULL; }
-    void open(const char* filename) VL_MT_UNSAFE;
-    void flush() VL_MT_UNSAFE { lxt2_wr_flush(m_lxt2); }
-    void close() VL_MT_UNSAFE {
-        m_assertOne.check();
-        lxt2_wr_close(m_lxt2);
-        m_lxt2 = NULL;
-    }
-    // void set_time_unit(const char* unitp);  ///< Set time units (s/ms, defaults to ns)
-    // void set_time_unit(const std::string& unit) { set_time_unit(unit.c_str()); }
-
-    // void set_time_resolution(const char* unitp);  ///< Set time resolution (s/ms, defaults to ns)
-    // void set_time_resolution(const std::string& unit) { set_time_resolution(unit.c_str()); }
-
-    // double timescaleToDouble(const char* unitp);
-    // std::string doubleToTimescale(double value);
-
-    /// Change character that splits scopes.  Note whitespace are ALWAYS escapes.
-    void scopeEscape(char flag) { m_scopeEscape = flag; }
-    /// Is this an escape?
-    bool isScopeEscape(char c) { return isspace(c) || c==m_scopeEscape; }
-    /// Inside dumping routines, called each cycle to make the dump
-    void dump(vluint64_t timeui);
-    /// Inside dumping routines, declare callbacks for tracings
-    void addCallback(VerilatedLxt2Callback_t initcb, VerilatedLxt2Callback_t fullcb,
-                     VerilatedLxt2Callback_t changecb,
-                     void* userthis) VL_MT_UNSAFE_ONE;
-
-    /// Inside dumping routines, declare a module
-    void module(const std::string& name);
-    /// Inside dumping routines, declare a signal
-    void declBit(vluint32_t code, const char* name, int arraynum) {
-        declSymbol(code, name, arraynum, 0, 0, LXT2_WR_SYM_F_BITS);
-    }
-    void declBus(vluint32_t code, const char* name, int arraynum, int msb, int lsb) {
-        declSymbol(code, name, arraynum, msb, lsb, LXT2_WR_SYM_F_BITS);
-    }
-    void declDouble(vluint32_t code, const char* name, int arraynum) {
-        declSymbol(code, name, arraynum, 63, 0, LXT2_WR_SYM_F_DOUBLE);
-    }
-    void declFloat(vluint32_t code, const char* name, int arraynum) {
-        declSymbol(code, name, arraynum, 63, 0, LXT2_WR_SYM_F_DOUBLE);
-    }
-    void declQuad(vluint32_t code, const char* name, int arraynum, int msb, int lsb) {
-        declSymbol(code, name, arraynum, msb, lsb, LXT2_WR_SYM_F_BITS);
-    }
-    void declArray(vluint32_t code, const char* name, int arraynum, int msb, int lsb) {
-        declSymbol(code, name, arraynum, msb, lsb, LXT2_WR_SYM_F_BITS);
-    }
-
-    /// Inside dumping routines, dump one signal if it has changed
-    void chgBit(vluint32_t code, const vluint32_t newval) {
-        lxt2_wr_emit_value_int(m_lxt2, m_code2symbol[code], 0, newval);
-    }
-    void chgBus(vluint32_t code, const vluint32_t newval, int bits) {
-        lxt2_wr_emit_value_int(m_lxt2, m_code2symbol[code], 0, newval);
-    }
-    void chgDouble(vluint32_t code, const double newval) {
-        lxt2_wr_emit_value_double(m_lxt2, m_code2symbol[code], 0, newval);
-    }
-    void chgFloat(vluint32_t code, const float newval) {
-        lxt2_wr_emit_value_double(m_lxt2, m_code2symbol[code], 0, newval);
-    }
-    void chgQuad(vluint32_t code, const vluint64_t newval, int bits) {
-        lxt2_wr_emit_value_bit_string(m_lxt2, m_code2symbol[code], 0, quad2Str(newval, bits));
-    }
-    void chgArray(vluint32_t code, const vluint32_t* newval, int bits) {
-        lxt2_wr_emit_value_bit_string(m_lxt2, m_code2symbol[code], 0, array2Str(newval, bits));
-    }
-
-    void fullBit(vluint32_t code, const vluint32_t newval) { chgBit(code, newval); }
-    void fullBus(vluint32_t code, const vluint32_t newval, int bits) { chgBus(code, newval, bits); }
-    void fullDouble(vluint32_t code, const double newval) { chgDouble(code, newval); }
-    void fullFloat(vluint32_t code, const float newval) { chgFloat(code, newval); }
-    void fullQuad(vluint32_t code, const vluint64_t newval, int bits) { chgQuad(code, newval, bits); }
-    void fullArray(vluint32_t code, const vluint32_t* newval, int bits) { chgArray(code, newval, bits); }
-
-    void declTriBit(vluint32_t code, const char* name, int arraynum);
-    void declTriBus(vluint32_t code, const char* name, int arraynum, int msb, int lsb);
-    void declTriQuad(vluint32_t code, const char* name, int arraynum, int msb, int lsb);
-    void declTriArray(vluint32_t code, const char* name, int arraynum, int msb, int lsb);
-    void fullTriBit(vluint32_t code, const vluint32_t newval, const vluint32_t newtri);
-    void fullTriBus(vluint32_t code, const vluint32_t newval, const vluint32_t newtri, int bits);
-    void fullTriQuad(vluint32_t code, const vluint64_t newval, const vluint32_t newtri, int bits);
-    void fullTriArray(vluint32_t code, const vluint32_t* newvalp, const vluint32_t* newtrip, int bits);
-    void fullBitX(vluint32_t code);
-    void fullBusX(vluint32_t code, int bits);
-    void fullQuadX(vluint32_t code, int bits);
-    void fullArrayX(vluint32_t code, int bits);
-    void chgTriBit(vluint32_t code, const vluint32_t newval, const vluint32_t newtri);
-    void chgTriBus(vluint32_t code, const vluint32_t newval, const vluint32_t newtri, int bits);
-    void chgTriQuad(vluint32_t code, const vluint64_t newval, const vluint32_t newtri, int bits);
-    void chgTriArray(vluint32_t code, const vluint32_t* newvalp, const vluint32_t* newtrip, int bits);
-};
-
-//=============================================================================
-// VerilatedLxt2C
-/// Create a LXT2 dump file in C standalone (no SystemC) simulations.
-/// Also derived for use in SystemC simulations.
-/// Thread safety: Unless otherwise indicated, every function is VL_MT_UNSAFE_ONE
-
-class VerilatedLxt2C {
-    VerilatedLxt2 m_sptrace;  ///< Trace file being created
-
-    // CONSTRUCTORS
-    VL_UNCOPYABLE(VerilatedLxt2C);
-public:
-    explicit VerilatedLxt2C(lxt2_wr_trace* filep=NULL) : m_sptrace(filep) {}
-    ~VerilatedLxt2C() {}
-public:
-    // ACCESSORS
-    /// Is file open?
-    bool isOpen() const { return m_sptrace.isOpen(); }
-    // METHODS
-    /// Open a new LXT2 file
-    void open(const char* filename) VL_MT_UNSAFE_ONE { m_sptrace.open(filename); }
-    /// Close dump
-    void close() VL_MT_UNSAFE_ONE { m_sptrace.close(); }
-    /// Flush dump
-    void flush() VL_MT_UNSAFE_ONE { m_sptrace.flush(); }
-    /// Write one cycle of dump data
-    void dump(vluint64_t timeui) { m_sptrace.dump(timeui); }
-    /// Write one cycle of dump data - backward compatible and to reduce
-    /// conversion warnings.  It's better to use a vluint64_t time instead.
-    void dump(double timestamp) { dump(static_cast<vluint64_t>(timestamp)); }
-    void dump(vluint32_t timestamp) { dump(static_cast<vluint64_t>(timestamp)); }
-    void dump(int timestamp) { dump(static_cast<vluint64_t>(timestamp)); }
-    /// Set time units (s/ms, defaults to ns)
-    /// See also VL_TIME_PRECISION, and VL_TIME_MULTIPLIER in verilated.h
-    void set_time_unit(const char* unit) { /* TODO */ }
-    void set_time_unit(const std::string& unit) { set_time_unit(unit.c_str()); }
-    /// Set time resolution (s/ms, defaults to ns)
-    /// See also VL_TIME_PRECISION, and VL_TIME_MULTIPLIER in verilated.h
-    void set_time_resolution(const char* unit) { /* TODO */ }
-    void set_time_resolution(const std::string& unit) { set_time_resolution(unit.c_str()); }
-
-    /// Internal class access
-    inline VerilatedLxt2* spTrace() { return &m_sptrace; };
-};
-
-#endif  // guard
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2012-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2012-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2009-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2012-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2012-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2012-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2012-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -7,7 +7,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -3,7 +3,7 @@
 //
 // THIS MODULE IS PUBLICLY LICENSED
 //
-// Copyright 2001-2018 by Wilson Snyder.  This program is free software;
+// Copyright 2001-2019 by Wilson Snyder.  This program is free software;
 // you can redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
 //
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2009-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2009-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -1,7 +1,7 @@
 // -*- mode: C++; c-file-style: "cc-mode" -*-
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder. This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License.
 // Version 2.0.
@@ -271,6 +271,7 @@ typedef unsigned long long	vluint64_t;	///< 64-bit unsigned type
 // Alas cinttypes isn't that standard yet

 #ifdef _WIN32
+# define __STDC_FORMAT_MACROS 1  // Otherwise MinGW doesn't get PRId64 for fstapi.c
 # define VL_PRI64 "I64"
 #else  // Linux or compliant Unix flavors
 # if defined(__WORDSIZE) && (__WORDSIZE == 64)
@@ -452,10 +452,10 @@ implementation is not found, the system will look in turn for overloaded
 implementations up the inheritance hierarchy. For example calling C<accept>
 on C<AstIf> will look in turn for:

-  void visit (AstIf* nodep)
-  void visit (AstNodeIf* nodep)
-  void visit (AstNodeStmt* nodep)
-  void visit (AstNode* nodep)
+  void visit(AstIf* nodep)
+  void visit(AstNodeIf* nodep)
+  void visit(AstNodeStmt* nodep)
+  void visit(AstNode* nodep)

 There are three ways data is passed between visitor functions.

@@ -997,7 +997,7 @@ in C<src/Makefile_obj.in> and reconfigure.

 The latest version is available from L<http://www.veripool.org/>.

-Copyright 2008-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2008-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 ######################################################################
 #
-# Copyright 2007-2018 by Wilson Snyder.  This package is free software; you
+# Copyright 2007-2019 by Wilson Snyder.  This package is free software; you
 # can redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 ######################################################################
 #
-# Copyright 2007-2018 by Wilson Snyder.  This package is free software; you
+# Copyright 2007-2019 by Wilson Snyder.  This package is free software; you
 # can redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -143,7 +143,7 @@ Displays this message and program version and exits.

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2005-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -184,7 +184,7 @@ Displays this message and program version and exits.

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2005-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 ######################################################################
 #
-# Copyright 2007-2018 by Wilson Snyder.  This package is free software; you
+# Copyright 2007-2019 by Wilson Snyder.  This package is free software; you
 # can redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -231,7 +231,7 @@ Displays program version and exits.

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2005-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -189,7 +189,7 @@ Runs a specific test stage (see the script).

 =head1 DISTRIBUTION

-Copyright 2009-2018 by Wilson Snyder.  This package is free software; you
+Copyright 2009-2019 by Wilson Snyder.  This package is free software; you
 can redistribute it and/or modify it under the terms of either the GNU
 Lesser General Public License Version 3 or the Perl Artistic License
 Version 2.0.
@@ -28,7 +28,7 @@ invoke_atsim - Invoke tool under "modules" command

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  This package is free software; you
+Copyright 2005-2019 by Wilson Snyder.  This package is free software; you
 can redistribute it and/or modify it under the terms of either the GNU
 Lesser General Public License Version 3 or the Perl Artistic License
 Version 2.0.
@@ -28,7 +28,7 @@ invoke_iccr - Invoke tool under "modules" command

 =head1 DISTRIBUTION

-Copyright 2007-2018 by Wilson Snyder.  This package is free software; you
+Copyright 2007-2019 by Wilson Snyder.  This package is free software; you
 can redistribute it and/or modify it under the terms of either the GNU
 Lesser General Public License Version 3 or the Perl Artistic License
 Version 2.0.
@@ -28,7 +28,7 @@ invoke_ncverilog - Invoke tool under "modules" command

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  This package is free software; you
+Copyright 2005-2019 by Wilson Snyder.  This package is free software; you
 can redistribute it and/or modify it under the terms of either the GNU
 Lesser General Public License Version 3 or the Perl Artistic License
 Version 2.0.
@@ -28,7 +28,7 @@ invoke_vcs - Invoke tool under "modules" command

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  This package is free software; you
+Copyright 2005-2019 by Wilson Snyder.  This package is free software; you
 can redistribute it and/or modify it under the terms of either the GNU
 Lesser General Public License Version 3 or the Perl Artistic License
 Version 2.0.
@@ -331,7 +331,7 @@ Displays this message and program version and exits.

 =head1 DISTRIBUTION

-Copyright 2005-2018 by Wilson Snyder.  Verilator is free software; you can
+Copyright 2005-2019 by Wilson Snyder.  Verilator is free software; you can
 redistribute it and/or modify it under the terms of either the GNU Lesser
 General Public License Version 3 or the Perl Artistic License Version 2.0.

@@ -1,6 +1,6 @@
 # DESCRIPTION: Verilator: GDB startup file with useful defines
 #
-# Copyright 2012-2018 by Wilson Snyder. This program is free software; you can
+# Copyright 2012-2019 by Wilson Snyder. This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -7,7 +7,7 @@
 #
 #*****************************************************************************
 #
-# Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -7,7 +7,7 @@
 #
 #*****************************************************************************
 #
-# Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+# Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 # redistribute it and/or modify it under the terms of either the GNU
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2005-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2005-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2005-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2005-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2005-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2005-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2005-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2005-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -510,6 +510,36 @@ public:

 //######################################################################

+/// Boolean or unknown
+class VBoolOrUnknown {
+public:
+    enum en {
+        BU_FALSE=0,
+        BU_TRUE=1,
+        BU_UNKNOWN=2,
+        _ENUM_END
+    };
+    enum en m_e;
+    // CONSTRUCTOR - note defaults to *UNKNOWN*
+    inline VBoolOrUnknown() : m_e(BU_UNKNOWN) {}
+    // cppcheck-suppress noExplicitConstructor
+    inline VBoolOrUnknown(en _e) : m_e(_e) {}
+    explicit inline VBoolOrUnknown(int _e) : m_e(static_cast<en>(_e)) {}
+    const char* ascii() const {
+        static const char* const names[] = {
+            "FALSE","TRUE","UNK"};
+        return names[m_e]; }
+    bool trueU() const { return m_e == BU_TRUE || m_e == BU_UNKNOWN; }
+    bool falseU() const { return m_e == BU_FALSE || m_e == BU_UNKNOWN; }
+    bool unknown() const { return m_e == BU_UNKNOWN; }
+  };
+  inline bool operator== (VBoolOrUnknown lhs, VBoolOrUnknown rhs) { return (lhs.m_e == rhs.m_e); }
+  inline bool operator== (VBoolOrUnknown lhs, VBoolOrUnknown::en rhs) { return (lhs.m_e == rhs); }
+  inline bool operator== (VBoolOrUnknown::en lhs, VBoolOrUnknown rhs) { return (lhs == rhs.m_e); }
+  inline std::ostream& operator<<(std::ostream& os, const VBoolOrUnknown& rhs) { return os<<rhs.ascii(); }
+
+//######################################################################
+
 class AstVarType {
 public:
    enum en {
@@ -1642,6 +1672,7 @@ public:
 	: AstNode(fl) {}
    ASTNODE_BASE_FUNCS(NodeStmt)
    // METHODS
+    virtual bool isStatement() const { return true; }  // Really a statement
    virtual void addNextStmt(AstNode* newp, AstNode* belowp);  // Stop statement searchback here
    virtual void addBeforeStmt(AstNode* newp, AstNode* belowp);  // Stop statement searchback here
 };
@@ -1975,13 +2006,13 @@ class AstNodeSel : public AstNodeBiop {
    // Single bit range extraction, perhaps with non-constant selection or array selection
 public:
    AstNodeSel(FileLine* fl, AstNode* fromp, AstNode* bitp)
-	:AstNodeBiop(fl, fromp, bitp) {}
+        : AstNodeBiop(fl, fromp, bitp) {}
    ASTNODE_BASE_FUNCS(NodeSel)
-    AstNode* fromp() const { return op1p(); }	// op1 = Extracting what (NULL=TBD during parsing)
+    AstNode* fromp() const { return op1p(); }  // op1 = Extracting what (NULL=TBD during parsing)
    void fromp(AstNode* nodep) { setOp1p(nodep); }
-    AstNode* bitp() const { return op2p(); }	// op2 = Msb selection expression
+    AstNode* bitp() const { return op2p(); }  // op2 = Msb selection expression
    void bitp(AstNode* nodep) { setOp2p(nodep); }
-    int	     bitConst()	const;
+    int bitConst() const;
    virtual bool hasDType() const { return true; }
 };

@@ -2067,8 +2098,9 @@ public:
    bool pure() const { return m_pure; }
 };

-class AstNodeFTaskRef : public AstNode {
+class AstNodeFTaskRef : public AstNodeStmt {
    // A reference to a task (or function)
+    // Functions are not statements, while tasks are. AstNodeStmt needs isStatement() to deal.
 private:
    AstNodeFTask*	m_taskp;	// [AfterLink] Pointer to task referenced
    string		m_name;		// Name of variable
@@ -2077,14 +2109,14 @@ private:
    AstPackage*		m_packagep;	// Package hierarchy
 public:
    AstNodeFTaskRef(FileLine* fl, AstNode* namep, AstNode* pinsp)
-	:AstNode(fl)
-	, m_taskp(NULL), m_packagep(NULL) {
-	setOp1p(namep);	addNOp2p(pinsp);
+        : AstNodeStmt(fl)
+        , m_taskp(NULL), m_packagep(NULL) {
+        setOp1p(namep); addNOp2p(pinsp);
    }
    AstNodeFTaskRef(FileLine* fl, const string& name, AstNode* pinsp)
-	:AstNode(fl)
-	, m_taskp(NULL), m_name(name), m_packagep(NULL) {
-	addNOp2p(pinsp);
+        : AstNodeStmt(fl)
+        , m_taskp(NULL), m_name(name), m_packagep(NULL) {
+        addNOp2p(pinsp);
    }
    ASTNODE_BASE_FUNCS(NodeFTaskRef)
    virtual const char* broken() const { BROKEN_RTN(m_taskp && !m_taskp->brokeExists()); return NULL; }
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -200,6 +200,8 @@ string AstVar::verilogKwd() const {
        return "wire";
    } else if (varType()==AstVarType::WREAL) {
        return "wreal";
+    } else if (varType()==AstVarType::IFACEREF) {
+        return "ifaceref";
    } else {
        return dtypep()->name();
    }
@@ -759,7 +761,7 @@ void AstNode::addBeforeStmt(AstNode* newp, AstNode*) {
    this->backp()->addBeforeStmt(newp, this);
 }
 void AstNode::addNextStmt(AstNode* newp, AstNode*) {
-    if (!backp()) newp->v3fatalSrc("Can't find current statement to addBeforeStmt");
+    if (!backp()) newp->v3fatalSrc("Can't find current statement to addNextStmt");
    // Look up; virtual call will find where to put it
    this->backp()->addNextStmt(newp, this);
 }
@@ -927,8 +929,15 @@ void AstRange::dump(std::ostream& str) {
    if (littleEndian()) str<<" [LITTLE]";
 }
 void AstRefDType::dump(std::ostream& str) {
+    static bool s_recursing = false;
    this->AstNodeDType::dump(str);
-    if (defp()) { str<<" -> "; defp()->dump(str); }
+    if (defp()) {
+        if (!s_recursing) {  // Prevent infinite dump if circular typedefs
+            s_recursing = true;
+            str<<" -> "; defp()->dump(str);
+            s_recursing = false;
+        }
+    }
    else { str<<" -> UNLINKED"; }
 }
 void AstNodeClassDType::dump(std::ostream& str) {
@@ -1188,6 +1197,8 @@ void AstCFunc::dump(std::ostream& str) {
    this->AstNode::dump(str);
    if (slow()) str<<" [SLOW]";
    if (pure()) str<<" [PURE]";
+    if (isStatic().unknown()) str<<" [STATICU]";
+    else if (isStatic().trueU()) str<<" [STATIC]";
    if (dpiImport()) str<<" [DPII]";
    if (dpiExport()) str<<" [DPIX]";
    if (dpiExportWrapper()) str<<" [DPIXWR]";
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -2026,6 +2026,7 @@ public:
    AstTaskRef(FileLine* fl, const string& name, AstNode* pinsp)
 	:AstNodeFTaskRef(fl, name, pinsp) {}
    ASTNODE_NODE_FUNCS(TaskRef)
+    virtual bool isStatement() const { return true; }  // A statement, unlike FuncRef
 };

 class AstFuncRef : public AstNodeFTaskRef {
@@ -2036,6 +2037,7 @@ public:
    AstFuncRef(FileLine* fl, const string& name, AstNode* pinsp)
 	:AstNodeFTaskRef(fl, name, pinsp) {}
    ASTNODE_NODE_FUNCS(FuncRef)
+    virtual bool isStatement() const { return false; }  // Not a statement, unlike TaskRef
    virtual bool hasDType() const { return true; }
 };

@@ -5526,15 +5528,15 @@ private:
    string	m_cname;		// C name, for dpiExports
    string	m_rtnType;		// void, bool, or other return type
    string	m_argTypes;
-    string	m_ifdef;		// #ifdef symbol around this function
-    bool	m_dontCombine:1;	// V3Combine shouldn't compare this func tree, it's special
+    string      m_ifdef;                // #ifdef symbol around this function
+    VBoolOrUnknown m_isStatic;          // Function is declared static (no this)
+    bool        m_dontCombine:1;        // V3Combine shouldn't compare this func tree, it's special
    bool	m_skipDecl:1;		// Don't declare it
    bool	m_declPrivate:1;	// Declare it private
    bool	m_formCallTree:1;	// Make a global function to call entire tree of functions
    bool	m_slow:1;		// Slow routine, called once or just at init time
    bool	m_funcPublic:1;		// From user public task/function
    bool	m_isInline:1;		// Inline function
-    bool	m_isStatic:1;		// Function is declared static (no this)
    bool	m_symProlog:1;		// Setup symbol table for later instructions
    bool	m_entryPoint:1;		// User may call into this top level function
    bool	m_pure:1;		// Pure function
@@ -5545,8 +5547,9 @@ private:
 public:
    AstCFunc(FileLine* fl, const string& name, AstScope* scopep, const string& rtnType="")
 	: AstNode(fl) {
-	m_funcType = AstCFuncType::FT_NORMAL;
-	m_scopep = scopep;
+        m_funcType = AstCFuncType::FT_NORMAL;
+        m_isStatic = VBoolOrUnknown::BU_UNKNOWN;  // Unknown until see where thisp needed
+        m_scopep = scopep;
 	m_name = name;
 	m_rtnType = rtnType;
 	m_dontCombine = false;
@@ -5556,7 +5559,6 @@ public:
 	m_slow = false;
 	m_funcPublic = false;
 	m_isInline = false;
-	m_isStatic = true;	// Note defaults to static, later we see where thisp is needed
 	m_symProlog = false;
 	m_entryPoint = false;
 	m_pure = false;
@@ -5580,7 +5582,10 @@ public:
 		    || name() == asamep->name())); }
    //
    virtual void name(const string& name) { m_name = name; }
-    virtual int instrCount()	const { return dpiImport() ? instrCountDpi() : 0; }
+    virtual int instrCount() const { return dpiImport() ? instrCountDpi() : 0; }
+    VBoolOrUnknown isStatic() const { return m_isStatic; }
+    void isStatic(bool flag) { m_isStatic = flag ? VBoolOrUnknown::BU_TRUE : VBoolOrUnknown::BU_FALSE; }
+    void isStatic(VBoolOrUnknown flag) { m_isStatic = flag; }
    void	cname(const string& name) { m_cname = name; }
    string	cname() const { return m_cname; }
    AstScope*	scopep() const { return m_scopep; }
@@ -5607,8 +5612,6 @@ public:
    AstCFuncType funcType() const { return m_funcType; }
    bool	isInline() const { return m_isInline; }
    void	isInline(bool flag) { m_isInline = flag; }
-    bool	isStatic() const { return m_isStatic; }
-    void	isStatic(bool flag) { m_isStatic = flag; }
    bool	symProlog() const { return m_symProlog; }
    void	symProlog(bool flag) { m_symProlog = flag; }
    bool	entryPoint() const { return m_entryPoint; }
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2004-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2004-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2004-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2004-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
@@ -6,7 +6,7 @@
 //
 //*************************************************************************
 //
-// Copyright 2003-2018 by Wilson Snyder.  This program is free software; you can
+// Copyright 2003-2019 by Wilson Snyder.  This program is free software; you can
 // redistribute it and/or modify it under the terms of either the GNU
 // Lesser General Public License Version 3 or the Perl Artistic License
 // Version 2.0.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Wilson Snyder	44e53129a0	Version bump	2019-01-27 21:31:05 -05:00
Wilson Snyder	cf2e8f7a9c	Add sizeof checks on types.	2019-01-25 18:26:14 -05:00
Wilson Snyder	46be6d32c9	Add unsupported for loops error, msg2692.	2019-01-22 19:25:00 -05:00
Wilson Snyder	93d1fd6bb5	Commentary, msg2820	2019-01-22 18:46:47 -05:00
Wilson Snyder	f700a73b3e	Fix cygwin warning on fstapi, msg2770.	2019-01-20 14:16:09 -05:00
Wilson Snyder	abd69167ef	Commentary	2019-01-18 18:15:07 -05:00
Wilson Snyder	60f2f176a2	Fix DPI export void compiler error, bug1391.	2019-01-16 00:38:42 -05:00
Wilson Snyder	3a51e84ebc	For XML, fix extends, bug1372.	2019-01-13 20:59:15 -05:00
Wilson Snyder	a2a09253a2	Internals: Show static funcs.	2019-01-12 09:43:24 -05:00
Wilson Snyder	ef884143d1	Add circular typedef error, bug1388.	2019-01-12 09:33:57 -05:00
Wilson Snyder	62a7d713a7	Fix internal error on xrefs into unrolled functions, bug1387.	2019-01-06 17:38:27 -05:00
Wilson Snyder	aaf5b7c2c0	Fix uninitialized data in unroller, bug1386. [Al Grant]	2019-01-06 16:56:56 -05:00
Wilson Snyder	30aa180211	Internals: Use pushDelete for empty unrolls. Theoretical problem only.	2019-01-05 06:53:26 -05:00
Wilson Snyder	0d4270c979	Turn off temporary debug message.	2019-01-05 06:01:22 -05:00
Wilson Snyder	3505486ec8	Internals: Spacing; fix assertion	2019-01-05 05:46:37 -05:00
Wilson Snyder	9b0f2cce86	Copyright year update	2019-01-05 05:46:23 -05:00
Wilson Snyder	0e1f8db0d1	Fix uninitialized data in verFiles.dat, bug1385.	2019-01-05 04:58:14 -05:00
Wilson Snyder	8a4aeddbb0	Copyright year update.	2019-01-03 19:17:22 -05:00
Wilson Snyder	e8636f987f	Fix missing too many digits warning, bug1380.	2019-01-03 19:03:27 -05:00
Wilson Snyder	0198a2e9f3	Fix error when no modules in , bug1381.	2019-01-02 18:38:49 -05:00
Wilson Snyder	db92ab47ba	For --xml, add additional information, bug1372.	2019-01-02 07:16:37 -05:00
Wilson Snyder	47107a5a36	Fix FST tracing of wide arrays, bug1376.	2018-12-18 20:49:44 -05:00
Wilson Snyder	e01c9df35e	Fix error when pattern assignment has too few elements, bug1378.	2018-12-18 20:41:14 -05:00
Wilson Snyder	8f16557499	Tests: Less verbose	2018-12-12 22:19:33 -05:00
Wilson Snyder	89fb57e54f	For --xml, add additional information, bug1372.	2018-12-12 22:12:31 -05:00
Wilson Snyder	8a3e9748b3	For --xml, add additional information, bug1372.	2018-12-10 19:11:35 -05:00
Wilson Snyder	66b23be746	For --xml, add additional modport information, bug1372.	2018-12-10 07:25:44 -05:00
Wilson Snyder	f0cdae129e	Removed --trace-lxt2, use --trace-fst instead.	2018-12-06 19:06:20 -05:00
Wilson Snyder	ede7236945	For --xml, add additional var information, bug1372.	2018-12-06 07:12:39 -05:00
Wilson Snyder	a226111829	Fix fst_config compile error on MINGW, msg2670.	2018-12-06 07:12:21 -05:00
Wilson Snyder	49edcbc2ac	Internals: Misc cleanup. No functional change.	2018-12-06 06:56:39 -05:00
Wilson Snyder	6050ab311e	Commentary	2018-12-05 20:14:22 -05:00
Wilson Snyder	83b5c981d0	devel release	2018-12-01 15:07:31 -05:00