luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from master for release.

This commit is contained in:
Wilson Snyder 2020-01-11 07:12:09 -05:00
parent 6f52208b68 0c99bee4b1
commit 0c6c83e278
403 changed files with 7172 additions and 2994 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.clang-format
View File

@ -90,10 +90,6 @@ PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000 PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60 PenaltyReturnTypeOnItsOwnLine: 60
PointerAlignment: Left PointerAlignment: Left
RawStringFormats:
- Delimiter: pb
Language: TextProto
BasedOnStyle: google
ReflowComments: true ReflowComments: true
SortIncludes: false SortIncludes: false
SortUsingDeclarations: true SortUsingDeclarations: true
@ -108,7 +104,7 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false SpacesInCStyleCastParentheses: false
SpacesInParentheses: false SpacesInParentheses: false
SpacesInSquareBrackets: false SpacesInSquareBrackets: false
Standard: Cpp11 Standard: Cpp03
TabWidth: 8 TabWidth: 8
UseTab: Never UseTab: Never
... ...

1
.codacy.yml
View File

@ -1,4 +1,5 @@
--- ---
exclude_paths: exclude_paths:
- '.github/**'
- 'ci/build_verilator.sh' - 'ci/build_verilator.sh'
- 'include/vltstd/**' - 'include/vltstd/**'

14
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,14 @@
---
name: Bug report
about: Something isn't working as expected, and it isn't "Unsupported." (Note our contributor agreement at https://github.com/verilator/verilator/.github/blob/master/CONTRIBUTING.adoc)
title: ''
labels: new
assignees: ''
---
Thanks for taking the time to report this.
Can you attach an example that shows the issue? (Must be openly licensed, ideally in test_regress format.)
May we assist you in trying to fix this yourself?

16
.github/ISSUE_TEMPLATE/feature.md vendored Normal file
View File

@ -0,0 +1,16 @@
---
name: Feature Request
about: Request something should be supported, or a new feature added. (Note our contributor agreement at https://github.com/verilator/verilator/.github/blob/master/CONTRIBUTING.adoc)
title: ''
labels: new
assignees: ''
---
Thanks for taking the time to report this.
What would you like added/supported?
Can you attach an example that runs on other simulators? (Must be openly licensed, ideally in test_regress format.)
May we assist you in trying to fix this yourself?

10
.github/ISSUE_TEMPLATE/questions.md vendored Normal file
View File

@ -0,0 +1,10 @@
---
name: Q and A, or Other
about: Ask a question, not related to a specific bug or feature request. (Note our contributor agreement at https://github.com/verilator/verilator/.github/blob/master/CONTRIBUTING.adoc)
title: ''
labels: new
assignees: ''
---
How may we help - what is your question?

1
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1 @@
We appreciate your contributing to Verilator. If this is your first commit, please add your name to docs/CONTRIBUTORS, and read our contributing guidelines in docs/CONTRIBUTING.adoc.

199
.github/labels.toml vendored Normal file
View File

@ -0,0 +1,199 @@
["area: assertions"]
color = "ffffe8"
name = "area: assertions"
description = "Issue involves assertions"
["area: configure/compiling"]
color = "ffffe8"
name = "area: configure/compiling"
description = "Issue involves configuring or compilating Verilator itself"
["area: coverage"]
color = "ffffe8"
name = "area: coverage"
description = "Issue involves coverage generation"
["area: data-types"]
color = "ffffe8"
name = "area: data-types"
description = "Issue involves data-types"
["area: documentation"]
color = "ffffe8"
name = "area: documentation"
description = "Issue involves documentation"
["area: elaboration"]
color = "ffffe8"
name = "area: elaboration"
description = "Issue involves elaboration phase"
["area: invoking/options"]
color = "ffffe8"
name = "area: invoking/options"
description = "Issue involves options passed to Verilator"
["area: lint"]
color = "ffffe8"
name = "area: lint"
description = "Issue involves SystemVerilog lint checking"
["area: parser"]
color = "ffffe8"
name = "area: parser"
description = "Issue involves SystemVerilog parsing"
["area: performance"]
color = "ffffe8"
name = "area: performance"
description = "Issue involves performance issues"
["area: portability"]
color = "ffffe8"
name = "area: portability"
description = "Issue involves operating system/compiler portability"
["area: runtime result"]
color = "ffffe8"
name = "area: runtime result"
description = "Issue involves an incorrect runtine result from Verilated model"
["area: scheduling"]
color = "ffffe8"
name = "area: scheduling"
description = "Issue involves scheduling/ordering of events"
["area: tests"]
color = "ffffe8"
name = "area: tests"
description = "Issue involves the testing system"
["area: usability"]
color = "ffffe8"
name = "area: usability"
description = "Issue involves general usability"
["effort: days"]
color = "d0c0b0"
name = "effort: days"
description = "Expect this issue to require roughly days of invested effort to resolve"
["effort: hours"]
color = "f5e6d6"
name = "effort: hours"
description = "Expect this issue to require roughly hours of invested effort to resolve"
["effort: minutes"]
color = "f5e6d6"
name = "effort: minutes"
description = "Expect this issue to require less than an hour of invested effort to resolve"
["effort: weeks"]
color = "d0c0b0"
name = "effort: weeks"
description = "Expect this issue to require weeks or more of invested effort to resolve"
["good first issue"]
color = "7057ff"
name = "good first issue"
description = "Good for newcomers"
["help wanted"]
color = "008672"
name = "help wanted"
description = "Extra attention is needed"
["new"]
color = "ff4400"
name = "new"
description = "New issue, not yet seen by maintainers"
["resolution: abandoned"]
color = "cfd3d7"
name = "resolution: abandoned"
description = "Closed; not enough information or otherwise never finished"
["resolution: answered"]
color = "cfd3d7"
name = "resolution: answered"
description = "Closed; only applies to questions which were answered"
["resolution: duplicate"]
color = "cfd3d7"
name = "resolution: duplicate"
description = "Closed; issue or pull request already exists"
["resolution: external"]
color = "cfd3d7"
name = "resolution: external"
description = "Closed; passed to another tool's bug tracker"
["resolution: fixed"]
color = "cfd3d7"
name = "resolution: fixed"
description = "Closed; fixed"
["resolution: invalid"]
color = "cfd3d7"
name = "resolution: invalid"
description = "Closed; issue or pull request is no longer relevant"
["resolution: no fix needed"]
color = "cfd3d7"
name = "resolution: no fix needed"
description = "Closed; no fix required (not a bug)"
["resolution: wontfix"]
color = "cfd3d7"
name = "resolution: wontfix"
description = "Closed; work won't continue on an issue or pull request"
["status: asked reporter"]
color = "ffffff"
name = "status: asked reporter"
description = "Bug is waiting for reporter to answer a question"
["status: assigned"]
color = "a0f0ff"
name = "status: assigned"
description = "Issue is assigned to someone to work on"
["status: blocked"]
color = "00007f"
name = "status: blocked"
description = "Issue is waiting for another bug, when other bug is fixed, then goes to 'status: assigned'"
["status: discussion"]
color = "d876e3"
name = "status: discussion"
description = "Issue is waiting for discussions to resolve"
["status: ready"]
color = "b6c92a"
name = "status: ready"
description = "Issue is ready for someone to fix; then goes to 'status: assigned'"
["type: bug"]
color = "d73a4a"
name = "type: bug"
description = "Defect"
["type: feature-IEEE"]
color = "cfccff"
name = "type: feature-IEEE"
description = "Request to add new feature, described in IEEE 1800"
["type: feature-non-IEEE"]
color = "cfccff"
name = "type: feature-non-IEEE"
description = "Request to add new feature, outside IEEE 1800"
["type: maintenance"]
color = "cfccff"
name = "type: maintenance"
description = "Internal maintenance task"
["type: q and a"]
color = "84ba34"
name = "type: q and a"
description = "Question and answer about some feature or user question"

1
.travis.yml
View File

@ -27,6 +27,7 @@ before_install:
- yes yes | sudo cpan -fi Unix::Processors Parallel::Forker Bit::Vector - yes yes | sudo cpan -fi Unix::Processors Parallel::Forker Bit::Vector
- sudo apt-get install gdb gtkwave - sudo apt-get install gdb gtkwave
before_script: before_script:
- bash -x ci/build_vcddiff.sh
- bash -x ci/build_verilator.sh - bash -x ci/build_verilator.sh
after_script: after_script:
- ccache -s - ccache -s

1405
Changes
View File

File diff suppressed because it is too large Load Diff

1
MANIFEST.SKIP
View File

@ -2,6 +2,7 @@
\.clang-tidy \.clang-tidy
\.git/ \.git/
\.git$ \.git$
\.github/
\.svn/ \.svn/
\.(bak|old)/ \.(bak|old)/
\.(bak|old)$ \.(bak|old)$

6
Makefile.in
View File

@ -7,7 +7,7 @@
# #
#***************************************************************************** #*****************************************************************************
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -103,7 +103,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
SHELL = /bin/sh SHELL = /bin/sh
SUBDIRS = src test_regress \ SUBDIRS = docs src test_regress \
examples/cmake_hello_c \ examples/cmake_hello_c \
examples/cmake_hello_sc \ examples/cmake_hello_sc \
examples/cmake_tracing_c \ examples/cmake_tracing_c \
@ -114,6 +114,7 @@ SUBDIRS = src test_regress \
examples/make_tracing_c \ examples/make_tracing_c \
examples/make_tracing_sc \ examples/make_tracing_sc \
examples/make_protect_lib \ examples/make_protect_lib \
examples/xml_py \
INFOS = verilator.txt verilator.html verilator.pdf INFOS = verilator.txt verilator.html verilator.pdf
@ -513,6 +514,7 @@ clean mostlyclean distclean maintainer-clean::
rm -f *.tex rm -f *.tex
rm -rf examples/*/obj_dir* examples/*/logs rm -rf examples/*/obj_dir* examples/*/logs
rm -rf test_*/obj_dir rm -rf test_*/obj_dir
rm -rf nodist/fuzzer/dictionary
rm -rf nodist/obj_dir rm -rf nodist/obj_dir
distclean maintainer-clean:: distclean maintainer-clean::

8
README.adoc
View File

@ -4,7 +4,7 @@
ifdef::env-github[] ifdef::env-github[]
image:https://img.shields.io/badge/License-LGPL%20v3-blue.svg[license LGPLv3,link=https://www.gnu.org/licenses/lgpl-3.0] image:https://img.shields.io/badge/License-LGPL%20v3-blue.svg[license LGPLv3,link=https://www.gnu.org/licenses/lgpl-3.0]
image:https://img.shields.io/badge/License-Artistic%202.0-0298c3.svg[license Artistic-2.0,link=https://opensource.org/licenses/Artistic-2.0] image:https://img.shields.io/badge/License-Artistic%202.0-0298c3.svg[license Artistic-2.0,link=https://opensource.org/licenses/Artistic-2.0]
image:https://api.codacy.com/project/badge/Grade/ff998fdaa6f64b9a95eb5f342ee6bf4d[Code Quality,link=https://www.codacy.com/manual/wsnyder/verilator] image:https://api.codacy.com/project/badge/Grade/48478c986f13400682ffe4a5e0939b3a[Code Quality,link=https://www.codacy.com/gh/verilator/verilator]
image:https://travis-ci.com/verilator/verilator.svg?branch=master[Build Status (Travis CI),link=https://travis-ci.com/verilator/verilator] image:https://travis-ci.com/verilator/verilator.svg?branch=master[Build Status (Travis CI),link=https://travis-ci.com/verilator/verilator]
endif::[] endif::[]
@ -131,10 +131,10 @@ perhaps Icarus may.
== Open License == Open License
Verilator is Copyright 2003-2019 by Wilson Snyder. (Report bugs to Verilator is Copyright 2003-2020 by Wilson Snyder. (Report bugs to
https://verilator.org/issues[Verilator Issues].) https://verilator.org/issues[Verilator Issues].)
Verilator is free software; you can redistribute it and/or modify it under 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 the terms of either the GNU Lesser General Public License Version 3 or the
Perl Artistic License Version 2.0. (See the documentation for more Perl Artistic License Version 2.0. See the documentation for more
details.) details.

63
bin/verilator
View File

@ -1,9 +1,7 @@
: # -*-Mode: perl;-*- use perl, wherever it is #!/usr/bin/env perl
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
###################################################################### ######################################################################
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you # Copyright 2003-2020 by Wilson Snyder. This program is free software; you
# can redistribute it and/or modify it under the terms of either the GNU # 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 # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -1078,7 +1076,7 @@ and the remaining files can be compiled on parallel machines. Using
design --output-split 20000 resulted in splitting into approximately design --output-split 20000 resulted in splitting into approximately
one-minute-compile chunks. one-minute-compile chunks.
Typically when using this, make with VM_PARALLEL_BUILD=1, and use Typically when using this, make with VM_PARALLEL_BUILDS=1, and use
I<ccache>. I<ccache>.
=item --output-split-cfuncs I<statements> =item --output-split-cfuncs I<statements>
@ -2114,16 +2112,16 @@ specified, it will come from a default optionally specified at configure
time (before Verilator was compiled), or computed from time (before Verilator was compiled), or computed from
SYSTEMC/lib-SYSTEMC_ARCH. SYSTEMC/lib-SYSTEMC_ARCH.
=item VCS_HOME
If set, specifies the directory containing the Synopsys VCS distribution.
When set, a 'make test' in the Verilator distribution will also run VCS
baseline regression tests.
=item VERILATOR_BIN =item VERILATOR_BIN
If set, specifies an alternative name of the Verilator binary. May be used If set, specifies an alternative name of the C<verilator> binary. May be
for debugging and selecting between multiple operating system builds. used for debugging and selecting between multiple operating system builds.
=item VERILATOR_COVERAGE_BIN
If set, specifies an alternative name of the C<verilator_coverage binary>.
May be used for debugging and selecting between multiple operating system
builds.
=item VERILATOR_GDB =item VERILATOR_GDB
@ -2674,7 +2672,7 @@ The remainder of this section describe behavior with --threads 1 or
VL_THREADED is defined when compiling a threaded Verilated module, causing VL_THREADED is defined when compiling a threaded Verilated module, causing
the Verilated support classes become threadsafe. the Verilated support classes become threadsafe.
The thread used for constructing a model must the the same thread that The thread used for constructing a model must be the same thread that
calls eval() into the model, this is called the "eval thread". The thread calls eval() into the model, this is called the "eval thread". The thread
used to perform certain global operations such as saving and tracing must used to perform certain global operations such as saving and tracing must
be done by a "main thread". In most cases the eval thread and main thread be done by a "main thread". In most cases the eval thread and main thread
@ -2737,8 +2735,8 @@ controlled by configuration files, typically named with the .vlt
extension. An example: extension. An example:
`verilator_config `verilator_config
lint_off -msg WIDTH lint_off -rule WIDTH
lint_off -msg CASEX -file "silly_vendor_code.v" lint_off -rule CASEX -file "silly_vendor_code.v"
This disables WIDTH warnings globally, and CASEX for a specific file. This disables WIDTH warnings globally, and CASEX for a specific file.
@ -2756,8 +2754,7 @@ The grammar of configuration commands is as follows:
=item `verilator_config =item `verilator_config
Take remaining text up the the next `verilog mode switch and treat it as Take remaining text and treat it as Verilator configuration commands.
Verilator configuration commands.
=item coverage_on [-file "<filename>" [-lines <line> [ - <line> ]]] =item coverage_on [-file "<filename>" [-lines <line> [ - <line> ]]]
@ -2768,9 +2765,9 @@ Enable/disable coverage for the specified filename (or wildcard with '*' or
omitted). Often used to ignore an entire module for coverage analysis omitted). Often used to ignore an entire module for coverage analysis
purposes. purposes.
=item lint_on [-msg <message>] [-file "<filename>" [-lines <line> [ - <line>]]] =item lint_on [-rule <message>] [-file "<filename>" [-lines <line> [ - <line>]]]
=item lint_off [-msg <message>] [-file "<filename>" [-lines <line> [ - <line>]]] =item lint_off [-rule <message>] [-file "<filename>" [-lines <line> [ - <line>]]]
Enable/disables the specified lint warning, in the specified filename (or Enable/disables the specified lint warning, in the specified filename (or
wildcard with '*' or '?', or all files if omitted) and range of line wildcard with '*' or '?', or all files if omitted) and range of line
@ -2779,10 +2776,13 @@ numbers (or all lines if omitted).
With lint_off using '*' will override any lint_on directives in the source, With lint_off using '*' will override any lint_on directives in the source,
i.e. the warning will still not be printed. i.e. the warning will still not be printed.
If the -msg is omitted, all lint warnings (see list in -Wno-lint) are If the -rule is omitted, all lint warnings (see list in -Wno-lint) are
enabled/disabled. This will override all later lint warning enables for enabled/disabled. This will override all later lint warning enables for
the specified region. the specified region.
In previous versions -rule was named -msg. The latter is deprecated, but
still works with a deprecation info, it may be removed in future versions.
=item tracing_on [-file "<filename>" [-lines <line> [ - <line> ]]] =item tracing_on [-file "<filename>" [-lines <line> [ - <line> ]]]
=item tracing_off [-file "<filename>" [-lines <line> [ - <line> ]]] =item tracing_off [-file "<filename>" [-lines <line> [ - <line> ]]]
@ -2995,7 +2995,7 @@ may `ifdef around compiler specific constructs.
=item `verilator_config =item `verilator_config
Take remaining text up the the next `verilog mode switch and treat it as Take remaining text up to the next `verilog mode switch and treat it as
Verilator configuration commands. Verilator configuration commands.
=item `verilog =item `verilog
@ -3317,7 +3317,7 @@ that Verilator will print a list of known scopes to help your debugging.
=head2 Floating Point =head2 Floating Point
Floating Point (real) numbers are supported. Short floating point (shortreal) numbers are converted to real.
=head2 Latches =head2 Latches
@ -3507,6 +3507,11 @@ Assignment patterns with order based, default, constant integer (array) or
member identifier (struct/union) keys are supported. Data type keys and member identifier (struct/union) keys are supported. Data type keys and
keys which are computed from a constant expression are not supported. keys which are computed from a constant expression are not supported.
=item `uselib
Uselib, a vendor specific library specification method, is ignored along
with anything following it until the end of that line.
=item cast operator =item cast operator
Casting is supported only between simple scalar types, signed and unsigned, Casting is supported only between simple scalar types, signed and unsigned,
@ -3743,6 +3748,14 @@ generally unrolls small loops. You may want to try increasing
--unroll-count (and occasionally --unroll-stmts) which will raise the small --unroll-count (and occasionally --unroll-stmts) which will raise the small
loop bar to avoid this error. loop bar to avoid this error.
=item BOUNDED
This indicates that bounded queues (e.g. "var name[$ : 3]") are
unsupported.
Ignoring this warning may make Verilator simulations differ from other
simulators.
=item BSSPACE =item BSSPACE
Warns that a backslash is followed by a space then a newline. Likely the Warns that a backslash is followed by a space then a newline. Likely the
@ -4844,7 +4857,7 @@ SystemC module *may* be faster.)
=head1 BUGS =head1 BUGS
First, check the the coding limitations section. First, check the coding limitations section.
Next, try the --debug switch. This will enable additional internal Next, try the --debug switch. This will enable additional internal
assertions, and may help identify the problem. assertions, and may help identify the problem.
@ -5016,7 +5029,7 @@ remain anonymous.
The latest version is available from L<https://verilator.org>. The latest version is available from L<https://verilator.org>.
Copyright 2003-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2003-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify the Verilator internals under the terms of 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 either the GNU Lesser General Public License Version 3 or the Perl Artistic
License Version 2.0. License Version 2.0.

8
bin/verilator_coverage
View File

@ -1,9 +1,7 @@
: # -*-Mode: perl;-*- use perl, wherever it is #!/usr/bin/env perl
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
###################################################################### ######################################################################
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you # Copyright 2003-2020 by Wilson Snyder. This program is free software; you
# can redistribute it and/or modify it under the terms of either the GNU # 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 # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -271,7 +269,7 @@ Specifies a module search directory.
The latest version is available from L<https://verilator.org>. The latest version is available from L<https://verilator.org>.
Copyright 2003-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2003-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify the Verilator internals under the terms of 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 either the GNU Lesser General Public License Version 3 or the Perl Artistic
License Version 2.0. License Version 2.0.

7
bin/verilator_difftree
View File

@ -1,10 +1,7 @@
: # -*-Mode: perl;-*- use perl, wherever it is #!/usr/bin/env perl
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001;
use warnings; use warnings;
use Getopt::Long; use Getopt::Long;
use IO::File; use IO::File;
@ -236,7 +233,7 @@ Do not show differences in line numbering.
The latest version is available from L<https://verilator.org>. The latest version is available from L<https://verilator.org>.
Copyright 2005-2019 by Wilson Snyder. This package is free software; you can Copyright 2005-2020 by Wilson Snyder. This package is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

8
bin/verilator_gantt
View File

@ -1,11 +1,9 @@
: # -*-Mode: perl;-*- use perl, wherever it is #!/usr/bin/env perl
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
use strict;
use warnings; use warnings;
use strict;
use Getopt::Long; use Getopt::Long;
use IO::File; use IO::File;
use Pod::Usage; use Pod::Usage;
@ -540,7 +538,7 @@ verilator_gantt.vcd.
The latest version is available from L<https://verilator.org>. The latest version is available from L<https://verilator.org>.
Copyright 2018-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2018-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

6
bin/verilator_includer
View File

@ -1,9 +1,7 @@
: # -*-Mode: perl;-*- use perl, wherever it is #!/usr/bin/env perl
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
# DESCRIPTION: Print include statements for each ARGV # DESCRIPTION: Print include statements for each ARGV
# #
# Copyright 2003-2019 by Wilson Snyder. This package is free software; you can # Copyright 2003-2020 by Wilson Snyder. This package is free software; you can
# redistribute it and/or modify it under the terms of either the GNU Lesser # 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. # General Public License Version 3 or the Perl Artistic License Version 2.0.
###################################################################### ######################################################################

6
bin/verilator_profcfunc
View File

@ -1,6 +1,4 @@
: # -*-Mode: perl;-*- use perl, wherever it is #!/usr/bin/env perl
eval 'exec perl -wS $0 ${1+"$@"}'
if 0;
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
@ -230,7 +228,7 @@ Displays this message and program version and exits.
The latest version is available from L<https://verilator.org>. The latest version is available from L<https://verilator.org>.
Copyright 2007-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2007-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

18
ci/build_vcddiff.sh Executable file
View File

@ -0,0 +1,18 @@
#!/bin/bash
# DESCRIPTION: Verilator: Build script for vcddiff
#
# Copyright 2019 by Todd Strader. 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.
set -e
# NB: it would be better to add this via a PPA
TMP_DIR=$(mktemp -d)
git -C "${TMP_DIR}" clone https://github.com/veripool/vcddiff
VCDDIFF_DIR=${TMP_DIR}/vcddiff
git -C "${VCDDIFF_DIR}" checkout 5112f88b7ba8818dce9dfb72619e64a1fc19542c
make -C "${VCDDIFF_DIR}"
sudo cp "${VCDDIFF_DIR}/vcddiff" /usr/local/bin

57
ci/docker/buildenv/Dockerfile Normal file
View File

@ -0,0 +1,57 @@
# DESCRIPTION: Dockerfile for env to build and fully test Verilator
#
# Copyright 2020 by Stefan Wallentowitz. 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.
FROM ubuntu:18.04
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \
autoconf=2.69-11 \
bc=1.07.1-2 \
bison=2:3.0.4.dfsg-1build1 \
build-essential=12.4ubuntu1 \
ca-certificates=20180409 \
cmake=3.10.2-1ubuntu2.18.04.1 \
flex=2.6.4-6 \
gdb=8.1-0ubuntu3.2 \
gcc-6=6.5.0-2ubuntu1~18.04 \
gcc-5=5.5.0-12ubuntu1 \
gcc-4.8=4.8.5-4ubuntu8 \
git=1:2.17.1-1ubuntu0.5 \
gtkwave=3.3.86-1 \
g++-6=6.5.0-2ubuntu1~18.04 \
g++-5=5.5.0-12ubuntu1 \
g++-4.8=4.8.5-4ubuntu8 \
libfl2=2.6.4-6 \
libfl-dev=2.6.4-6 \
numactl=2.0.11-2.1ubuntu0.1 \
perl=5.26.1-6ubuntu0.3 \
python3=3.6.7-1~18.04 \
wget=1.19.4-1ubuntu2.2 \
zlibc=0.9k-4.3 \
zlib1g=1:1.2.11.dfsg-0ubuntu2 \
zlib1g-dev=1:1.2.11.dfsg-0ubuntu2 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /tmp
COPY build-systemc.sh /tmp/
RUN ./build-systemc.sh
RUN cpan install -fi Unix::Processors Parallel::Forker Bit::Vector
RUN git clone https://github.com/veripool/vcddiff.git && \
make -C vcddiff && \
cp -p vcddiff/vcddiff /usr/local/bin/vcddiff && \
rm -rf vcddiff
COPY build.sh /tmp/build.sh
ENV VERILATOR_AUTHOR_SITE=1
ENTRYPOINT [ "/tmp/build.sh" ]

50
ci/docker/buildenv/README.adoc Normal file
View File

@ -0,0 +1,50 @@
= Verilator Build Environment
This container is set up to compile and test a Verilator build based
on the following parameters:
* Source repository (default: https://github.com/verilator/verilator)
* Source revision (default: master)
* GCC version (4.8.5, 5.5.0, 6.5.0, 7.4.0, default: 7.4.0)
The container is published as `verilator/verilator-buildenv` on
https://hub.docker.com/repository/docker/verilator/verilator-buildenv[docker hub].
To run the basic build of current master:
docker run -ti verilator/verilator-buildenv
To also run tests:
docker run -ti verilator/verilator-buildenv test
Change the compiler:
docker run -ti -e CC=gcc-4.8 -e CXX=g++-4.8 verilator/verilator-buildenv test
The tests that involve gdb are not working due to security restrictions.
To run those too:
....
docker run -ti -v ${PWD}:/tmp/repo -e REPO=/tmp/repo -e REV=`git rev-parse --short HEAD` -e CC=gcc-4.8 -e CXX=g++-4.8 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined verilator/verilator-buildenv test
....
You may want to avoid pushing your changes to a remote repository and
instead use a local working copy. You can mount the local working copy
path as a volume and use this as repo. Be careful, that it can only
use committed changes, so you may want to use a work-in-progress
commit or so. To build the current HEAD from top of a repository:
....
docker run -ti -v ${PWD}:/tmp/repo -e REPO=/tmp/repo -e REV=`git rev-parse --short HEAD` --cap-add=SYS_PTRACE --security-opt seccomp=unconfined verilator/verilator-buildenv test
....
== Under the Hood
To rebuild the image, simply run:
docker build .
It will build SystemC in all supported compiler variants to reduce the
impact on testing cycles. A build script will be the entrypoint to the
container that will perform a standard build and test procedure.

29
ci/docker/buildenv/build-systemc.sh Executable file
View File

@ -0,0 +1,29 @@
#!/bin/bash -e
# DESCRIPTION: Build SystemC in Ubuntu 18.04 with different g++/gcc
#
# Copyright 2020 by Stefan Wallentowitz. 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.
build_variant () {
version=$($1 --version | grep gcc | awk '{print $4}')
mkdir "/usr/local/systemc-2.3.3-gcc$version"
mkdir build
cd build
../configure --prefix="/usr/local/systemc-2.3.3-gcc$version" CC="$1" CXX="$2" LD="$2"
make -j
make install
cd ..
rm -r build
}
wget https://www.accellera.org/images/downloads/standards/systemc/systemc-2.3.3.tar.gz
tar -xzf systemc-2.3.3.tar.gz
cd systemc-2.3.3
build_variant gcc g++
build_variant gcc-6 g++-6
build_variant gcc-5 g++-5
build_variant gcc-4.8 g++-4.8
cd ..
rm -r systemc-2.3.3*

30
ci/docker/buildenv/build.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/bash -e
# DESCRIPTION: Build Verilator (inside container)
#
# Copyright 2020 by Stefan Wallentowitz. 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.
: "${REPO:=https://github.com/verilator/verilator}"
: "${REV:=master}"
: "${CC:=gcc}"
: "${CXX:=g++}"
GCCVERSION=$(${CC} --version | grep gcc | awk '{print $4}')
export SYSTEMC_INCLUDE="/usr/local/systemc-2.3.3-gcc${GCCVERSION}/include"
export SYSTEMC_LIBDIR="/usr/local/systemc-2.3.3-gcc${GCCVERSION}/lib-linux64"
export LD_LIBRARY_PATH=${SYSTEMC_LIBDIR}
SRCS=$PWD/verilator
git clone "$REPO" "$SRCS"
cd "$SRCS"
git checkout "$REV"
autoconf
./configure --enable-longtests
make -j $(nproc)
if [ "${1:-''}" == "test" ]; then
make test
fi

47
ci/docker/run/Dockerfile Normal file
View File

@ -0,0 +1,47 @@
# DESCRIPTION: Dockerfile for image to run Verilator inside
#
# Copyright 2020 by Stefan Wallentowitz. 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.
FROM ubuntu:18.04
RUN apt-get update \
&& apt-get install --no-install-recommends -y \
autoconf=2.69-11 \
bc=1.07.1-2 \
bison=2:3.0.4.dfsg-1build1 \
build-essential=12.4ubuntu1 \
ca-certificates=20180409 \
flex=2.6.4-6 \
git=1:2.17.1-1ubuntu0.5 \
libfl-dev=2.6.4-6 \
perl=5.26.1-6ubuntu0.3 \
python3=3.6.7-1~18.04 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
ARG REPO=https://github.com/verilator/verilator
ARG SOURCE_COMMIT=master
WORKDIR /tmp
# Add an exception for the linter, we want to cd here in one layer
# to reduce the number of layers (and thereby size).
# hadolint ignore=DL3003
RUN git clone "${REPO}" verilator && \
cd verilator && \
git checkout "${SOURCE_COMMIT}" && \
autoconf && \
./configure && \
make -j "$(nproc)" && \
make install && \
cd .. && \
rm -r verilator
COPY verilator-wrap.sh /usr/local/bin/verilator-wrap.sh
WORKDIR /work
ENTRYPOINT [ "/usr/local/bin/verilator-wrap.sh" ]

49
ci/docker/run/README.adoc Normal file
View File

@ -0,0 +1,49 @@
= Docker Container as Verilator executable
This allows you to run Verilator easily as a docker image, e.g.:
docker run -ti verilator/verilator:latest --version
This is in particular useful to compare against older version or to
check when an issue was introduced.
You will need to give it access to your files as a volume and fix the
user rights:
....
docker run -ti -v ${PWD}:/work --user $(id -u):$(id -g) verilator/verilator:latest --cc test.v
....
The caveat is that it can only access files below the current
directory then, a workaround is to adopt the volume and set
`-workdir`.
There is a convenience script in this folder that wraps around the
docker calls:
$ verilator-docker 3.922 --version
Verilator 3.922 2018-03-17 rev UNKNOWN_REV
Finally, you can also work in the container by setting the entrypoint
(don't forget to mount a volume if you want your work persistent):
docker run -ti --entrypoint /bin/bash verilator/verilator:latest
The other files in this folder all for building the containers and to
store in them. You could use it to build Verilator at a specific
commit:
docker build --build-arg SOURCE_COMMIT=<commit> .
== Internals
The Dockerfile is pretty straight-forward, it builds Verilator and
removes the tree after that to reduce the image size. It sets a
wrapper script (`verilator-wrap.sh`) as entrypoint. This script calls
Verilator but also copies the verilated runtime files to the `obj_dir`
or the `-Mdir` respectively. This allows the user to build the C++
output with the matching runtime files. The wrapper patches the
generated Makefile accordingly.
There is also a hook defined that is run by docker hub via automated
builds.

9
ci/docker/run/hooks/build Normal file
View File

@ -0,0 +1,9 @@
#!/bin/bash
# DESCRIPTION: Docker hub hook to pass SOURCE_COMMIT
#
# Copyright 2020 by Stefan Wallentowitz. 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.FROM ubuntu:18.04
docker build --build-arg SOURCE_COMMIT=${SOURCE_COMMIT} -f $DOCKERFILE_PATH -t $IMAGE_NAME .

10
ci/docker/run/verilator-docker Executable file
View File

@ -0,0 +1,10 @@
#!/bin/bash
# DESCRIPTION: Wrap a verilator call to run a docker container
#
# Copyright 2020 by Stefan Wallentowitz. 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.
docker pull verilator/verilator:$1 >/dev/null
docker run -ti -v ${PWD}:/work --user $(id -u):$(id -g) verilator/verilator:$1 "${@:2}"

26
ci/docker/run/verilator-wrap.sh Executable file
View File

@ -0,0 +1,26 @@
#!/bin/bash -e
# DESCRIPTION: Wrap a Verilator call and copy vlt includes
# (inside docker container)
#
# Copyright 2020 by Stefan Wallentowitz. 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.
perl /usr/local/bin/verilator "$@"
# Check if user set an obj_dir
obj_dir=$(echo " $@" | grep -oP '\s--Mdir\s*\K\S+')
if [ "$obj_dir" == "" ]; then
obj_dir="obj_dir"
fi
# If the run was successful: Copy required files to allow build without this container
if [ -e ${obj_dir} ]; then
# Copy files required for the build
mkdir -p ${obj_dir}/vlt
cp -r /usr/local/share/verilator/bin ${obj_dir}/vlt
cp -r /usr/local/share/verilator/include ${obj_dir}/vlt
# Point Makefile to that folder
perl -i -pe 's/VERILATOR_ROOT = \/usr\/local\/share\/verilator/VERILATOR_ROOT = vlt/g' ${obj_dir}/*.mk
fi

4
configure.ac
View File

@ -1,12 +1,12 @@
# DESCRIPTION: Process this file with autoconf to produce a configure script. # DESCRIPTION: Process this file with autoconf to produce a configure script.
# #
# Copyright 2003-2019 by Wilson Snyder. Verilator is free software; you can # Copyright 2003-2020 by Wilson Snyder. Verilator is free software; you can
# redistribute it and/or modify it under the terms of either the GNU Lesser # 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. # General Public License Version 3 or the Perl Artistic License Version 2.0.
#AC_INIT([Verilator],[#.### YYYY-MM-DD]) #AC_INIT([Verilator],[#.### YYYY-MM-DD])
#AC_INIT([Verilator],[#.### devel]) #AC_INIT([Verilator],[#.### devel])
AC_INIT([Verilator],[4.024 2019-12-08], AC_INIT([Verilator],[4.026 2020-01-11],
[https://verilator.org], [https://verilator.org],
[verilator],[https://verilator.org]) [verilator],[https://verilator.org])
# When releasing, also update header of Changes file # When releasing, also update header of Changes file

4
docs/CONTRIBUTING.adoc
View File

@ -24,8 +24,8 @@ contributions flow more efficiently.
* Please https://verilator.org/issues/new[Open a new issue]. * Please https://verilator.org/issues/new[Open a new issue].
* You may attach a patch to the issue, or (preferred) may point to a GitHub * You may attach a patch to the issue, or (preferred) may request a GitHub
repository branch within your GitHub account. pull request.
** Verilator uses Travis CI to provide continuous integration. You may ** Verilator uses Travis CI to provide continuous integration. You may
want to setup Travis CI on your GitHub branch to ensure your changes want to setup Travis CI on your GitHub branch to ensure your changes

3
docs/CONTRIBUTORS
View File

@ -19,10 +19,12 @@ John Coiner
Julien Margetts Julien Margetts
Kanad Kanhere Kanad Kanhere
Kevin Kiningham Kevin Kiningham
Kuba Ober
Lukasz Dalek Lukasz Dalek
Maarten De Braekeleer Maarten De Braekeleer
Matthew Ballance Matthew Ballance
Mike Popoloski Mike Popoloski
Peter Monsson
Patrick Stewart Patrick Stewart
Philipp Wagner Philipp Wagner
Richard Myers Richard Myers
@ -30,4 +32,5 @@ Sebastien Van Cauwenberghe
Stefan Wallentowitz Stefan Wallentowitz
Todd Strader Todd Strader
Wilson Snyder Wilson Snyder
Yutetsu TAKATSUKASA
Yves Mathieu Yves Mathieu

2
docs/Makefile.in
View File

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

2
docs/TODO
View File

@ -1,6 +1,6 @@
// DESCRIPTION: Verilator: List of To Do issues. // DESCRIPTION: Verilator: List of To Do issues.
// //
// Copyright 2004-2019 by Wilson Snyder. This program is free software; you can // Copyright 2004-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License // Lesser General Public License Version 3 or the Perl Artistic License
// Version 2.0. // Version 2.0.

2
docs/doxygen-mainpage
View File

@ -3,4 +3,4 @@
* \section intro_sec Introduction * \section intro_sec Introduction
* *
* This is a full doxygen analysis of the Verilator source tree. * This is a full doxygen analysis of the Verilator source tree.
*/ */

19
docs/install.adoc
View File

@ -21,9 +21,14 @@ Git, below, maybe a better alternative.) To install as a package:
If this works, skip down to <<Running Verilator>>. If this works, skip down to <<Running Verilator>>.
=== Docker
Verilator is available in pre-built Docker containers. See
https://github.com/verilator/verilator/blob/master/ci/docker/run/README.adoc
=== Git === Git
Alternatively, installing Verilator with Git provides the most flexibility. Installing Verilator with Git provides the most flexibility.
For additional options and details see the additional sections below. In For additional options and details see the additional sections below. In
brief: brief:
@ -96,11 +101,11 @@ Those developing Verilator may also want these (see internals.adoc):
==== Install SystemC ==== Install SystemC
If you will be using SystemC (vs straight C++ output), download If you will be using SystemC (vs straight C++ output), download
http://www.systemc.org[SystemC]. Follow their installation instructions. https://www.accellera.org/downloads/standards/systemc[SystemC].
You will need to set `SYSTEMC_INCLUDE` to point to the include directory Follow their installation instructions. You will need to set `SYSTEMC_INCLUDE`
with systemc.h in it, and `SYSTEMC_LIBDIR` to points to the directory with to point to the include directory with `systemc.h` in it, and `SYSTEMC_LIBDIR`
libsystemc.a in it. (Older installations may set `SYSTEMC` and to points to the directory with `libsystemc.a` in it. (Older installations
`SYSTEMC_ARCH` instead.) may set `SYSTEMC` and `SYSTEMC_ARCH` instead.)
==== Install GTKWave ==== Install GTKWave
@ -289,6 +294,6 @@ or https://verilator.org/verilator_doc.pdf[Verilator manual (PDF)].
== License == License
Copyright 2008-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2008-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

9
docs/internals.adoc
View File

@ -382,6 +382,13 @@ changed; if clear, checking those signals for changes may be skipped.
== Coding Conventions == Coding Conventions
=== Compiler Version and C++11
Verilator supports GCC 4.4.7 and newer. GCC 4.4.7 does not support C++11,
therefore C++11 is generally not required. Exceptions may be made to
require C++11 for features that are only practical with C++11,
e.g. threads.
=== Indentation and Naming Style === Indentation and Naming Style
We will work with contributors to fix up indentation style issues, but it We will work with contributors to fix up indentation style issues, but it
@ -973,6 +980,6 @@ list in `src/Makefile_obj.in` and reconfigure.
== Distribution == Distribution
Copyright 2008-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2008-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

2
examples/cmake_hello_c/CMakeLists.txt
View File

@ -5,7 +5,7 @@
# This is an example cmake script to build a verilog to systemc project # This is an example cmake script to build a verilog to systemc project
# using cmake and verilator. # using cmake and verilator.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_hello_c/Makefile
View File

@ -6,7 +6,7 @@
# This makefile is here for testing the examples and should # This makefile is here for testing the examples and should
# generally not be added to a CMake project. # generally not be added to a CMake project.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_hello_sc/CMakeLists.txt
View File

@ -5,7 +5,7 @@
# This is an example cmake script to build a verilog to SystemC project # This is an example cmake script to build a verilog to SystemC project
# using CMake and Verilator. # using CMake and Verilator.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_hello_sc/Makefile
View File

@ -6,7 +6,7 @@
# This makefile is here for testing the examples and should # This makefile is here for testing the examples and should
# generally not be added to a CMake project. # generally not be added to a CMake project.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_protect_lib/CMakeLists.txt
View File

@ -5,7 +5,7 @@
# This is an example cmake script to build a verilog to systemc project # This is an example cmake script to build a verilog to systemc project
# using cmake and verilator. # using cmake and verilator.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_protect_lib/Makefile
View File

@ -6,7 +6,7 @@
# This makefile is here for testing the examples and should # This makefile is here for testing the examples and should
# generally not be added to a CMake project. # generally not be added to a CMake project.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_tracing_c/CMakeLists.txt
View File

@ -5,7 +5,7 @@
# This is an example cmake script to build a verilog to systemc project # This is an example cmake script to build a verilog to systemc project
# using cmake and verilator. # using cmake and verilator.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_tracing_c/Makefile
View File

@ -6,7 +6,7 @@
# This makefile is here for testing the examples and should # This makefile is here for testing the examples and should
# generally not be added to a CMake project. # generally not be added to a CMake project.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_tracing_sc/CMakeLists.txt
View File

@ -5,7 +5,7 @@
# This is an example cmake script to build a verilog to SystemC project # This is an example cmake script to build a verilog to SystemC project
# using CMake and Verilator. # using CMake and Verilator.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/cmake_tracing_sc/Makefile
View File

@ -6,7 +6,7 @@
# This makefile is here for testing the examples and should # This makefile is here for testing the examples and should
# generally not be added to a CMake project. # generally not be added to a CMake project.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/make_hello_c/Makefile
View File

@ -5,7 +5,7 @@
# This calls the object directory makefile. That allows the objects to # This calls the object directory makefile. That allows the objects to
# be placed in the "current directory" which simplifies the Makefile. # be placed in the "current directory" which simplifies the Makefile.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/make_hello_sc/Makefile
View File

@ -5,7 +5,7 @@
# This calls the object directory makefile. That allows the objects to # This calls the object directory makefile. That allows the objects to
# be placed in the "current directory" which simplifies the Makefile. # be placed in the "current directory" which simplifies the Makefile.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

9
examples/make_tracing_c/Makefile
View File

@ -5,7 +5,7 @@
# This calls the object directory makefile. That allows the objects to # This calls the object directory makefile. That allows the objects to
# be placed in the "current directory" which simplifies the Makefile. # be placed in the "current directory" which simplifies the Makefile.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -52,6 +52,9 @@ VERILATOR_FLAGS += --coverage
# Add this trace to get a backtrace in gdb # Add this trace to get a backtrace in gdb
#VERILATOR_FLAGS += --gdbbt #VERILATOR_FLAGS += --gdbbt
# Input files for Verilator
VERILATOR_INPUT = -f input.vc top.v sim_main.cpp
###################################################################### ######################################################################
default: run default: run
@ -61,7 +64,7 @@ run:
@echo @echo
@echo "-- VERILATE ----------------" @echo "-- VERILATE ----------------"
$(VERILATOR) $(VERILATOR_FLAGS) -f input.vc top.v sim_main.cpp $(VERILATOR) $(VERILATOR_FLAGS) $(VERILATOR_INPUT)
@echo @echo
@echo "-- COMPILE -----------------" @echo "-- COMPILE -----------------"
@ -72,11 +75,13 @@ run:
@echo @echo
@echo "-- RUN ---------------------" @echo "-- RUN ---------------------"
@rm -rf logs
@mkdir -p logs @mkdir -p logs
obj_dir/Vtop +trace obj_dir/Vtop +trace
@echo @echo
@echo "-- COVERAGE ----------------" @echo "-- COVERAGE ----------------"
@rm -rf logs/annotated
$(VERILATOR_COVERAGE) --annotate logs/annotated logs/coverage.dat $(VERILATOR_COVERAGE) --annotate logs/annotated logs/coverage.dat
@echo @echo

2
examples/make_tracing_c/Makefile_obj
View File

@ -5,7 +5,7 @@
# #
# This is executed in the object directory, and called by ../Makefile # This is executed in the object directory, and called by ../Makefile
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

12
examples/make_tracing_sc/Makefile
View File

@ -5,7 +5,7 @@
# This calls the object directory makefile. That allows the objects to # This calls the object directory makefile. That allows the objects to
# be placed in the "current directory" which simplifies the Makefile. # be placed in the "current directory" which simplifies the Makefile.
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -52,6 +52,9 @@ VERILATOR_FLAGS += --coverage
# Add this trace to get a backtrace in gdb # Add this trace to get a backtrace in gdb
#VERILATOR_FLAGS += --gdbbt #VERILATOR_FLAGS += --gdbbt
# Input files for Verilator
VERILATOR_INPUT = -f input.vc top.v sc_main.cpp
# Check if SC exists via a verilator call (empty if not) # Check if SC exists via a verilator call (empty if not)
SYSTEMC_EXISTS := $(shell $(VERILATOR) --getenv SYSTEMC_INCLUDE) SYSTEMC_EXISTS := $(shell $(VERILATOR) --getenv SYSTEMC_INCLUDE)
@ -69,10 +72,10 @@ run:
@echo @echo
@echo "-- VERILATE ----------------" @echo "-- VERILATE ----------------"
$(VERILATOR) $(VERILATOR_FLAGS) -f input.vc top.v sc_main.cpp $(VERILATOR) $(VERILATOR_FLAGS) $(VERILATOR_INPUT)
@echo @echo
@echo "-- COMPILE ----------------=" @echo "-- COMPILE -----------------"
# To compile, we can either just do what Verilator asks, # To compile, we can either just do what Verilator asks,
# or call a submakefile where we can override the rules ourselves # or call a submakefile where we can override the rules ourselves
# $(MAKE) -j 4 -C obj_dir -f Vtop.mk # $(MAKE) -j 4 -C obj_dir -f Vtop.mk
@ -80,11 +83,13 @@ run:
@echo @echo
@echo "-- RUN ---------------------" @echo "-- RUN ---------------------"
@rm -rf logs
@mkdir -p logs @mkdir -p logs
obj_dir/Vtop +trace obj_dir/Vtop +trace
@echo @echo
@echo "-- COVERAGE ----------------" @echo "-- COVERAGE ----------------"
@rm -rf logs/annotated
$(VERILATOR_COVERAGE) --annotate logs/annotated logs/coverage.dat $(VERILATOR_COVERAGE) --annotate logs/annotated logs/coverage.dat
@echo @echo
@ -92,6 +97,7 @@ run:
@echo "To see waveforms, open vlt_dump.vcd in a waveform viewer" @echo "To see waveforms, open vlt_dump.vcd in a waveform viewer"
@echo @echo
###################################################################### ######################################################################
# Other targets # Other targets

2
examples/make_tracing_sc/Makefile_obj
View File

@ -5,7 +5,7 @@
# #
# This is executed in the object directory, and called by ../Makefile # This is executed in the object directory, and called by ../Makefile
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

2
examples/xml_py/Makefile
View File

@ -2,7 +2,7 @@
# #
# DESCRIPTION: Verilator Example: XML tests # DESCRIPTION: Verilator Example: XML tests
# #
# Copyright 2003-2019 by Wilson Snyder. This program is free software; you can # Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

135
include/gtkwave/fstapi.c
View File

@ -133,9 +133,9 @@ void **JenkinsIns(void *base_i, const unsigned char *mem, uint32_t length, uint3
#endif #endif
#ifdef __GNUC__ #ifdef __GNUC__
// Boolean expression more often true than false /* Boolean expression more often true than false */
#define FST_LIKELY(x) __builtin_expect(!!(x), 1) #define FST_LIKELY(x) __builtin_expect(!!(x), 1)
// Boolean expression more often false than true /* Boolean expression more often false than true */
#define FST_UNLIKELY(x) __builtin_expect(!!(x), 0) #define FST_UNLIKELY(x) __builtin_expect(!!(x), 0)
#else #else
#define FST_LIKELY(x) (!!(x)) #define FST_LIKELY(x) (!!(x))
@ -737,6 +737,9 @@ off_t hier_file_len;
uint32_t *valpos_mem; uint32_t *valpos_mem;
unsigned char *curval_mem; unsigned char *curval_mem;
unsigned char *outval_mem; /* for two-state / Verilator-style value changes */
uint32_t outval_alloc_siz;
char *filename; char *filename;
fstHandle maxhandle; fstHandle maxhandle;
@ -1944,6 +1947,11 @@ if(xc && !xc->already_in_close && !xc->already_in_flush)
} }
} }
fstDestroyMmaps(xc, 1); fstDestroyMmaps(xc, 1);
if(xc->outval_mem)
{
free(xc->outval_mem); xc->outval_mem = NULL;
xc->outval_alloc_siz = 0;
}
/* write out geom section */ /* write out geom section */
fflush(xc->geom_handle); fflush(xc->geom_handle);
@ -2913,7 +2921,7 @@ if(FST_LIKELY((xc) && (handle <= xc->maxhandle)))
{ {
xc->vchg_alloc_siz += (xc->fst_break_add_size + len); /* +len added in the case of extremely long vectors and small break add sizes */ xc->vchg_alloc_siz += (xc->fst_break_add_size + len); /* +len added in the case of extremely long vectors and small break add sizes */
xc->vchg_mem = (unsigned char *)realloc(xc->vchg_mem, xc->vchg_alloc_siz); xc->vchg_mem = (unsigned char *)realloc(xc->vchg_mem, xc->vchg_alloc_siz);
if(VL_UNLIKELY(!xc->vchg_mem)) if(FST_UNLIKELY(!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); exit(255);
@ -2998,6 +3006,127 @@ if(FST_LIKELY((xc) && (handle <= xc->maxhandle)))
} }
} }
void fstWriterEmitValueChange32(void *ctx, fstHandle handle,
uint32_t bits, uint32_t val) {
char buf[32];
char *s = buf;
uint32_t i;
for (i = 0; i < bits; ++i)
{
*s++ = '0' + ((val >> (bits - i - 1)) & 1);
}
fstWriterEmitValueChange(ctx, handle, buf);
}
void fstWriterEmitValueChange64(void *ctx, fstHandle handle,
uint32_t bits, uint64_t val) {
char buf[64];
char *s = buf;
uint32_t i;
for (i = 0; i < bits; ++i)
{
*s++ = '0' + ((val >> (bits - i - 1)) & 1);
}
fstWriterEmitValueChange(ctx, handle, buf);
}
void fstWriterEmitValueChangeVec32(void *ctx, fstHandle handle,
uint32_t bits, const uint32_t *val) {
struct fstWriterContext *xc = (struct fstWriterContext *)ctx;
if (FST_UNLIKELY(bits <= 32))
{
fstWriterEmitValueChange32(ctx, handle, bits, val[0]);
}
else if(FST_LIKELY(xc))
{
int bq = bits / 32;
int br = bits & 31;
int i;
int w;
uint32_t v;
unsigned char* s;
if (FST_UNLIKELY(bits > xc->outval_alloc_siz))
{
xc->outval_alloc_siz = bits*2 + 1;
xc->outval_mem = (unsigned char*)realloc(xc->outval_mem, xc->outval_alloc_siz);
if (FST_UNLIKELY(!xc->outval_mem))
{
fprintf(stderr,
FST_APIMESS "Could not realloc() in fstWriterEmitValueChangeVec32, exiting.\n");
exit(255);
}
}
s = xc->outval_mem;
{
w = bq;
v = val[w];
for (i = 0; i < br; ++i)
{
*s++ = '0' + ((v >> (br - i - 1)) & 1);
}
}
for (w = bq - 1; w >= 0; --w)
{
v = val[w];
for (i = (32 - 4); i >= 0; i -= 4) {
s[0] = '0' + ((v >> (i + 3)) & 1);
s[1] = '0' + ((v >> (i + 2)) & 1);
s[2] = '0' + ((v >> (i + 1)) & 1);
s[3] = '0' + ((v >> (i + 0)) & 1);
s += 4;
}
}
fstWriterEmitValueChange(ctx, handle, xc->outval_mem);
}
}
void fstWriterEmitValueChangeVec64(void *ctx, fstHandle handle,
uint32_t bits, const uint64_t *val) {
struct fstWriterContext *xc = (struct fstWriterContext *)ctx;
if (FST_UNLIKELY(bits <= 64))
{
fstWriterEmitValueChange64(ctx, handle, bits, val[0]);
}
else if(FST_LIKELY(xc))
{
int bq = bits / 64;
int br = bits & 63;
int i;
int w;
uint32_t v;
unsigned char* s;
if (FST_UNLIKELY(bits > xc->outval_alloc_siz))
{
xc->outval_alloc_siz = bits*2 + 1;
xc->outval_mem = (unsigned char*)realloc(xc->outval_mem, xc->outval_alloc_siz);
if (FST_UNLIKELY(!xc->outval_mem))
{
fprintf(stderr,
FST_APIMESS "Could not realloc() in fstWriterEmitValueChangeVec64, exiting.\n");
exit(255);
}
}
s = xc->outval_mem;
{
w = bq;
v = val[w];
for (i = 0; i < br; ++i)
{
*s++ = '0' + ((v >> (br - i - 1)) & 1);
}
}
for (w = bq - 1; w >= 0; --w) {
v = val[w];
for (i = (64 - 4); i >= 0; i -= 4)
{
s[0] = '0' + ((v >> (i + 3)) & 1);
s[1] = '0' + ((v >> (i + 2)) & 1);
s[2] = '0' + ((v >> (i + 1)) & 1);
s[3] = '0' + ((v >> (i + 0)) & 1);
s += 4;
}
}
fstWriterEmitValueChange(ctx, handle, xc->outval_mem);
}
}
void fstWriterEmitVariableLengthValueChange(void *ctx, fstHandle handle, const void *val, uint32_t len) void fstWriterEmitVariableLengthValueChange(void *ctx, fstHandle handle, const void *val, uint32_t len)
{ {

8
include/gtkwave/fstapi.h
View File

@ -355,6 +355,14 @@ fstHandle fstWriterCreateVar2(void *ctx, enum fstVarType vt, enum fstVarDi
void fstWriterEmitDumpActive(void *ctx, int enable); void fstWriterEmitDumpActive(void *ctx, int enable);
void fstWriterEmitEnumTableRef(void *ctx, fstEnumHandle handle); void fstWriterEmitEnumTableRef(void *ctx, fstEnumHandle handle);
void fstWriterEmitValueChange(void *ctx, fstHandle handle, const void *val); void fstWriterEmitValueChange(void *ctx, fstHandle handle, const void *val);
void fstWriterEmitValueChange32(void *ctx, fstHandle handle,
uint32_t bits, uint32_t val);
void fstWriterEmitValueChange64(void *ctx, fstHandle handle,
uint32_t bits, uint64_t val);
void fstWriterEmitValueChangeVec32(void *ctx, fstHandle handle,
uint32_t bits, const uint32_t *val);
void fstWriterEmitValueChangeVec64(void *ctx, fstHandle handle,
uint32_t bits, const uint64_t *val);
void fstWriterEmitVariableLengthValueChange(void *ctx, fstHandle handle, const void *val, uint32_t len); void fstWriterEmitVariableLengthValueChange(void *ctx, fstHandle handle, const void *val, uint32_t len);
void fstWriterEmitTimeChange(void *ctx, uint64_t tim); void fstWriterEmitTimeChange(void *ctx, uint64_t tim);
void fstWriterFlushContext(void *ctx); void fstWriterFlushContext(void *ctx);

178
include/verilated.cpp
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can // Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.
@ -30,7 +30,9 @@
#include "verilated_config.h" #include "verilated_config.h"
#include <algorithm>
#include <cctype> #include <cctype>
#include <cerrno>
#include <sys/stat.h> // mkdir #include <sys/stat.h> // mkdir
#if defined(_WIN32) || defined(__MINGW32__) #if defined(_WIN32) || defined(__MINGW32__)
@ -311,7 +313,7 @@ WDataOutP VL_RANDOM_W(int obits, WDataOutP outwp) VL_MT_SAFE {
if (i<(VL_WORDS_I(obits)-1)) { if (i<(VL_WORDS_I(obits)-1)) {
outwp[i] = vl_rand64(); outwp[i] = vl_rand64();
} else { } else {
outwp[i] = vl_rand64() & VL_MASK_I(obits); outwp[i] = vl_rand64() & VL_MASK_E(obits);
} }
} }
return outwp; return outwp;
@ -323,7 +325,7 @@ IData VL_RAND_RESET_I(int obits) VL_MT_SAFE {
if (Verilated::randReset()!=1) { // if 2, randomize if (Verilated::randReset()!=1) { // if 2, randomize
data = VL_RANDOM_I(obits); data = VL_RANDOM_I(obits);
} }
if (obits<32) data &= VL_MASK_I(obits); data &= VL_MASK_I(obits);
return data; return data;
} }
QData VL_RAND_RESET_Q(int obits) VL_MT_SAFE { QData VL_RAND_RESET_Q(int obits) VL_MT_SAFE {
@ -332,7 +334,7 @@ QData VL_RAND_RESET_Q(int obits) VL_MT_SAFE {
if (Verilated::randReset()!=1) { // if 2, randomize if (Verilated::randReset()!=1) { // if 2, randomize
data = VL_RANDOM_Q(obits); data = VL_RANDOM_Q(obits);
} }
if (obits<64) data &= VL_MASK_Q(obits); data &= VL_MASK_Q(obits);
return data; return data;
} }
WDataOutP VL_RAND_RESET_W(int obits, WDataOutP outwp) VL_MT_SAFE { WDataOutP VL_RAND_RESET_W(int obits, WDataOutP outwp) VL_MT_SAFE {
@ -340,7 +342,7 @@ WDataOutP VL_RAND_RESET_W(int obits, WDataOutP outwp) VL_MT_SAFE {
if (i<(VL_WORDS_I(obits)-1)) { if (i<(VL_WORDS_I(obits)-1)) {
outwp[i] = VL_RAND_RESET_I(32); outwp[i] = VL_RAND_RESET_I(32);
} else { } else {
outwp[i] = VL_RAND_RESET_I(32) & VL_MASK_I(obits); outwp[i] = VL_RAND_RESET_I(32) & VL_MASK_E(obits);
} }
} }
return outwp; return outwp;
@ -356,7 +358,9 @@ WDataOutP VL_ZERO_RESET_W(int obits, WDataOutP outwp) VL_MT_SAFE {
void _VL_DEBUG_PRINT_W(int lbits, WDataInP iwp) VL_MT_SAFE { void _VL_DEBUG_PRINT_W(int lbits, WDataInP iwp) VL_MT_SAFE {
VL_PRINTF_MT(" Data: w%d: ", lbits); VL_PRINTF_MT(" Data: w%d: ", lbits);
for (int i=VL_WORDS_I(lbits)-1; i>=0; --i) { VL_PRINTF_MT("%08x ", iwp[i]); } for (int i = VL_WORDS_I(lbits) - 1; i >= 0; --i) {
VL_PRINTF_MT("%08x ", iwp[i]);
}
VL_PRINTF_MT("\n"); VL_PRINTF_MT("\n");
} }
@ -499,7 +503,7 @@ WDataOutP VL_POW_WWW(int obits, int, int rbits,
} }
WDataOutP VL_POW_WWQ(int obits, int lbits, int rbits, WDataOutP VL_POW_WWQ(int obits, int lbits, int rbits,
WDataOutP owp, WDataInP lwp, QData rhs) VL_MT_SAFE { WDataOutP owp, WDataInP lwp, QData rhs) VL_MT_SAFE {
WData rhsw[2]; VL_SET_WQ(rhsw, rhs); WData rhsw[VL_WQ_WORDS_E]; VL_SET_WQ(rhsw, rhs);
return VL_POW_WWW(obits, lbits, rbits, owp, lwp, rhsw); return VL_POW_WWW(obits, lbits, rbits, owp, lwp, rhsw);
} }
QData VL_POW_QQW(int, int, int rbits, QData lhs, WDataInP rwp) VL_MT_SAFE { QData VL_POW_QQW(int, int, int rbits, QData lhs, WDataInP rwp) VL_MT_SAFE {
@ -520,14 +524,14 @@ WDataOutP VL_POWSS_WWW(int obits, int, int rbits, WDataOutP owp, WDataInP lwp, W
if (rsign && VL_SIGN_W(rbits, rwp)) { if (rsign && VL_SIGN_W(rbits, rwp)) {
int words = VL_WORDS_I(obits); int words = VL_WORDS_I(obits);
VL_ZERO_W(obits, owp); VL_ZERO_W(obits, owp);
IData lor = 0; // 0=all zeros, ~0=all ones, else mix EData lor = 0; // 0=all zeros, ~0=all ones, else mix
for (int i=1; i < (words-1); ++i) { for (int i=1; i < (words-1); ++i) {
lor |= lwp[i]; lor |= lwp[i];
} }
lor |= ( (lwp[words-1] == VL_MASK_I(rbits)) ? ~VL_UL(0) : 0); lor |= ( (lwp[words-1] == VL_MASK_E(rbits)) ? ~VL_EUL(0) : 0);
if (lor==0 && lwp[0]==0) { return owp; } // "X" so return 0 if (lor==0 && lwp[0]==0) { return owp; } // "X" so return 0
else if (lor==0 && lwp[0]==1) { owp[0] = 1; return owp; } // 1 else if (lor==0 && lwp[0]==1) { owp[0] = 1; return owp; } // 1
else if (lsign && lor == ~VL_UL(0) && lwp[0]==~VL_UL(0)) { // -1 else if (lsign && lor == ~VL_EUL(0) && lwp[0] == ~VL_EUL(0)) { // -1
if (rwp[0] & 1) { return VL_ALLONES_W(obits, owp); } // -1^odd=-1 if (rwp[0] & 1) { return VL_ALLONES_W(obits, owp); } // -1^odd=-1
else { owp[0] = 1; return owp; } // -1^even=1 else { owp[0] = 1; return owp; } // -1^even=1
} }
@ -538,7 +542,7 @@ WDataOutP VL_POWSS_WWW(int obits, int, int rbits, WDataOutP owp, WDataInP lwp, W
WDataOutP VL_POWSS_WWQ(int obits, int lbits, int rbits, WDataOutP VL_POWSS_WWQ(int obits, int lbits, int rbits,
WDataOutP owp, WDataInP lwp, QData rhs, WDataOutP owp, WDataInP lwp, QData rhs,
bool lsign, bool rsign) VL_MT_SAFE { bool lsign, bool rsign) VL_MT_SAFE {
WData rhsw[2]; VL_SET_WQ(rhsw, rhs); WData rhsw[VL_WQ_WORDS_E]; VL_SET_WQ(rhsw, rhs);
return VL_POWSS_WWW(obits, lbits, rbits, owp, lwp, rhsw, lsign, rsign); return VL_POWSS_WWW(obits, lbits, rbits, owp, lwp, rhsw, lsign, rsign);
} }
QData VL_POWSS_QQW(int obits, int, int rbits, QData VL_POWSS_QQW(int obits, int, int rbits,
@ -576,7 +580,7 @@ std::string VL_DECIMAL_NW(int width, WDataInP lwp) VL_MT_SAFE {
for (int nibble_bit = 0; nibble_bit < maxdecwidth; nibble_bit+=4) { for (int nibble_bit = 0; nibble_bit < maxdecwidth; nibble_bit+=4) {
if ((VL_BITRSHIFT_W(bcd, nibble_bit) & 0xf) >= 5) { if ((VL_BITRSHIFT_W(bcd, nibble_bit) & 0xf) >= 5) {
VL_ZERO_RESET_W(maxdecwidth, tmp2); VL_ZERO_RESET_W(maxdecwidth, tmp2);
tmp2[VL_BITWORD_I(nibble_bit)] |= 0x3 << VL_BITBIT_I(nibble_bit); tmp2[VL_BITWORD_E(nibble_bit)] |= VL_EUL(0x3) << VL_BITBIT_E(nibble_bit);
VL_ASSIGN_W(maxdecwidth, tmp, bcd); VL_ASSIGN_W(maxdecwidth, tmp, bcd);
VL_ADD_W(VL_WORDS_I(maxdecwidth), bcd, tmp, tmp2); VL_ADD_W(VL_WORDS_I(maxdecwidth), bcd, tmp, tmp2);
} }
@ -599,7 +603,7 @@ std::string VL_DECIMAL_NW(int width, WDataInP lwp) VL_MT_SAFE {
} }
// Do a va_arg returning a quad, assuming input argument is anything less than wide // Do a va_arg returning a quad, assuming input argument is anything less than wide
#define _VL_VA_ARG_Q(ap, bits) (((bits) <= VL_WORDSIZE) ? va_arg(ap, IData) : va_arg(ap, QData)) #define _VL_VA_ARG_Q(ap, bits) (((bits) <= VL_IDATASIZE) ? va_arg(ap, IData) : va_arg(ap, QData))
void _vl_vsformat(std::string& output, const char* formatp, va_list ap) VL_MT_SAFE { void _vl_vsformat(std::string& output, const char* formatp, va_list ap) VL_MT_SAFE {
// Format a Verilog $write style format into the output list // Format a Verilog $write style format into the output list
@ -658,6 +662,7 @@ void _vl_vsformat(std::string& output, const char* formatp, va_list ap) VL_MT_SA
case '@': { // Verilog/C++ string case '@': { // Verilog/C++ string
va_arg(ap, int); // # bits is ignored va_arg(ap, int); // # bits is ignored
const std::string* cstrp = va_arg(ap, const std::string*); const std::string* cstrp = va_arg(ap, const std::string*);
if (width > cstrp->size()) output += std::string(width - cstrp->size(), ' ');
output += *cstrp; output += *cstrp;
break; break;
} }
@ -691,7 +696,7 @@ void _vl_vsformat(std::string& output, const char* formatp, va_list ap) VL_MT_SA
// Deal with all read-and-print somethings // Deal with all read-and-print somethings
const int lbits = va_arg(ap, int); const int lbits = va_arg(ap, int);
QData ld = 0; QData ld = 0;
WData qlwp[2]; WData qlwp[VL_WQ_WORDS_E];
WDataInP lwp; WDataInP lwp;
if (lbits <= VL_QUADSIZE) { if (lbits <= VL_QUADSIZE) {
ld = _VL_VA_ARG_Q(ap, lbits); ld = _VL_VA_ARG_Q(ap, lbits);
@ -709,13 +714,17 @@ void _vl_vsformat(std::string& output, const char* formatp, va_list ap) VL_MT_SA
output += charval; output += charval;
break; break;
} }
case 's': case 's': {
std::string field;
for (; lsb>=0; --lsb) { for (; lsb>=0; --lsb) {
lsb = (lsb / 8) * 8; // Next digit lsb = (lsb / 8) * 8; // Next digit
IData charval = VL_BITRSHIFT_W(lwp, lsb) & 0xff; IData charval = VL_BITRSHIFT_W(lwp, lsb) & 0xff;
output += (charval==0)?' ':charval; field += (charval==0)?' ':charval;
} }
if (width > field.size()) output += std::string(width - field.size(), ' ');
output += field;
break; break;
}
case 'd': { // Signed decimal case 'd': { // Signed decimal
int digits; int digits;
std::string append; std::string append;
@ -724,7 +733,7 @@ void _vl_vsformat(std::string& output, const char* formatp, va_list ap) VL_MT_SA
static_cast<vlsint64_t>(VL_EXTENDS_QQ(lbits, lbits, ld))); static_cast<vlsint64_t>(VL_EXTENDS_QQ(lbits, lbits, ld)));
append = tmp; append = tmp;
} else { } else {
if (VL_SIGN_I(lbits, lwp[VL_WORDS_I(lbits)-1])) { if (VL_SIGN_E(lbits, lwp[VL_WORDS_I(lbits) - 1])) {
WData neg[VL_VALUE_STRING_MAX_WIDTH/4+2]; WData neg[VL_VALUE_STRING_MAX_WIDTH/4+2];
VL_NEGATE_W(VL_WORDS_I(lbits), neg, lwp); VL_NEGATE_W(VL_WORDS_I(lbits), neg, lwp);
append = std::string("-") + VL_DECIMAL_NW(lbits, neg); append = std::string("-") + VL_DECIMAL_NW(lbits, neg);
@ -966,7 +975,7 @@ IData _vl_vsscanf(FILE* fp, // If a fscanf
// Deal with all read-and-scan somethings // Deal with all read-and-scan somethings
// Note LSBs are preserved if there's an overflow // Note LSBs are preserved if there's an overflow
const int obits = va_arg(ap, int); const int obits = va_arg(ap, int);
WData qowp[2] = {0, 0}; WData qowp[VL_WQ_WORDS_E]; VL_SET_WQ(qowp, VL_ULL(0));
WDataOutP owp = qowp; WDataOutP owp = qowp;
if (obits > VL_QUADSIZE) { if (obits > VL_QUADSIZE) {
owp = va_arg(ap, WDataOutP); owp = va_arg(ap, WDataOutP);
@ -1055,7 +1064,7 @@ IData _vl_vsscanf(FILE* fp, // If a fscanf
CData* p = va_arg(ap, CData*); *p = owp[0]; CData* p = va_arg(ap, CData*); *p = owp[0];
} else if (obits <= VL_SHORTSIZE) { } else if (obits <= VL_SHORTSIZE) {
SData* p = va_arg(ap, SData*); *p = owp[0]; SData* p = va_arg(ap, SData*); *p = owp[0];
} else if (obits <= VL_WORDSIZE) { } else if (obits <= VL_IDATASIZE) {
IData* p = va_arg(ap, IData*); *p = owp[0]; IData* p = va_arg(ap, IData*); *p = owp[0];
} else if (obits <= VL_QUADSIZE) { } else if (obits <= VL_QUADSIZE) {
QData* p = va_arg(ap, QData*); *p = VL_SET_QW(owp); QData* p = va_arg(ap, QData*); *p = VL_SET_QW(owp);
@ -1112,9 +1121,9 @@ IData VL_FGETS_IXI(int obits, void* destp, IData fpi) VL_MT_SAFE {
// any read data. This means we can't know in what location the first // any read data. This means we can't know in what location the first
// character will finally live, so we need to copy. Yuk. // character will finally live, so we need to copy. Yuk.
IData bytes = VL_BYTES_I(obits); IData bytes = VL_BYTES_I(obits);
char buffer[VL_TO_STRING_MAX_WORDS*VL_WORDSIZE+1]; char buffer[VL_TO_STRING_MAX_WORDS * VL_EDATASIZE + 1];
// V3Emit has static check that bytes < VL_TO_STRING_MAX_WORDS, but be safe // V3Emit has static check that bytes < VL_TO_STRING_MAX_WORDS, but be safe
if (VL_UNCOVERABLE(bytes > VL_TO_STRING_MAX_WORDS*VL_WORDSIZE)) { if (VL_UNCOVERABLE(bytes > VL_TO_STRING_MAX_WORDS * VL_EDATASIZE)) {
VL_FATAL_MT(__FILE__, __LINE__, "", "Internal: fgets buffer overrun"); // LCOV_EXCL_LINE VL_FATAL_MT(__FILE__, __LINE__, "", "Internal: fgets buffer overrun"); // LCOV_EXCL_LINE
} }
@ -1135,20 +1144,22 @@ IData VL_FGETS_IXI(int obits, void* destp, IData fpi) VL_MT_SAFE {
IData VL_FOPEN_NI(const std::string& filename, IData mode) VL_MT_SAFE { IData VL_FOPEN_NI(const std::string& filename, IData mode) VL_MT_SAFE {
// While threadsafe, each thread can only access different file handles // While threadsafe, each thread can only access different file handles
char modez[5]; char modez[5];
_VL_VINT_TO_STRING(VL_WORDSIZE, modez, &mode); EData modee = mode;
_VL_VINT_TO_STRING(VL_IDATASIZE, modez, &modee);
return VL_FOPEN_S(filename.c_str(), modez); return VL_FOPEN_S(filename.c_str(), modez);
} }
IData VL_FOPEN_QI(QData filename, IData mode) VL_MT_SAFE { IData VL_FOPEN_QI(QData filename, IData mode) VL_MT_SAFE {
// While threadsafe, each thread can only access different file handles // While threadsafe, each thread can only access different file handles
WData fnw[2]; VL_SET_WQ(fnw, filename); WData fnw[VL_WQ_WORDS_E]; VL_SET_WQ(fnw, filename);
return VL_FOPEN_WI(2, fnw, mode); return VL_FOPEN_WI(VL_WQ_WORDS_E, fnw, mode);
} }
IData VL_FOPEN_WI(int fnwords, WDataInP filenamep, IData mode) VL_MT_SAFE { IData VL_FOPEN_WI(int fnwords, WDataInP filenamep, IData mode) VL_MT_SAFE {
// While threadsafe, each thread can only access different file handles // While threadsafe, each thread can only access different file handles
char filenamez[VL_TO_STRING_MAX_WORDS*VL_WORDSIZE+1]; char filenamez[VL_TO_STRING_MAX_WORDS * VL_EDATASIZE + 1];
_VL_VINT_TO_STRING(fnwords*VL_WORDSIZE, filenamez, filenamep); _VL_VINT_TO_STRING(fnwords * VL_EDATASIZE, filenamez, filenamep);
EData modee = mode;
char modez[5]; char modez[5];
_VL_VINT_TO_STRING(VL_WORDSIZE, modez, &mode); _VL_VINT_TO_STRING(4 * sizeof(char), modez, &modee);
return VL_FOPEN_S(filenamez, modez); return VL_FOPEN_S(filenamez, modez);
} }
IData VL_FOPEN_S(const char* filenamep, const char* modep) VL_MT_SAFE { IData VL_FOPEN_S(const char* filenamep, const char* modep) VL_MT_SAFE {
@ -1277,7 +1288,7 @@ IData VL_FSCANF_IX(IData fpi, const char* formatp, ...) VL_MT_SAFE {
} }
IData VL_SSCANF_IIX(int lbits, IData ld, const char* formatp, ...) VL_MT_SAFE { IData VL_SSCANF_IIX(int lbits, IData ld, const char* formatp, ...) VL_MT_SAFE {
WData fnw[2]; VL_SET_WI(fnw, ld); WData fnw[VL_WQ_WORDS_E]; VL_SET_WI(fnw, ld);
va_list ap; va_list ap;
va_start(ap, formatp); va_start(ap, formatp);
@ -1286,7 +1297,7 @@ IData VL_SSCANF_IIX(int lbits, IData ld, const char* formatp, ...) VL_MT_SAFE {
return got; return got;
} }
IData VL_SSCANF_IQX(int lbits, QData ld, const char* formatp, ...) VL_MT_SAFE { IData VL_SSCANF_IQX(int lbits, QData ld, const char* formatp, ...) VL_MT_SAFE {
WData fnw[2]; VL_SET_WQ(fnw, ld); WData fnw[VL_WQ_WORDS_E]; VL_SET_WQ(fnw, ld);
va_list ap; va_list ap;
va_start(ap, formatp); va_start(ap, formatp);
@ -1312,15 +1323,15 @@ IData VL_SSCANF_INX(int, const std::string& ld, const char* formatp, ...) VL_MT_
void VL_WRITEMEM_Q(bool hex, int width, int depth, int array_lsb, int, void VL_WRITEMEM_Q(bool hex, int width, int depth, int array_lsb, int,
QData filename, const void* memp, IData start, QData filename, const void* memp, IData start,
IData end) VL_MT_SAFE { IData end) VL_MT_SAFE {
WData fnw[2]; VL_SET_WQ(fnw, filename); WData fnw[VL_WQ_WORDS_E]; VL_SET_WQ(fnw, filename);
return VL_WRITEMEM_W(hex, width, depth, array_lsb,2, fnw, memp, start, end); return VL_WRITEMEM_W(hex, width, depth, array_lsb, VL_WQ_WORDS_E, fnw, memp, start, end);
} }
void VL_WRITEMEM_W(bool hex, int width, int depth, int array_lsb, int fnwords, void VL_WRITEMEM_W(bool hex, int width, int depth, int array_lsb, int fnwords,
WDataInP filenamep, const void* memp, IData start, WDataInP filenamep, const void* memp, IData start,
IData end) VL_MT_SAFE { IData end) VL_MT_SAFE {
char filenamez[VL_TO_STRING_MAX_WORDS*VL_WORDSIZE+1]; char filenamez[VL_TO_STRING_MAX_WORDS * VL_EDATASIZE + 1];
_VL_VINT_TO_STRING(fnwords*VL_WORDSIZE, filenamez, filenamep); _VL_VINT_TO_STRING(fnwords * VL_EDATASIZE, filenamez, filenamep);
std::string filenames(filenamez); std::string filenames(filenamez);
return VL_WRITEMEM_N(hex, width, depth, array_lsb, filenames, memp, start, end); return VL_WRITEMEM_N(hex, width, depth, array_lsb, filenames, memp, start, end);
} }
@ -1425,21 +1436,20 @@ void VL_WRITEMEM_N(
} else { } else {
WDataInP memDatap = reinterpret_cast<WDataInP>(memp); WDataInP memDatap = reinterpret_cast<WDataInP>(memp);
WDataInP datap = &memDatap[row_offset * VL_WORDS_I(width)]; WDataInP datap = &memDatap[row_offset * VL_WORDS_I(width)];
// output as a sequence of VL_WORDSIZE'd words // output as a sequence of VL_EDATASIZE'd words
// from MSB to LSB. Mask off the MSB word which could // from MSB to LSB. Mask off the MSB word which could
// contain junk above the top of valid data. // contain junk above the top of valid data.
int word_idx = ((width - 1) / VL_WORDSIZE); int word_idx = ((width - 1) / VL_EDATASIZE);
bool first = true; bool first = true;
while (word_idx >= 0) { while (word_idx >= 0) {
IData data = datap[word_idx]; EData data = datap[word_idx];
if (first) { if (first) {
data &= VL_MASK_I(width); data &= VL_MASK_E(width);
int top_word_nbits = ((width - 1) & 0x1f) + 1; int top_word_nbits = ((width - 1) & (VL_EDATASIZE - 1)) + 1;
fprintf(fp, memhFormat(top_word_nbits), data); fprintf(fp, memhFormat(top_word_nbits), data);
} else { } else {
fprintf(fp, "%08x", data); fprintf(fp, "%08x", data);
} }
word_idx--; word_idx--;
first = false; first = false;
} }
@ -1477,7 +1487,7 @@ IData VL_FREAD_I(int width, int array_lsb, int array_size,
SData* datap = &(reinterpret_cast<SData*>(memp))[entry]; SData* datap = &(reinterpret_cast<SData*>(memp))[entry];
if (shift == start_shift) { *datap = 0; } if (shift == start_shift) { *datap = 0; }
*datap |= (c << shift) & VL_MASK_I(width); *datap |= (c << shift) & VL_MASK_I(width);
} else if (width <= VL_WORDSIZE) { } else if (width <= VL_IDATASIZE) {
IData* datap = &(reinterpret_cast<IData*>(memp))[entry]; IData* datap = &(reinterpret_cast<IData*>(memp))[entry];
if (shift == start_shift) { *datap = 0; } if (shift == start_shift) { *datap = 0; }
*datap |= (c << shift) & VL_MASK_I(width); *datap |= (c << shift) & VL_MASK_I(width);
@ -1486,10 +1496,10 @@ IData VL_FREAD_I(int width, int array_lsb, int array_size,
if (shift == start_shift) { *datap = 0; } if (shift == start_shift) { *datap = 0; }
*datap |= ((static_cast<QData>(c) << static_cast<QData>(shift)) *datap |= ((static_cast<QData>(c) << static_cast<QData>(shift))
& VL_MASK_Q(width)); & VL_MASK_Q(width));
} else { } else {
WDataOutP datap = &(reinterpret_cast<WDataOutP>(memp))[ entry*VL_WORDS_I(width) ]; WDataOutP datap = &(reinterpret_cast<WDataOutP>(memp))[entry * VL_WORDS_I(width)];
if (shift == start_shift) { VL_ZERO_RESET_W(width, datap); } if (shift == start_shift) { VL_ZERO_RESET_W(width, datap); }
datap[VL_BITWORD_I(shift)] |= (c << VL_BITBIT_I(shift)); datap[VL_BITWORD_E(shift)] |= (static_cast<EData>(c) << VL_BITBIT_E(shift));
} }
// Prep for next // Prep for next
++read_count; ++read_count;
@ -1505,14 +1515,14 @@ IData VL_FREAD_I(int width, int array_lsb, int array_size,
void VL_READMEM_Q(bool hex, int width, int depth, int array_lsb, int, void VL_READMEM_Q(bool hex, int width, int depth, int array_lsb, int,
QData filename, void* memp, IData start, IData end) VL_MT_SAFE { QData filename, void* memp, IData start, IData end) VL_MT_SAFE {
WData fnw[2]; VL_SET_WQ(fnw, filename); WData fnw[VL_WQ_WORDS_E]; VL_SET_WQ(fnw, filename);
return VL_READMEM_W(hex, width, depth, array_lsb, 2, fnw, memp, start, end); return VL_READMEM_W(hex, width, depth, array_lsb, VL_WQ_WORDS_E, fnw, memp, start, end);
} }
void VL_READMEM_W(bool hex, int width, int depth, int array_lsb, int fnwords, void VL_READMEM_W(bool hex, int width, int depth, int array_lsb, int fnwords,
WDataInP filenamep, void* memp, IData start, IData end) VL_MT_SAFE { WDataInP filenamep, void* memp, IData start, IData end) VL_MT_SAFE {
char filenamez[VL_TO_STRING_MAX_WORDS*VL_WORDSIZE+1]; char filenamez[VL_TO_STRING_MAX_WORDS * VL_EDATASIZE + 1];
_VL_VINT_TO_STRING(fnwords*VL_WORDSIZE, filenamez, filenamep); _VL_VINT_TO_STRING(fnwords * VL_EDATASIZE, filenamez, filenamep);
std::string filenames(filenamez); std::string filenames(filenamez);
return VL_READMEM_N(hex, width, depth, array_lsb, filenames, memp, start, end); return VL_READMEM_N(hex, width, depth, array_lsb, filenames, memp, start, end);
} }
@ -1601,7 +1611,7 @@ void VL_READMEM_N(
SData* datap = &(reinterpret_cast<SData*>(memp))[entry]; SData* datap = &(reinterpret_cast<SData*>(memp))[entry];
if (!innum) { *datap = 0; } if (!innum) { *datap = 0; }
*datap = ((*datap << shift) + value) & VL_MASK_I(width); *datap = ((*datap << shift) + value) & VL_MASK_I(width);
} else if (width<=VL_WORDSIZE) { } else if (width <= VL_IDATASIZE) {
IData* datap = &(reinterpret_cast<IData*>(memp))[entry]; IData* datap = &(reinterpret_cast<IData*>(memp))[entry];
if (!innum) { *datap = 0; } if (!innum) { *datap = 0; }
*datap = ((*datap << shift) + value) & VL_MASK_I(width); *datap = ((*datap << shift) + value) & VL_MASK_I(width);
@ -1642,12 +1652,12 @@ void VL_READMEM_N(
} }
IData VL_SYSTEM_IQ(QData lhs) VL_MT_SAFE { IData VL_SYSTEM_IQ(QData lhs) VL_MT_SAFE {
WData lhsw[2]; VL_SET_WQ(lhsw, lhs); WData lhsw[VL_WQ_WORDS_E]; VL_SET_WQ(lhsw, lhs);
return VL_SYSTEM_IW(2, lhsw); return VL_SYSTEM_IW(VL_WQ_WORDS_E, lhsw);
} }
IData VL_SYSTEM_IW(int lhswords, WDataInP lhsp) VL_MT_SAFE { IData VL_SYSTEM_IW(int lhswords, WDataInP lhsp) VL_MT_SAFE {
char filenamez[VL_TO_STRING_MAX_WORDS*VL_WORDSIZE+1]; char filenamez[VL_TO_STRING_MAX_WORDS * VL_EDATASIZE + 1];
_VL_VINT_TO_STRING(lhswords*VL_WORDSIZE, filenamez, lhsp); _VL_VINT_TO_STRING(lhswords * VL_EDATASIZE, filenamez, lhsp);
int code = system(filenamez); // Yes, system() is threadsafe int code = system(filenamez); // Yes, system() is threadsafe
return code >> 8; // Want exit status return code >> 8; // Want exit status
} }
@ -1803,8 +1813,8 @@ std::string VL_TOUPPER_NN(const std::string& ld) VL_MT_SAFE {
std::string VL_CVT_PACK_STR_NW(int lwords, WDataInP lwp) VL_MT_SAFE { std::string VL_CVT_PACK_STR_NW(int lwords, WDataInP lwp) VL_MT_SAFE {
// See also _VL_VINT_TO_STRING // See also _VL_VINT_TO_STRING
char destout[VL_TO_STRING_MAX_WORDS*VL_WORDSIZE+1]; char destout[VL_TO_STRING_MAX_WORDS * VL_EDATASIZE + 1];
int obits = lwords * VL_WORDSIZE; int obits = lwords * VL_EDATASIZE;
int lsb=obits-1; int lsb=obits-1;
bool start=true; bool start=true;
char* destp = destout; char* destp = destout;
@ -1821,6 +1831,66 @@ std::string VL_CVT_PACK_STR_NW(int lwords, WDataInP lwp) VL_MT_SAFE {
return std::string(destout, len); return std::string(destout, len);
} }
std::string VL_PUTC_N(const std::string& lhs, IData rhs, CData ths) VL_PURE {
std::string lstring = lhs;
const vlsint32_t rhs_s = rhs; // To signed value
// 6.16.2:str.putc(i, c) does not change the value when i < 0 || i >= str.len() || c == 0
if (0 <= rhs_s && rhs < lhs.length() && ths != 0) lstring[rhs] = ths;
return lstring;
}
CData VL_GETC_N(const std::string& lhs, IData rhs) VL_PURE {
CData v = 0;
const vlsint32_t rhs_s = rhs; // To signed value
// 6.16.3:str.getc(i) returns 0 if i < 0 || i >= str.len()
if (0 <= rhs_s && rhs < lhs.length()) v = lhs[rhs];
return v;
}
std::string VL_SUBSTR_N(const std::string& lhs, IData rhs, IData ths) VL_PURE {
const vlsint32_t rhs_s = rhs; // To signed value
const vlsint32_t ths_s = ths; // To signed value
// 6.16.8:str.substr(i, j) returns an empty string when i < 0 || j < i || j >= str.len()
if (rhs_s < 0 || ths_s < rhs_s || ths >= lhs.length()) return "";
// Second parameter of std::string::substr(i, n) is length, not position as in SystemVerilog
return lhs.substr(rhs, ths - rhs + 1);
}
IData VL_ATOI_N(const std::string& str, int base) VL_PURE {
std::string str_mod = str;
// IEEE 1800-2017 6.16.9 says '_' may exist.
str_mod.erase(std::remove(str_mod.begin(), str_mod.end(), '_'), str_mod.end());
errno = 0;
long v = std::strtol(str_mod.c_str(), NULL, base);
if (errno != 0) v = 0;
return static_cast<IData>(v);
}
//===========================================================================
// Timescale conversion
// Helper function for conversion of timescale strings
// Converts (1|10|100)(s|ms|us|ns|ps|fs) to power of then
int VL_TIME_STR_CONVERT(const char* strp) {
int scale = 0;
if (!strp) return 0;
if (*strp++ != '1') return 0;
while (*strp == '0') { scale++; strp++; }
switch (*strp++) {
case 's': break;
case 'm': scale -= 3; break;
case 'u': scale -= 6; break;
case 'n': scale -= 9; break;
case 'p': scale -= 12; break;
case 'f': scale -= 15; break;
default: return 0;
}
if ((scale < 0) && (*strp++ != 's')) return 0;
if (*strp) return 0;
return scale;
}
//=========================================================================== //===========================================================================
// Verilated:: Methods // Verilated:: Methods

575
include/verilated.h
View File

File diff suppressed because it is too large Load Diff

2
include/verilated.mk.in
View File

@ -2,7 +2,7 @@
###################################################################### ######################################################################
# DESCRIPTION: Makefile commands for all verilated target files # DESCRIPTION: Makefile commands for all verilated target files
# #
# Copyright 2003-2019 by Wilson Snyder. Verilator is free software; you can # Copyright 2003-2020 by Wilson Snyder. Verilator is free software; you can
# redistribute it and/or modify it under the terms of either the GNU Lesser # 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. # General Public License Version 3 or the Perl Artistic License Version 2.0.
###################################################################### ######################################################################

2
include/verilated.v
View File

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

2
include/verilated_config.h.in
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can // Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.

2
include/verilated_cov.cpp
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

2
include/verilated_cov.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

2
include/verilated_cov_key.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

2
include/verilated_dpi.cpp
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can // Copyright 2009-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.

2
include/verilated_dpi.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can // Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.

52
include/verilated_fst_c.cpp
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //
@ -118,7 +118,7 @@ void VerilatedFst::declDTypeEnum(int dtypenum, const char* name, vluint32_t elem
void VerilatedFst::declSymbol(vluint32_t code, const char* name, void VerilatedFst::declSymbol(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum, vluint32_t len) { bool array, int arraynum, vluint32_t len) {
std::pair<Code2SymbolType::iterator, bool> p std::pair<Code2SymbolType::iterator, bool> p
= m_code2symbol.insert(std::make_pair(code, static_cast<fstHandle>(NULL))); = m_code2symbol.insert(std::make_pair(code, static_cast<fstHandle>(NULL)));
std::istringstream nameiss(name); std::istringstream nameiss(name);
@ -153,8 +153,7 @@ void VerilatedFst::declSymbol(vluint32_t code, const char* name,
std::stringstream name_ss; std::stringstream name_ss;
name_ss << symbol_name; name_ss << symbol_name;
if (arraynum >= 0) if (array) name_ss << "(" << arraynum << ")";
name_ss << "(" << arraynum << ")";
std::string name_str = name_ss.str(); std::string name_str = name_ss.str();
if (dtypenum > 0) { if (dtypenum > 0) {
@ -205,51 +204,6 @@ void VerilatedFst::dump(vluint64_t timeui) {
} }
} }
//=============================================================================
// Helpers
char* VerilatedFst::word2Str(vluint32_t newval, int bits) {
// Constructor makes sure m_valueStrBuffer.reserve() > 32+1
char* s = m_valueStrBuffer.data();
for (int i = 0; i < bits; ++i) {
*s++ = '0' + ((newval>>(bits-i-1))&1);
}
*s = '\0';
return m_valueStrBuffer.data();
}
char* VerilatedFst::quad2Str(vluint64_t newval, int bits) {
// Constructor makes sure m_valueStrBuffer.reserve() > 64+1
char* s = m_valueStrBuffer.data();
for (int i = 0; i < bits; ++i) {
*s++ = '0' + ((newval>>(bits-i-1))&1);
}
*s = '\0';
return m_valueStrBuffer.data();
}
char* VerilatedFst::array2Str(const vluint32_t* newval, int bits) {
int bq = VL_BITWORD_I(bits), br = VL_BITBIT_I(bits);
m_valueStrBuffer.reserve(bits+1);
char* s = m_valueStrBuffer.data();
vluint32_t v = newval[bq];
for (int i = 0; i < br; ++i) {
*s++ = '0' + ((v>>(br-i-1))&1);
}
for (int w = bq-1; w >= 0; --w) {
v = newval[w];
for (int i = 28; i >= 0; i-=4) {
s[0] = '0' + ((v>>(i+3))&1);
s[1] = '0' + ((v>>(i+2))&1);
s[2] = '0' + ((v>>(i+1))&1);
s[3] = '0' + ((v>>(i+0))&1);
s+=4;
}
}
*s = '\0';
return m_valueStrBuffer.data();
}
//******************************************************************** //********************************************************************
// Local Variables: // Local Variables:
// End: // End:

37
include/verilated_fst_c.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //
@ -60,12 +60,9 @@ private:
VL_UNCOPYABLE(VerilatedFst); VL_UNCOPYABLE(VerilatedFst);
void declSymbol(vluint32_t code, const char* name, void declSymbol(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum, vluint32_t len); bool array, int arraynum, vluint32_t len);
// helpers // helpers
std::vector<char> m_valueStrBuffer; std::vector<char> m_valueStrBuffer;
char* word2Str(vluint32_t newval, int bits);
char* quad2Str(vluint64_t newval, int bits);
char* array2Str(const vluint32_t *newval, int bits);
public: public:
explicit VerilatedFst(void* fst=NULL); explicit VerilatedFst(void* fst=NULL);
~VerilatedFst() { if (m_fst == NULL) { fstWriterClose(m_fst); } } ~VerilatedFst() { if (m_fst == NULL) { fstWriterClose(m_fst); } }
@ -106,33 +103,33 @@ public:
/// Inside dumping routines, declare a signal /// Inside dumping routines, declare a signal
void declBit(vluint32_t code, const char* name, void declBit(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum) { bool array, int arraynum) {
declSymbol(code, name, dtypenum, vardir, vartype, arraynum, 1); declSymbol(code, name, dtypenum, vardir, vartype, array, arraynum, 1);
} }
void declBus(vluint32_t code, const char* name, void declBus(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum, int msb, int lsb) { bool array, int arraynum, int msb, int lsb) {
declSymbol(code, name, dtypenum, vardir, vartype, arraynum, msb - lsb + 1); declSymbol(code, name, dtypenum, vardir, vartype, array, arraynum, msb - lsb + 1);
} }
void declDouble(vluint32_t code, const char* name, void declDouble(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum) { bool array, int arraynum) {
declSymbol(code, name, dtypenum, vardir, vartype, arraynum, 2); declSymbol(code, name, dtypenum, vardir, vartype, array, arraynum, 2);
} }
void declFloat(vluint32_t code, const char* name, void declFloat(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum) { bool array, int arraynum) {
declSymbol(code, name, dtypenum, vardir, vartype, arraynum, 1); declSymbol(code, name, dtypenum, vardir, vartype, array, arraynum, 1);
} }
void declQuad(vluint32_t code, const char* name, void declQuad(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum, int msb, int lsb) { bool array, int arraynum, int msb, int lsb) {
declSymbol(code, name, dtypenum, vardir, vartype, arraynum, msb - lsb + 1); declSymbol(code, name, dtypenum, vardir, vartype, array, arraynum, msb - lsb + 1);
} }
void declArray(vluint32_t code, const char* name, void declArray(vluint32_t code, const char* name,
int dtypenum, fstVarDir vardir, fstVarType vartype, int dtypenum, fstVarDir vardir, fstVarType vartype,
int arraynum, int msb, int lsb) { bool array, int arraynum, int msb, int lsb) {
declSymbol(code, name, dtypenum, vardir, vartype, arraynum, msb - lsb + 1); declSymbol(code, name, dtypenum, vardir, vartype, array, arraynum, msb - lsb + 1);
} }
/// Inside dumping routines, dump one signal if it has changed /// Inside dumping routines, dump one signal if it has changed
@ -140,7 +137,7 @@ public:
fstWriterEmitValueChange(m_fst, m_code2symbol[code], newval ? "1" : "0"); fstWriterEmitValueChange(m_fst, m_code2symbol[code], newval ? "1" : "0");
} }
void chgBus(vluint32_t code, const vluint32_t newval, int bits) { void chgBus(vluint32_t code, const vluint32_t newval, int bits) {
fstWriterEmitValueChange(m_fst, m_code2symbol[code], word2Str(newval, bits)); fstWriterEmitValueChange32(m_fst, m_code2symbol[code], bits, newval);
} }
void chgDouble(vluint32_t code, const double newval) { void chgDouble(vluint32_t code, const double newval) {
double val = newval; double val = newval;
@ -151,10 +148,10 @@ public:
fstWriterEmitValueChange(m_fst, m_code2symbol[code], &val); fstWriterEmitValueChange(m_fst, m_code2symbol[code], &val);
} }
void chgQuad(vluint32_t code, const vluint64_t newval, int bits) { void chgQuad(vluint32_t code, const vluint64_t newval, int bits) {
fstWriterEmitValueChange(m_fst, m_code2symbol[code], quad2Str(newval, bits)); fstWriterEmitValueChange64(m_fst, m_code2symbol[code], bits, newval);
} }
void chgArray(vluint32_t code, const vluint32_t* newval, int bits) { void chgArray(vluint32_t code, const vluint32_t* newval, int bits) {
fstWriterEmitValueChange(m_fst, m_code2symbol[code], array2Str(newval, bits)); fstWriterEmitValueChangeVec32(m_fst, m_code2symbol[code], bits, newval);
} }
void fullBit(vluint32_t code, const vluint32_t newval) { void fullBit(vluint32_t code, const vluint32_t newval) {

53
include/verilated_heavy.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2010-2019 by Wilson Snyder. This program is free software; you can // Copyright 2010-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.
@ -41,7 +41,7 @@ extern std::string VL_TO_STRING(CData obj);
extern std::string VL_TO_STRING(SData obj); extern std::string VL_TO_STRING(SData obj);
extern std::string VL_TO_STRING(IData obj); extern std::string VL_TO_STRING(IData obj);
extern std::string VL_TO_STRING(QData obj); extern std::string VL_TO_STRING(QData obj);
inline std::string VL_TO_STRING(const std::string& obj) { return "\""+obj+"\""; } inline std::string VL_TO_STRING(const std::string& obj) { return "\"" + obj + "\""; }
//=================================================================== //===================================================================
// Verilog array container // Verilog array container
@ -185,7 +185,8 @@ std::string VL_TO_STRING(const VlAssocArray<T_Key, T_Value>& obj) {
// There are no multithreaded locks on this; the base variable must // There are no multithreaded locks on this; the base variable must
// be protected by other means // be protected by other means
// //
template <class T_Value> class VlQueue { // Bound here is the maximum size() allowed, e.g. 1 + SystemVerilog bound
template <class T_Value, size_t T_MaxSize = 0> class VlQueue {
private: private:
// TYPES // TYPES
typedef std::deque<T_Value> Deque; typedef std::deque<T_Value> Deque;
@ -215,9 +216,14 @@ public:
void erase(size_t index) { if (VL_LIKELY(index < m_deque.size())) m_deque.erase(index); } void erase(size_t index) { if (VL_LIKELY(index < m_deque.size())) m_deque.erase(index); }
// function void q.push_front(value) // function void q.push_front(value)
void push_front(const T_Value& value) { m_deque.push_front(value); } void push_front(const T_Value& value) {
m_deque.push_front(value);
if (VL_UNLIKELY(T_MaxSize != 0 && m_deque.size() > T_MaxSize)) m_deque.pop_back();
}
// function void q.push_back(value) // function void q.push_back(value)
void push_back(const T_Value& value) { m_deque.push_back(value); } void push_back(const T_Value& value) {
if (VL_LIKELY(T_MaxSize == 0 || m_deque.size() < T_MaxSize)) m_deque.push_back(value);
}
// function value_t q.pop_front(); // function value_t q.pop_front();
T_Value pop_front() { T_Value pop_front() {
if (m_deque.empty()) return m_defaultValue; if (m_deque.empty()) return m_defaultValue;
@ -278,14 +284,14 @@ std::string VL_TO_STRING(const VlQueue<T_Value>& obj) {
extern std::string VL_CVT_PACK_STR_NW(int lwords, WDataInP lwp) VL_MT_SAFE; extern std::string VL_CVT_PACK_STR_NW(int lwords, WDataInP lwp) VL_MT_SAFE;
inline std::string VL_CVT_PACK_STR_NQ(QData lhs) VL_PURE { inline std::string VL_CVT_PACK_STR_NQ(QData lhs) VL_PURE {
WData lw[2]; VL_SET_WQ(lw, lhs); WData lw[VL_WQ_WORDS_E]; VL_SET_WQ(lw, lhs);
return VL_CVT_PACK_STR_NW(2, lw); return VL_CVT_PACK_STR_NW(VL_WQ_WORDS_E, lw);
} }
inline std::string VL_CVT_PACK_STR_NN(const std::string& lhs) VL_PURE { inline std::string VL_CVT_PACK_STR_NN(const std::string& lhs) VL_PURE {
return lhs; return lhs;
} }
inline std::string VL_CVT_PACK_STR_NI(IData lhs) VL_PURE { inline std::string VL_CVT_PACK_STR_NI(IData lhs) VL_PURE {
WData lw[1]; lw[0] = lhs; WData lw[VL_WQ_WORDS_E]; VL_SET_WI(lw, lhs);
return VL_CVT_PACK_STR_NW(1, lw); return VL_CVT_PACK_STR_NW(1, lw);
} }
inline std::string VL_CONCATN_NNN(const std::string& lhs, const std::string& rhs) VL_PURE { inline std::string VL_CONCATN_NNN(const std::string& lhs, const std::string& rhs) VL_PURE {
@ -298,7 +304,7 @@ inline std::string VL_REPLICATEN_NNQ(int,int,int, const std::string& lhs, IData
} }
inline std::string VL_REPLICATEN_NNI(int obits,int lbits,int rbits, inline std::string VL_REPLICATEN_NNI(int obits,int lbits,int rbits,
const std::string& lhs, IData rep) VL_PURE { const std::string& lhs, IData rep) VL_PURE {
return VL_REPLICATEN_NNQ(obits,lbits,rbits,lhs,rep); return VL_REPLICATEN_NNQ(obits, lbits, rbits, lhs, rep);
} }
inline IData VL_LEN_IN(const std::string& ld) { return ld.length(); } inline IData VL_LEN_IN(const std::string& ld) { return ld.length(); }
@ -320,18 +326,18 @@ extern std::string VL_SFORMATF_NX(const char* formatp, ...) VL_MT_SAFE;
extern IData VL_VALUEPLUSARGS_INW(int rbits, const std::string& ld, WDataOutP rwp) VL_MT_SAFE; extern IData VL_VALUEPLUSARGS_INW(int rbits, const std::string& ld, WDataOutP rwp) VL_MT_SAFE;
inline IData VL_VALUEPLUSARGS_INI(int rbits, const std::string& ld, CData& rdr) VL_MT_SAFE { inline IData VL_VALUEPLUSARGS_INI(int rbits, const std::string& ld, CData& rdr) VL_MT_SAFE {
WData rwp[2]; // WData must always be at least 2 WData rwp[2]; // WData must always be at least 2
IData got = VL_VALUEPLUSARGS_INW(rbits,ld,rwp); IData got = VL_VALUEPLUSARGS_INW(rbits, ld, rwp);
if (got) rdr = rwp[0]; if (got) rdr = rwp[0];
return got; return got;
} }
inline IData VL_VALUEPLUSARGS_INI(int rbits, const std::string& ld, SData& rdr) VL_MT_SAFE { inline IData VL_VALUEPLUSARGS_INI(int rbits, const std::string& ld, SData& rdr) VL_MT_SAFE {
WData rwp[2]; // WData must always be at least 2 WData rwp[2]; // WData must always be at least 2
IData got = VL_VALUEPLUSARGS_INW(rbits,ld,rwp); IData got = VL_VALUEPLUSARGS_INW(rbits, ld, rwp);
if (got) rdr = rwp[0]; if (got) rdr = rwp[0];
return got; return got;
} }
inline IData VL_VALUEPLUSARGS_INI(int rbits, const std::string& ld, IData& rdr) VL_MT_SAFE { inline IData VL_VALUEPLUSARGS_INI(int rbits, const std::string& ld, IData& rdr) VL_MT_SAFE {
WData rwp[2]; // WData must always be at least 2 WData rwp[2];
IData got = VL_VALUEPLUSARGS_INW(rbits, ld, rwp); IData got = VL_VALUEPLUSARGS_INW(rbits, ld, rwp);
if (got) rdr = rwp[0]; if (got) rdr = rwp[0];
return got; return got;
@ -344,10 +350,31 @@ inline IData VL_VALUEPLUSARGS_INQ(int rbits, const std::string& ld, QData& rdr)
} }
inline IData VL_VALUEPLUSARGS_INQ(int rbits, const std::string& ld, double& rdr) VL_MT_SAFE { inline IData VL_VALUEPLUSARGS_INQ(int rbits, const std::string& ld, double& rdr) VL_MT_SAFE {
WData rwp[2]; WData rwp[2];
IData got = VL_VALUEPLUSARGS_INW(rbits,ld,rwp); IData got = VL_VALUEPLUSARGS_INW(rbits, ld, rwp);
if (got) rdr = VL_CVT_D_Q(VL_SET_QW(rwp)); if (got) rdr = VL_CVT_D_Q(VL_SET_QW(rwp));
return got; return got;
} }
extern IData VL_VALUEPLUSARGS_INN(int, const std::string& ld, std::string& rdr) VL_MT_SAFE; extern IData VL_VALUEPLUSARGS_INN(int, const std::string& ld, std::string& rdr) VL_MT_SAFE;
//======================================================================
// Strings
extern std::string VL_PUTC_N(const std::string& lhs, IData rhs, CData ths) VL_PURE;
extern CData VL_GETC_N(const std::string& lhs, IData rhs) VL_PURE;
extern std::string VL_SUBSTR_N(const std::string& lhs, IData rhs, IData ths) VL_PURE;
inline IData VL_CMP_NN(const std::string& lhs, const std::string& rhs, bool ignoreCase) VL_PURE {
// SystemVerilog does not allow a string variable to contain '\0'.
// So C functions such as strcmp() can correctly compare strings.
int result;
if (ignoreCase) {
result = VL_STRCASECMP(lhs.c_str(), rhs.c_str());
} else {
result = std::strcmp(lhs.c_str(), rhs.c_str());
}
return result;
}
extern IData VL_ATOI_N(const std::string& str, int base) VL_PURE;
#endif // Guard #endif // Guard

2
include/verilated_imp.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can // Copyright 2009-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.

2
include/verilated_save.cpp
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

52
include/verilated_save.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2012-2019 by Wilson Snyder. This program is free software; // Copyright 2012-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //
@ -35,14 +35,14 @@ class VerilatedSerialize {
protected: protected:
// MEMBERS // MEMBERS
// For speed, keep m_cp as the first member of this structure // For speed, keep m_cp as the first member of this structure
vluint8_t* m_cp; ///< Current pointer into m_bufp buffer vluint8_t* m_cp; ///< Current pointer into m_bufp buffer
vluint8_t* m_bufp; ///< Output buffer vluint8_t* m_bufp; ///< Output buffer
bool m_isOpen; ///< True indicates open file/stream bool m_isOpen; ///< True indicates open file/stream
std::string m_filename; ///< Filename, for error messages std::string m_filename; ///< Filename, for error messages
VerilatedAssertOneThread m_assertOne; ///< Assert only called from single thread VerilatedAssertOneThread m_assertOne; ///< Assert only called from single thread
inline static size_t bufferSize() { return 256*1024; } // See below for slack calculation inline static size_t bufferSize() { return 256 * 1024; } // See below for slack calculation
inline static size_t bufferInsertSize() { return 16*1024; } inline static size_t bufferInsertSize() { return 16 * 1024; }
void header() VL_MT_UNSAFE_ONE; void header() VL_MT_UNSAFE_ONE;
void trailer() VL_MT_UNSAFE_ONE; void trailer() VL_MT_UNSAFE_ONE;
@ -94,15 +94,15 @@ class VerilatedDeserialize {
protected: protected:
// MEMBERS // MEMBERS
// For speed, keep m_cp as the first member of this structure // For speed, keep m_cp as the first member of this structure
vluint8_t* m_cp; ///< Current pointer into m_bufp buffer vluint8_t* m_cp; ///< Current pointer into m_bufp buffer
vluint8_t* m_bufp; ///< Output buffer vluint8_t* m_bufp; ///< Output buffer
vluint8_t* m_endp; ///< Last valid byte in m_bufp buffer vluint8_t* m_endp; ///< Last valid byte in m_bufp buffer
bool m_isOpen; ///< True indicates open file/stream bool m_isOpen; ///< True indicates open file/stream
std::string m_filename; ///< Filename, for error messages std::string m_filename; ///< Filename, for error messages
VerilatedAssertOneThread m_assertOne; ///< Assert only called from single thread VerilatedAssertOneThread m_assertOne; ///< Assert only called from single thread
inline static size_t bufferSize() { return 256*1024; } // See below for slack calculation inline static size_t bufferSize() { return 256 * 1024; } // See below for slack calculation
inline static size_t bufferInsertSize() { return 16*1024; } inline static size_t bufferInsertSize() { return 16 * 1024; }
virtual void fill() = 0; virtual void fill() = 0;
void header() VL_MT_UNSAFE_ONE; void header() VL_MT_UNSAFE_ONE;
@ -195,56 +195,56 @@ public:
//============================================================================= //=============================================================================
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint64_t& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint64_t& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint64_t& rhs){ inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint64_t& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint32_t& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint32_t& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint32_t& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint32_t& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint16_t& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint16_t& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint16_t& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint16_t& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint8_t& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, vluint8_t& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint8_t& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, vluint8_t& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, bool& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, bool& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, bool& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, bool& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, double& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, double& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, double& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, double& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, float& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, float& rhs) {
return os.write(&rhs, sizeof(rhs)); return os.write(&rhs, sizeof(rhs));
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, float& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, float& rhs) {
return os.read(&rhs, sizeof(rhs)); return os.read(&rhs, sizeof(rhs));
} }
inline VerilatedSerialize& operator<<(VerilatedSerialize& os, std::string& rhs) { inline VerilatedSerialize& operator<<(VerilatedSerialize& os, std::string& rhs) {
vluint32_t len = rhs.length(); vluint32_t len = rhs.length();
os<<len; os << len;
return os.write(rhs.data(), len); return os.write(rhs.data(), len);
} }
inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, std::string& rhs) { inline VerilatedDeserialize& operator>>(VerilatedDeserialize& os, std::string& rhs) {
vluint32_t len = 0; vluint32_t len = 0;
os>>len; os >> len;
rhs.resize(len); rhs.resize(len);
return os.read((void*)rhs.data(), len); return os.read((void*)rhs.data(), len);
} }

5
include/verilated_sc.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can // Copyright 2009-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.
@ -41,7 +41,8 @@
class VlScBvExposer : public sc_bv_base { class VlScBvExposer : public sc_bv_base {
public: public:
static const vluint32_t* sp_datap(const sc_bv_base& base) VL_MT_SAFE { static const vluint32_t* sp_datap(const sc_bv_base& base) VL_MT_SAFE {
return static_cast<const VlScBvExposer*>(&base)->sp_datatp(); } return static_cast<const VlScBvExposer*>(&base)->sp_datatp();
}
const vluint32_t* sp_datatp() const { return reinterpret_cast<vluint32_t*>(m_data); } const vluint32_t* sp_datatp() const { return reinterpret_cast<vluint32_t*>(m_data); }
// Above reads this protected element in sc_bv_base: // Above reads this protected element in sc_bv_base:
// sc_digit* m_data; // data array // sc_digit* m_data; // data array

2
include/verilated_sym_props.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can // Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.

12
include/verilated_syms.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can // Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.
@ -42,9 +42,7 @@
/// Class to sort maps keyed by const char*'s /// Class to sort maps keyed by const char*'s
struct VerilatedCStrCmp { struct VerilatedCStrCmp {
bool operator() (const char* a, const char* b) const { bool operator()(const char* a, const char* b) const { return std::strcmp(a, b) < 0; }
return std::strcmp(a, b) < 0;
}
}; };
/// Map of sorted scope names to find associated scope class /// Map of sorted scope names to find associated scope class
@ -56,8 +54,7 @@ public:
}; };
/// Map of sorted variable names to find associated variable class /// Map of sorted variable names to find associated variable class
class VerilatedVarNameMap class VerilatedVarNameMap : public std::map<const char*, VerilatedVar, VerilatedCStrCmp> {
: public std::map<const char*, VerilatedVar, VerilatedCStrCmp> {
public: public:
VerilatedVarNameMap() {} VerilatedVarNameMap() {}
~VerilatedVarNameMap() {} ~VerilatedVarNameMap() {}
@ -65,8 +62,7 @@ public:
typedef std::vector<const VerilatedScope*> VerilatedScopeVector; typedef std::vector<const VerilatedScope*> VerilatedScopeVector;
class VerilatedHierarchyMap class VerilatedHierarchyMap : public std::map<const VerilatedScope*, VerilatedScopeVector> {
: public std::map<const VerilatedScope*, VerilatedScopeVector> {
public: public:
VerilatedHierarchyMap() {} VerilatedHierarchyMap() {}
~VerilatedHierarchyMap() {} ~VerilatedHierarchyMap() {}

2
include/verilated_threads.cpp
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2012-2019 by Wilson Snyder. This program is free software; // Copyright 2012-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

4
include/verilated_threads.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2012-2019 by Wilson Snyder. This program is free software; // Copyright 2012-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //
@ -153,7 +153,7 @@ public:
#elif defined(__APPLE__) #elif defined(__APPLE__)
vluint32_t info[4]; vluint32_t info[4];
__cpuid_count(1, 0, info[0], info[1], info[2], info[3]); __cpuid_count(1, 0, info[0], info[1], info[2], info[3]);
/* info[1] is EBX, bits 24-31 are APIC ID */ // info[1] is EBX, bits 24-31 are APIC ID
if ((info[3] & (1 << 9)) == 0) { if ((info[3] & (1 << 9)) == 0) {
return -1; // no APIC on chip return -1; // no APIC on chip
} else { } else {

2
include/verilated_unordered_set_map.h
View File

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

62
include/verilated_vcd_c.cpp
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //
@ -525,7 +525,7 @@ void VerilatedVcd::module(const std::string& name) {
} }
void VerilatedVcd::declare(vluint32_t code, const char* name, const char* wirep, void VerilatedVcd::declare(vluint32_t code, const char* name, const char* wirep,
int arraynum, bool tri, bool bussed, int msb, int lsb) { bool array, int arraynum, bool tri, bool bussed, int msb, int lsb) {
if (!code) { VL_FATAL_MT(__FILE__, __LINE__, "", if (!code) { VL_FATAL_MT(__FILE__, __LINE__, "",
"Internal: internal trace problem, code 0 is illegal"); } "Internal: internal trace problem, code 0 is illegal"); }
@ -584,7 +584,7 @@ void VerilatedVcd::declare(vluint32_t code, const char* name, const char* wirep,
} }
decl += " "; decl += " ";
decl += basename; decl += basename;
if (arraynum>=0) { if (array) {
sprintf(buf, "(%d)", arraynum); sprintf(buf, "(%d)", arraynum);
decl += buf; decl += buf;
hiername += buf; hiername += buf;
@ -597,26 +597,42 @@ void VerilatedVcd::declare(vluint32_t code, const char* name, const char* wirep,
m_namemapp->insert(std::make_pair(hiername,decl)); m_namemapp->insert(std::make_pair(hiername,decl));
} }
void VerilatedVcd::declBit (vluint32_t code, const char* name, int arraynum) void VerilatedVcd::declBit(vluint32_t code, const char* name, bool array, int arraynum) {
{ declare(code, name, "wire", arraynum, false, false, 0, 0); } declare(code, name, "wire", array, arraynum, false, false, 0, 0);
void VerilatedVcd::declBus (vluint32_t code, const char* name, int arraynum, int msb, int lsb) }
{ declare(code, name, "wire", arraynum, false, true, msb, lsb); } void VerilatedVcd::declBus(vluint32_t code, const char* name, bool array, int arraynum, int msb,
void VerilatedVcd::declQuad (vluint32_t code, const char* name, int arraynum, int msb, int lsb) int lsb) {
{ declare(code, name, "wire", arraynum, false, true, msb, lsb); } declare(code, name, "wire", array, arraynum, false, true, msb, lsb);
void VerilatedVcd::declArray (vluint32_t code, const char* name, int arraynum, int msb, int lsb) }
{ declare(code, name, "wire", arraynum, false, true, msb, lsb); } void VerilatedVcd::declQuad(vluint32_t code, const char* name, bool array, int arraynum, int msb,
void VerilatedVcd::declTriBit (vluint32_t code, const char* name, int arraynum) int lsb) {
{ declare(code, name, "wire", arraynum, true, false, 0, 0); } declare(code, name, "wire", array, arraynum, false, true, msb, lsb);
void VerilatedVcd::declTriBus (vluint32_t code, const char* name, int arraynum, int msb, int lsb) }
{ declare(code, name, "wire", arraynum, true, true, msb, lsb); } void VerilatedVcd::declArray(vluint32_t code, const char* name, bool array, int arraynum, int msb,
void VerilatedVcd::declTriQuad (vluint32_t code, const char* name, int arraynum, int msb, int lsb) int lsb) {
{ declare(code, name, "wire", arraynum, true, true, msb, lsb); } declare(code, name, "wire", array, arraynum, false, true, msb, lsb);
void VerilatedVcd::declTriArray (vluint32_t code, const char* name, int arraynum, int msb, int lsb) }
{ declare(code, name, "wire", arraynum, true, true, msb, lsb); } void VerilatedVcd::declTriBit(vluint32_t code, const char* name, bool array, int arraynum) {
void VerilatedVcd::declFloat (vluint32_t code, const char* name, int arraynum) declare(code, name, "wire", array, arraynum, true, false, 0, 0);
{ declare(code, name, "real", arraynum, false, false, 31, 0); } }
void VerilatedVcd::declDouble (vluint32_t code, const char* name, int arraynum) void VerilatedVcd::declTriBus(vluint32_t code, const char* name, bool array, int arraynum, int msb,
{ declare(code, name, "real", arraynum, false, false, 63, 0); } int lsb) {
declare(code, name, "wire", array, arraynum, true, true, msb, lsb);
}
void VerilatedVcd::declTriQuad(vluint32_t code, const char* name, bool array, int arraynum,
int msb, int lsb) {
declare(code, name, "wire", array, arraynum, true, true, msb, lsb);
}
void VerilatedVcd::declTriArray(vluint32_t code, const char* name, bool array, int arraynum,
int msb, int lsb) {
declare(code, name, "wire", array, arraynum, true, true, msb, lsb);
}
void VerilatedVcd::declFloat(vluint32_t code, const char* name, bool array, int arraynum) {
declare(code, name, "real", array, arraynum, false, false, 31, 0);
}
void VerilatedVcd::declDouble(vluint32_t code, const char* name, bool array, int arraynum) {
declare(code, name, "real", array, arraynum, false, false, 63, 0);
}
//============================================================================= //=============================================================================

36
include/verilated_vcd_c.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //
@ -43,7 +43,8 @@ private:
int m_fd; ///< File descriptor we're writing to int m_fd; ///< File descriptor we're writing to
public: public:
// METHODS // METHODS
VerilatedVcdFile() : m_fd(0) {} VerilatedVcdFile()
: m_fd(0) {}
virtual ~VerilatedVcdFile() {} virtual ~VerilatedVcdFile() {}
virtual bool open(const std::string& name) VL_MT_UNSAFE; virtual bool open(const std::string& name) VL_MT_UNSAFE;
virtual void close() VL_MT_UNSAFE; virtual void close() VL_MT_UNSAFE;
@ -57,10 +58,11 @@ public:
class VerilatedVcdSig { class VerilatedVcdSig {
protected: protected:
friend class VerilatedVcd; friend class VerilatedVcd;
vluint32_t m_code; ///< VCD file code number vluint32_t m_code; ///< VCD file code number
int m_bits; ///< Size of value in bits int m_bits; ///< Size of value in bits
VerilatedVcdSig(vluint32_t code, int bits) VerilatedVcdSig(vluint32_t code, int bits)
: m_code(code), m_bits(bits) {} : m_code(code)
, m_bits(bits) {}
public: public:
~VerilatedVcdSig() {} ~VerilatedVcdSig() {}
}; };
@ -123,8 +125,8 @@ private:
void printStr(const char* str); void printStr(const char* str);
void printQuad(vluint64_t n); void printQuad(vluint64_t n);
void printTime(vluint64_t timeui); void printTime(vluint64_t timeui);
void declare(vluint32_t code, const char* name, const char* wirep, void declare(vluint32_t code, const char* name, const char* wirep, bool array, int arraynum,
int arraynum, bool tri, bool bussed, int msb, int lsb); bool tri, bool bussed, int msb, int lsb);
void dumpHeader(); void dumpHeader();
void dumpPrep(vluint64_t timeui); void dumpPrep(vluint64_t timeui);
@ -199,16 +201,16 @@ public:
/// Inside dumping routines, declare a module /// Inside dumping routines, declare a module
void module(const std::string& name); void module(const std::string& name);
/// Inside dumping routines, declare a signal /// Inside dumping routines, declare a signal
void declBit (vluint32_t code, const char* name, int arraynum); void declBit( vluint32_t code, const char* name, bool array, int arraynum);
void declBus (vluint32_t code, const char* name, int arraynum, int msb, int lsb); void declBus( vluint32_t code, const char* name, bool array, int arraynum, int msb, int lsb);
void declQuad (vluint32_t code, const char* name, int arraynum, int msb, int lsb); void declQuad( vluint32_t code, const char* name, bool array, int arraynum, int msb, int lsb);
void declArray (vluint32_t code, const char* name, int arraynum, int msb, int lsb); void declArray( vluint32_t code, const char* name, bool array, int arraynum, int msb, int lsb);
void declTriBit (vluint32_t code, const char* name, int arraynum); void declTriBit( vluint32_t code, const char* name, bool array, int arraynum);
void declTriBus (vluint32_t code, const char* name, int arraynum, int msb, int lsb); void declTriBus( vluint32_t code, const char* name, bool array, int arraynum, int msb, int lsb);
void declTriQuad (vluint32_t code, const char* name, int arraynum, int msb, int lsb); void declTriQuad( vluint32_t code, const char* name, bool array, int arraynum, int msb, int lsb);
void declTriArray (vluint32_t code, const char* name, int arraynum, int msb, int lsb); void declTriArray(vluint32_t code, const char* name, bool array, int arraynum, int msb, int lsb);
void declDouble (vluint32_t code, const char* name, int arraynum); void declDouble( vluint32_t code, const char* name, bool array, int arraynum);
void declFloat (vluint32_t code, const char* name, int arraynum); void declFloat( vluint32_t code, const char* name, bool array, int arraynum);
// ... other module_start for submodules (based on cell name) // ... other module_start for submodules (based on cell name)
/// Inside dumping routines, dump one signal /// Inside dumping routines, dump one signal

2
include/verilated_vcd_sc.cpp
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

2
include/verilated_vcd_sc.h
View File

@ -3,7 +3,7 @@
// //
// THIS MODULE IS PUBLICLY LICENSED // THIS MODULE IS PUBLICLY LICENSED
// //
// Copyright 2001-2019 by Wilson Snyder. This program is free software; // Copyright 2001-2020 by Wilson Snyder. This program is free software;
// you can redistribute it and/or modify it under the terms of either the GNU // 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. // Lesser General Public License Version 3 or the Perl Artistic License Version 2.0.
// //

9
include/verilated_vpi.cpp
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can // Copyright 2009-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.
@ -1224,6 +1224,9 @@ PLI_INT32 vpi_get(PLI_INT32 property, vpiHandle object) {
case vpiTimePrecision: { case vpiTimePrecision: {
return VL_TIME_PRECISION; return VL_TIME_PRECISION;
} }
case vpiTimeUnit: {
return VL_TIME_UNIT;
}
case vpiType: { case vpiType: {
VerilatedVpio* vop = VerilatedVpio::castp(object); VerilatedVpio* vop = VerilatedVpio::castp(object);
if (VL_UNLIKELY(!vop)) return 0; if (VL_UNLIKELY(!vop)) return 0;
@ -1333,7 +1336,7 @@ void vpi_get_value(vpiHandle object, p_vpi_value value_p) {
VL_FATAL_MT(__FILE__, __LINE__, "", VL_FATAL_MT(__FILE__, __LINE__, "",
"vpi_get_value with more than VL_MULS_MAX_WORDS; increase and recompile"); "vpi_get_value with more than VL_MULS_MAX_WORDS; increase and recompile");
} }
WDataInP datap = (reinterpret_cast<IData*>(vop->varDatap())); WDataInP datap = (reinterpret_cast<EData*>(vop->varDatap()));
for (int i=0; i<words; ++i) { for (int i=0; i<words; ++i) {
out[i].aval = datap[i]; out[i].aval = datap[i];
out[i].bval = 0; out[i].bval = 0;
@ -1617,7 +1620,7 @@ vpiHandle vpi_put_value(vpiHandle object, p_vpi_value value_p,
return object; return object;
case VLVT_WDATA: { case VLVT_WDATA: {
int words = VL_WORDS_I(vop->varp()->packed().elements()); int words = VL_WORDS_I(vop->varp()->packed().elements());
WDataOutP datap = (reinterpret_cast<IData*>(vop->varDatap())); WDataOutP datap = (reinterpret_cast<EData*>(vop->varDatap()));
for (int i=0; i<words; ++i) { for (int i=0; i<words; ++i) {
datap[i] = value_p->value.vector[i].aval; datap[i] = value_p->value.vector[i].aval;
if (i==(words-1)) { if (i==(words-1)) {

2
include/verilated_vpi.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2009-2019 by Wilson Snyder. This program is free software; you can // Copyright 2009-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.

50
include/verilatedos.h
View File

@ -1,7 +1,7 @@
// -*- mode: C++; c-file-style: "cc-mode" -*- // -*- mode: C++; c-file-style: "cc-mode" -*-
//************************************************************************* //*************************************************************************
// //
// Copyright 2003-2019 by Wilson Snyder. This program is free software; you can // Copyright 2003-2020 by Wilson Snyder. This program is free software; you can
// redistribute it and/or modify it under the terms of either the GNU // redistribute it and/or modify it under the terms of either the GNU
// Lesser General Public License Version 3 or the Perl Artistic License. // Lesser General Public License Version 3 or the Perl Artistic License.
// Version 2.0. // Version 2.0.
@ -317,16 +317,20 @@ typedef unsigned long long vluint64_t; ///< 64-bit unsigned type
//========================================================================= //=========================================================================
// Integer size macros // Integer size macros
#define VL_BYTESIZE 8 ///< Bits in a byte #define VL_BYTESIZE 8 ///< Bits in a CData / byte
#define VL_SHORTSIZE 16 ///< Bits in a short #define VL_SHORTSIZE 16 ///< Bits in a SData / short
#define VL_WORDSIZE 32 ///< Bits in a word #define VL_IDATASIZE 32 ///< Bits in a IData / word
#define VL_QUADSIZE 64 ///< Bits in a quadword #define VL_WORDSIZE IDATASIZE ///< Legacy define
#define VL_WORDSIZE_LOG2 5 ///< log2(VL_WORDSIZE) #define VL_QUADSIZE 64 ///< Bits in a QData / quadword
#define VL_EDATASIZE 32 ///< Bits in a EData (WData entry)
#define VL_EDATASIZE_LOG2 5 ///< log2(VL_EDATASIZE)
/// Bytes this number of bits needs (1 bit=1 byte) /// Bytes this number of bits needs (1 bit=1 byte)
#define VL_BYTES_I(nbits) (((nbits) + (VL_BYTESIZE - 1)) / VL_BYTESIZE) #define VL_BYTES_I(nbits) (((nbits) + (VL_BYTESIZE - 1)) / VL_BYTESIZE)
/// Words this number of bits needs (1 bit=1 word) /// Words/EDatas this number of bits needs (1 bit=1 word)
#define VL_WORDS_I(nbits) (((nbits) + (VL_WORDSIZE - 1)) / VL_WORDSIZE) #define VL_WORDS_I(nbits) (((nbits) + (VL_EDATASIZE - 1)) / VL_EDATASIZE)
/// Words/EDatas a quad requires
#define VL_WQ_WORDS_E VL_WORDS_I(VL_QUADSIZE)
//========================================================================= //=========================================================================
// Class definition helpers // Class definition helpers
@ -345,8 +349,9 @@ typedef unsigned long long vluint64_t; ///< 64-bit unsigned type
//========================================================================= //=========================================================================
// Base macros // Base macros
#define VL_SIZEBITS_I (VL_WORDSIZE - 1) ///< Bit mask for bits in a word #define VL_SIZEBITS_I (VL_IDATASIZE - 1) ///< Bit mask for bits in a word
#define VL_SIZEBITS_Q (VL_QUADSIZE - 1) ///< Bit mask for bits in a quad #define VL_SIZEBITS_Q (VL_QUADSIZE - 1) ///< Bit mask for bits in a quad
#define VL_SIZEBITS_E (VL_EDATASIZE - 1) ///< Bit mask for bits in a quad
/// Mask for words with 1's where relevant bits are (0=all bits) /// Mask for words with 1's where relevant bits are (0=all bits)
#define VL_MASK_I(nbits) (((nbits) & VL_SIZEBITS_I) \ #define VL_MASK_I(nbits) (((nbits) & VL_SIZEBITS_I) \
@ -354,9 +359,15 @@ typedef unsigned long long vluint64_t; ///< 64-bit unsigned type
/// Mask for quads with 1's where relevant bits are (0=all bits) /// Mask for quads with 1's where relevant bits are (0=all bits)
#define VL_MASK_Q(nbits) (((nbits) & VL_SIZEBITS_Q) \ #define VL_MASK_Q(nbits) (((nbits) & VL_SIZEBITS_Q) \
? ((VL_ULL(1) << ((nbits) & VL_SIZEBITS_Q) )-VL_ULL(1)) : VL_ULL(~0)) ? ((VL_ULL(1) << ((nbits) & VL_SIZEBITS_Q) )-VL_ULL(1)) : VL_ULL(~0))
#define VL_BITWORD_I(bit) ((bit)/VL_WORDSIZE) ///< Word number for a wide quantity /// Mask for EData with 1's where relevant bits are (0=all bits)
#define VL_BITBIT_I(bit) ((bit)&VL_SIZEBITS_I) ///< Bit number for a bit in a long #define VL_MASK_E(nbits) VL_MASK_I(nbits)
#define VL_BITBIT_Q(bit) ((bit)&VL_SIZEBITS_Q) ///< Bit number for a bit in a quad #define VL_EUL(n) VL_UL(n) ///< Make constant number EData sized
#define VL_BITWORD_I(bit) ((bit) / VL_IDATASIZE) ///< Word number for sv DPI vectors
#define VL_BITWORD_E(bit) ((bit) >> VL_EDATASIZE_LOG2) ///< Word number for a wide quantity
#define VL_BITBIT_I(bit) ((bit) & VL_SIZEBITS_I) ///< Bit number for a bit in a long
#define VL_BITBIT_Q(bit) ((bit) & VL_SIZEBITS_Q) ///< Bit number for a bit in a quad
#define VL_BITBIT_E(bit) ((bit) & VL_SIZEBITS_E) ///< Bit number for a bit in a EData
//========================================================================= //=========================================================================
// Floating point // Floating point
@ -412,6 +423,21 @@ typedef unsigned long long vluint64_t; ///< 64-bit unsigned type
# endif # endif
#endif #endif
//=========================================================================
// String related OS-specific functions
#ifdef _MSC_VER
# define VL_STRCASECMP _stricmp
#else
# define VL_STRCASECMP strcasecmp
#endif
//=========================================================================
// Stringify macros
#define VL_STRINGIFY(x) VL_STRINGIFY2(x)
#define VL_STRINGIFY2(x) #x
//========================================================================= //=========================================================================
#endif // Guard #endif // Guard

5
nodist/bisondiff
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
###################################################################### ######################################################################
# #
# Copyright 2007-2019 by Wilson Snyder. This package is free software; you # Copyright 2007-2020 by Wilson Snyder. This package is free software; you
# can redistribute it and/or modify it under the terms of either the GNU # 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 # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -15,6 +15,7 @@
# DESCRIPTION: Diff bison files # DESCRIPTION: Diff bison files
use warnings;
use Getopt::Long; use Getopt::Long;
use IO::File; use IO::File;
use strict; use strict;

5
nodist/bisonreader
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
###################################################################### ######################################################################
# #
# Copyright 2007-2019 by Wilson Snyder. This package is free software; you # Copyright 2007-2020 by Wilson Snyder. This package is free software; you
# can redistribute it and/or modify it under the terms of either the GNU # 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 # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -15,6 +15,7 @@
# DESCRIPTION: Debugging of bison output # DESCRIPTION: Debugging of bison output
use warnings;
use strict; use strict;
my $Debug; my $Debug;

5
nodist/code_coverage
View File

@ -1,7 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
use warnings;
use Cwd; use Cwd;
use File::Copy qw(cp); use File::Copy qw(cp);
use File::Path qw(mkpath); use File::Path qw(mkpath);
@ -242,7 +243,7 @@ Runs a specific stage (see the script).
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2019-2019 by Wilson Snyder. This package is free software; you Copyright 2019-2020 by Wilson Snyder. This package is free software; you
can redistribute it and/or modify it under the terms of either the GNU 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 Lesser General Public License Version 3 or the Perl Artistic License
Version 2.0. Version 2.0.

2
nodist/code_coverage.dat
View File

@ -1,7 +1,7 @@
# -*- Perl -*- # -*- Perl -*-
# DESCRIPTION: Verilator: Internal C++ code lcov control file # DESCRIPTION: Verilator: Internal C++ code lcov control file
# #
# Copyright 2019-2019 by Wilson Snyder. This program is free software; you can # Copyright 2019-2020 by Wilson Snyder. This program is free software; you can
# redistribute it and/or modify it under the terms of either the GNU # redistribute it and/or modify it under the terms of either the GNU
# Lesser General Public License Version 3 or the Perl Artistic License # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.

6
nodist/dot_importer
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use Getopt::Long; use Getopt::Long;
use IO::File; use IO::File;
use Pod::Usage; use Pod::Usage;
@ -143,7 +143,7 @@ Displays this message and program version and exits.
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2005-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

6
nodist/dot_pruner
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use Getopt::Long; use Getopt::Long;
use IO::File; use IO::File;
use Pod::Usage; use Pod::Usage;
@ -184,7 +184,7 @@ Displays this message and program version and exits.
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2005-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

5
nodist/flexdiff
View File

@ -1,7 +1,7 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
###################################################################### ######################################################################
# #
# Copyright 2007-2019 by Wilson Snyder. This package is free software; you # Copyright 2007-2020 by Wilson Snyder. This package is free software; you
# can redistribute it and/or modify it under the terms of either the GNU # 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 # Lesser General Public License Version 3 or the Perl Artistic License
# Version 2.0. # Version 2.0.
@ -15,6 +15,7 @@
# DESCRIPTION: Diff flex files # DESCRIPTION: Diff flex files
use warnings;
use IO::File; use IO::File;
use strict; use strict;

5
nodist/git_untabify
View File

@ -1,7 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
use warnings;
use Getopt::Long; use Getopt::Long;
#use Data::Dumper; $Data::Dumper::Indent=1; $Data::Dumper::Sortkeys=1; #Debug #use Data::Dumper; $Data::Dumper::Indent=1; $Data::Dumper::Sortkeys=1; #Debug
use IO::File; use IO::File;
@ -235,7 +236,7 @@ Displays program version and exits.
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2005-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

5
nodist/install_test
View File

@ -1,7 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
use warnings;
use Getopt::Long; use Getopt::Long;
use Cwd; use Cwd;
use IO::File; use IO::File;
@ -189,7 +190,7 @@ Runs a specific test stage (see the script).
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2009-2019 by Wilson Snyder. This package is free software; you Copyright 2009-2020 by Wilson Snyder. This package is free software; you
can redistribute it and/or modify it under the terms of either the GNU 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 Lesser General Public License Version 3 or the Perl Artistic License
Version 2.0. Version 2.0.

6
nodist/invoke_atsim
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use strict; use strict;
#====================================================================== #======================================================================
@ -28,7 +28,7 @@ invoke_atsim - Invoke tool under "modules" command
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. This package is free software; you Copyright 2005-2020 by Wilson Snyder. This package is free software; you
can redistribute it and/or modify it under the terms of either the GNU 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 Lesser General Public License Version 3 or the Perl Artistic License
Version 2.0. Version 2.0.

6
nodist/invoke_iccr
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use strict; use strict;
#====================================================================== #======================================================================
@ -28,7 +28,7 @@ invoke_iccr - Invoke tool under "modules" command
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2007-2019 by Wilson Snyder. This package is free software; you Copyright 2007-2020 by Wilson Snyder. This package is free software; you
can redistribute it and/or modify it under the terms of either the GNU 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 Lesser General Public License Version 3 or the Perl Artistic License
Version 2.0. Version 2.0.

6
nodist/invoke_ncverilog
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use strict; use strict;
#====================================================================== #======================================================================
@ -28,7 +28,7 @@ invoke_ncverilog - Invoke tool under "modules" command
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. This package is free software; you Copyright 2005-2020 by Wilson Snyder. This package is free software; you
can redistribute it and/or modify it under the terms of either the GNU 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 Lesser General Public License Version 3 or the Perl Artistic License
Version 2.0. Version 2.0.

6
nodist/invoke_vcs
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use strict; use strict;
#====================================================================== #======================================================================
@ -28,7 +28,7 @@ invoke_vcs - Invoke tool under "modules" command
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. This package is free software; you Copyright 2005-2020 by Wilson Snyder. This package is free software; you
can redistribute it and/or modify it under the terms of either the GNU 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 Lesser General Public License Version 3 or the Perl Artistic License
Version 2.0. Version 2.0.

6
nodist/vtree_importer
View File

@ -1,8 +1,8 @@
#!/usr/bin/perl -w #!/usr/bin/env perl
# See copyright, etc in below POD section. # See copyright, etc in below POD section.
###################################################################### ######################################################################
require 5.006_001; use warnings;
use Getopt::Long; use Getopt::Long;
use IO::File; use IO::File;
use Pod::Usage; use Pod::Usage;
@ -331,7 +331,7 @@ Displays this message and program version and exits.
=head1 DISTRIBUTION =head1 DISTRIBUTION
Copyright 2005-2019 by Wilson Snyder. Verilator is free software; you can Copyright 2005-2020 by Wilson Snyder. Verilator is free software; you can
redistribute it and/or modify it under the terms of either the GNU Lesser 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. General Public License Version 3 or the Perl Artistic License Version 2.0.

2
src/.gdbinit
View File

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

2
src/Makefile.in
View File

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

Some files were not shown because too many files have changed in this diff Show More