From d87b9d25ca03d487d414c9d20847c37c18fe3d24 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 14 Oct 2018 13:43:24 -0400 Subject: [PATCH] Internals: Cleanup and standardize include order. No functional change intended. --- include/verilated.cpp | 2 + include/verilated.h | 6 +- include/verilated_dpi.cpp | 1 + include/verilated_dpi.h | 4 +- include/verilated_fst_c.cpp | 3 +- include/verilated_fst_c.h | 1 + include/verilated_imp.h | 4 +- include/verilated_lxt2_c.cpp | 1 + include/verilated_lxt2_c.h | 1 + include/verilated_sc.h | 1 + include/verilated_sym_props.h | 2 + include/verilated_syms.h | 3 +- include/verilated_threads.cpp | 1 + include/verilated_threads.h | 9 +-- include/verilated_unordered_set_map.h | 1 - include/verilated_vcd_c.h | 2 +- include/verilated_vcd_sc.h | 1 + include/verilated_vpi.h | 1 + include/verilatedos.h | 8 +-- src/V3Active.cpp | 7 +-- src/V3Active.h | 2 + src/V3ActiveTop.cpp | 5 -- src/V3ActiveTop.h | 2 + src/V3Assert.cpp | 8 +-- src/V3Assert.h | 2 + src/V3AssertPre.cpp | 9 +-- src/V3AssertPre.h | 2 + src/V3Ast.cpp | 11 ++-- src/V3Ast.h | 5 +- src/V3AstNodes.cpp | 11 ++-- src/V3Begin.cpp | 9 ++- src/V3Begin.h | 2 + src/V3Branch.cpp | 7 +-- src/V3Branch.h | 2 + src/V3Broken.cpp | 9 ++- src/V3Broken.h | 2 + src/V3CCtors.cpp | 14 ++--- src/V3CCtors.h | 2 + src/V3Case.cpp | 7 +-- src/V3Case.h | 2 + src/V3Cast.cpp | 7 +-- src/V3Cast.h | 2 + src/V3Cdc.cpp | 17 +++--- src/V3Cdc.h | 2 + src/V3Changed.cpp | 9 ++- src/V3Changed.h | 2 + src/V3Clean.cpp | 7 +-- src/V3Clean.h | 2 + src/V3ClkGater.cpp | 11 ++-- src/V3ClkGater.h | 2 + src/V3Clock.cpp | 7 +-- src/V3Clock.h | 2 + src/V3Combine.cpp | 11 ++-- src/V3Combine.h | 2 + src/V3Config.cpp | 7 ++- src/V3Config.h | 3 +- src/V3Const.cpp | 9 ++- src/V3Const.h | 2 + src/V3Coverage.cpp | 7 +-- src/V3Coverage.h | 2 + src/V3CoverageJoin.cpp | 7 +-- src/V3CoverageJoin.h | 2 + src/V3Dead.cpp | 9 ++- src/V3Dead.h | 2 + src/V3Delayed.cpp | 11 ++-- src/V3Delayed.h | 2 + src/V3Depth.cpp | 7 +-- src/V3Depth.h | 2 + src/V3DepthBlock.cpp | 7 +-- src/V3DepthBlock.h | 2 + src/V3Descope.cpp | 7 +-- src/V3Descope.h | 2 + src/V3EmitC.cpp | 15 +++-- src/V3EmitC.h | 2 + src/V3EmitCBase.h | 7 +-- src/V3EmitCInlines.cpp | 11 ++-- src/V3EmitCSyms.cpp | 15 +++-- src/V3EmitMk.cpp | 13 ++-- src/V3EmitMk.h | 2 + src/V3EmitV.cpp | 13 ++-- src/V3EmitV.h | 2 + src/V3EmitXml.cpp | 13 ++-- src/V3EmitXml.h | 2 + src/V3Error.cpp | 6 +- src/V3Error.h | 10 ++-- src/V3Expand.cpp | 7 +-- src/V3Expand.h | 2 + src/V3File.cpp | 14 ++--- src/V3File.h | 4 +- src/V3FileLine.cpp | 7 +-- src/V3FileLine.h | 10 ++-- src/V3Gate.cpp | 17 +++--- src/V3Gate.h | 2 + src/V3GenClk.cpp | 5 +- src/V3GenClk.h | 2 + src/V3Global.h | 3 +- src/V3Graph.cpp | 12 ++-- src/V3Graph.h | 4 +- src/V3GraphAcyc.cpp | 11 ++-- src/V3GraphAlg.cpp | 13 ++-- src/V3GraphAlg.h | 1 + src/V3GraphDfa.cpp | 11 ++-- src/V3GraphDfa.h | 1 - src/V3GraphStream.h | 5 +- src/V3GraphTest.cpp | 5 +- src/V3Hashed.cpp | 13 ++-- src/V3Hashed.h | 3 +- src/V3Inline.cpp | 11 ++-- src/V3Inline.h | 2 + src/V3Inst.cpp | 7 +-- src/V3Inst.h | 2 + src/V3InstrCount.cpp | 3 +- src/V3LangCode.h | 1 - src/V3LanguageWords.h | 2 + src/V3Life.cpp | 9 ++- src/V3Life.h | 2 + src/V3LifePost.cpp | 9 ++- src/V3LifePost.h | 2 + src/V3LinkCells.cpp | 13 ++-- src/V3LinkCells.h | 2 + src/V3LinkDot.cpp | 11 ++-- src/V3LinkDot.h | 2 + src/V3LinkJump.cpp | 9 ++- src/V3LinkJump.h | 2 + src/V3LinkLValue.cpp | 11 ++-- src/V3LinkLValue.h | 2 + src/V3LinkLevel.cpp | 11 ++-- src/V3LinkLevel.h | 2 + src/V3LinkParse.cpp | 13 ++-- src/V3LinkParse.h | 2 + src/V3LinkResolve.cpp | 11 ++-- src/V3LinkResolve.h | 2 + src/V3List.h | 2 + src/V3Localize.cpp | 7 +-- src/V3Localize.h | 2 + src/V3Name.cpp | 7 +-- src/V3Name.h | 2 + src/V3Number.cpp | 10 ++-- src/V3Number.h | 4 +- src/V3Number_test.cpp | 13 ++-- src/V3Options.cpp | 18 +++--- src/V3Options.h | 7 ++- src/V3Order.cpp | 18 +++--- src/V3Order.h | 2 + src/V3OrderGraph.h | 2 + src/V3Os.cpp | 10 ++-- src/V3Os.h | 3 +- src/V3Param.cpp | 11 ++-- src/V3Param.h | 2 + src/V3Parse.h | 2 + src/V3ParseImp.cpp | 9 ++- src/V3ParseImp.h | 3 + src/V3ParseLex.cpp | 7 +-- src/V3ParseSym.h | 3 + src/V3Partition.cpp | 6 +- src/V3Partition.h | 3 +- src/V3PartitionGraph.h | 3 +- src/V3PreLex.h | 6 +- src/V3PreProc.cpp | 15 ++--- src/V3PreProc.h | 2 +- src/V3PreShell.cpp | 13 ++-- src/V3PreShell.h | 1 + src/V3Premit.cpp | 8 +-- src/V3Premit.h | 2 + src/V3Reloop.cpp | 7 +-- src/V3Reloop.h | 2 + src/V3Scope.cpp | 15 +++-- src/V3Scope.h | 2 + src/V3Scoreboard.h | 3 +- src/V3SenTree.h | 13 ++-- src/V3Simulate.h | 2 + src/V3Slice.cpp | 5 +- src/V3Slice.h | 2 + src/V3Split.cpp | 15 +++-- src/V3Split.h | 2 + src/V3SplitAs.cpp | 11 ++-- src/V3SplitAs.h | 2 + src/V3Stats.cpp | 9 ++- src/V3Stats.h | 2 + src/V3StatsReport.cpp | 11 ++-- src/V3String.cpp | 1 - src/V3String.h | 2 +- src/V3Subst.cpp | 9 ++- src/V3Subst.h | 2 + src/V3SymTable.h | 11 ++-- src/V3TSP.cpp | 14 ++--- src/V3TSP.h | 2 + src/V3Table.cpp | 9 ++- src/V3Table.h | 2 + src/V3Task.cpp | 7 +-- src/V3Task.h | 3 + src/V3Trace.cpp | 9 ++- src/V3Trace.h | 2 + src/V3TraceDecl.cpp | 5 +- src/V3TraceDecl.h | 2 + src/V3Tristate.cpp | 9 ++- src/V3Tristate.h | 2 + src/V3Undriven.cpp | 9 ++- src/V3Undriven.h | 2 + src/V3Unknown.cpp | 7 +-- src/V3Unknown.h | 2 + src/V3Unroll.cpp | 7 +-- src/V3Unroll.h | 2 + src/V3Width.cpp | 5 +- src/V3Width.h | 2 + src/V3WidthCommit.h | 2 + src/V3WidthSel.cpp | 5 +- src/Verilator.cpp | 5 +- src/VlcMain.cpp | 7 +-- src/VlcOptions.h | 6 +- src/VlcPoint.h | 2 + src/VlcSource.h | 1 + src/VlcTest.h | 2 + src/VlcTop.cpp | 4 +- src/VlcTop.h | 1 + src/verilog.l | 5 +- src/verilog.y | 8 +-- test_regress/t/t_dist_inctree.pl | 85 +++++++++++++++++++++++++++ 218 files changed, 738 insertions(+), 579 deletions(-) create mode 100755 test_regress/t/t_dist_inctree.pl diff --git a/include/verilated.cpp b/include/verilated.cpp index c4effbdcf..56dde07e3 100644 --- a/include/verilated.cpp +++ b/include/verilated.cpp @@ -25,7 +25,9 @@ #define _VERILATED_CPP_ +#include "verilatedos.h" #include "verilated_imp.h" + #include "verilated_config.h" #include diff --git a/include/verilated.h b/include/verilated.h index e2096256c..365f21aac 100644 --- a/include/verilated.h +++ b/include/verilated.h @@ -36,14 +36,14 @@ #include #include #include +// avoided to reduce compile time +// avoided and instead in verilated_heavy.h to reduce compile time +// avoided and instead in verilated_heavy.h to reduce compile time #ifdef VL_THREADED # include # include # include #endif -// avoided to reduce compile time -// avoided and instead in verilated_heavy.h to reduce compile time -// avoided and instead in verilated_heavy.h to reduce compile time //============================================================================= // Switches diff --git a/include/verilated_dpi.cpp b/include/verilated_dpi.cpp index dce9f6eac..6d203e68a 100644 --- a/include/verilated_dpi.cpp +++ b/include/verilated_dpi.cpp @@ -24,6 +24,7 @@ //========================================================================= #define _VERILATED_DPI_CPP_ + #include "verilatedos.h" #include "verilated_dpi.h" #include "verilated_imp.h" diff --git a/include/verilated_dpi.h b/include/verilated_dpi.h index 5c6442185..8fe8255c8 100644 --- a/include/verilated_dpi.h +++ b/include/verilated_dpi.h @@ -28,8 +28,10 @@ #ifndef _VERILATED_DPI_H_ #define _VERILATED_DPI_H_ 1 ///< Header Guard -#include "verilated.h" // Also presumably included by caller +#include "verilatedos.h" +#include "verilated.h" // Also presumably included by caller #include "verilated_sym_props.h" + #include "svdpi.h" //=================================================================== diff --git a/include/verilated_fst_c.cpp b/include/verilated_fst_c.cpp index 867570828..09210af10 100644 --- a/include/verilated_fst_c.cpp +++ b/include/verilated_fst_c.cpp @@ -23,9 +23,10 @@ #include "verilatedos.h" #include "verilated.h" #include "verilated_fst_c.h" + // Include the GTKWave implementation directly -#include "gtkwave/fstapi.c" #include "gtkwave/fastlz.c" +#include "gtkwave/fstapi.c" #include "gtkwave/lz4.c" #include diff --git a/include/verilated_fst_c.h b/include/verilated_fst_c.h index 4ae0d3e95..619fb110f 100644 --- a/include/verilated_fst_c.h +++ b/include/verilated_fst_c.h @@ -25,6 +25,7 @@ #include "verilatedos.h" #include "verilated.h" + #include "gtkwave/fstapi.h" #include diff --git a/include/verilated_imp.h b/include/verilated_imp.h index 0a22b42f8..374d6ffda 100644 --- a/include/verilated_imp.h +++ b/include/verilated_imp.h @@ -33,11 +33,9 @@ #include "verilated_heavy.h" #include "verilated_syms.h" -#include +#include #include #include -#include -#include #ifdef VL_THREADED # include # include diff --git a/include/verilated_lxt2_c.cpp b/include/verilated_lxt2_c.cpp index ef452deae..96f03781f 100644 --- a/include/verilated_lxt2_c.cpp +++ b/include/verilated_lxt2_c.cpp @@ -23,6 +23,7 @@ #include "verilatedos.h" #include "verilated.h" #include "verilated_lxt2_c.h" + // Include the GTKWave implementation directly #include "gtkwave/lxt2_write.cpp" diff --git a/include/verilated_lxt2_c.h b/include/verilated_lxt2_c.h index 828fc7b1f..b30414670 100644 --- a/include/verilated_lxt2_c.h +++ b/include/verilated_lxt2_c.h @@ -25,6 +25,7 @@ #include "verilatedos.h" #include "verilated.h" + #include "gtkwave/lxt2_write.h" #include diff --git a/include/verilated_sc.h b/include/verilated_sc.h index 27b884af7..054fc7f12 100644 --- a/include/verilated_sc.h +++ b/include/verilated_sc.h @@ -28,6 +28,7 @@ #define _VERILATED_SC_H_ 1 ///< Header Guard #include "verilatedos.h" + #include "systemc.h" //============================================================================= diff --git a/include/verilated_sym_props.h b/include/verilated_sym_props.h index 8b55524fd..0d4a0a6bd 100644 --- a/include/verilated_sym_props.h +++ b/include/verilated_sym_props.h @@ -32,6 +32,8 @@ #ifndef _VERILATED_SYM_PROPS_H_ #define _VERILATED_SYM_PROPS_H_ 1 ///< Header Guard +#include "verilatedos.h" + //=========================================================================== /// Verilator range /// Thread safety: Assume is constructed only with model, then any number of readers diff --git a/include/verilated_syms.h b/include/verilated_syms.h index 20083093c..2678051fe 100644 --- a/include/verilated_syms.h +++ b/include/verilated_syms.h @@ -31,9 +31,10 @@ #ifndef _VERILATED_SYMS_H_ #define _VERILATED_SYMS_H_ 1 ///< Header Guard +#include "verilatedos.h" +#include "verilated_heavy.h" #include "verilated_sym_props.h" -#include "verilated_heavy.h" #include //====================================================================== diff --git a/include/verilated_threads.cpp b/include/verilated_threads.cpp index fccb4dffd..914b8259e 100644 --- a/include/verilated_threads.cpp +++ b/include/verilated_threads.cpp @@ -21,6 +21,7 @@ #include "verilatedos.h" #include "verilated_threads.h" + #include std::atomic VlNotification::s_yields; diff --git a/include/verilated_threads.h b/include/verilated_threads.h index 2f34d296b..b6a014eb2 100644 --- a/include/verilated_threads.h +++ b/include/verilated_threads.h @@ -23,18 +23,15 @@ #define _VERILATED_THREADS_H_ #include "verilatedos.h" +#include "verilated.h" // for VerilatedMutex and clang annotations -#include -#include -#include -#include #include // For sched_getcpu() +#include +#include #if defined(__APPLE__) # include // For __cpuid_count() #endif -#include "verilated.h" // for VerilatedMutex and clang annotations - // VlMTaskVertex and VlThreadpool will work with multiple symbol table types. // Since the type is opaque to VlMTaskVertex and VlThreadPool, represent it // as a void* here. diff --git a/include/verilated_unordered_set_map.h b/include/verilated_unordered_set_map.h index 589b5712c..e3504a3d6 100644 --- a/include/verilated_unordered_set_map.h +++ b/include/verilated_unordered_set_map.h @@ -39,7 +39,6 @@ #ifndef _V3_UNORDERED_SET_MAP_H_ #define _V3_UNORDERED_SET_MAP_H_ -#include "verilated_config.h" #include "verilatedos.h" #include diff --git a/include/verilated_vcd_c.h b/include/verilated_vcd_c.h index 389f446cf..428b9220a 100644 --- a/include/verilated_vcd_c.h +++ b/include/verilated_vcd_c.h @@ -26,9 +26,9 @@ #include "verilatedos.h" #include "verilated.h" +#include #include #include -#include class VerilatedVcd; class VerilatedVcdCallInfo; diff --git a/include/verilated_vcd_sc.h b/include/verilated_vcd_sc.h index c7c0e8c4a..735aa7533 100644 --- a/include/verilated_vcd_sc.h +++ b/include/verilated_vcd_sc.h @@ -25,6 +25,7 @@ #ifndef _VERILATED_VCD_SC_H_ #define _VERILATED_VCD_SC_H_ 1 +#include "verilatedos.h" #include "verilated_sc.h" #include "verilated_vcd_c.h" diff --git a/include/verilated_vpi.h b/include/verilated_vpi.h index dfb8f83e3..61d27f226 100644 --- a/include/verilated_vpi.h +++ b/include/verilated_vpi.h @@ -26,6 +26,7 @@ #ifndef _VERILATED_VPI_H_ #define _VERILATED_VPI_H_ 1 ///< Header Guard +#include "verilatedos.h" #include "verilated.h" #include "verilated_syms.h" diff --git a/include/verilatedos.h b/include/verilatedos.h index 9bc68c821..f4d1a928c 100644 --- a/include/verilatedos.h +++ b/include/verilatedos.h @@ -202,11 +202,11 @@ //========================================================================= // Basic integer types -#ifdef VL_UINTS_DEFINED -#elif defined(__CYGWIN__) +#if defined(__CYGWIN__) # include # include // __WORDSIZE +# include // ssize_t typedef unsigned char uint8_t; ///< 8-bit unsigned type (backward compatibility) typedef unsigned short int uint16_t; ///< 16-bit unsigned type (backward compatibility) typedef unsigned char vluint8_t; ///< 8-bit unsigned type @@ -249,10 +249,10 @@ typedef signed __int32 ssize_t; ///< signed size_t; returned fro #else // Linux or compliant Unix flavors, -m64 -# include // Linux and most flavors -# include // Linux ssize_t # include // Solaris +# include // Linux and most flavors # include // __WORDSIZE +# include // ssize_t typedef uint8_t vluint8_t; ///< 32-bit unsigned type typedef uint16_t vluint16_t; ///< 32-bit unsigned type typedef int vlsint32_t; ///< 32-bit signed type diff --git a/src/V3Active.cpp b/src/V3Active.cpp index d46a91ac1..af2fdd242 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -32,12 +32,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Active.h" @@ -45,6 +39,7 @@ #include "V3EmitCBase.h" #include "V3Const.h" #include "V3SenTree.h" // for SenTreeSet + #include VL_INCLUDE_UNORDERED_MAP //***** See below for main transformation engine diff --git a/src/V3Active.h b/src/V3Active.h index 6c549831c..1e6d5a5ff 100644 --- a/src/V3Active.h +++ b/src/V3Active.h @@ -20,8 +20,10 @@ #ifndef _V3ACTIVE_H_ #define _V3ACTIVE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index 484e404a5..1eb328d4f 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -29,11 +29,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3ActiveTop.h" diff --git a/src/V3ActiveTop.h b/src/V3ActiveTop.h index a82d709ed..0f164b56d 100644 --- a/src/V3ActiveTop.h +++ b/src/V3ActiveTop.h @@ -20,8 +20,10 @@ #ifndef _V3ACTIVETOP_H_ #define _V3ACTIVETOP_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp index 2f4123421..2ea4eeeb1 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -20,11 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Assert.h" @@ -32,6 +27,9 @@ #include "V3GraphDfa.h" #include "V3Stats.h" +#include +#include + //###################################################################### // Assert class functions diff --git a/src/V3Assert.h b/src/V3Assert.h index c62a6d97b..98ce195ae 100644 --- a/src/V3Assert.h +++ b/src/V3Assert.h @@ -20,8 +20,10 @@ #ifndef _V3ASSERT_H_ #define _V3ASSERT_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp index eee9a3d31..c9300a6fa 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -23,15 +23,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3AssertPre.h" -#include "V3Ast.h" + +#include +#include //###################################################################### // Assert class functions diff --git a/src/V3AssertPre.h b/src/V3AssertPre.h index 9cc924723..fd135aaf6 100644 --- a/src/V3AssertPre.h +++ b/src/V3AssertPre.h @@ -20,8 +20,10 @@ #ifndef _V3ASSERTPRE_H_ #define _V3ASSERTPRE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp index 11275da47..b5de9d0fc 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -18,11 +18,8 @@ // //************************************************************************* -#include -#include -#include -#include -#include +#include "config_build.h" +#include "verilatedos.h" #include "V3Ast.h" #include "V3File.h" @@ -30,6 +27,10 @@ #include "V3Broken.h" #include "V3String.h" +#include +#include +#include + //====================================================================== // Statics diff --git a/src/V3Ast.h b/src/V3Ast.h index faf661299..084d20875 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -20,15 +20,16 @@ #ifndef _V3AST_H_ #define _V3AST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3FileLine.h" #include "V3Number.h" #include "V3Global.h" + #include -#include -#include #include VL_INCLUDE_UNORDERED_SET #include "V3Ast__gen_classes.h" // From ./astgen diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp index abe04d3b8..798a5435f 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -20,13 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Ast.h" #include "V3File.h" @@ -34,6 +27,10 @@ #include "V3Graph.h" #include "V3PartitionGraph.h" // Just for mtask dumping +#include +#include +#include + //====================================================================== // Special methods diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp index 0279a42b9..c5031d9e1 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -31,17 +31,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Begin.h" #include "V3Inst.h" #include "V3Ast.h" +#include +#include +#include + //###################################################################### class BeginState { diff --git a/src/V3Begin.h b/src/V3Begin.h index c5cb977de..3ef0f3da4 100644 --- a/src/V3Begin.h +++ b/src/V3Begin.h @@ -20,8 +20,10 @@ #ifndef _V3BEGIN_H_ #define _V3BEGIN_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp index e52b616d6..35b2f8ad2 100644 --- a/src/V3Branch.cpp +++ b/src/V3Branch.cpp @@ -29,15 +29,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Branch.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Branch state, as a visitor of each AstNode diff --git a/src/V3Branch.h b/src/V3Branch.h index eeb702812..984c2da5c 100644 --- a/src/V3Branch.h +++ b/src/V3Branch.h @@ -20,8 +20,10 @@ #ifndef _V3BRANCH_H_ #define _V3BRANCH_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index d3472297e..a669249e3 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -27,11 +27,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_MAP #include "V3Global.h" #include "V3Broken.h" @@ -40,6 +35,10 @@ // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators #include "V3AstConstOnly.h" +#include +#include +#include VL_INCLUDE_UNORDERED_MAP + //###################################################################### class BrokenTable : public AstNVisitor { diff --git a/src/V3Broken.h b/src/V3Broken.h index d8cb826a3..9b76c6f00 100644 --- a/src/V3Broken.h +++ b/src/V3Broken.h @@ -20,8 +20,10 @@ #ifndef _V3BROKEN_H_ #define _V3BROKEN_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3CCtors.cpp b/src/V3CCtors.cpp index 1e9d92485..0fe9d9361 100644 --- a/src/V3CCtors.cpp +++ b/src/V3CCtors.cpp @@ -27,20 +27,20 @@ // // This transformation honors outputSplitCFuncs. //************************************************************************* + #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3EmitCBase.h" #include "V3CCtors.h" +#include +#include +#include +#include +#include + class V3CCtorsVisitor { private: string m_basename; diff --git a/src/V3CCtors.h b/src/V3CCtors.h index 4f2be8af0..173ebe474 100644 --- a/src/V3CCtors.h +++ b/src/V3CCtors.h @@ -20,8 +20,10 @@ #ifndef _V3CCTORS_H_ #define _V3CCTORS_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Case.cpp b/src/V3Case.cpp index 694ccec85..6026cadf4 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -39,16 +39,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Case.h" #include "V3Ast.h" #include "V3Stats.h" +#include +#include + #define CASE_OVERLAP_WIDTH 12 // Maximum width we can check for overlaps in #define CASE_BARF 999999 // Magic width when non-constant #define CASE_ENCODER_GROUP_DEPTH 8 // Levels of priority to be ORed together in top IF tree diff --git a/src/V3Case.h b/src/V3Case.h index ee7b04492..088980d48 100644 --- a/src/V3Case.h +++ b/src/V3Case.h @@ -20,8 +20,10 @@ #ifndef _V3CASE_H_ #define _V3CASE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp index 638e39ada..1d291be1b 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -43,15 +43,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Cast.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Cast state, as a visitor of each AstNode diff --git a/src/V3Cast.h b/src/V3Cast.h index 41d7e5873..1d2ee9b72 100644 --- a/src/V3Cast.h +++ b/src/V3Cast.h @@ -20,8 +20,10 @@ #ifndef _V3CAST_H_ #define _V3CAST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp index 9efb40f6a..c8b4286d5 100644 --- a/src/V3Cdc.cpp +++ b/src/V3Cdc.cpp @@ -27,15 +27,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Cdc.h" @@ -45,6 +36,14 @@ #include "V3EmitV.h" #include "V3File.h" +#include +#include +#include +#include +#include +#include +#include + #define CDC_WEIGHT_ASYNC 0x1000 // Weight for edges that feed async logic //###################################################################### diff --git a/src/V3Cdc.h b/src/V3Cdc.h index 30062f173..a99dc7c44 100644 --- a/src/V3Cdc.h +++ b/src/V3Cdc.h @@ -20,8 +20,10 @@ #ifndef _V3CDC_H_ #define _V3CDC_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp index bc1de9273..2b8a0ddf5 100644 --- a/src/V3Changed.cpp +++ b/src/V3Changed.cpp @@ -32,17 +32,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Ast.h" #include "V3Changed.h" #include "V3EmitCBase.h" +#include +#include +#include + //###################################################################### class ChangedState { diff --git a/src/V3Changed.h b/src/V3Changed.h index 15cbf38e9..47db29c58 100644 --- a/src/V3Changed.h +++ b/src/V3Changed.h @@ -20,8 +20,10 @@ #ifndef _V3CHANGED_H_ #define _V3CHANGED_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp index f4e9c9b9f..8770fe20c 100644 --- a/src/V3Clean.cpp +++ b/src/V3Clean.cpp @@ -29,15 +29,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Clean.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Clean state, as a visitor of each AstNode diff --git a/src/V3Clean.h b/src/V3Clean.h index 0fb65b770..02a169abf 100644 --- a/src/V3Clean.h +++ b/src/V3Clean.h @@ -20,8 +20,10 @@ #ifndef _V3CLEAN_H_ #define _V3CLEAN_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3ClkGater.cpp b/src/V3ClkGater.cpp index a8b1fbba5..7bf1aee19 100644 --- a/src/V3ClkGater.cpp +++ b/src/V3ClkGater.cpp @@ -33,12 +33,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Ast.h" @@ -46,6 +40,11 @@ #include "V3Graph.h" #include "V3ClkGater.h" +#include +#include +#include +#include + //###################################################################### // Base for debug diff --git a/src/V3ClkGater.h b/src/V3ClkGater.h index 6eb068d78..2ef384655 100644 --- a/src/V3ClkGater.h +++ b/src/V3ClkGater.h @@ -20,8 +20,10 @@ #ifndef _V3CLKGATER_H_ #define _V3CLKGATER_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index 84a4a983d..0e164a1d6 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -33,16 +33,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Clock.h" #include "V3Ast.h" #include "V3EmitCBase.h" +#include +#include + //###################################################################### // Clock state, as a visitor of each AstNode diff --git a/src/V3Clock.h b/src/V3Clock.h index 46d4dcbfb..2fd90a5f3 100644 --- a/src/V3Clock.h +++ b/src/V3Clock.h @@ -20,8 +20,10 @@ #ifndef _V3CLOCK_H_ #define _V3CLOCK_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index c7e7a0774..0a0e82ef5 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -36,12 +36,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Combine.h" @@ -49,6 +43,11 @@ #include "V3Stats.h" #include "V3Ast.h" +#include +#include +#include +#include + //###################################################################### #define COMBINE_MIN_STATEMENTS 50 // Min # of statements to be worth making a function diff --git a/src/V3Combine.h b/src/V3Combine.h index b8072d677..e4c172940 100644 --- a/src/V3Combine.h +++ b/src/V3Combine.h @@ -20,8 +20,10 @@ #ifndef _V3COMBINE_H_ #define _V3COMBINE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Config.cpp b/src/V3Config.cpp index bc4759259..f40d4127a 100644 --- a/src/V3Config.cpp +++ b/src/V3Config.cpp @@ -20,14 +20,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3String.h" #include "V3Config.h" +#include +#include +#include + //###################################################################### class V3ConfigLine { diff --git a/src/V3Config.h b/src/V3Config.h index 996cdea99..37564fbdd 100644 --- a/src/V3Config.h +++ b/src/V3Config.h @@ -20,9 +20,10 @@ #ifndef _V3CONFIG_H_ #define _V3CONFIG_H_ 1 + #include "config_build.h" #include "verilatedos.h" -#include + #include "V3Error.h" #include "V3FileLine.h" diff --git a/src/V3Const.cpp b/src/V3Const.cpp index 7a9208dd7..5aabc2bb4 100644 --- a/src/V3Const.cpp +++ b/src/V3Const.cpp @@ -26,11 +26,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3String.h" @@ -39,6 +34,10 @@ #include "V3Width.h" #include "V3Simulate.h" +#include +#include +#include + //###################################################################### // Utilities diff --git a/src/V3Const.h b/src/V3Const.h index 62f4ba179..191ce5927 100644 --- a/src/V3Const.h +++ b/src/V3Const.h @@ -20,8 +20,10 @@ #ifndef _V3CONST_H_ #define _V3CONST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index ce36243dc..5a6087fdc 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -30,15 +30,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Coverage.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Coverage state, as a visitor of each AstNode diff --git a/src/V3Coverage.h b/src/V3Coverage.h index 268c4cecd..9e5562747 100644 --- a/src/V3Coverage.h +++ b/src/V3Coverage.h @@ -20,8 +20,10 @@ #ifndef _V3COVERAGE_H_ #define _V3COVERAGE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp index 9b6e79e39..cdcd3f978 100644 --- a/src/V3CoverageJoin.cpp +++ b/src/V3CoverageJoin.cpp @@ -24,16 +24,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3CoverageJoin.h" #include "V3Hashed.h" #include "V3Stats.h" +#include +#include + //###################################################################### // CoverageJoin state, as a visitor of each AstNode diff --git a/src/V3CoverageJoin.h b/src/V3CoverageJoin.h index f3be97342..8427e8e0e 100644 --- a/src/V3CoverageJoin.h +++ b/src/V3CoverageJoin.h @@ -20,8 +20,10 @@ #ifndef _V3COVERAGEJOIN_H_ #define _V3COVERAGEJOIN_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp index 4de40f1e5..2b1fb3665 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -40,16 +40,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Dead.h" #include "V3Ast.h" +#include +#include +#include + //###################################################################### class DeadModVisitor : public AstNVisitor { diff --git a/src/V3Dead.h b/src/V3Dead.h index 89224db80..673e49e0b 100644 --- a/src/V3Dead.h +++ b/src/V3Dead.h @@ -20,8 +20,10 @@ #ifndef _V3DEAD_H_ #define _V3DEAD_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index 9e4caaa8d..a0b2d4208 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -53,18 +53,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Delayed.h" #include "V3Ast.h" #include "V3Stats.h" +#include +#include +#include +#include + //###################################################################### // Delayed state, as a visitor of each AstNode diff --git a/src/V3Delayed.h b/src/V3Delayed.h index 99d88f1d9..81cf55b37 100644 --- a/src/V3Delayed.h +++ b/src/V3Delayed.h @@ -20,8 +20,10 @@ #ifndef _V3DELAYED_H_ #define _V3DELAYED_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp index 409ef02ad..e11b21497 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -29,15 +29,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Depth.h" #include "V3Ast.h" +#include +#include + //###################################################################### class DepthVisitor : public AstNVisitor { diff --git a/src/V3Depth.h b/src/V3Depth.h index ccb57690f..53bb831bc 100644 --- a/src/V3Depth.h +++ b/src/V3Depth.h @@ -20,8 +20,10 @@ #ifndef _V3DEPTH_H_ #define _V3DEPTH_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp index cdfb9e3f5..d8cc2c8de 100644 --- a/src/V3DepthBlock.cpp +++ b/src/V3DepthBlock.cpp @@ -26,16 +26,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3DepthBlock.h" #include "V3Ast.h" #include "V3EmitCBase.h" +#include +#include + //###################################################################### class DepthBlockVisitor : public AstNVisitor { diff --git a/src/V3DepthBlock.h b/src/V3DepthBlock.h index 260db45b5..a817a340b 100644 --- a/src/V3DepthBlock.h +++ b/src/V3DepthBlock.h @@ -20,8 +20,10 @@ #ifndef _V3DEPTHBLOCK_H_ #define _V3DEPTHBLOCK_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp index 5d044438e..9b46c5379 100644 --- a/src/V3Descope.cpp +++ b/src/V3Descope.cpp @@ -28,16 +28,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Descope.h" #include "V3Ast.h" #include "V3EmitCBase.h" +#include +#include + //###################################################################### class DescopeVisitor : public AstNVisitor { diff --git a/src/V3Descope.h b/src/V3Descope.h index d4d4bb014..3cb4f5965 100644 --- a/src/V3Descope.h +++ b/src/V3Descope.h @@ -20,8 +20,10 @@ #ifndef _V3DESCOPE_H_ #define _V3DESCOPE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index d60c01094..b96ecd795 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -20,14 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3String.h" @@ -37,6 +29,13 @@ #include "V3PartitionGraph.h" #include "V3TSP.h" +#include +#include +#include +#include +#include +#include VL_INCLUDE_UNORDERED_SET + #define VL_VALUE_STRING_MAX_WIDTH 8192 // We use a static char array in VL_VALUE_STRING #define EMITC_NUM_CONSTW 8 // Number of VL_CONST_W_*X's in verilated.h (IE VL_CONST_W_8X is last) diff --git a/src/V3EmitC.h b/src/V3EmitC.h index 28520f4d8..773298462 100644 --- a/src/V3EmitC.h +++ b/src/V3EmitC.h @@ -20,8 +20,10 @@ #ifndef _V3EMITC_H_ #define _V3EMITC_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitCBase.h b/src/V3EmitCBase.h index 88f5dfe4a..ee5491a7f 100644 --- a/src/V3EmitCBase.h +++ b/src/V3EmitCBase.h @@ -23,15 +23,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3File.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Base Visitor class -- holds output file pointer diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp index 19ff1196a..231a78873 100644 --- a/src/V3EmitCInlines.cpp +++ b/src/V3EmitCInlines.cpp @@ -20,18 +20,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3EmitC.h" #include "V3EmitCBase.h" #include "V3Stats.h" +#include +#include +#include +#include + //###################################################################### class EmitCInlines : EmitCBaseVisitor { diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index afa3e88ce..dc4f48250 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -20,20 +20,19 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3EmitC.h" #include "V3EmitCBase.h" #include "V3LanguageWords.h" +#include +#include +#include +#include +#include +#include + //###################################################################### // Symbol table emitting diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp index 04b1902dd..6dff7b6ca 100644 --- a/src/V3EmitMk.cpp +++ b/src/V3EmitMk.cpp @@ -20,19 +20,18 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Os.h" #include "V3EmitMk.h" #include "V3EmitCBase.h" +#include +#include +#include +#include +#include + //###################################################################### // Emit statements and math operators diff --git a/src/V3EmitMk.h b/src/V3EmitMk.h index 282694228..50f89e792 100644 --- a/src/V3EmitMk.h +++ b/src/V3EmitMk.h @@ -20,8 +20,10 @@ #ifndef _V3EMITMK_H_ #define _V3EMITMK_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp index 28ada1122..cbaa76e6c 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -20,18 +20,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3EmitV.h" #include "V3EmitCBase.h" +#include +#include +#include +#include +#include + //###################################################################### // Emit statements and math operators diff --git a/src/V3EmitV.h b/src/V3EmitV.h index bf8c2daa8..c22ceb30a 100644 --- a/src/V3EmitV.h +++ b/src/V3EmitV.h @@ -20,8 +20,10 @@ #ifndef _V3EMITV_H_ #define _V3EMITV_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp index d7fb97625..d8cf1caa8 100644 --- a/src/V3EmitXml.cpp +++ b/src/V3EmitXml.cpp @@ -20,19 +20,18 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3String.h" #include "V3EmitXml.h" #include "V3EmitCBase.h" +#include +#include +#include +#include +#include + //###################################################################### // Emit statements and math operators diff --git a/src/V3EmitXml.h b/src/V3EmitXml.h index 5a9ec3ecf..a6a4cb9de 100644 --- a/src/V3EmitXml.h +++ b/src/V3EmitXml.h @@ -20,8 +20,10 @@ #ifndef _V3EMITXML_H_ #define _V3EMITXML_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Error.cpp b/src/V3Error.cpp index 4336e9a22..e11e79f2c 100644 --- a/src/V3Error.cpp +++ b/src/V3Error.cpp @@ -18,10 +18,6 @@ // //************************************************************************* -#include -#include -#include -#include #include "V3Error.h" #ifndef _V3ERROR_NO_GLOBAL_ # include "V3Ast.h" @@ -29,6 +25,8 @@ # include "V3Stats.h" #endif +#include + //====================================================================== // Statics diff --git a/src/V3Error.h b/src/V3Error.h index 819363dd0..70a3f9822 100644 --- a/src/V3Error.h +++ b/src/V3Error.h @@ -20,16 +20,16 @@ #ifndef _V3ERROR_H_ #define _V3ERROR_H_ 1 + #include "config_build.h" #include "verilatedos.h" -#include -#include -#include + #include +#include +#include #include #include -#include -#include +#include //###################################################################### diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp index 95b5f0e25..067bfe197 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -31,15 +31,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Expand.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Expand state, as a visitor of each AstNode diff --git a/src/V3Expand.h b/src/V3Expand.h index 2483ef0f6..a743d1848 100644 --- a/src/V3Expand.h +++ b/src/V3Expand.h @@ -20,8 +20,10 @@ #ifndef _V3EXPAND_H_ #define _V3EXPAND_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3File.cpp b/src/V3File.cpp index 6b9e47222..d4baf5436 100644 --- a/src/V3File.cpp +++ b/src/V3File.cpp @@ -20,6 +20,13 @@ #include "config_build.h" #include "verilatedos.h" + +#include "V3Global.h" +#include "V3File.h" +#include "V3Os.h" +#include "V3PreShell.h" +#include "V3Ast.h" + #include #include #include @@ -28,7 +35,6 @@ #include #include #include -#include #if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) # define INFILTER_PIPE // Allow pipe filtering. Needs fork() @@ -46,12 +52,6 @@ # include #endif -#include "V3Global.h" -#include "V3File.h" -#include "V3Os.h" -#include "V3PreShell.h" -#include "V3Ast.h" - // If change this code, run a test with the below size set very small //#define INFILTER_IPC_BUFSIZ 16 #define INFILTER_IPC_BUFSIZ 64*1024 // For debug, try this as a small number diff --git a/src/V3File.h b/src/V3File.h index 5ba70e04a..46f401699 100644 --- a/src/V3File.h +++ b/src/V3File.h @@ -20,10 +20,12 @@ #ifndef _V3FILE_H_ #define _V3FILE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" -#include + #include #include #include diff --git a/src/V3FileLine.cpp b/src/V3FileLine.cpp index 4f06471b9..51961d195 100644 --- a/src/V3FileLine.cpp +++ b/src/V3FileLine.cpp @@ -20,10 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Error.h" #include "V3FileLine.h" @@ -34,6 +30,9 @@ # include "V3Config.h" #endif +#include +#include VL_INCLUDE_UNORDERED_SET + //###################################################################### // FileLineSingleton class functions diff --git a/src/V3FileLine.h b/src/V3FileLine.h index 83306fcbb..8c4db3d67 100644 --- a/src/V3FileLine.h +++ b/src/V3FileLine.h @@ -20,19 +20,19 @@ #ifndef _V3FileLine_H_ #define _V3FileLine_H_ 1 + #include "config_build.h" #include "verilatedos.h" -#include -#include + +#include "V3Error.h" +#include "V3LangCode.h" + #include #include #include #include #include -#include "V3Error.h" -#include "V3LangCode.h" - //###################################################################### class FileLine; diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index 87f252ad2..684187840 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -27,15 +27,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3Gate.h" @@ -45,6 +36,14 @@ #include "V3Stats.h" #include "V3Hashed.h" +#include +#include +#include +#include +#include +#include +#include VL_INCLUDE_UNORDERED_SET + typedef std::list GateVarRefList; #define GATE_DEDUP_MAX_DEPTH 20 diff --git a/src/V3Gate.h b/src/V3Gate.h index 8a66e425a..9ebd0820b 100644 --- a/src/V3Gate.h +++ b/src/V3Gate.h @@ -20,8 +20,10 @@ #ifndef _V3GATE_H_ #define _V3GATE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp index f5131ba61..ee911c71e 100644 --- a/src/V3GenClk.cpp +++ b/src/V3GenClk.cpp @@ -25,14 +25,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3GenClk.h" #include "V3Ast.h" +#include + //###################################################################### // GenClk state, as a visitor of each AstNode diff --git a/src/V3GenClk.h b/src/V3GenClk.h index bbd88bb59..7d11279e0 100644 --- a/src/V3GenClk.h +++ b/src/V3GenClk.h @@ -20,8 +20,10 @@ #ifndef _V3GENCLK_H_ #define _V3GENCLK_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Global.h b/src/V3Global.h index 965b3555e..0da3c02e3 100644 --- a/src/V3Global.h +++ b/src/V3Global.h @@ -27,12 +27,13 @@ #endif #include "verilatedos.h" -#include #include "V3Error.h" #include "V3FileLine.h" #include "V3Options.h" +#include + class AstNetlist; //====================================================================== diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp index 56c1f505d..595ab67c8 100644 --- a/src/V3Graph.cpp +++ b/src/V3Graph.cpp @@ -20,18 +20,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3File.h" #include "V3Graph.h" +#include +#include +#include +#include + int V3Graph::s_debug = 0; int V3Graph::debug() { return std::max(V3Error::debugDefault(), s_debug); } diff --git a/src/V3Graph.h b/src/V3Graph.h index 3937564f2..cd09dd40d 100644 --- a/src/V3Graph.h +++ b/src/V3Graph.h @@ -20,11 +20,13 @@ #ifndef _V3GRAPH_H_ #define _V3GRAPH_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3List.h" -#include + #include class FileLine; diff --git a/src/V3GraphAcyc.cpp b/src/V3GraphAcyc.cpp index 9152b076e..72a49f7ac 100644 --- a/src/V3GraphAcyc.cpp +++ b/src/V3GraphAcyc.cpp @@ -20,16 +20,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Graph.h" +#include +#include +#include +#include + //###################################################################### //###################################################################### // Algorithms - acyclic diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp index ea16c7ef5..6e894aed6 100644 --- a/src/V3GraphAlg.cpp +++ b/src/V3GraphAlg.cpp @@ -20,18 +20,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3GraphAlg.h" #include "V3GraphPathChecker.h" +#include +#include +#include +#include +#include + //###################################################################### //###################################################################### // Algorithms - delete diff --git a/src/V3GraphAlg.h b/src/V3GraphAlg.h index fdc3bd09c..663fd79d5 100644 --- a/src/V3GraphAlg.h +++ b/src/V3GraphAlg.h @@ -20,6 +20,7 @@ #ifndef _V3GRAPHALG_H_ #define _V3GRAPHALG_H_ 1 + #include "config_build.h" #include "verilatedos.h" diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp index 332cd9354..dae58bbcc 100644 --- a/src/V3GraphDfa.cpp +++ b/src/V3GraphDfa.cpp @@ -20,17 +20,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3GraphDfa.h" #include "V3GraphAlg.h" +#include +#include +#include +#include + //###################################################################### //###################################################################### // Algorithms - find starting node diff --git a/src/V3GraphDfa.h b/src/V3GraphDfa.h index 32fc9571b..8df75e0db 100644 --- a/src/V3GraphDfa.h +++ b/src/V3GraphDfa.h @@ -22,7 +22,6 @@ #define _V3GRAPHDFA_H_ 1 #include "config_build.h" #include "verilatedos.h" -#include #include "V3Ast.h" // for VNUser #include "V3Global.h" diff --git a/src/V3GraphStream.h b/src/V3GraphStream.h index 04e7f4e79..df06b7f98 100644 --- a/src/V3GraphStream.h +++ b/src/V3GraphStream.h @@ -24,11 +24,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include VL_INCLUDE_UNORDERED_MAP #include "V3Graph.h" +#include +#include VL_INCLUDE_UNORDERED_MAP + //###################################################################### // GraphStream // diff --git a/src/V3GraphTest.cpp b/src/V3GraphTest.cpp index f7371efed..2413a4be8 100644 --- a/src/V3GraphTest.cpp +++ b/src/V3GraphTest.cpp @@ -20,14 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3Graph.h" #include "V3GraphDfa.h" +#include + //###################################################################### //###################################################################### // Test class diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp index 5a6fac63a..ef485e289 100644 --- a/src/V3Hashed.cpp +++ b/src/V3Hashed.cpp @@ -27,19 +27,18 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Hashed.h" #include "V3Ast.h" #include "V3File.h" +#include +#include +#include +#include +#include + //###################################################################### // Hashed state, as a visitor of each AstNode diff --git a/src/V3Hashed.h b/src/V3Hashed.h index d020a4d85..aa95a3fa3 100644 --- a/src/V3Hashed.h +++ b/src/V3Hashed.h @@ -22,11 +22,10 @@ #define _V3HASHED_H_ 1 #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" -#include - //============================================================================ class VHashedBase { diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index f4aa8ff6a..8291bdbaf 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -30,12 +30,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3Inline.h" @@ -44,6 +38,11 @@ #include "V3Ast.h" #include "V3String.h" +#include +#include +#include +#include VL_INCLUDE_UNORDERED_SET + // CONFIG static const int INLINE_MODS_SMALLER = 100; // If a mod is < this # nodes, can always inline it diff --git a/src/V3Inline.h b/src/V3Inline.h index 1b5073be2..dd535b201 100644 --- a/src/V3Inline.h +++ b/src/V3Inline.h @@ -20,8 +20,10 @@ #ifndef _V3INLINE_H_ #define _V3INLINE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index 16923f8a3..3cf97c6ce 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -27,10 +27,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Inst.h" @@ -38,6 +34,9 @@ #include "V3Changed.h" #include "V3Const.h" +#include +#include + //###################################################################### // Inst state, as a visitor of each AstNode diff --git a/src/V3Inst.h b/src/V3Inst.h index 57700f3d0..a17b4f04d 100644 --- a/src/V3Inst.h +++ b/src/V3Inst.h @@ -20,8 +20,10 @@ #ifndef _V3INST_H_ #define _V3INST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3InstrCount.cpp b/src/V3InstrCount.cpp index 0ef86912b..325d5c3ae 100644 --- a/src/V3InstrCount.cpp +++ b/src/V3InstrCount.cpp @@ -21,11 +21,12 @@ #include "config_build.h" #include "verilatedos.h" -#include #include "V3Ast.h" #include "V3InstrCount.h" +#include + /// Estimate the instruction cost for executing all logic within and below /// a given AST node. Note this estimates the number of instructions we'll /// execute, not the number we'll generate. That is, for conditionals, diff --git a/src/V3LangCode.h b/src/V3LangCode.h index d79d57e0f..aa0d7b572 100644 --- a/src/V3LangCode.h +++ b/src/V3LangCode.h @@ -24,7 +24,6 @@ #include "config_build.h" #include "verilatedos.h" -#include #include #include #include diff --git a/src/V3LanguageWords.h b/src/V3LanguageWords.h index 5c9a82ec4..cc3a1a9b2 100644 --- a/src/V3LanguageWords.h +++ b/src/V3LanguageWords.h @@ -20,8 +20,10 @@ #ifndef _V3LANGUAGEWORDS_H_ #define _V3LANGUAGEWORDS_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include //============================================================================ diff --git a/src/V3Life.cpp b/src/V3Life.cpp index 99bd7ba33..ac9c833ea 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -29,11 +29,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Life.h" @@ -41,6 +36,10 @@ #include "V3Ast.h" #include "V3Const.h" +#include +#include +#include + //###################################################################### // Structure for global state diff --git a/src/V3Life.h b/src/V3Life.h index 674fad113..550aefd61 100644 --- a/src/V3Life.h +++ b/src/V3Life.h @@ -20,8 +20,10 @@ #ifndef _V3LIFE_H_ #define _V3LIFE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index e510f2038..620c3f5df 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -30,11 +30,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include // for vl_unique_ptr -> auto_ptr or unique_ptr -#include -#include VL_INCLUDE_UNORDERED_MAP #include "V3Global.h" #include "V3PartitionGraph.h" @@ -43,6 +38,10 @@ #include "V3Stats.h" #include "V3Ast.h" +#include +#include // for vl_unique_ptr -> auto_ptr or unique_ptr +#include VL_INCLUDE_UNORDERED_MAP + //###################################################################### // LifePost class functions diff --git a/src/V3LifePost.h b/src/V3LifePost.h index d4e1fe626..d7e1c3a4e 100644 --- a/src/V3LifePost.h +++ b/src/V3LifePost.h @@ -20,8 +20,10 @@ #ifndef _V3LIFEPOST_H_ #define _V3LIFEPOST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp index 827f745b0..9556ee2e7 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -29,13 +29,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3LinkCells.h" @@ -44,6 +37,12 @@ #include "V3Ast.h" #include "V3Graph.h" +#include +#include +#include +#include +#include VL_INCLUDE_UNORDERED_SET + //###################################################################### // Graph subclasses diff --git a/src/V3LinkCells.h b/src/V3LinkCells.h index 6aaf690ff..1720d9a2c 100644 --- a/src/V3LinkCells.h +++ b/src/V3LinkCells.h @@ -20,8 +20,10 @@ #ifndef _V3LINKCELLS_H_ #define _V3LINKCELLS_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index e990639a3..921751ce9 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -65,12 +65,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3LinkDot.h" @@ -80,6 +74,11 @@ #include "V3ParseImp.h" #include "V3String.h" +#include +#include +#include +#include + //###################################################################### // LinkDot state, as a visitor of each AstNode diff --git a/src/V3LinkDot.h b/src/V3LinkDot.h index 3592e79a5..e9fed9138 100644 --- a/src/V3LinkDot.h +++ b/src/V3LinkDot.h @@ -20,8 +20,10 @@ #ifndef _V3LINKDOT_H_ #define _V3LINKDOT_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp index 93c04a0b9..1f86f77b0 100644 --- a/src/V3LinkJump.cpp +++ b/src/V3LinkJump.cpp @@ -28,16 +28,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3LinkJump.h" #include "V3Ast.h" +#include +#include +#include + //###################################################################### class LinkJumpVisitor : public AstNVisitor { diff --git a/src/V3LinkJump.h b/src/V3LinkJump.h index b6bf89376..21fcaabd4 100644 --- a/src/V3LinkJump.h +++ b/src/V3LinkJump.h @@ -20,8 +20,10 @@ #ifndef _V3LINKJUMP_H_ #define _V3LINKJUMP_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp index 10b6e6c32..41073c419 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -24,17 +24,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3LinkLValue.h" #include "V3Ast.h" +#include +#include +#include +#include + //###################################################################### // Link state, as a visitor of each AstNode diff --git a/src/V3LinkLValue.h b/src/V3LinkLValue.h index 91ad8d5d5..d08ffb99b 100644 --- a/src/V3LinkLValue.h +++ b/src/V3LinkLValue.h @@ -20,8 +20,10 @@ #ifndef _V3LINKLVALUE_H_ #define _V3LINKLVALUE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp index e0ac8bbe7..139850f7d 100644 --- a/src/V3LinkLevel.cpp +++ b/src/V3LinkLevel.cpp @@ -25,17 +25,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3LinkLevel.h" #include "V3Ast.h" +#include +#include +#include +#include + //###################################################################### // Levelizing class functions diff --git a/src/V3LinkLevel.h b/src/V3LinkLevel.h index f048196ad..1af721372 100644 --- a/src/V3LinkLevel.h +++ b/src/V3LinkLevel.h @@ -20,8 +20,10 @@ #ifndef _V3LINKLEVEL_H_ #define _V3LINKLEVEL_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp index e2b61e4ff..3083f6fbb 100644 --- a/src/V3LinkParse.cpp +++ b/src/V3LinkParse.cpp @@ -24,18 +24,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3LinkParse.h" #include "V3Ast.h" +#include +#include +#include +#include +#include + //###################################################################### // Link state, as a visitor of each AstNode diff --git a/src/V3LinkParse.h b/src/V3LinkParse.h index 0bf572db3..243b846ab 100644 --- a/src/V3LinkParse.h +++ b/src/V3LinkParse.h @@ -20,8 +20,10 @@ #ifndef _V3LINKPARSE_H_ #define _V3LINKPARSE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index 3f973375d..7d32bbb07 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -30,18 +30,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3String.h" #include "V3LinkResolve.h" #include "V3Ast.h" +#include +#include +#include +#include + //###################################################################### // Link state, as a visitor of each AstNode diff --git a/src/V3LinkResolve.h b/src/V3LinkResolve.h index 43635d9b6..89b3e0eed 100644 --- a/src/V3LinkResolve.h +++ b/src/V3LinkResolve.h @@ -20,8 +20,10 @@ #ifndef _V3LINKRESOLVE_H_ #define _V3LINKRESOLVE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3List.h b/src/V3List.h index 8922fa421..427eaaa43 100644 --- a/src/V3List.h +++ b/src/V3List.h @@ -20,8 +20,10 @@ #ifndef _V3LIST_H_ #define _V3LIST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include //============================================================================ diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp index 5427f32e7..a218cf0af 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -28,16 +28,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Localize.h" #include "V3Stats.h" #include "V3Ast.h" +#include +#include + //###################################################################### // Localize base class diff --git a/src/V3Localize.h b/src/V3Localize.h index acfa58fec..a042f191f 100644 --- a/src/V3Localize.h +++ b/src/V3Localize.h @@ -20,8 +20,10 @@ #ifndef _V3LOCALIZE_H_ #define _V3LOCALIZE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Name.cpp b/src/V3Name.cpp index 764c3417d..6c5f1592b 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -25,16 +25,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Name.h" #include "V3Ast.h" #include "V3LanguageWords.h" +#include +#include + //###################################################################### // Name state, as a visitor of each AstNode diff --git a/src/V3Name.h b/src/V3Name.h index 293032a4b..207bb2f1e 100644 --- a/src/V3Name.h +++ b/src/V3Name.h @@ -20,8 +20,10 @@ #ifndef _V3NAME_H_ #define _V3NAME_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Number.cpp b/src/V3Number.cpp index 9f4209473..85e443c33 100644 --- a/src/V3Number.cpp +++ b/src/V3Number.cpp @@ -20,15 +20,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Number.h" +#include +#include +#include +#include + #define MAX_SPRINTF_DOUBLE_SIZE 100 // Maximum characters with a sprintf %e/%f/%g (probably < 30) //###################################################################### diff --git a/src/V3Number.h b/src/V3Number.h index be38265ac..188f1629d 100644 --- a/src/V3Number.h +++ b/src/V3Number.h @@ -20,13 +20,15 @@ #ifndef _V3NUMBER_H_ #define _V3NUMBER_H_ 1 + #include "config_build.h" #include "verilatedos.h" -#include #include "V3Error.h" #include "V3FileLine.h" +#include + //============================================================================ class V3Number { diff --git a/src/V3Number_test.cpp b/src/V3Number_test.cpp index d58fc42d6..b6684a4a1 100644 --- a/src/V3Number_test.cpp +++ b/src/V3Number_test.cpp @@ -21,17 +21,18 @@ // CHEAT! #define V3NUMBER_ASCII_BINARY #define _V3ERROR_NO_GLOBAL_ 1 -#include "V3Error.cpp" -#include "V3FileLine.cpp" -#include "V3Number.cpp" #include #include "verilatedos.h" -#include -#include -#include + +#include "V3Error.cpp" +#include "V3FileLine.cpp" +#include "V3Number.cpp" #include "V3Number.h" +#include +#include + void test(const string& lhss, const string& op, const string& rhss, const string& exps) { char* l1 = strdup(lhss.c_str()); char* r1 = strdup(rhss.c_str()); diff --git a/src/V3Options.cpp b/src/V3Options.cpp index 703b732fe..8a8ef854a 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -20,6 +20,15 @@ #include "config_build.h" #include "verilatedos.h" + +#include "V3Global.h" +#include "V3String.h" +#include "V3Os.h" +#include "V3Options.h" +#include "V3Error.h" +#include "V3File.h" +#include "V3PreShell.h" + #include #include #ifndef _WIN32 @@ -32,15 +41,6 @@ #include #include #include -#include - -#include "V3Global.h" -#include "V3String.h" -#include "V3Os.h" -#include "V3Options.h" -#include "V3Error.h" -#include "V3File.h" -#include "V3PreShell.h" #include "config_rev.h" diff --git a/src/V3Options.h b/src/V3Options.h index 149334460..2d44a10f0 100644 --- a/src/V3Options.h +++ b/src/V3Options.h @@ -23,14 +23,15 @@ #include "config_build.h" #include "verilatedos.h" + +#include "V3Global.h" +#include "V3LangCode.h" + #include #include #include #include -#include "V3Global.h" -#include "V3LangCode.h" - class V3OptionsImp; class FileLine; diff --git a/src/V3Order.cpp b/src/V3Order.cpp index b8d0d65f4..eddb04b5b 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -78,16 +78,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "V3Ast.h" #include "V3Const.h" @@ -106,6 +96,14 @@ #include "V3Order.h" #include "V3OrderGraph.h" +#include +#include +#include +#include +#include +#include +#include +#include #include VL_INCLUDE_UNORDERED_MAP #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3Order.h b/src/V3Order.h index c8cbf9891..8f2fc5e80 100644 --- a/src/V3Order.h +++ b/src/V3Order.h @@ -20,8 +20,10 @@ #ifndef _V3ORDER_H_ #define _V3ORDER_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3OrderGraph.h b/src/V3OrderGraph.h index 81ff4bcb5..94cc4a17c 100644 --- a/src/V3OrderGraph.h +++ b/src/V3OrderGraph.h @@ -46,8 +46,10 @@ #include "config_build.h" #include "verilatedos.h" + #include "V3Ast.h" #include "V3Graph.h" + #include VL_INCLUDE_UNORDERED_MAP class OrderVisitor; diff --git a/src/V3Os.cpp b/src/V3Os.cpp index f747533c9..35588685f 100644 --- a/src/V3Os.cpp +++ b/src/V3Os.cpp @@ -20,10 +20,14 @@ #include "config_build.h" #include "verilatedos.h" + +#include "V3Global.h" +#include "V3String.h" +#include "V3Os.h" + #include #include #include -#include #include #include #include @@ -31,15 +35,11 @@ #include #include #include -#include #if defined(WIN32) || defined(__MINGW32__) # include // mkdir #endif -#include "V3Global.h" -#include "V3String.h" -#include "V3Os.h" //###################################################################### // Environment diff --git a/src/V3Os.h b/src/V3Os.h index 742614407..ebaf6298d 100644 --- a/src/V3Os.h +++ b/src/V3Os.h @@ -20,10 +20,11 @@ #ifndef _V3OS_H_ #define _V3OS_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" -#include //============================================================================ // V3Os: OS static class diff --git a/src/V3Param.cpp b/src/V3Param.cpp index 4ae35d039..d47b67f93 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -50,12 +50,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Param.h" @@ -65,6 +59,11 @@ #include "V3Width.h" #include "V3Unroll.h" +#include +#include +#include +#include + //###################################################################### // Param state, as a visitor of each AstNode diff --git a/src/V3Param.h b/src/V3Param.h index 021d9df23..e07f08036 100644 --- a/src/V3Param.h +++ b/src/V3Param.h @@ -20,8 +20,10 @@ #ifndef _V3PARAM_H_ #define _V3PARAM_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Parse.h b/src/V3Parse.h index a9f0332a6..edbf2fac0 100644 --- a/src/V3Parse.h +++ b/src/V3Parse.h @@ -20,8 +20,10 @@ #ifndef _V3PARSE_H_ #define _V3PARSE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Global.h" diff --git a/src/V3ParseImp.cpp b/src/V3ParseImp.cpp index 4a9e105b2..f0f8974da 100644 --- a/src/V3ParseImp.cpp +++ b/src/V3ParseImp.cpp @@ -28,11 +28,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Error.h" #include "V3Global.h" @@ -42,6 +37,10 @@ #include "V3ParseImp.h" #include "V3PreShell.h" +#include +#include +#include + //====================================================================== // Globals diff --git a/src/V3ParseImp.h b/src/V3ParseImp.h index a268148a7..12e6a29c7 100644 --- a/src/V3ParseImp.h +++ b/src/V3ParseImp.h @@ -20,13 +20,16 @@ #ifndef _V3PARSEIMP_H_ #define _V3PARSEIMP_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3FileLine.h" #include "V3Global.h" #include "V3Parse.h" #include "V3ParseSym.h" + #include class V3Lexer; diff --git a/src/V3ParseLex.cpp b/src/V3ParseLex.cpp index 240e990a0..9b6c6f981 100644 --- a/src/V3ParseLex.cpp +++ b/src/V3ParseLex.cpp @@ -20,16 +20,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Error.h" #include "V3Global.h" #include "V3File.h" #include "V3ParseImp.h" +#include +#include + //====================================================================== // Build in LEX script diff --git a/src/V3ParseSym.h b/src/V3ParseSym.h index d7ec15c6a..0af3efbf4 100644 --- a/src/V3ParseSym.h +++ b/src/V3ParseSym.h @@ -20,12 +20,15 @@ #ifndef _V3PARSESYM_H_ #define _V3PARSESYM_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3FileLine.h" #include "V3Global.h" #include "V3SymTable.h" + #include //###################################################################### diff --git a/src/V3Partition.cpp b/src/V3Partition.cpp index 49ba02e9b..ce23d2d96 100644 --- a/src/V3Partition.cpp +++ b/src/V3Partition.cpp @@ -20,9 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Os.h" #include "V3File.h" @@ -34,6 +31,9 @@ #include "V3PartitionGraph.h" #include "V3Scoreboard.h" #include "V3Stats.h" + +#include +#include #include VL_INCLUDE_UNORDERED_SET class MergeCandidate; diff --git a/src/V3Partition.h b/src/V3Partition.h index ae5606a8e..eec43a459 100644 --- a/src/V3Partition.h +++ b/src/V3Partition.h @@ -23,11 +23,12 @@ #include "config_build.h" #include "verilatedos.h" -#include #include "V3Graph.h" #include "V3OrderGraph.h" +#include + class LogicMTask; typedef vl_unordered_map Vx2MTaskMap; diff --git a/src/V3PartitionGraph.h b/src/V3PartitionGraph.h index 5ac29082a..9234ca730 100644 --- a/src/V3PartitionGraph.h +++ b/src/V3PartitionGraph.h @@ -23,11 +23,12 @@ #include "config_build.h" #include "verilatedos.h" -#include #include "V3Graph.h" #include "V3OrderGraph.h" +#include + //************************************************************************* // MTasks and graph structures diff --git a/src/V3PreLex.h b/src/V3PreLex.h index f46e67cdf..783e2a0d2 100644 --- a/src/V3PreLex.h +++ b/src/V3PreLex.h @@ -25,12 +25,12 @@ #ifndef _VPREPROCLEX_H_ // Guard #define _VPREPROCLEX_H_ 1 -#include -#include - #include "V3Error.h" #include "V3FileLine.h" +#include +#include + //====================================================================== class V3PreLex; diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp index 9e0c63dbc..128c769b7 100644 --- a/src/V3PreProc.cpp +++ b/src/V3PreProc.cpp @@ -20,15 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "V3Error.h" #include "V3Global.h" @@ -37,6 +28,12 @@ #include "V3PreProc.h" #include "V3PreShell.h" +#include +#include +#include +#include +#include + //====================================================================== // Build in LEX script diff --git a/src/V3PreProc.h b/src/V3PreProc.h index 02979913a..901abc23d 100644 --- a/src/V3PreProc.h +++ b/src/V3PreProc.h @@ -23,10 +23,10 @@ #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3FileLine.h" -#include #include #include #include diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp index d7a66472d..030ff0515 100644 --- a/src/V3PreShell.cpp +++ b/src/V3PreShell.cpp @@ -20,13 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3PreShell.h" @@ -35,6 +28,12 @@ #include "V3Parse.h" #include "V3Os.h" +#include +#include +#include +#include +#include + //###################################################################### class V3PreShellImp { diff --git a/src/V3PreShell.h b/src/V3PreShell.h index 1948ada8f..64cf9d3bd 100644 --- a/src/V3PreShell.h +++ b/src/V3PreShell.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3FileLine.h" diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index 7a30bb4a1..134786c67 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -30,16 +30,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Premit.h" #include "V3Ast.h" +#include +#include +#include //###################################################################### // Structure for global state diff --git a/src/V3Premit.h b/src/V3Premit.h index f54771bc0..875f9cb82 100644 --- a/src/V3Premit.h +++ b/src/V3Premit.h @@ -20,8 +20,10 @@ #ifndef _V3PREMIT_H_ #define _V3PREMIT_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp index 9fb26d485..bbc0b8992 100644 --- a/src/V3Reloop.cpp +++ b/src/V3Reloop.cpp @@ -35,16 +35,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Reloop.h" #include "V3Stats.h" #include "V3Ast.h" +#include +#include + #define RELOOP_MIN_ITERS 40 // Need at least this many loops to do this optimization //###################################################################### diff --git a/src/V3Reloop.h b/src/V3Reloop.h index c5899a42f..955fef1fa 100644 --- a/src/V3Reloop.h +++ b/src/V3Reloop.h @@ -20,8 +20,10 @@ #ifndef _V3RELOOP_H_ #define _V3RELOOP_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index 2b1b53f99..3845bd4f7 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -27,19 +27,18 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_MAP -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3Scope.h" #include "V3Ast.h" +#include +#include +#include +#include +#include VL_INCLUDE_UNORDERED_MAP +#include VL_INCLUDE_UNORDERED_SET + //###################################################################### // Scope class functions diff --git a/src/V3Scope.h b/src/V3Scope.h index eb18c018f..20e33d57d 100644 --- a/src/V3Scope.h +++ b/src/V3Scope.h @@ -20,8 +20,10 @@ #ifndef _V3SCOPE_H_ #define _V3SCOPE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Scoreboard.h b/src/V3Scoreboard.h index 7b6832c4b..376a5ff17 100644 --- a/src/V3Scoreboard.h +++ b/src/V3Scoreboard.h @@ -30,9 +30,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include "V3Error.h" + +#include #include VL_INCLUDE_UNORDERED_MAP #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3SenTree.h b/src/V3SenTree.h index c9c4c14fd..7a63ce31d 100644 --- a/src/V3SenTree.h +++ b/src/V3SenTree.h @@ -35,18 +35,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3Ast.h" #include "V3Hashed.h" +#include +#include +#include +#include +#include VL_INCLUDE_UNORDERED_SET + //###################################################################### // Collect SenTrees under the entire scope // And provide functions to find/add a new one diff --git a/src/V3Simulate.h b/src/V3Simulate.h index 220ecf105..3e0b2e2e0 100644 --- a/src/V3Simulate.h +++ b/src/V3Simulate.h @@ -36,8 +36,10 @@ #ifndef _V3SIMULATE_H_ #define _V3SIMULATE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" #include "V3Width.h" diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp index be75fca1c..2ae85dbae 100644 --- a/src/V3Slice.cpp +++ b/src/V3Slice.cpp @@ -41,14 +41,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3Slice.h" #include "V3Ast.h" +#include + //************************************************************************* class SliceVisitor : public AstNVisitor { diff --git a/src/V3Slice.h b/src/V3Slice.h index 3415a8d17..1f1466f0b 100644 --- a/src/V3Slice.h +++ b/src/V3Slice.h @@ -20,8 +20,10 @@ #ifndef _V3SLICE_H_ #define _V3SLICE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Split.cpp b/src/V3Split.cpp index 67b358dbe..b53923a05 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -83,14 +83,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_MAP -#include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" #include "V3Split.h" @@ -98,6 +90,13 @@ #include "V3Ast.h" #include "V3Graph.h" +#include +#include +#include +#include +#include VL_INCLUDE_UNORDERED_MAP +#include VL_INCLUDE_UNORDERED_SET + //###################################################################### // Support classes diff --git a/src/V3Split.h b/src/V3Split.h index b6016f5b7..107eb1e5f 100644 --- a/src/V3Split.h +++ b/src/V3Split.h @@ -20,8 +20,10 @@ #ifndef _V3SPLIT_H_ #define _V3SPLIT_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp index 86f854993..efed5829b 100644 --- a/src/V3SplitAs.cpp +++ b/src/V3SplitAs.cpp @@ -27,18 +27,17 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3SplitAs.h" #include "V3Stats.h" #include "V3Ast.h" +#include +#include +#include +#include + //###################################################################### class SplitAsBaseVisitor : public AstNVisitor { diff --git a/src/V3SplitAs.h b/src/V3SplitAs.h index c6c833766..af0238c14 100644 --- a/src/V3SplitAs.h +++ b/src/V3SplitAs.h @@ -20,8 +20,10 @@ #ifndef _V3SPLITAS_H_ #define _V3SPLITAS_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp index cd41d908c..f36351c4a 100644 --- a/src/V3Stats.cpp +++ b/src/V3Stats.cpp @@ -20,11 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Stats.h" @@ -34,6 +29,10 @@ // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators #include "V3AstConstOnly.h" +#include +#include +#include + //###################################################################### // Stats class functions diff --git a/src/V3Stats.h b/src/V3Stats.h index fd1893126..7d0673bd9 100644 --- a/src/V3Stats.h +++ b/src/V3Stats.h @@ -20,8 +20,10 @@ #ifndef _V3STATS_H_ #define _V3STATS_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" class AstNetlist; diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp index 89e36c0ea..dfefc9258 100644 --- a/src/V3StatsReport.cpp +++ b/src/V3StatsReport.cpp @@ -20,12 +20,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include VL_INCLUDE_UNORDERED_MAP #include "V3Global.h" #include "V3Stats.h" @@ -33,6 +27,11 @@ #include "V3File.h" #include "V3Os.h" +#include +#include +#include +#include VL_INCLUDE_UNORDERED_MAP + //###################################################################### // Stats dumping diff --git a/src/V3String.cpp b/src/V3String.cpp index 8a752b4c3..9c93439ef 100644 --- a/src/V3String.cpp +++ b/src/V3String.cpp @@ -25,7 +25,6 @@ #include "V3String.h" #include "V3Error.h" - size_t VName::s_minLength = 32; size_t VName::s_maxLength = 0; // Disabled diff --git a/src/V3String.h b/src/V3String.h index 543acc96c..46bdafd16 100644 --- a/src/V3String.h +++ b/src/V3String.h @@ -23,8 +23,8 @@ #include "config_build.h" #include "verilatedos.h" + #include -#include "V3Error.h" //###################################################################### // VString - String manipulation diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp index 9b8ea5657..96bf0afcb 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -28,11 +28,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Subst.h" @@ -40,6 +35,10 @@ #include "V3Stats.h" #include "V3Ast.h" +#include +#include +#include + //###################################################################### // Common debugging baseclass diff --git a/src/V3Subst.h b/src/V3Subst.h index 7b673e139..2fac2b6f5 100644 --- a/src/V3Subst.h +++ b/src/V3Subst.h @@ -20,8 +20,10 @@ #ifndef _V3SUBST_H_ #define _V3SUBST_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3SymTable.h b/src/V3SymTable.h index d83132540..19fc436de 100644 --- a/src/V3SymTable.h +++ b/src/V3SymTable.h @@ -23,17 +23,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Ast.h" #include "V3File.h" +#include +#include +#include +#include + class VSymGraph; class VSymEnt; diff --git a/src/V3TSP.cpp b/src/V3TSP.cpp index 867a4e537..2536aa827 100644 --- a/src/V3TSP.cpp +++ b/src/V3TSP.cpp @@ -25,11 +25,15 @@ #include "config_build.h" #include "verilatedos.h" +#include "V3Error.h" +#include "V3Global.h" +#include "V3File.h" +#include "V3Graph.h" +#include "V3TSP.h" + #include #include -#include #include -#include #include #include #include @@ -39,12 +43,6 @@ #include #include #include - -#include "V3Error.h" -#include "V3Global.h" -#include "V3File.h" -#include "V3Graph.h" -#include "V3TSP.h" #include VL_INCLUDE_UNORDERED_SET #include VL_INCLUDE_UNORDERED_MAP diff --git a/src/V3TSP.h b/src/V3TSP.h index 81f072443..328fa4a05 100644 --- a/src/V3TSP.h +++ b/src/V3TSP.h @@ -21,8 +21,10 @@ #ifndef _V3TSP_H_ #define _V3TSP_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" namespace V3TSP { diff --git a/src/V3Table.cpp b/src/V3Table.cpp index 69160eb9c..8edb7b27c 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -27,11 +27,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Table.h" @@ -39,6 +34,10 @@ #include "V3Stats.h" #include "V3Ast.h" +#include +#include +#include + //###################################################################### // Table class functions diff --git a/src/V3Table.h b/src/V3Table.h index f991e68a0..f1ac5aaee 100644 --- a/src/V3Table.h +++ b/src/V3Table.h @@ -20,8 +20,10 @@ #ifndef _V3TABLE_H_ #define _V3TABLE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Task.cpp b/src/V3Task.cpp index 134ab28a0..921c559bc 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -29,10 +29,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Const.h" @@ -43,6 +39,9 @@ #include "V3Graph.h" #include "V3LinkLValue.h" +#include +#include + //###################################################################### // Graph subclasses diff --git a/src/V3Task.h b/src/V3Task.h index 354a989dc..b79d2a24d 100644 --- a/src/V3Task.h +++ b/src/V3Task.h @@ -20,10 +20,13 @@ #ifndef _V3TASK_H_ #define _V3TASK_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" + #include //============================================================================ diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp index 9c8aac714..2fa41f2ad 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -48,11 +48,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Trace.h" @@ -61,6 +56,10 @@ #include "V3Hashed.h" #include "V3Stats.h" +#include +#include +#include + //###################################################################### // Graph vertexes diff --git a/src/V3Trace.h b/src/V3Trace.h index c9397bc06..bf7350fcd 100644 --- a/src/V3Trace.h +++ b/src/V3Trace.h @@ -20,8 +20,10 @@ #ifndef _V3TRACE_H_ #define _V3TRACE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index f2274f752..660b6fb31 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -26,15 +26,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3TraceDecl.h" #include "V3EmitCBase.h" #include "V3Stats.h" +#include + //###################################################################### // TraceDecl state, as a visitor of each AstNode diff --git a/src/V3TraceDecl.h b/src/V3TraceDecl.h index 13b829fad..d246643f3 100644 --- a/src/V3TraceDecl.h +++ b/src/V3TraceDecl.h @@ -20,8 +20,10 @@ #ifndef _V3TRACEDECL_H_ #define _V3TRACEDECL_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp index d1a6b262c..eb2e78997 100644 --- a/src/V3Tristate.cpp +++ b/src/V3Tristate.cpp @@ -59,11 +59,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3Tristate.h" @@ -74,6 +69,10 @@ #include "V3Stats.h" #include "V3Graph.h" +#include +#include +#include + //###################################################################### class TristateBaseVisitor : public AstNVisitor { diff --git a/src/V3Tristate.h b/src/V3Tristate.h index e0721378e..989244e5e 100644 --- a/src/V3Tristate.h +++ b/src/V3Tristate.h @@ -20,8 +20,10 @@ #ifndef _V3TRISTATE_H_ #define _V3TRISTATE_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp index cb957eb21..2d5a84697 100644 --- a/src/V3Undriven.cpp +++ b/src/V3Undriven.cpp @@ -29,17 +29,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include #include "V3Global.h" #include "V3String.h" #include "V3Undriven.h" #include "V3Ast.h" +#include +#include +#include + //###################################################################### // Class for every variable we may process diff --git a/src/V3Undriven.h b/src/V3Undriven.h index d7ae56093..52e939e4e 100644 --- a/src/V3Undriven.h +++ b/src/V3Undriven.h @@ -20,8 +20,10 @@ #ifndef _V3UNDRIVEN_H_ #define _V3UNDRIVEN_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index affff96c4..77035aabb 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -33,10 +33,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Unknown.h" @@ -44,6 +40,9 @@ #include "V3Const.h" #include "V3Stats.h" +#include +#include + //###################################################################### class UnknownVisitor : public AstNVisitor { diff --git a/src/V3Unknown.h b/src/V3Unknown.h index a6c30f1be..8d886aa7c 100644 --- a/src/V3Unknown.h +++ b/src/V3Unknown.h @@ -20,8 +20,10 @@ #ifndef _V3UNKNOWN_H_ #define _V3UNKNOWN_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp index b11790178..549531fd7 100644 --- a/src/V3Unroll.cpp +++ b/src/V3Unroll.cpp @@ -30,10 +30,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include "V3Global.h" #include "V3Unroll.h" @@ -42,6 +38,9 @@ #include "V3Ast.h" #include "V3Simulate.h" +#include +#include + //###################################################################### // Unroll state, as a visitor of each AstNode diff --git a/src/V3Unroll.h b/src/V3Unroll.h index 1d17cd23b..ec3b05630 100644 --- a/src/V3Unroll.h +++ b/src/V3Unroll.h @@ -20,8 +20,10 @@ #ifndef _V3UNROLL_H_ #define _V3UNROLL_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3Width.cpp b/src/V3Width.cpp index aa520ee3e..2ee91053b 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -69,9 +69,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3Width.h" @@ -80,6 +77,8 @@ #include "V3String.h" #include "V3Task.h" +#include + // More code; this file was getting too large; see actions there #define _V3WIDTH_CPP_ #include "V3WidthCommit.h" diff --git a/src/V3Width.h b/src/V3Width.h index 28accd95c..dece2c31f 100644 --- a/src/V3Width.h +++ b/src/V3Width.h @@ -20,8 +20,10 @@ #ifndef _V3WIDTH_H_ #define _V3WIDTH_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3WidthCommit.h b/src/V3WidthCommit.h index bdccabb55..99c1c482c 100644 --- a/src/V3WidthCommit.h +++ b/src/V3WidthCommit.h @@ -20,8 +20,10 @@ #ifndef _V3WIDTHCOMMIT_H_ #define _V3WIDTHCOMMIT_H_ 1 + #include "config_build.h" #include "verilatedos.h" + #include "V3Error.h" #include "V3Ast.h" diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp index e4dd5661a..71519b767 100644 --- a/src/V3WidthSel.cpp +++ b/src/V3WidthSel.cpp @@ -32,14 +32,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include "V3Global.h" #include "V3Width.h" #include "V3Const.h" +#include + //###################################################################### // Width state, as a visitor of each AstNode diff --git a/src/Verilator.cpp b/src/Verilator.cpp index ef71bc064..37506f5e2 100644 --- a/src/Verilator.cpp +++ b/src/Verilator.cpp @@ -20,8 +20,6 @@ #include "V3Global.h" #include "V3Ast.h" -#include -#include #include "V3Active.h" #include "V3ActiveTop.h" @@ -96,6 +94,9 @@ #include "V3Unroll.h" #include "V3Width.h" +#include +#include + V3Global v3Global; //###################################################################### diff --git a/src/VlcMain.cpp b/src/VlcMain.cpp index f76efe8c1..2b8af1a6b 100644 --- a/src/VlcMain.cpp +++ b/src/VlcMain.cpp @@ -26,10 +26,6 @@ #include "verilatedos.h" -#include -#include -#include - #define _V3ERROR_NO_GLOBAL_ 1 #include "V3Error.cpp" #include "V3String.cpp" @@ -39,6 +35,9 @@ #include "VlcOptions.h" #include "VlcTop.h" +#include +#include + //###################################################################### // VlcOptions diff --git a/src/VlcOptions.h b/src/VlcOptions.h index cf767d23e..1aab326e4 100644 --- a/src/VlcOptions.h +++ b/src/VlcOptions.h @@ -23,13 +23,13 @@ #include "config_build.h" #include "verilatedos.h" -#include + +#include "config_rev.h" + #include #include #include -#include "config_rev.h" - //###################################################################### // V3Options - Command line options diff --git a/src/VlcPoint.h b/src/VlcPoint.h index c3e27458e..f8dd95432 100644 --- a/src/VlcPoint.h +++ b/src/VlcPoint.h @@ -23,7 +23,9 @@ #include "config_build.h" #include "verilatedos.h" + #include "verilated_cov_key.h" + #include #include #include VL_INCLUDE_UNORDERED_MAP diff --git a/src/VlcSource.h b/src/VlcSource.h index 271e354db..5019ff155 100644 --- a/src/VlcSource.h +++ b/src/VlcSource.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" + #include #include diff --git a/src/VlcTest.h b/src/VlcTest.h index c43292fc0..25f03d56c 100644 --- a/src/VlcTest.h +++ b/src/VlcTest.h @@ -23,8 +23,10 @@ #include "config_build.h" #include "verilatedos.h" + #include "VlcPoint.h" #include "VlcBucket.h" + #include #include diff --git a/src/VlcTop.cpp b/src/VlcTop.cpp index ebf9895cb..7d6d95226 100644 --- a/src/VlcTop.cpp +++ b/src/VlcTop.cpp @@ -23,9 +23,9 @@ #include "VlcOptions.h" #include "VlcTop.h" -#include -#include #include +#include +#include //###################################################################### diff --git a/src/VlcTop.h b/src/VlcTop.h index bbcd9f176..2d6c262ed 100644 --- a/src/VlcTop.h +++ b/src/VlcTop.h @@ -23,6 +23,7 @@ #include "config_build.h" #include "verilatedos.h" + #include "VlcOptions.h" #include "VlcTest.h" #include "VlcPoint.h" diff --git a/src/verilog.l b/src/verilog.l index dc322bc7b..17df323a6 100644 --- a/src/verilog.l +++ b/src/verilog.l @@ -22,13 +22,12 @@ %{ /* %option nodefault */ -#include -#include -#include #include "V3Number.h" #include "V3ParseImp.h" // Defines YYTYPE; before including bison header #include "V3ParseBison.h" // Generated by bison +#include + extern void yyerror(const char*); extern void yyerrorf(const char* format, ...); diff --git a/src/verilog.y b/src/verilog.y index c72998382..889bc56cd 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -21,16 +21,14 @@ //************************************************************************* %{ -#include -#include -#include -#include - #include "V3Ast.h" #include "V3Global.h" #include "V3Config.h" #include "V3ParseImp.h" // Defines YYTYPE; before including bison header +#include +#include + #define YYERROR_VERBOSE 1 #define YYINITDEPTH 10000 // Older bisons ignore YYMAXDEPTH #define YYMAXDEPTH 10000 diff --git a/test_regress/t/t_dist_inctree.pl b/test_regress/t/t_dist_inctree.pl new file mode 100755 index 000000000..019d3254d --- /dev/null +++ b/test_regress/t/t_dist_inctree.pl @@ -0,0 +1,85 @@ +#!/usr/bin/perl +if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } +# DESCRIPTION: Verilator: Verilog Test driver/expect definition +# +# Copyright 2003 by Wilson Snyder. This program is free software; you can +# redistribute it and/or modify it under the terms of either the GNU +# Lesser General Public License Version 3 or the Perl Artistic License +# Version 2.0. + +use IO::File; +use strict; + +scenarios(dist => 1); + +my $root = ".."; +my $Debug; +my %Files; + +if (!-r "$root/.git") { + skip("Not in a git repository"); +} else { + print "-Test is only for occasional cleanup, never completely clean\n"; + #inctree(); +} + +ok(1); + +sub inctree { + # Note do not do test_regress, as VPI files need to compile without verilatedos.h + my $files = "src/*.c* src/*.h include/*.c* include/*.h"; + my $cmd = "cd $root && grep -n -P '^(# *include)' $files | sort"; + print "C $cmd\n"; + my $grep = `$cmd`; + foreach my $line (split /\n/, $grep) { + if ($line =~ /^(\S+):(\d+):#\s*include\s*(\S+)/) { + my $filename = $1; my $line = $2+0; my $inc = $3; + (my $base = $filename) =~ s!.*/(.*?)!$1!; + $inc =~ s/[<>"]//g; + $Files{$base}{filename} = $filename; + $Files{$base}{incs}{$inc} = $line; + #print "I $fileline $base $inc\n"; + } else { + warn "%Warning: Strange line: $line\n"; + } + } + foreach my $base (keys %Files) { + _inctree_recurse($base); + } + #use Data::Dumper; print Dumper(\%Files); + foreach my $base (sort keys %Files) { + my $fileref = $Files{$base}; + foreach my $subinc (sort keys %{$fileref->{incs}}) { + my $subline = $fileref->{incs}{$subinc}; + if (my $subsubinfo = $fileref->{subincs}{$subinc}) { + if ($subsubinfo->{line} < $subline) { + error("$fileref->{filename}:$subline: Include of $subinc is also included by earlier include ($subsubinfo->{name})"); + } + } + } + } +} + +sub _inctree_recurse { + my $basename = shift; + my $fileref = $Files{$basename}; + + return if $fileref->{subincs}; + $fileref->{subincs} = {}; + foreach my $subinc (keys %{$fileref->{incs}}) { + _inctree_recurse($subinc); + } + foreach my $subinc (keys %{$fileref->{incs}}) { + my $subline = $fileref->{incs}{$subinc}; + foreach my $subsubinc (keys %{$Files{$subinc}{incs}}) { + if (!$fileref->{subincs}{$subsubinc} + || $fileref->{subincs}{$subsubinc}{line} < $subline) { + $fileref->{subincs}{$subsubinc} + = {line => $subline, + name => $subinc, }; + } + } + } +} + +1;