From 3b554f4c5ba97878c011dd0ae45288069baf0589 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 18 Dec 2006 19:20:45 +0000 Subject: [PATCH] Rename config.h to config_build.h, and add cross compile notes. git-svn-id: file://localhost/svn/verilator/trunk/verilator@842 77ca24e4-aefa-0310-84f0-b9a241c72d87 --- Changes | 2 ++ Makefile.in | 11 +++++------ bin/verilator | 24 ++++++++++++++++++++++++ configure.ac | 4 ++-- include/verilatedos.h | 8 +++++--- src/.cvsignore | 2 +- src/Makefile.in | 2 +- src/Makefile_obj.in | 7 +++---- src/V3Active.cpp | 3 ++- src/V3Active.h | 3 ++- src/V3ActiveTop.cpp | 3 ++- src/V3ActiveTop.h | 3 ++- src/V3Assert.cpp | 3 ++- src/V3Assert.h | 3 ++- src/V3AssertPre.cpp | 3 ++- src/V3AssertPre.h | 3 ++- src/V3Ast.h | 3 ++- src/V3AstNodes.cpp | 2 ++ src/V3Begin.cpp | 3 ++- src/V3Begin.h | 3 ++- src/V3Branch.cpp | 3 ++- src/V3Branch.h | 3 ++- src/V3Broken.cpp | 3 ++- src/V3Broken.h | 3 ++- src/V3Case.cpp | 3 ++- src/V3Case.h | 3 ++- src/V3Cast.cpp | 3 ++- src/V3Cast.h | 3 ++- src/V3Changed.cpp | 3 ++- src/V3Changed.h | 3 ++- src/V3Clean.cpp | 3 ++- src/V3Clean.h | 3 ++- src/V3Clock.cpp | 3 ++- src/V3Clock.h | 3 ++- src/V3Combine.cpp | 3 ++- src/V3Combine.h | 3 ++- src/V3Const.cpp | 3 ++- src/V3Const.h | 3 ++- src/V3Coverage.cpp | 3 ++- src/V3Coverage.h | 3 ++- src/V3Dead.cpp | 3 ++- src/V3Dead.h | 3 ++- src/V3Delayed.cpp | 3 ++- src/V3Delayed.h | 3 ++- src/V3Depth.cpp | 3 ++- src/V3Depth.h | 3 ++- src/V3Descope.cpp | 3 ++- src/V3Descope.h | 3 ++- src/V3EmitC.cpp | 3 ++- src/V3EmitC.h | 3 ++- src/V3EmitCBase.h | 3 ++- src/V3EmitCSyms.cpp | 3 ++- src/V3EmitMk.cpp | 3 ++- src/V3EmitMk.h | 3 ++- src/V3EmitV.cpp | 3 ++- src/V3EmitV.h | 3 ++- src/V3Error.h | 3 ++- src/V3Expand.cpp | 3 ++- src/V3Expand.h | 3 ++- src/V3File.cpp | 3 ++- src/V3File.h | 3 ++- src/V3Gate.cpp | 3 ++- src/V3Gate.h | 3 ++- src/V3GenClk.cpp | 3 ++- src/V3GenClk.h | 3 ++- src/V3Global.h | 3 ++- src/V3Graph.cpp | 3 ++- src/V3Graph.h | 3 ++- src/V3GraphAcyc.cpp | 3 ++- src/V3GraphAlg.cpp | 3 ++- src/V3GraphAlg.h | 3 ++- src/V3GraphDfa.cpp | 3 ++- src/V3GraphDfa.h | 3 ++- src/V3GraphTest.cpp | 3 ++- src/V3Hashed.cpp | 3 ++- src/V3Hashed.h | 3 ++- src/V3Inline.cpp | 3 ++- src/V3Inline.h | 3 ++- src/V3Inst.cpp | 3 ++- src/V3Inst.h | 3 ++- src/V3LanguageWords.h | 3 ++- src/V3Life.cpp | 3 ++- src/V3Life.h | 3 ++- src/V3LifePost.cpp | 3 ++- src/V3LifePost.h | 3 ++- src/V3Link.cpp | 3 ++- src/V3Link.h | 3 ++- src/V3LinkCells.cpp | 3 ++- src/V3LinkCells.h | 3 ++- src/V3LinkDot.cpp | 3 ++- src/V3LinkDot.h | 3 ++- src/V3LinkLevel.cpp | 3 ++- src/V3LinkLevel.h | 3 ++- src/V3LinkResolve.cpp | 3 ++- src/V3LinkResolve.h | 3 ++- src/V3List.h | 3 ++- src/V3Localize.cpp | 3 ++- src/V3Localize.h | 3 ++- src/V3Name.cpp | 3 ++- src/V3Name.h | 3 ++- src/V3Number.cpp | 3 ++- src/V3Number.h | 3 ++- src/V3Number_test.cpp | 3 ++- src/V3Options.cpp | 3 ++- src/V3Options.h | 3 ++- src/V3Order.cpp | 3 ++- src/V3Order.h | 3 ++- src/V3OrderGraph.h | 3 ++- src/V3Param.cpp | 3 ++- src/V3Param.h | 3 ++- src/V3PreProc.cpp | 3 ++- src/V3PreProc.h | 3 ++- src/V3PreShell.cpp | 3 ++- src/V3PreShell.h | 3 ++- src/V3Premit.cpp | 3 ++- src/V3Premit.h | 3 ++- src/V3Read.cpp | 3 ++- src/V3Read.h | 3 ++- src/V3Scope.cpp | 3 ++- src/V3Scope.h | 3 ++- src/V3SenTree.h | 3 ++- src/V3Signed.cpp | 3 ++- src/V3Signed.h | 3 ++- src/V3Split.cpp | 3 ++- src/V3Split.h | 3 ++- src/V3Stats.cpp | 3 ++- src/V3Stats.h | 3 ++- src/V3StatsReport.cpp | 3 ++- src/V3Subst.cpp | 3 ++- src/V3Subst.h | 3 ++- src/V3SymTable.h | 3 ++- src/V3Table.cpp | 3 ++- src/V3Table.h | 3 ++- src/V3Task.cpp | 3 ++- src/V3Task.h | 3 ++- src/V3Trace.cpp | 3 ++- src/V3Trace.h | 3 ++- src/V3TraceDecl.cpp | 3 ++- src/V3TraceDecl.h | 3 ++- src/V3Unknown.cpp | 3 ++- src/V3Unknown.h | 3 ++- src/V3Unroll.cpp | 3 ++- src/V3Unroll.h | 3 ++- src/V3Width.cpp | 3 ++- src/V3Width.h | 3 ++- src/{config.h.in => config_build.h.in} | 3 +++ 146 files changed, 320 insertions(+), 153 deletions(-) rename src/{config.h.in => config_build.h.in} (96%) diff --git a/Changes b/Changes index 867ec2863..b8fd3d8d3 100644 --- a/Changes +++ b/Changes @@ -5,6 +5,8 @@ indicates the contributor was also the author of the fix; Thanks! * Verilator 3.62*** +*** Fixed configure and compiling under Solaris. [Bob Farrell] + *** When dotted signal lookup fails, help the user by showing known scopes. **** Fix dotted references inside generated cells. [David Hewson] diff --git a/Makefile.in b/Makefile.in index 02b1fb8b7..d29984d13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -78,7 +78,6 @@ datadir = @datadir@ infodir = @infodir@ # Directory in which to install package specific files -# Note this gets coded into v3c/config.h also pkgdatadir = @pkgdatadir@ #### End of system configuration section. #### @@ -265,16 +264,16 @@ uninstall: -cd $(mandir)/man1 && rm -f $(VL_INST_MAN_FILES) -cd $(bindir) && rm -f $(VL_INST_BIN_FILES) -# autoheader might not change config.h.in, so touch a stamp file. +# autoheader might not change config_build.h.in, so touch a stamp file. IN_WILD := ${srcdir}/*.in ${srcdir}/*/*.in ${srcdir}/*/*/*.in \ *.in */*.in */*.in -${srcdir}/config.h.in: stamp-h.in +${srcdir}/config_build.h.in: stamp-h.in ${srcdir}/stamp-h.in: configure.ac $(wildcard $(IN_WILD)) cd ${srcdir} && autoheader echo timestamp > ${srcdir}/stamp-h.in -config.h: stamp-h -stamp-h: config.h.in config.status +config_build.h: stamp-h +stamp-h: config_build.h.in config.status ./config.status Makefile: Makefile.in config.status ./config.status @@ -317,7 +316,7 @@ TAGS: $(TAGFILES) ###################################################################### # Distributions -DISTCONFIG = src/config.h.in +DISTCONFIG = src/config_build.h.in DISTTITLE := $(shell sed -e '/DTVERSION/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e 's/v/V/' -e q $(DISTCONFIG)) DISTNAME := $(shell sed -e '/DTVERSION/!d' -e 's/[^0-9]*\([0-9.a-z]*\).*/verilator-\1/' -e q $(DISTCONFIG)) diff --git a/bin/verilator b/bin/verilator index 670ede256..9143e381e 100755 --- a/bin/verilator +++ b/bin/verilator @@ -855,6 +855,30 @@ Lower modules are not pure SystemC code. This is a feature, as using the SystemC pin interconnect scheme everywhere would reduce performance by an order of magnitude. +=head1 CROSS COMPILATION + +Verilator supports cross-compling Verilated code. This is generally used +to run Verilator on a Linux system and produce C++ code that is then compiled +on Windows. + +Cross compilation involves up to three different OSes. The build system is +where you configured and compiled Verilator, the host system where you run +Verilator, and the target system where you compile the Verilated code and +run the simulation. + +Currently, Verilator requires the build and host system type to be the +same, though the target system type may be different. To support this, +./configure and make Verilator on the build system. Then, run Verilator on +the host system. Finally, the output of Verilator may be compiled on the +different target system. + +To support this, none of the files that Verilator produces will reference +any configure generated build-system specific files, such as config.h +(which is renamed in Verilator to config_build.h to reduce confusion.) The +disadvantage of this approach is that include/verilatedos.h must +self-detect the requirements of the target system, rather then using +configure. + =head1 VERILOG 2001 SUPPORT Verilator supports the more common Verilog 2001 language features. This diff --git a/configure.ac b/configure.ac index f65302dec..3efd67984 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl General Public License or the Perl Artistic License. AC_REVISION($Revision$)dnl AC_INIT(src/Verilator.cpp) -AC_CONFIG_HEADER(src/config.h) +AC_CONFIG_HEADER(src/config_build.h) dnl Special Substitutions @@ -24,7 +24,7 @@ dnl Checks for libraries. dnl Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h unistd.h sys/file.h sys/time.h sys/un.h math.h stdint.h mingw/stdint.h) +AC_CHECK_HEADERS(fcntl.h unistd.h inttypes.h sys/file.h sys/time.h sys/un.h math.h stdint.h mingw/stdint.h) dnl Checks for typedefs, structures AC_CHECK_TYPE(size_t,unsigned int) diff --git a/include/verilatedos.h b/include/verilatedos.h index 49e73e844..3ed2afce8 100644 --- a/include/verilatedos.h +++ b/include/verilatedos.h @@ -15,9 +15,11 @@ /// \file /// \brief Verilator: Common include for OS portability (verilated & verilator) /// -/// This header is used by both verilated code, and the verilator -/// program itself Code needed by only one goes into verilated.h or -/// config.h.in respectively. +/// This header is used by both the Verilator source code (run on the +/// build and host system), and the Verilated output (run on the target +/// system). Code needed by only the host system goes into +/// config_build.h.in, code needed by Verilated code only goes into +/// verilated.h, and code needed by both goes here (verilatedos.h). /// /// Code available from: http://www.veripool.com/verilator /// diff --git a/src/.cvsignore b/src/.cvsignore index 96b8cda8e..3e29602ca 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,5 +1,5 @@ *.old -config.h +config_build.h Makefile Makefile_obj .objcache* diff --git a/src/Makefile.in b/src/Makefile.in index 9aa7ae48e..5d9b09a14 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -87,4 +87,4 @@ clean mostlyclean distclean maintainer-clean:: -rm -f .objcache* distclean maintainer-clean:: - -rm -f Makefile Makefile_obj + -rm -f Makefile Makefile_obj config_build.h diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in index 2f0205136..afaf12987 100644 --- a/src/Makefile_obj.in +++ b/src/Makefile_obj.in @@ -28,6 +28,8 @@ CC = @CC@ CXX = @CXX@ LINK = @CXX@ +LDFLAGS += @LDFLAGS@ + #### End of system configuration section. #### VPATH += . $(srcdir) @@ -36,14 +38,12 @@ TGT = ../../verilator_bin ################# ifeq ($(VL_DEBUG),) # Optimize -LDFLAGS = COPT = -O else # Debug -LDFLAGS = COPT = -ggdb -DVL_DEBUG # Debug & Profile: -#LDFLAGS = -pg -g +#LDFLAGS += -pg -g #COPT = -ggdb -pg -g endif ################# @@ -89,7 +89,6 @@ clean mostlyclean distclean maintainer-clean:: -rm -f obj_* .objcache* distclean maintainer-clean:: clean - rm -f Makefile config.h maintainer-clean:: diff --git a/src/V3Active.cpp b/src/V3Active.cpp index b900cc0ac..3b63de03e 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -31,7 +31,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Active.h b/src/V3Active.h index 883ccf23d..272e0bcdf 100644 --- a/src/V3Active.h +++ b/src/V3Active.h @@ -21,7 +21,8 @@ #ifndef _V3ACTIVE_H_ #define _V3ACTIVE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index 96c1684b9..1cae75245 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -28,7 +28,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3ActiveTop.h b/src/V3ActiveTop.h index 7dee4f62f..4eac81364 100644 --- a/src/V3ActiveTop.h +++ b/src/V3ActiveTop.h @@ -21,7 +21,8 @@ #ifndef _V3ACTIVETOP_H_ #define _V3ACTIVETOP_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp index 1838cc2c0..709b46207 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Assert.h b/src/V3Assert.h index 1322fbd97..5a85eec53 100644 --- a/src/V3Assert.h +++ b/src/V3Assert.h @@ -21,7 +21,8 @@ #ifndef _V3ASSERT_H_ #define _V3ASSERT_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp index 39f5f8d76..b6b395fcf 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -22,7 +22,8 @@ // Attach clocks to each assertion //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3AssertPre.h b/src/V3AssertPre.h index fea43ab80..9a5d10b52 100644 --- a/src/V3AssertPre.h +++ b/src/V3AssertPre.h @@ -21,7 +21,8 @@ #ifndef _V3ASSERTPRE_H_ #define _V3ASSERTPRE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Ast.h b/src/V3Ast.h index 11ea3e488..5a3910f05 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -21,7 +21,8 @@ #ifndef _V3AST_H_ #define _V3AST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Number.h" #include diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp index 48ced3029..825026759 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -19,6 +19,8 @@ // //************************************************************************* +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp index 50e01911c..b1fa89996 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -27,7 +27,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Begin.h b/src/V3Begin.h index 036c09c0f..6f10dfc87 100644 --- a/src/V3Begin.h +++ b/src/V3Begin.h @@ -21,7 +21,8 @@ #ifndef _V3BEGIN_H_ #define _V3BEGIN_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp index 8e649ed15..af9b02643 100644 --- a/src/V3Branch.cpp +++ b/src/V3Branch.cpp @@ -25,7 +25,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Branch.h b/src/V3Branch.h index a24009fe7..cdbfaaa1b 100644 --- a/src/V3Branch.h +++ b/src/V3Branch.h @@ -21,7 +21,8 @@ #ifndef _V3BRANCH_H_ #define _V3BRANCH_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index 616900bac..cf913bb5e 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Broken.h b/src/V3Broken.h index 26e2d521f..dee5a999f 100644 --- a/src/V3Broken.h +++ b/src/V3Broken.h @@ -21,7 +21,8 @@ #ifndef _V3BROKEN_H_ #define _V3BROKEN_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Case.cpp b/src/V3Case.cpp index 927f437ae..100f4606a 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -38,7 +38,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Case.h b/src/V3Case.h index 3cf2e092c..a9e761eb7 100644 --- a/src/V3Case.h +++ b/src/V3Case.h @@ -21,7 +21,8 @@ #ifndef _V3CASE_H_ #define _V3CASE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp index 109056bf4..c2f4199e8 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -42,7 +42,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Cast.h b/src/V3Cast.h index 0aeb23c8c..54f2b9369 100644 --- a/src/V3Cast.h +++ b/src/V3Cast.h @@ -21,7 +21,8 @@ #ifndef _V3CAST_H_ #define _V3CAST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp index 4aac84e8a..b9ff6cbf4 100644 --- a/src/V3Changed.cpp +++ b/src/V3Changed.cpp @@ -31,7 +31,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Changed.h b/src/V3Changed.h index ebfb9885c..3919b3565 100644 --- a/src/V3Changed.h +++ b/src/V3Changed.h @@ -21,7 +21,8 @@ #ifndef _V3CHANGED_H_ #define _V3CHANGED_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp index 82f72e7d6..45a84fc62 100644 --- a/src/V3Clean.cpp +++ b/src/V3Clean.cpp @@ -28,7 +28,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Clean.h b/src/V3Clean.h index 75f386dfc..43d485d13 100644 --- a/src/V3Clean.h +++ b/src/V3Clean.h @@ -21,7 +21,8 @@ #ifndef _V3CLEAN_H_ #define _V3CLEAN_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index 821904475..d59caf574 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -32,7 +32,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Clock.h b/src/V3Clock.h index 15e140ba3..05e3d5d98 100644 --- a/src/V3Clock.h +++ b/src/V3Clock.h @@ -21,7 +21,8 @@ #ifndef _V3CLOCK_H_ #define _V3CLOCK_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index 3ec6d2e42..86a37e0c5 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -35,7 +35,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Combine.h b/src/V3Combine.h index ad9321172..51166c7c7 100644 --- a/src/V3Combine.h +++ b/src/V3Combine.h @@ -21,7 +21,8 @@ #ifndef _V3COMBINE_H_ #define _V3COMBINE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Const.cpp b/src/V3Const.cpp index 63cff02b8..41a833843 100644 --- a/src/V3Const.cpp +++ b/src/V3Const.cpp @@ -25,7 +25,8 @@ // If operands are constant, replace this node with constant. //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Const.h b/src/V3Const.h index e1a057b51..a277978c4 100644 --- a/src/V3Const.h +++ b/src/V3Const.h @@ -21,7 +21,8 @@ #ifndef _V3CONST_H_ #define _V3CONST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index 22aade6e2..49f5f3553 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -29,7 +29,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Coverage.h b/src/V3Coverage.h index 2406d863a..f51e3631c 100644 --- a/src/V3Coverage.h +++ b/src/V3Coverage.h @@ -21,7 +21,8 @@ #ifndef _V3COVERAGE_H_ #define _V3COVERAGE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp index fb8cde3be..0dafd1c10 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -24,7 +24,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Dead.h b/src/V3Dead.h index 66b157b9e..6c449f32f 100644 --- a/src/V3Dead.h +++ b/src/V3Dead.h @@ -21,7 +21,8 @@ #ifndef _V3DEAD_H_ #define _V3DEAD_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index 4e8e72f7d..5adbcb48b 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -52,7 +52,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Delayed.h b/src/V3Delayed.h index 6bddc788b..731bcf1c7 100644 --- a/src/V3Delayed.h +++ b/src/V3Delayed.h @@ -21,7 +21,8 @@ #ifndef _V3DELAYED_H_ #define _V3DELAYED_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp index af238fdde..2e1ffe108 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -28,7 +28,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Depth.h b/src/V3Depth.h index 102e5591a..3d5985b19 100644 --- a/src/V3Depth.h +++ b/src/V3Depth.h @@ -21,7 +21,8 @@ #ifndef _V3DEPTH_H_ #define _V3DEPTH_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp index 9643beebc..7d34e9858 100644 --- a/src/V3Descope.cpp +++ b/src/V3Descope.cpp @@ -27,7 +27,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Descope.h b/src/V3Descope.h index 61a388d01..98d659343 100644 --- a/src/V3Descope.h +++ b/src/V3Descope.h @@ -21,7 +21,8 @@ #ifndef _V3DESCOPE_H_ #define _V3DESCOPE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index acd07d583..424126891 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3EmitC.h b/src/V3EmitC.h index c09327366..71847eb2c 100644 --- a/src/V3EmitC.h +++ b/src/V3EmitC.h @@ -21,7 +21,8 @@ #ifndef _V3EMITC_H_ #define _V3EMITC_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitCBase.h b/src/V3EmitCBase.h index 9ad55368b..f9eb5e146 100644 --- a/src/V3EmitCBase.h +++ b/src/V3EmitCBase.h @@ -22,7 +22,8 @@ #ifndef _V3EMITCBASE_H_ #define _V3EMITCBASE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index 1cc05a5ba..b9c7d6f82 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp index 201b6f02a..c16c3c4ed 100644 --- a/src/V3EmitMk.cpp +++ b/src/V3EmitMk.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3EmitMk.h b/src/V3EmitMk.h index 7902fec1b..917182b2a 100644 --- a/src/V3EmitMk.h +++ b/src/V3EmitMk.h @@ -21,7 +21,8 @@ #ifndef _V3EMITMK_H_ #define _V3EMITMK_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp index 9c3f6209a..efe9b8b61 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3EmitV.h b/src/V3EmitV.h index a84764a77..6e64498a4 100644 --- a/src/V3EmitV.h +++ b/src/V3EmitV.h @@ -21,7 +21,8 @@ #ifndef _V3EMITV_H_ #define _V3EMITV_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Error.h b/src/V3Error.h index ce49ee601..0d3d6ed1a 100644 --- a/src/V3Error.h +++ b/src/V3Error.h @@ -21,7 +21,8 @@ #ifndef _V3ERROR_H_ #define _V3ERROR_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp index 3f099e166..b6653d375 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -30,7 +30,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Expand.h b/src/V3Expand.h index fd8f056a4..05bd965fd 100644 --- a/src/V3Expand.h +++ b/src/V3Expand.h @@ -21,7 +21,8 @@ #ifndef _V3EXPAND_H_ #define _V3EXPAND_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3File.cpp b/src/V3File.cpp index 0450c36cd..301706340 100644 --- a/src/V3File.cpp +++ b/src/V3File.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3File.h b/src/V3File.h index 8d2868fce..6e91e7703 100644 --- a/src/V3File.h +++ b/src/V3File.h @@ -21,7 +21,8 @@ #ifndef _V3FILE_H_ #define _V3FILE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include #include diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index a467bae83..efd425f35 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Gate.h b/src/V3Gate.h index a0f3fbaa5..bfe277614 100644 --- a/src/V3Gate.h +++ b/src/V3Gate.h @@ -21,7 +21,8 @@ #ifndef _V3GATE_H_ #define _V3GATE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp index 15c00159b..ba687958e 100644 --- a/src/V3GenClk.cpp +++ b/src/V3GenClk.cpp @@ -24,7 +24,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3GenClk.h b/src/V3GenClk.h index d1d80177c..a6bd6ff6b 100644 --- a/src/V3GenClk.h +++ b/src/V3GenClk.h @@ -21,7 +21,8 @@ #ifndef _V3GENCLK_H_ #define _V3GENCLK_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Global.h b/src/V3Global.h index 75d820eed..63870966f 100644 --- a/src/V3Global.h +++ b/src/V3Global.h @@ -22,7 +22,8 @@ #ifndef _V3GLOBAL_H_ #define _V3GLOBAL_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include "V3Error.h" diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp index dfaf293ae..335f488be 100644 --- a/src/V3Graph.cpp +++ b/src/V3Graph.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Graph.h b/src/V3Graph.h index b60cfc806..676669cb8 100644 --- a/src/V3Graph.h +++ b/src/V3Graph.h @@ -21,7 +21,8 @@ #ifndef _V3GRAPH_H_ #define _V3GRAPH_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3List.h" #include diff --git a/src/V3GraphAcyc.cpp b/src/V3GraphAcyc.cpp index 673277b3f..202bb2b35 100644 --- a/src/V3GraphAcyc.cpp +++ b/src/V3GraphAcyc.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp index 74095c72c..02aa026cf 100644 --- a/src/V3GraphAlg.cpp +++ b/src/V3GraphAlg.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3GraphAlg.h b/src/V3GraphAlg.h index 7d4cabd9e..2da390c26 100644 --- a/src/V3GraphAlg.h +++ b/src/V3GraphAlg.h @@ -21,7 +21,8 @@ #ifndef _V3GRAPHALG_H_ #define _V3GRAPHALG_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Global.h" #include "V3Graph.h" diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp index 877495339..d55834e96 100644 --- a/src/V3GraphDfa.cpp +++ b/src/V3GraphDfa.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3GraphDfa.h b/src/V3GraphDfa.h index 0f80f00b4..128b5f0d6 100644 --- a/src/V3GraphDfa.h +++ b/src/V3GraphDfa.h @@ -21,7 +21,8 @@ #ifndef _V3GRAPHDFA_H_ #define _V3GRAPHDFA_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include "V3Global.h" diff --git a/src/V3GraphTest.cpp b/src/V3GraphTest.cpp index 5ae24b0a1..4ead54796 100644 --- a/src/V3GraphTest.cpp +++ b/src/V3GraphTest.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp index b8ecf98e7..35d39c4ff 100644 --- a/src/V3Hashed.cpp +++ b/src/V3Hashed.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Hashed.h b/src/V3Hashed.h index 87d532f88..bb4a983ae 100644 --- a/src/V3Hashed.h +++ b/src/V3Hashed.h @@ -21,7 +21,8 @@ #ifndef _V3HASHED_H_ #define _V3HASHED_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index 1c41c0b0b..dfc145f34 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -29,7 +29,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Inline.h b/src/V3Inline.h index 19e98c645..174e147c3 100644 --- a/src/V3Inline.h +++ b/src/V3Inline.h @@ -21,7 +21,8 @@ #ifndef _V3INLINE_H_ #define _V3INLINE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index 70702976a..9b3e038c2 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Inst.h b/src/V3Inst.h index 0cb1f22be..4865adac4 100644 --- a/src/V3Inst.h +++ b/src/V3Inst.h @@ -21,7 +21,8 @@ #ifndef _V3INST_H_ #define _V3INST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LanguageWords.h b/src/V3LanguageWords.h index 0eca0a772..77e68a1d4 100644 --- a/src/V3LanguageWords.h +++ b/src/V3LanguageWords.h @@ -21,7 +21,8 @@ #ifndef _V3LANGUAGEWORDS_H_ #define _V3LANGUAGEWORDS_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include //============================================================================ diff --git a/src/V3Life.cpp b/src/V3Life.cpp index ed4412641..f8f1ea14f 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -28,7 +28,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Life.h b/src/V3Life.h index d6df56c8e..f1988204d 100644 --- a/src/V3Life.h +++ b/src/V3Life.h @@ -21,7 +21,8 @@ #ifndef _V3LIFE_H_ #define _V3LIFE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index 50af61c91..7ce50bb6f 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -29,7 +29,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3LifePost.h b/src/V3LifePost.h index ac9a76147..5353cfb99 100644 --- a/src/V3LifePost.h +++ b/src/V3LifePost.h @@ -21,7 +21,8 @@ #ifndef _V3LIFEPOST_H_ #define _V3LIFEPOST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Link.cpp b/src/V3Link.cpp index 1944e83fb..e2aac6432 100644 --- a/src/V3Link.cpp +++ b/src/V3Link.cpp @@ -26,7 +26,8 @@ // Link to var they reference //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Link.h b/src/V3Link.h index d9c4cf774..1fc75c7db 100644 --- a/src/V3Link.h +++ b/src/V3Link.h @@ -21,7 +21,8 @@ #ifndef _V3LINK_H_ #define _V3LINK_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp index 8af096cf6..01526fe49 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -25,7 +25,8 @@ // Link to module that instantiates it //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3LinkCells.h b/src/V3LinkCells.h index d386c1ab0..11d840493 100644 --- a/src/V3LinkCells.h +++ b/src/V3LinkCells.h @@ -21,7 +21,8 @@ #ifndef _V3LINKCELLS_H_ #define _V3LINKCELLS_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 07b3d22a8..26f3d5b6b 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -29,7 +29,8 @@ // Find appropriate named cell and link to var they reference //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3LinkDot.h b/src/V3LinkDot.h index 84d74c081..352c22be8 100644 --- a/src/V3LinkDot.h +++ b/src/V3LinkDot.h @@ -21,7 +21,8 @@ #ifndef _V3LINKDOT_H_ #define _V3LINKDOT_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp index 7ff4f08d2..b6a17aa53 100644 --- a/src/V3LinkLevel.cpp +++ b/src/V3LinkLevel.cpp @@ -24,7 +24,8 @@ // Create new MODULE TOP with connections to below signals //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3LinkLevel.h b/src/V3LinkLevel.h index bc7f3ab89..2eaf8f7c9 100644 --- a/src/V3LinkLevel.h +++ b/src/V3LinkLevel.h @@ -21,7 +21,8 @@ #ifndef _V3LINKLEVEL_H_ #define _V3LINKLEVEL_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index 2784461c3..37475bf94 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -28,7 +28,8 @@ // Convert normal var to FILE* type //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3LinkResolve.h b/src/V3LinkResolve.h index eba67fbfa..d1f9c3175 100644 --- a/src/V3LinkResolve.h +++ b/src/V3LinkResolve.h @@ -21,7 +21,8 @@ #ifndef _V3LINKRESOLVE_H_ #define _V3LINKRESOLVE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3List.h b/src/V3List.h index c3b1fb5fb..299ebbcbb 100644 --- a/src/V3List.h +++ b/src/V3List.h @@ -21,7 +21,8 @@ #ifndef _V3LIST_H_ #define _V3LIST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include //============================================================================ diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp index 0d635e882..9c5525b5a 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -27,7 +27,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Localize.h b/src/V3Localize.h index 40a905939..dadce751e 100644 --- a/src/V3Localize.h +++ b/src/V3Localize.h @@ -21,7 +21,8 @@ #ifndef _V3LOCALIZE_H_ #define _V3LOCALIZE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Name.cpp b/src/V3Name.cpp index 979ce627f..ec376ece3 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -24,7 +24,8 @@ // Prepend __PVT__ to variable names //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Name.h b/src/V3Name.h index 865b98565..50247b42c 100644 --- a/src/V3Name.h +++ b/src/V3Name.h @@ -21,7 +21,8 @@ #ifndef _V3NAME_H_ #define _V3NAME_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Number.cpp b/src/V3Number.cpp index c54573ccc..523a4acfa 100644 --- a/src/V3Number.cpp +++ b/src/V3Number.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include +#include +#include "verilatedos.h" #include #include #include diff --git a/src/V3Number.h b/src/V3Number.h index 95ec3fbec..4ec702d06 100644 --- a/src/V3Number.h +++ b/src/V3Number.h @@ -21,7 +21,8 @@ #ifndef _V3NUMBER_H_ #define _V3NUMBER_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include "V3Error.h" diff --git a/src/V3Number_test.cpp b/src/V3Number_test.cpp index f3d62abc1..7758753c7 100644 --- a/src/V3Number_test.cpp +++ b/src/V3Number_test.cpp @@ -25,7 +25,8 @@ #include "V3Error.cpp" #include "V3Number.cpp" -#include +#include +#include "verilatedos.h" #include #include #include diff --git a/src/V3Options.cpp b/src/V3Options.cpp index cc9aad580..d0479d611 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Options.h b/src/V3Options.h index 676e30881..faa484f5c 100644 --- a/src/V3Options.h +++ b/src/V3Options.h @@ -22,7 +22,8 @@ #ifndef _V3OPTIONS_H_ #define _V3OPTIONS_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include diff --git a/src/V3Order.cpp b/src/V3Order.cpp index 8c96e6d17..d6b9c6950 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -87,7 +87,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Order.h b/src/V3Order.h index 15f94e367..43c4ec1d4 100644 --- a/src/V3Order.h +++ b/src/V3Order.h @@ -21,7 +21,8 @@ #ifndef _V3ORDER_H_ #define _V3ORDER_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3OrderGraph.h b/src/V3OrderGraph.h index 278075a70..e2b20f6c6 100644 --- a/src/V3OrderGraph.h +++ b/src/V3OrderGraph.h @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Ast.h" #include "V3Graph.h" diff --git a/src/V3Param.cpp b/src/V3Param.cpp index ebf4f08ac..7eccf0513 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -29,7 +29,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Param.h b/src/V3Param.h index bba9d1c7a..f5e1c6f51 100644 --- a/src/V3Param.h +++ b/src/V3Param.h @@ -21,7 +21,8 @@ #ifndef _V3PARAM_H_ #define _V3PARAM_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp index face11d7b..a7fa996bf 100644 --- a/src/V3PreProc.cpp +++ b/src/V3PreProc.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3PreProc.h b/src/V3PreProc.h index 8e6d6328f..8abb0e63f 100644 --- a/src/V3PreProc.h +++ b/src/V3PreProc.h @@ -22,7 +22,8 @@ #ifndef _V3PREPROC_H_ #define _V3PREPROC_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp index 3020f6117..63d2db5b3 100644 --- a/src/V3PreShell.cpp +++ b/src/V3PreShell.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3PreShell.h b/src/V3PreShell.h index 0cb7238df..0b3ed24bf 100644 --- a/src/V3PreShell.h +++ b/src/V3PreShell.h @@ -22,7 +22,8 @@ #ifndef _V3PRESHELL_H_ #define _V3PRESHELL_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" //============================================================================ diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index b5a4c523b..25f220a3e 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Premit.h b/src/V3Premit.h index d3348b7e0..c2ae4d768 100644 --- a/src/V3Premit.h +++ b/src/V3Premit.h @@ -21,7 +21,8 @@ #ifndef _V3PREMIT_H_ #define _V3PREMIT_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Read.cpp b/src/V3Read.cpp index b7b3ff011..8115010cf 100644 --- a/src/V3Read.cpp +++ b/src/V3Read.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Read.h b/src/V3Read.h index c3463aee2..6c0e91955 100644 --- a/src/V3Read.h +++ b/src/V3Read.h @@ -21,7 +21,8 @@ #ifndef _V3READ_H_ #define _V3READ_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index 042595777..014098815 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Scope.h b/src/V3Scope.h index 70e8c55ba..8e629edd3 100644 --- a/src/V3Scope.h +++ b/src/V3Scope.h @@ -21,7 +21,8 @@ #ifndef _V3SCOPE_H_ #define _V3SCOPE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3SenTree.h b/src/V3SenTree.h index f9d1abf40..45b7b3563 100644 --- a/src/V3SenTree.h +++ b/src/V3SenTree.h @@ -34,7 +34,8 @@ #ifndef _V3SENTREE_H_ #define _V3SENTREE_H_ -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Signed.cpp b/src/V3Signed.cpp index 9f3c0c3ba..a54293983 100644 --- a/src/V3Signed.cpp +++ b/src/V3Signed.cpp @@ -29,7 +29,8 @@ // Else, if any operand unsigned, output unsigned //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Signed.h b/src/V3Signed.h index 5c26a6f12..f2276132f 100644 --- a/src/V3Signed.h +++ b/src/V3Signed.h @@ -21,7 +21,8 @@ #ifndef _V3SIGNED_H_ #define _V3SIGNED_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Split.cpp b/src/V3Split.cpp index 54f016e90..515b6b7f8 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -50,7 +50,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Split.h b/src/V3Split.h index 6e2646eda..6b63c7db0 100644 --- a/src/V3Split.h +++ b/src/V3Split.h @@ -21,7 +21,8 @@ #ifndef _V3SPLIT_H_ #define _V3SPLIT_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp index eb5a0eb39..c23b41079 100644 --- a/src/V3Stats.cpp +++ b/src/V3Stats.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Stats.h b/src/V3Stats.h index 58a25d2f2..ee63c3495 100644 --- a/src/V3Stats.h +++ b/src/V3Stats.h @@ -21,7 +21,8 @@ #ifndef _V3STATS_H_ #define _V3STATS_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp index 44cb95e06..2018b95eb 100644 --- a/src/V3StatsReport.cpp +++ b/src/V3StatsReport.cpp @@ -19,7 +19,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp index cc11e3c35..e9a2de1fb 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -27,7 +27,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Subst.h b/src/V3Subst.h index 595028311..6523c2bae 100644 --- a/src/V3Subst.h +++ b/src/V3Subst.h @@ -21,7 +21,8 @@ #ifndef _V3SUBST_H_ #define _V3SUBST_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3SymTable.h b/src/V3SymTable.h index 06bd76a70..5e25a30c7 100644 --- a/src/V3SymTable.h +++ b/src/V3SymTable.h @@ -22,7 +22,8 @@ #ifndef _V3LINKSYMTABLE_H_ #define _V3LINKSYMTABLE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Table.cpp b/src/V3Table.cpp index c385191fa..f2fe4c3bd 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -26,7 +26,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Table.h b/src/V3Table.h index 49b037da7..a5791b65e 100644 --- a/src/V3Table.h +++ b/src/V3Table.h @@ -21,7 +21,8 @@ #ifndef _V3TABLE_H_ #define _V3TABLE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Task.cpp b/src/V3Task.cpp index c491699dd..17065319d 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -28,7 +28,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Task.h b/src/V3Task.h index 81807bcba..e6505f21e 100644 --- a/src/V3Task.h +++ b/src/V3Task.h @@ -21,7 +21,8 @@ #ifndef _V3TASK_H_ #define _V3TASK_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp index 98c6d6f2a..37faa66ef 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -47,7 +47,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Trace.h b/src/V3Trace.h index eef39a7bc..4dbccf108 100644 --- a/src/V3Trace.h +++ b/src/V3Trace.h @@ -21,7 +21,8 @@ #ifndef _V3TRACE_H_ #define _V3TRACE_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index b6ec597b7..525a06d06 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -25,7 +25,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3TraceDecl.h b/src/V3TraceDecl.h index f6aaaf388..2f2f258cf 100644 --- a/src/V3TraceDecl.h +++ b/src/V3TraceDecl.h @@ -21,7 +21,8 @@ #ifndef _V3TRACEDECL_H_ #define _V3TRACEDECL_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index 8a18021ec..1400a3f69 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -32,7 +32,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Unknown.h b/src/V3Unknown.h index d4e6b350c..73cba4100 100644 --- a/src/V3Unknown.h +++ b/src/V3Unknown.h @@ -21,7 +21,8 @@ #ifndef _V3UNKNOWN_H_ #define _V3UNKNOWN_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp index 99121f2ff..38b036096 100644 --- a/src/V3Unroll.cpp +++ b/src/V3Unroll.cpp @@ -29,7 +29,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Unroll.h b/src/V3Unroll.h index e5b9296ae..910f1c8b6 100644 --- a/src/V3Unroll.h +++ b/src/V3Unroll.h @@ -21,7 +21,8 @@ #ifndef _V3UNROLL_H_ #define _V3UNROLL_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Width.cpp b/src/V3Width.cpp index 75ca18773..1701045db 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -44,7 +44,8 @@ // //************************************************************************* -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include #include #include diff --git a/src/V3Width.h b/src/V3Width.h index e781ce5bc..e42ced99c 100644 --- a/src/V3Width.h +++ b/src/V3Width.h @@ -21,7 +21,8 @@ #ifndef _V3WIDTH_H_ #define _V3WIDTH_H_ 1 -#include "config.h" +#include "config_build.h" +#include "verilatedos.h" #include "V3Error.h" #include "V3Ast.h" diff --git a/src/config.h.in b/src/config_build.h.in similarity index 96% rename from src/config.h.in rename to src/config_build.h.in index 501150899..350ab0f58 100644 --- a/src/config.h.in +++ b/src/config_build.h.in @@ -54,6 +54,9 @@ // Set define if we have header: #define HAVE_MINGW_STDINT_H 0 +// Set define if we have header: +#define HAVE_INTTYPES_H 0 + //********************************************************************** //**** Compile options