From b5828a7ce990de997aca40a573ef13cf05b9488a Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 18 Oct 2023 06:37:46 -0400 Subject: [PATCH] Fix header order botched by clang-format in recent commit. --- .clang-format | 2 ++ src/V3Active.cpp | 3 ++- src/V3ActiveTop.cpp | 3 ++- src/V3Assert.cpp | 3 ++- src/V3AssertPre.cpp | 3 ++- src/V3Ast.cpp | 3 ++- src/V3AstNodes.cpp | 6 +----- src/V3Begin.cpp | 4 ++-- src/V3Branch.cpp | 4 ++-- src/V3Broken.cpp | 4 ++-- src/V3CCtors.cpp | 3 ++- src/V3CUse.cpp | 4 ++-- src/V3Case.cpp | 3 ++- src/V3Cast.cpp | 4 ++-- src/V3Class.cpp | 3 ++- src/V3Clean.cpp | 4 ++-- src/V3Clock.cpp | 3 ++- src/V3Combine.cpp | 3 ++- src/V3Common.cpp | 3 ++- src/V3Config.cpp | 3 ++- src/V3Coverage.cpp | 4 ++-- src/V3CoverageJoin.cpp | 3 ++- src/V3Dead.cpp | 4 ++-- src/V3Delayed.cpp | 3 ++- src/V3Depth.cpp | 3 ++- src/V3DepthBlock.cpp | 3 ++- src/V3Descope.cpp | 3 ++- src/V3Dfg.cpp | 3 ++- src/V3DfgAstToDfg.cpp | 3 ++- src/V3DfgDecomposition.cpp | 3 ++- src/V3DfgDfgToAst.cpp | 3 ++- src/V3DfgOptimizer.cpp | 3 ++- src/V3DfgPasses.cpp | 3 ++- src/V3DfgPeephole.cpp | 3 ++- src/V3DupFinder.cpp | 3 ++- src/V3EmitCBase.cpp | 3 ++- src/V3EmitCConstPool.cpp | 3 ++- src/V3EmitCFunc.cpp | 3 ++- src/V3EmitCHeaders.cpp | 3 ++- src/V3EmitCImp.cpp | 3 ++- src/V3EmitCInlines.cpp | 3 ++- src/V3EmitCMain.cpp | 3 ++- src/V3EmitCMake.cpp | 3 ++- src/V3EmitCModel.cpp | 3 ++- src/V3EmitCSyms.cpp | 3 ++- src/V3EmitMk.cpp | 3 ++- src/V3EmitV.cpp | 3 ++- src/V3EmitXml.cpp | 3 ++- src/V3Expand.cpp | 3 ++- src/V3File.cpp | 3 ++- src/V3Force.cpp | 3 ++- src/V3Fork.cpp | 3 ++- src/V3Gate.cpp | 3 ++- src/V3Global.cpp | 3 ++- src/V3Hasher.cpp | 4 ++-- src/V3HierBlock.cpp | 3 ++- src/V3Inline.cpp | 3 ++- src/V3Inst.cpp | 3 ++- src/V3InstrCount.cpp | 4 ++-- src/V3Interface.cpp | 4 ++-- src/V3Life.cpp | 3 ++- src/V3LifePost.cpp | 3 ++- src/V3LinkCells.cpp | 3 ++- src/V3LinkDot.cpp | 3 ++- src/V3LinkInc.cpp | 4 ++-- src/V3LinkJump.cpp | 3 ++- src/V3LinkLValue.cpp | 4 ++-- src/V3LinkLevel.cpp | 4 ++-- src/V3LinkParse.cpp | 3 ++- src/V3LinkResolve.cpp | 3 ++- src/V3Localize.cpp | 3 ++- src/V3MergeCond.cpp | 3 ++- src/V3Name.cpp | 3 ++- src/V3Number.cpp | 4 ++-- src/V3Options.cpp | 3 ++- src/V3Order.cpp | 3 ++- src/V3Param.cpp | 3 ++- src/V3Partition.cpp | 3 ++- src/V3Premit.cpp | 3 ++- src/V3ProtectLib.cpp | 3 ++- src/V3Randomize.cpp | 3 ++- src/V3Reloop.cpp | 3 ++- src/V3Sched.cpp | 3 ++- src/V3SchedAcyclic.cpp | 3 ++- src/V3SchedPartition.cpp | 3 ++- src/V3SchedReplicate.cpp | 3 ++- src/V3SchedTiming.cpp | 3 ++- src/V3Scope.cpp | 4 ++-- src/V3Scoreboard.cpp | 4 ++-- src/V3Slice.cpp | 4 ++-- src/V3Split.cpp | 3 ++- src/V3SplitAs.cpp | 3 ++- src/V3SplitVar.cpp | 3 ++- src/V3Stats.cpp | 4 ++-- src/V3StatsReport.cpp | 3 ++- src/V3Subst.cpp | 3 ++- src/V3TSP.cpp | 3 ++- src/V3Table.cpp | 3 ++- src/V3Task.cpp | 3 ++- src/V3Timing.cpp | 3 ++- src/V3Trace.cpp | 3 ++- src/V3TraceDecl.cpp | 3 ++- src/V3Tristate.cpp | 3 ++- src/V3Undriven.cpp | 3 ++- src/V3Unknown.cpp | 3 ++- src/V3Unroll.cpp | 3 ++- src/V3VariableOrder.cpp | 3 ++- src/V3Width.cpp | 3 ++- src/V3WidthCommit.cpp | 4 ++-- src/V3WidthSel.cpp | 3 ++- 110 files changed, 219 insertions(+), 133 deletions(-) diff --git a/.clang-format b/.clang-format index 3e8142bf7..8178613b6 100644 --- a/.clang-format +++ b/.clang-format @@ -63,6 +63,8 @@ ForEachMacros: SortIncludes: true IncludeBlocks: Regroup IncludeCategories: + - Regex: '"V3Pch.*\.h"' + Priority: -2 # Precompiled headers - Regex: '"(config_build|verilated_config|verilatedos)\.h"' Priority: -1 # Sepecials before main header - Regex: '(<|")verilated.*' diff --git a/src/V3Active.cpp b/src/V3Active.cpp index a49d9f0d9..4930b9293 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -26,11 +26,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Active.h" #include "V3Const.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index b3e74bc17..4239525b9 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -23,10 +23,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3ActiveTop.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3SenTree.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp index bab7e8a7a..3f8278e5b 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Assert.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp index 263fccf74..d0689361f 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -19,10 +19,11 @@ // Transform clocking blocks into imperative logic //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3AssertPre.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Task.h" #include "V3UniqueNames.h" diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp index 6c14af667..f7441655c 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3Broken.h" #include "V3EmitV.h" #include "V3File.h" -#include "V3PchAstMT.h" #include #include diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp index 48e054209..5af783789 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -14,17 +14,13 @@ // //************************************************************************* -#include "config_build.h" -#include "verilatedos.h" +#include "V3PchAstMT.h" -#include "V3Ast.h" #include "V3EmitCBase.h" #include "V3File.h" -#include "V3Global.h" #include "V3Graph.h" #include "V3Hasher.h" #include "V3PartitionGraph.h" // Just for mtask dumping -#include "V3PchAstMT.h" #include "V3String.h" #include "V3Ast__gen_macros.h" // Generated by 'astgen' diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp index 5c7b9282c..b4fa16a24 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -26,10 +26,10 @@ // //************************************************************************* -#include "V3Begin.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Begin.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp index f57d980c5..e297f59a9 100644 --- a/src/V3Branch.cpp +++ b/src/V3Branch.cpp @@ -23,10 +23,10 @@ // //************************************************************************* -#include "V3Branch.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Branch.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index 7f861c694..9ae17efb9 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -22,10 +22,10 @@ // //************************************************************************* -#include "V3Broken.h" - #include "V3PchAstMT.h" +#include "V3Broken.h" + // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators #include "V3AstConstOnly.h" diff --git a/src/V3CCtors.cpp b/src/V3CCtors.cpp index 2c4eaa09d..1f8abb5c3 100644 --- a/src/V3CCtors.cpp +++ b/src/V3CCtors.cpp @@ -24,10 +24,11 @@ // This transformation honors outputSplitCFuncs. //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3CCtors.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include diff --git a/src/V3CUse.cpp b/src/V3CUse.cpp index 5f6c77a68..748909c2e 100644 --- a/src/V3CUse.cpp +++ b/src/V3CUse.cpp @@ -22,10 +22,10 @@ // //************************************************************************* -#include "V3CUse.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3CUse.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Case.cpp b/src/V3Case.cpp index 8e44063c7..89458cda8 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -34,9 +34,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Case.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp index edd77577b..0290c944e 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -37,10 +37,10 @@ // //************************************************************************* -#include "V3Cast.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Cast.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Class.cpp b/src/V3Class.cpp index 0712ae11f..ef0eddf9b 100644 --- a/src/V3Class.cpp +++ b/src/V3Class.cpp @@ -20,9 +20,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Class.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3UniqueNames.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp index cf175572b..00ddad214 100644 --- a/src/V3Clean.cpp +++ b/src/V3Clean.cpp @@ -23,10 +23,10 @@ // //************************************************************************* -#include "V3Clean.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Clean.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index 4e642fc39..98596e135 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -27,9 +27,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Clock.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Sched.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index 0d73f7b29..2b858de6c 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -19,11 +19,12 @@ // Also drop empty CFuncs //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Combine.h" #include "V3AstUserAllocator.h" #include "V3DupFinder.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Common.cpp b/src/V3Common.cpp index 210d4c47c..6288ccea9 100644 --- a/src/V3Common.cpp +++ b/src/V3Common.cpp @@ -20,10 +20,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Common.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Config.cpp b/src/V3Config.cpp index 0ca224128..566021160 100644 --- a/src/V3Config.cpp +++ b/src/V3Config.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3Config.h" -#include "V3PchAstMT.h" #include "V3String.h" #include diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index 55fa334ab..4d04e00cc 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -24,10 +24,10 @@ // //************************************************************************* -#include "V3Coverage.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Coverage.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp index 6fe7cc7ed..76f0e7bdf 100644 --- a/src/V3CoverageJoin.cpp +++ b/src/V3CoverageJoin.cpp @@ -17,10 +17,11 @@ // If two COVERTOGGLEs have same VARSCOPE, combine them //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3CoverageJoin.h" #include "V3DupFinder.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp index a4ab80abc..768887b5f 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -33,10 +33,10 @@ // here after scoping to allow more dead node removal. //************************************************************************* -#include "V3Dead.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Dead.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index 7041da397..3a829d22d 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -48,9 +48,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Delayed.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp index 66aa89349..a459a26c7 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -23,9 +23,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Depth.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3UniqueNames.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp index 3ea035bfe..378f83d0c 100644 --- a/src/V3DepthBlock.cpp +++ b/src/V3DepthBlock.cpp @@ -20,10 +20,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3DepthBlock.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp index 4576cabe0..c603204f0 100644 --- a/src/V3Descope.cpp +++ b/src/V3Descope.cpp @@ -22,10 +22,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Descope.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Dfg.cpp b/src/V3Dfg.cpp index ff6da033c..9cda7d02a 100644 --- a/src/V3Dfg.cpp +++ b/src/V3Dfg.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Dfg.h" #include "V3File.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3DfgAstToDfg.cpp b/src/V3DfgAstToDfg.cpp index 3cf450615..3b23986ff 100644 --- a/src/V3DfgAstToDfg.cpp +++ b/src/V3DfgAstToDfg.cpp @@ -26,9 +26,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Dfg.h" #include "V3DfgPasses.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3DfgDecomposition.cpp b/src/V3DfgDecomposition.cpp index 3a0e41ee9..200d12610 100644 --- a/src/V3DfgDecomposition.cpp +++ b/src/V3DfgDecomposition.cpp @@ -18,9 +18,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Dfg.h" #include "V3File.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3DfgDfgToAst.cpp b/src/V3DfgDfgToAst.cpp index 056d747ad..a5d0a14a9 100644 --- a/src/V3DfgDfgToAst.cpp +++ b/src/V3DfgDfgToAst.cpp @@ -26,9 +26,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Dfg.h" #include "V3DfgPasses.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3UniqueNames.h" #include diff --git a/src/V3DfgOptimizer.cpp b/src/V3DfgOptimizer.cpp index 53cb79546..ea49de41e 100644 --- a/src/V3DfgOptimizer.cpp +++ b/src/V3DfgOptimizer.cpp @@ -18,13 +18,14 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3DfgOptimizer.h" #include "V3AstUserAllocator.h" #include "V3Dfg.h" #include "V3DfgPasses.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3UniqueNames.h" #include diff --git a/src/V3DfgPasses.cpp b/src/V3DfgPasses.cpp index 2616d5df0..f65b77897 100644 --- a/src/V3DfgPasses.cpp +++ b/src/V3DfgPasses.cpp @@ -14,11 +14,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3DfgPasses.h" #include "V3Dfg.h" #include "V3Global.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3String.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3DfgPeephole.cpp b/src/V3DfgPeephole.cpp index 206505a07..f162c9ec9 100644 --- a/src/V3DfgPeephole.cpp +++ b/src/V3DfgPeephole.cpp @@ -21,11 +21,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3DfgPeephole.h" #include "V3Dfg.h" #include "V3DfgPasses.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3DupFinder.cpp b/src/V3DupFinder.cpp index e81092c3a..58a889931 100644 --- a/src/V3DupFinder.cpp +++ b/src/V3DupFinder.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3DupFinder.h" #include "V3File.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3EmitCBase.cpp b/src/V3EmitCBase.cpp index bb6e09ad2..c382554c4 100644 --- a/src/V3EmitCBase.cpp +++ b/src/V3EmitCBase.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitCBase.h" -#include "V3PchAstMT.h" #include "V3Task.h" //###################################################################### diff --git a/src/V3EmitCConstPool.cpp b/src/V3EmitCConstPool.cpp index cabd546f6..656bffcd8 100644 --- a/src/V3EmitCConstPool.cpp +++ b/src/V3EmitCConstPool.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitC.h" #include "V3EmitCConstInit.h" #include "V3File.h" -#include "V3PchAstMT.h" #include "V3Stats.h" #include diff --git a/src/V3EmitCFunc.cpp b/src/V3EmitCFunc.cpp index b033a4ccf..461d6496e 100644 --- a/src/V3EmitCFunc.cpp +++ b/src/V3EmitCFunc.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitCFunc.h" -#include "V3PchAstMT.h" #include "V3TSP.h" #include diff --git a/src/V3EmitCHeaders.cpp b/src/V3EmitCHeaders.cpp index 2861df5ad..8d9f71c8d 100644 --- a/src/V3EmitCHeaders.cpp +++ b/src/V3EmitCHeaders.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitC.h" #include "V3EmitCConstInit.h" -#include "V3PchAstMT.h" #include #include diff --git a/src/V3EmitCImp.cpp b/src/V3EmitCImp.cpp index 34ec4ee16..e640634c9 100644 --- a/src/V3EmitCImp.cpp +++ b/src/V3EmitCImp.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitC.h" #include "V3EmitCFunc.h" -#include "V3PchAstMT.h" #include "V3ThreadPool.h" #include "V3UniqueNames.h" diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp index 64070760a..6425a367c 100644 --- a/src/V3EmitCInlines.cpp +++ b/src/V3EmitCInlines.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitC.h" #include "V3EmitCBase.h" -#include "V3PchAstMT.h" #include "V3Stats.h" #include diff --git a/src/V3EmitCMain.cpp b/src/V3EmitCMain.cpp index 67a9424e1..4a9f9c496 100644 --- a/src/V3EmitCMain.cpp +++ b/src/V3EmitCMain.cpp @@ -14,11 +14,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitCMain.h" #include "V3EmitC.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include diff --git a/src/V3EmitCMake.cpp b/src/V3EmitCMake.cpp index 666a5f8d5..ca548d68b 100644 --- a/src/V3EmitCMake.cpp +++ b/src/V3EmitCMake.cpp @@ -14,12 +14,13 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitCMake.h" #include "V3EmitCBase.h" #include "V3HierBlock.h" #include "V3Os.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include diff --git a/src/V3EmitCModel.cpp b/src/V3EmitCModel.cpp index e025154eb..53c5339fb 100644 --- a/src/V3EmitCModel.cpp +++ b/src/V3EmitCModel.cpp @@ -14,9 +14,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitC.h" #include "V3EmitCFunc.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3UniqueNames.h" #include diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index 1f3f9e80d..4642ac016 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -14,11 +14,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitC.h" #include "V3EmitCBase.h" #include "V3LanguageWords.h" #include "V3PartitionGraph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp index d39cadee8..e55ff26f5 100644 --- a/src/V3EmitMk.cpp +++ b/src/V3EmitMk.cpp @@ -14,12 +14,13 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitMk.h" #include "V3EmitCBase.h" #include "V3HierBlock.h" #include "V3Os.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp index 3a272fa9c..38bca92ba 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3EmitV.h" #include "V3EmitCBase.h" -#include "V3PchAstMT.h" #include diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp index 62db4f1c0..d2cb7d621 100644 --- a/src/V3EmitXml.cpp +++ b/src/V3EmitXml.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitXml.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp index 4cee48560..af67ad82e 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -25,10 +25,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Expand.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3File.cpp b/src/V3File.cpp index c1fd8e59e..97a26d572 100644 --- a/src/V3File.cpp +++ b/src/V3File.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3File.h" #include "V3Os.h" -#include "V3PchAstMT.h" #include "V3String.h" #include diff --git a/src/V3Force.cpp b/src/V3Force.cpp index af464e333..93a3d4a08 100644 --- a/src/V3Force.cpp +++ b/src/V3Force.cpp @@ -37,10 +37,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Force.h" #include "V3AstUserAllocator.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Fork.cpp b/src/V3Fork.cpp index 545605226..098104d11 100644 --- a/src/V3Fork.cpp +++ b/src/V3Fork.cpp @@ -38,11 +38,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Fork.h" #include "V3AstNodeExpr.h" #include "V3MemberMap.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index 756d78625..0f0bb61cc 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -21,13 +21,14 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Gate.h" #include "V3AstUserAllocator.h" #include "V3Const.h" #include "V3DupFinder.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Global.cpp b/src/V3Global.cpp index 4013f3097..f4ebc182a 100644 --- a/src/V3Global.cpp +++ b/src/V3Global.cpp @@ -14,12 +14,13 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3File.h" #include "V3HierBlock.h" #include "V3LinkCells.h" #include "V3Parse.h" #include "V3ParseSym.h" -#include "V3PchAstMT.h" #include "V3Stats.h" //###################################################################### diff --git a/src/V3Hasher.cpp b/src/V3Hasher.cpp index b9201c628..e58dce546 100644 --- a/src/V3Hasher.cpp +++ b/src/V3Hasher.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3Hasher.h" - #include "V3PchAstMT.h" +#include "V3Hasher.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3HierBlock.cpp b/src/V3HierBlock.cpp index 4e5371288..f1624493b 100644 --- a/src/V3HierBlock.cpp +++ b/src/V3HierBlock.cpp @@ -72,11 +72,12 @@ // Used for b) and c). // This options is repeated for all instantiating hierarchical blocks. +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3HierBlock.h" #include "V3File.h" #include "V3Os.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include "V3String.h" diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index afaf26507..dbc3e7bb9 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -24,11 +24,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Inline.h" #include "V3AstUserAllocator.h" #include "V3Inst.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index 80c385968..fa5b2da3c 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -21,10 +21,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Inst.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3InstrCount.cpp b/src/V3InstrCount.cpp index 23353c9b3..95bbdaa06 100644 --- a/src/V3InstrCount.cpp +++ b/src/V3InstrCount.cpp @@ -15,10 +15,10 @@ // //************************************************************************* -#include "V3InstrCount.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3InstrCount.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Interface.cpp b/src/V3Interface.cpp index 63644c598..de504d25c 100644 --- a/src/V3Interface.cpp +++ b/src/V3Interface.cpp @@ -23,10 +23,10 @@ // //************************************************************************* -#include "V3Interface.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Interface.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Life.cpp b/src/V3Life.cpp index 49e6d0f3b..84ee05d60 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -23,10 +23,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Life.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index e908a8a8a..6692a3ebf 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -24,11 +24,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3LifePost.h" #include "V3GraphPathChecker.h" #include "V3PartitionGraph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include // for std::unique_ptr -> auto_ptr or unique_ptr diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp index 570b1d3ed..14bcfee31 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -23,11 +23,12 @@ // Link to module that instantiates it //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3LinkCells.h" #include "V3Graph.h" #include "V3Parse.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3SymTable.h" #include diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 490ca4d71..473545166 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -61,11 +61,12 @@ // b (VSymEnt->AstCell) //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3LinkDot.h" #include "V3Graph.h" #include "V3MemberMap.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3String.h" #include "V3SymTable.h" diff --git a/src/V3LinkInc.cpp b/src/V3LinkInc.cpp index 79f31bb48..d4a00861c 100644 --- a/src/V3LinkInc.cpp +++ b/src/V3LinkInc.cpp @@ -36,10 +36,10 @@ // //************************************************************************* -#include "V3LinkInc.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3LinkInc.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp index 7a62c06f9..e777ac164 100644 --- a/src/V3LinkJump.cpp +++ b/src/V3LinkJump.cpp @@ -29,10 +29,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3LinkJump.h" #include "V3AstUserAllocator.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp index 5972b535c..11a1e4499 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -18,10 +18,10 @@ // Set lvalue() attributes on appropriate VARREFs. //************************************************************************* -#include "V3LinkLValue.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3LinkLValue.h" + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp index dea26b2f2..9c0500239 100644 --- a/src/V3LinkLevel.cpp +++ b/src/V3LinkLevel.cpp @@ -19,10 +19,10 @@ // Create new MODULE TOP with connections to below signals //************************************************************************* -#include "V3LinkLevel.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3LinkLevel.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp index aa1cc7d82..b3371c2a3 100644 --- a/src/V3LinkParse.cpp +++ b/src/V3LinkParse.cpp @@ -18,10 +18,11 @@ // Move some attributes around //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3LinkParse.h" #include "V3Config.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index ba1eeaa06..b0636a298 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -24,9 +24,10 @@ // SenItems: Convert pos/negedge of non-simple signals to temporaries //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3LinkResolve.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3String.h" #include "V3Task.h" diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp index aebd9f23c..d26a86175 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -22,10 +22,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Localize.h" #include "V3AstUserAllocator.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3MergeCond.cpp b/src/V3MergeCond.cpp index aab950d34..b9e08ea22 100644 --- a/src/V3MergeCond.cpp +++ b/src/V3MergeCond.cpp @@ -72,12 +72,13 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3MergeCond.h" #include "V3AstUserAllocator.h" #include "V3DupFinder.h" #include "V3Hasher.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Name.cpp b/src/V3Name.cpp index 64574a5a4..9825a3bac 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -19,10 +19,11 @@ // Prepend __PVT__ to variable names //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Name.h" #include "V3LanguageWords.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Number.cpp b/src/V3Number.cpp index 00551a50d..acc6e6639 100644 --- a/src/V3Number.cpp +++ b/src/V3Number.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3Number.h" - #include "V3PchAstMT.h" +#include "V3Number.h" + #include #include #include diff --git a/src/V3Options.cpp b/src/V3Options.cpp index d6ec1d0df..554af3421 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -14,6 +14,8 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3Options.h" #include "V3Error.h" @@ -22,7 +24,6 @@ #include "V3Mutex.h" #include "V3OptionParser.h" #include "V3Os.h" -#include "V3PchAstMT.h" #include "V3PreShell.h" #include "V3String.h" diff --git a/src/V3Order.cpp b/src/V3Order.cpp index c8b7dda5e..b3af14abc 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -71,6 +71,8 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Order.h" #include "V3AstUserAllocator.h" @@ -84,7 +86,6 @@ #include "V3OrderMoveGraph.h" #include "V3Partition.h" #include "V3PartitionGraph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Sched.h" #include "V3SenTree.h" #include "V3SplitVar.h" diff --git a/src/V3Param.cpp b/src/V3Param.cpp index acae4012b..4133df59f 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -44,6 +44,8 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Param.h" #include "V3Case.h" @@ -51,7 +53,6 @@ #include "V3Hasher.h" #include "V3Os.h" #include "V3Parse.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Unroll.h" #include "V3Width.h" diff --git a/src/V3Partition.cpp b/src/V3Partition.cpp index 93ad86a9f..16e7d612c 100644 --- a/src/V3Partition.cpp +++ b/src/V3Partition.cpp @@ -14,6 +14,8 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Partition.h" #include "V3Config.h" @@ -25,7 +27,6 @@ #include "V3Os.h" #include "V3PairingHeap.h" #include "V3PartitionGraph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Scoreboard.h" #include "V3Stats.h" #include "V3UniqueNames.h" diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index 9a6858352..c6ebaacee 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -24,9 +24,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Premit.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include "V3UniqueNames.h" diff --git a/src/V3ProtectLib.cpp b/src/V3ProtectLib.cpp index e85c70d84..0fa0c4c2a 100644 --- a/src/V3ProtectLib.cpp +++ b/src/V3ProtectLib.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3ProtectLib.h" #include "V3Hasher.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3String.h" #include "V3Task.h" diff --git a/src/V3Randomize.cpp b/src/V3Randomize.cpp index 60cb72f0c..5c39b78d2 100644 --- a/src/V3Randomize.cpp +++ b/src/V3Randomize.cpp @@ -24,10 +24,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Randomize.h" #include "V3MemberMap.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp index 8dbc82dd8..55f07fe35 100644 --- a/src/V3Reloop.cpp +++ b/src/V3Reloop.cpp @@ -29,9 +29,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Reloop.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Sched.cpp b/src/V3Sched.cpp index 2aa86bd2b..a7012d151 100644 --- a/src/V3Sched.cpp +++ b/src/V3Sched.cpp @@ -35,12 +35,13 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Sched.h" #include "V3EmitCBase.h" #include "V3EmitV.h" #include "V3Order.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3SenExprBuilder.h" #include "V3Stats.h" diff --git a/src/V3SchedAcyclic.cpp b/src/V3SchedAcyclic.cpp index 4df41bb9c..f70022350 100644 --- a/src/V3SchedAcyclic.cpp +++ b/src/V3SchedAcyclic.cpp @@ -33,8 +33,9 @@ // //************************************************************************* -#include "V3Graph.h" #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + +#include "V3Graph.h" #include "V3Sched.h" #include "V3SenTree.h" #include "V3SplitVar.h" diff --git a/src/V3SchedPartition.cpp b/src/V3SchedPartition.cpp index b9c0619fa..a5cbfd3c9 100644 --- a/src/V3SchedPartition.cpp +++ b/src/V3SchedPartition.cpp @@ -34,9 +34,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3EmitV.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Sched.h" #include diff --git a/src/V3SchedReplicate.cpp b/src/V3SchedReplicate.cpp index c37ae0c7d..9ef1fcdb0 100644 --- a/src/V3SchedReplicate.cpp +++ b/src/V3SchedReplicate.cpp @@ -34,8 +34,9 @@ // //************************************************************************* -#include "V3Graph.h" #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + +#include "V3Graph.h" #include "V3Sched.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3SchedTiming.cpp b/src/V3SchedTiming.cpp index 4c1523bd0..56a89ed24 100644 --- a/src/V3SchedTiming.cpp +++ b/src/V3SchedTiming.cpp @@ -24,8 +24,9 @@ // //************************************************************************* -#include "V3EmitCBase.h" #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + +#include "V3EmitCBase.h" #include "V3Sched.h" #include diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index a5fb65652..4f6efb93e 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -21,10 +21,10 @@ // //************************************************************************* -#include "V3Scope.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Scope.h" + #include #include diff --git a/src/V3Scoreboard.cpp b/src/V3Scoreboard.cpp index 253b958cf..1a26dbc2f 100644 --- a/src/V3Scoreboard.cpp +++ b/src/V3Scoreboard.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3Scoreboard.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Scoreboard.h" + class ScoreboardTestElem; struct Key { diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp index b63e5b71a..0076094e0 100644 --- a/src/V3Slice.cpp +++ b/src/V3Slice.cpp @@ -35,10 +35,10 @@ // simplified to look primarily for SLICESELs. //************************************************************************* -#include "V3Slice.h" - #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT +#include "V3Slice.h" + VL_DEFINE_DEBUG_FUNCTIONS; //************************************************************************* diff --git a/src/V3Split.cpp b/src/V3Split.cpp index 075259dd2..c543aec1d 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -77,10 +77,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Split.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp index 98699725d..26898c676 100644 --- a/src/V3SplitAs.cpp +++ b/src/V3SplitAs.cpp @@ -21,9 +21,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3SplitAs.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3SplitVar.cpp b/src/V3SplitVar.cpp index 01523c59b..8711f4bc6 100644 --- a/src/V3SplitVar.cpp +++ b/src/V3SplitVar.cpp @@ -110,9 +110,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3SplitVar.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include "V3UniqueNames.h" diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp index fca92184a..3f89004df 100644 --- a/src/V3Stats.cpp +++ b/src/V3Stats.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3Stats.h" - #include "V3PchAstMT.h" +#include "V3Stats.h" + // This visitor does not edit nodes, and is called at error-exit, so should use constant iterators #include "V3AstConstOnly.h" diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp index d24c4bb23..a41f116d6 100644 --- a/src/V3StatsReport.cpp +++ b/src/V3StatsReport.cpp @@ -14,10 +14,11 @@ // //************************************************************************* +#include "V3PchAstMT.h" + #include "V3File.h" #include "V3Global.h" #include "V3Os.h" -#include "V3PchAstMT.h" #include "V3Stats.h" #include diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp index 3a43b05a8..7c2465dad 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -22,9 +22,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Subst.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3TSP.cpp b/src/V3TSP.cpp index 85c2c575d..583db4ab4 100644 --- a/src/V3TSP.cpp +++ b/src/V3TSP.cpp @@ -19,11 +19,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3TSP.h" #include "V3File.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include #include diff --git a/src/V3Table.cpp b/src/V3Table.cpp index 30c0850db..cfdc10717 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -21,9 +21,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Table.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Simulate.h" #include "V3Stats.h" diff --git a/src/V3Task.cpp b/src/V3Task.cpp index ceeed9e00..a410f06a6 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -23,13 +23,14 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Task.h" #include "V3Const.h" #include "V3EmitCBase.h" #include "V3Graph.h" #include "V3LinkLValue.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include diff --git a/src/V3Timing.cpp b/src/V3Timing.cpp index a875d5dc3..65948a526 100644 --- a/src/V3Timing.cpp +++ b/src/V3Timing.cpp @@ -60,13 +60,14 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Timing.h" #include "V3Const.h" #include "V3EmitV.h" #include "V3Graph.h" #include "V3MemberMap.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3SenExprBuilder.h" #include "V3SenTree.h" #include "V3UniqueNames.h" diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp index 36a4bb0e3..653ba6548 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -35,12 +35,13 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Trace.h" #include "V3DupFinder.h" #include "V3EmitCBase.h" #include "V3Graph.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index 7e287f5fe..284936660 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -20,13 +20,14 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3TraceDecl.h" #include "verilated_trace_defs.h" // For VLT_TRACE_SCOPE_* #include "V3Config.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp index 84788265b..a584d1748 100644 --- a/src/V3Tristate.cpp +++ b/src/V3Tristate.cpp @@ -115,11 +115,12 @@ // unsupported. //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Tristate.h" #include "V3Graph.h" #include "V3Inst.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp index 2c2df44ff..09d6e5043 100644 --- a/src/V3Undriven.cpp +++ b/src/V3Undriven.cpp @@ -23,9 +23,10 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Undriven.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index 3d429998e..625055393 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -28,10 +28,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Unknown.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Stats.h" #include "V3UniqueNames.h" diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp index 3a5beea92..f2a7af31b 100644 --- a/src/V3Unroll.cpp +++ b/src/V3Unroll.cpp @@ -24,10 +24,11 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Unroll.h" #include "V3Const.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Simulate.h" #include "V3Stats.h" diff --git a/src/V3VariableOrder.cpp b/src/V3VariableOrder.cpp index 4275f5499..2fbea7c75 100644 --- a/src/V3VariableOrder.cpp +++ b/src/V3VariableOrder.cpp @@ -20,11 +20,12 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3VariableOrder.h" #include "V3AstUserAllocator.h" #include "V3EmitCBase.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3TSP.h" #include diff --git a/src/V3Width.cpp b/src/V3Width.cpp index 533da7a26..f5f9c85e8 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -63,12 +63,13 @@ // iterateSubtreeReturnEdits. //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "V3Width.h" #include "V3Const.h" #include "V3MemberMap.h" #include "V3Number.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Randomize.h" #include "V3String.h" #include "V3Task.h" diff --git a/src/V3WidthCommit.cpp b/src/V3WidthCommit.cpp index 16813f88a..abfb20bab 100644 --- a/src/V3WidthCommit.cpp +++ b/src/V3WidthCommit.cpp @@ -20,13 +20,13 @@ // //************************************************************************* +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include "config_build.h" #include "verilatedos.h" #include "V3WidthCommit.h" -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp index f2c875738..8c8aa4bb4 100644 --- a/src/V3WidthSel.cpp +++ b/src/V3WidthSel.cpp @@ -26,8 +26,9 @@ // //************************************************************************* -#include "V3Const.h" #include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + +#include "V3Const.h" #include "V3Width.h" VL_DEFINE_DEBUG_FUNCTIONS;