From 770cd24f27c1bff41f3b6a9e47f563413c5062eb Mon Sep 17 00:00:00 2001 From: github action Date: Wed, 18 Oct 2023 02:50:27 +0000 Subject: [PATCH] Apply 'make format' --- src/V3Active.cpp | 3 +-- src/V3ActiveTop.cpp | 3 +-- src/V3Assert.cpp | 3 +-- src/V3AssertPre.cpp | 3 +-- src/V3Ast.cpp | 3 +-- src/V3AstNodes.cpp | 3 +-- 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/V3PchAstMT.h | 4 ++-- src/V3PchAstNoMT.h | 8 ++++---- 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 +-- 111 files changed, 135 insertions(+), 224 deletions(-) diff --git a/src/V3Active.cpp b/src/V3Active.cpp index 4930b9293..a49d9f0d9 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -26,12 +26,11 @@ // //************************************************************************* -#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 4239525b9..b3e74bc17 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -23,11 +23,10 @@ // //************************************************************************* -#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 3f8278e5b..bab7e8a7a 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#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 d0689361f..263fccf74 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -19,11 +19,10 @@ // 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 f7441655c..6c14af667 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 1c2519ad6..48e054209 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -14,8 +14,6 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "config_build.h" #include "verilatedos.h" @@ -26,6 +24,7 @@ #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 b4fa16a24..5c7b9282c 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -26,10 +26,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Begin.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp index e297f59a9..f57d980c5 100644 --- a/src/V3Branch.cpp +++ b/src/V3Branch.cpp @@ -23,10 +23,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Branch.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index 9ae17efb9..7f861c694 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -22,10 +22,10 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3Broken.h" +#include "V3PchAstMT.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 1f8abb5c3..2c4eaa09d 100644 --- a/src/V3CCtors.cpp +++ b/src/V3CCtors.cpp @@ -24,11 +24,10 @@ // 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 748909c2e..5f6c77a68 100644 --- a/src/V3CUse.cpp +++ b/src/V3CUse.cpp @@ -22,10 +22,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3CUse.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Case.cpp b/src/V3Case.cpp index 89458cda8..8e44063c7 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -34,10 +34,9 @@ // //************************************************************************* -#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 0290c944e..edd77577b 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -37,10 +37,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Cast.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Class.cpp b/src/V3Class.cpp index ef0eddf9b..0712ae11f 100644 --- a/src/V3Class.cpp +++ b/src/V3Class.cpp @@ -20,10 +20,9 @@ // //************************************************************************* -#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 00ddad214..cf175572b 100644 --- a/src/V3Clean.cpp +++ b/src/V3Clean.cpp @@ -23,10 +23,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Clean.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index 98596e135..4e642fc39 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -27,10 +27,9 @@ // //************************************************************************* -#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 2b858de6c..0d73f7b29 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -19,12 +19,11 @@ // 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 6288ccea9..210d4c47c 100644 --- a/src/V3Common.cpp +++ b/src/V3Common.cpp @@ -20,11 +20,10 @@ // //************************************************************************* -#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 566021160..0ca224128 100644 --- a/src/V3Config.cpp +++ b/src/V3Config.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3Config.h" +#include "V3PchAstMT.h" #include "V3String.h" #include diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index 4d04e00cc..55fa334ab 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -24,10 +24,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Coverage.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp index 76f0e7bdf..6fe7cc7ed 100644 --- a/src/V3CoverageJoin.cpp +++ b/src/V3CoverageJoin.cpp @@ -17,11 +17,10 @@ // 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 768887b5f..a4ab80abc 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -33,10 +33,10 @@ // here after scoping to allow more dead node removal. //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Dead.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index 3a829d22d..7041da397 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -48,10 +48,9 @@ // //************************************************************************* -#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 a459a26c7..66aa89349 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -23,10 +23,9 @@ // //************************************************************************* -#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 378f83d0c..3ea035bfe 100644 --- a/src/V3DepthBlock.cpp +++ b/src/V3DepthBlock.cpp @@ -20,11 +20,10 @@ // //************************************************************************* -#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 c603204f0..4576cabe0 100644 --- a/src/V3Descope.cpp +++ b/src/V3Descope.cpp @@ -22,11 +22,10 @@ // //************************************************************************* -#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 9cda7d02a..ff6da033c 100644 --- a/src/V3Dfg.cpp +++ b/src/V3Dfg.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 3b23986ff..3cf450615 100644 --- a/src/V3DfgAstToDfg.cpp +++ b/src/V3DfgAstToDfg.cpp @@ -26,10 +26,9 @@ // //************************************************************************* -#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 200d12610..3a0e41ee9 100644 --- a/src/V3DfgDecomposition.cpp +++ b/src/V3DfgDecomposition.cpp @@ -18,10 +18,9 @@ // //************************************************************************* -#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 a5d0a14a9..056d747ad 100644 --- a/src/V3DfgDfgToAst.cpp +++ b/src/V3DfgDfgToAst.cpp @@ -26,10 +26,9 @@ // //************************************************************************* -#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 ea49de41e..53cb79546 100644 --- a/src/V3DfgOptimizer.cpp +++ b/src/V3DfgOptimizer.cpp @@ -18,14 +18,13 @@ // //************************************************************************* -#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 f65b77897..2616d5df0 100644 --- a/src/V3DfgPasses.cpp +++ b/src/V3DfgPasses.cpp @@ -14,12 +14,11 @@ // //************************************************************************* -#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 f162c9ec9..206505a07 100644 --- a/src/V3DfgPeephole.cpp +++ b/src/V3DfgPeephole.cpp @@ -21,12 +21,11 @@ // //************************************************************************* -#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 58a889931..e81092c3a 100644 --- a/src/V3DupFinder.cpp +++ b/src/V3DupFinder.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 c382554c4..bb6e09ad2 100644 --- a/src/V3EmitCBase.cpp +++ b/src/V3EmitCBase.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3EmitCBase.h" +#include "V3PchAstMT.h" #include "V3Task.h" //###################################################################### diff --git a/src/V3EmitCConstPool.cpp b/src/V3EmitCConstPool.cpp index 656bffcd8..cabd546f6 100644 --- a/src/V3EmitCConstPool.cpp +++ b/src/V3EmitCConstPool.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 461d6496e..b033a4ccf 100644 --- a/src/V3EmitCFunc.cpp +++ b/src/V3EmitCFunc.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3EmitCFunc.h" +#include "V3PchAstMT.h" #include "V3TSP.h" #include diff --git a/src/V3EmitCHeaders.cpp b/src/V3EmitCHeaders.cpp index 8d9f71c8d..2861df5ad 100644 --- a/src/V3EmitCHeaders.cpp +++ b/src/V3EmitCHeaders.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#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 e640634c9..34ec4ee16 100644 --- a/src/V3EmitCImp.cpp +++ b/src/V3EmitCImp.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#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 6425a367c..64070760a 100644 --- a/src/V3EmitCInlines.cpp +++ b/src/V3EmitCInlines.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#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 4a9f9c496..67a9424e1 100644 --- a/src/V3EmitCMain.cpp +++ b/src/V3EmitCMain.cpp @@ -14,12 +14,11 @@ // //************************************************************************* -#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 ca548d68b..666a5f8d5 100644 --- a/src/V3EmitCMake.cpp +++ b/src/V3EmitCMake.cpp @@ -14,13 +14,12 @@ // //************************************************************************* -#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 53c5339fb..e025154eb 100644 --- a/src/V3EmitCModel.cpp +++ b/src/V3EmitCModel.cpp @@ -14,10 +14,9 @@ // //************************************************************************* -#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 4642ac016..1f3f9e80d 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -14,12 +14,11 @@ // //************************************************************************* -#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 e55ff26f5..d39cadee8 100644 --- a/src/V3EmitMk.cpp +++ b/src/V3EmitMk.cpp @@ -14,13 +14,12 @@ // //************************************************************************* -#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 38bca92ba..3a272fa9c 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3EmitV.h" #include "V3EmitCBase.h" +#include "V3PchAstMT.h" #include diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp index d2cb7d621..62db4f1c0 100644 --- a/src/V3EmitXml.cpp +++ b/src/V3EmitXml.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 af67ad82e..4cee48560 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -25,11 +25,10 @@ // //************************************************************************* -#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 97a26d572..c1fd8e59e 100644 --- a/src/V3File.cpp +++ b/src/V3File.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 93a3d4a08..af464e333 100644 --- a/src/V3Force.cpp +++ b/src/V3Force.cpp @@ -37,11 +37,10 @@ // //************************************************************************* -#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 098104d11..545605226 100644 --- a/src/V3Fork.cpp +++ b/src/V3Fork.cpp @@ -38,12 +38,11 @@ // //************************************************************************* -#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 0f0bb61cc..756d78625 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -21,14 +21,13 @@ // //************************************************************************* -#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 f4ebc182a..4013f3097 100644 --- a/src/V3Global.cpp +++ b/src/V3Global.cpp @@ -14,13 +14,12 @@ // //************************************************************************* -#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 e58dce546..b9201c628 100644 --- a/src/V3Hasher.cpp +++ b/src/V3Hasher.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3Hasher.h" +#include "V3PchAstMT.h" + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3HierBlock.cpp b/src/V3HierBlock.cpp index f1624493b..4e5371288 100644 --- a/src/V3HierBlock.cpp +++ b/src/V3HierBlock.cpp @@ -72,12 +72,11 @@ // 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 dbc3e7bb9..afaf26507 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -24,12 +24,11 @@ // //************************************************************************* -#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 fa5b2da3c..80c385968 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -21,11 +21,10 @@ // //************************************************************************* -#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 95bbdaa06..23353c9b3 100644 --- a/src/V3InstrCount.cpp +++ b/src/V3InstrCount.cpp @@ -15,10 +15,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3InstrCount.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3Interface.cpp b/src/V3Interface.cpp index de504d25c..63644c598 100644 --- a/src/V3Interface.cpp +++ b/src/V3Interface.cpp @@ -23,10 +23,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Interface.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3Life.cpp b/src/V3Life.cpp index 84ee05d60..49e6d0f3b 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -23,11 +23,10 @@ // //************************************************************************* -#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 6692a3ebf..e908a8a8a 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -24,12 +24,11 @@ // //************************************************************************* -#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 14bcfee31..570b1d3ed 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -23,12 +23,11 @@ // 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 473545166..490ca4d71 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -61,12 +61,11 @@ // 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 d4a00861c..79f31bb48 100644 --- a/src/V3LinkInc.cpp +++ b/src/V3LinkInc.cpp @@ -36,10 +36,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3LinkInc.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp index e777ac164..7a62c06f9 100644 --- a/src/V3LinkJump.cpp +++ b/src/V3LinkJump.cpp @@ -29,11 +29,10 @@ // //************************************************************************* -#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 11a1e4499..5972b535c 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -18,10 +18,10 @@ // Set lvalue() attributes on appropriate VARREFs. //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3LinkLValue.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //###################################################################### diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp index 9c0500239..dea26b2f2 100644 --- a/src/V3LinkLevel.cpp +++ b/src/V3LinkLevel.cpp @@ -19,10 +19,10 @@ // Create new MODULE TOP with connections to below signals //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3LinkLevel.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp index b3371c2a3..aa1cc7d82 100644 --- a/src/V3LinkParse.cpp +++ b/src/V3LinkParse.cpp @@ -18,11 +18,10 @@ // 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 b0636a298..ba1eeaa06 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -24,10 +24,9 @@ // 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 d26a86175..aebd9f23c 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -22,11 +22,10 @@ // //************************************************************************* -#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 b9e08ea22..aab950d34 100644 --- a/src/V3MergeCond.cpp +++ b/src/V3MergeCond.cpp @@ -72,13 +72,12 @@ // //************************************************************************* -#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 9825a3bac..64574a5a4 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -19,11 +19,10 @@ // 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 acc6e6639..00551a50d 100644 --- a/src/V3Number.cpp +++ b/src/V3Number.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3Number.h" +#include "V3PchAstMT.h" + #include #include #include diff --git a/src/V3Options.cpp b/src/V3Options.cpp index 554af3421..d6ec1d0df 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -14,8 +14,6 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3Options.h" #include "V3Error.h" @@ -24,6 +22,7 @@ #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 b3af14abc..c8b7dda5e 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -71,8 +71,6 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Order.h" #include "V3AstUserAllocator.h" @@ -86,6 +84,7 @@ #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 4133df59f..acae4012b 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -44,8 +44,6 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Param.h" #include "V3Case.h" @@ -53,6 +51,7 @@ #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 16e7d612c..93ad86a9f 100644 --- a/src/V3Partition.cpp +++ b/src/V3Partition.cpp @@ -14,8 +14,6 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Partition.h" #include "V3Config.h" @@ -27,6 +25,7 @@ #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/V3PchAstMT.h b/src/V3PchAstMT.h index 50590fd6a..af0c3b25a 100644 --- a/src/V3PchAstMT.h +++ b/src/V3PchAstMT.h @@ -24,8 +24,6 @@ #include "config_build.h" #include "verilatedos.h" -#include - #include "V3Ast.h" #include "V3Broken.h" #include "V3Error.h" @@ -39,4 +37,6 @@ #include "V3String.h" #include "V3ThreadSafety.h" +#include + #endif // Guard diff --git a/src/V3PchAstNoMT.h b/src/V3PchAstNoMT.h index 0ac7907a8..2ecde3fd5 100644 --- a/src/V3PchAstNoMT.h +++ b/src/V3PchAstNoMT.h @@ -26,10 +26,6 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include - #include "V3Ast.h" #include "V3Broken.h" #include "V3Error.h" @@ -43,4 +39,8 @@ #include "V3String.h" #include "V3ThreadSafety.h" +#include +#include +#include + #endif // Guard diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index c6ebaacee..9a6858352 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -24,10 +24,9 @@ // //************************************************************************* -#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 0fa0c4c2a..e85c70d84 100644 --- a/src/V3ProtectLib.cpp +++ b/src/V3ProtectLib.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 5c39b78d2..60cb72f0c 100644 --- a/src/V3Randomize.cpp +++ b/src/V3Randomize.cpp @@ -24,11 +24,10 @@ // //************************************************************************* -#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 55f07fe35..8dbc82dd8 100644 --- a/src/V3Reloop.cpp +++ b/src/V3Reloop.cpp @@ -29,10 +29,9 @@ // //************************************************************************* -#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 a7012d151..2aa86bd2b 100644 --- a/src/V3Sched.cpp +++ b/src/V3Sched.cpp @@ -35,13 +35,12 @@ // //************************************************************************* -#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 f70022350..4df41bb9c 100644 --- a/src/V3SchedAcyclic.cpp +++ b/src/V3SchedAcyclic.cpp @@ -33,9 +33,8 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Graph.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Sched.h" #include "V3SenTree.h" #include "V3SplitVar.h" diff --git a/src/V3SchedPartition.cpp b/src/V3SchedPartition.cpp index a5cbfd3c9..b9c0619fa 100644 --- a/src/V3SchedPartition.cpp +++ b/src/V3SchedPartition.cpp @@ -34,10 +34,9 @@ // //************************************************************************* -#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 9ef1fcdb0..c37ae0c7d 100644 --- a/src/V3SchedReplicate.cpp +++ b/src/V3SchedReplicate.cpp @@ -34,9 +34,8 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Graph.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Sched.h" VL_DEFINE_DEBUG_FUNCTIONS; diff --git a/src/V3SchedTiming.cpp b/src/V3SchedTiming.cpp index 56a89ed24..4c1523bd0 100644 --- a/src/V3SchedTiming.cpp +++ b/src/V3SchedTiming.cpp @@ -24,9 +24,8 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3EmitCBase.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Sched.h" #include diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index 4f6efb93e..a5fb65652 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -21,10 +21,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Scope.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + #include #include diff --git a/src/V3Scoreboard.cpp b/src/V3Scoreboard.cpp index 1a26dbc2f..253b958cf 100644 --- a/src/V3Scoreboard.cpp +++ b/src/V3Scoreboard.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Scoreboard.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + class ScoreboardTestElem; struct Key { diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp index 0076094e0..b63e5b71a 100644 --- a/src/V3Slice.cpp +++ b/src/V3Slice.cpp @@ -35,10 +35,10 @@ // simplified to look primarily for SLICESELs. //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Slice.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT + VL_DEFINE_DEBUG_FUNCTIONS; //************************************************************************* diff --git a/src/V3Split.cpp b/src/V3Split.cpp index c543aec1d..075259dd2 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -77,11 +77,10 @@ // //************************************************************************* -#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 26898c676..98699725d 100644 --- a/src/V3SplitAs.cpp +++ b/src/V3SplitAs.cpp @@ -21,10 +21,9 @@ // //************************************************************************* -#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 8711f4bc6..01523c59b 100644 --- a/src/V3SplitVar.cpp +++ b/src/V3SplitVar.cpp @@ -110,10 +110,9 @@ // //************************************************************************* -#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 3f89004df..fca92184a 100644 --- a/src/V3Stats.cpp +++ b/src/V3Stats.cpp @@ -14,10 +14,10 @@ // //************************************************************************* -#include "V3PchAstMT.h" - #include "V3Stats.h" +#include "V3PchAstMT.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 a41f116d6..d24c4bb23 100644 --- a/src/V3StatsReport.cpp +++ b/src/V3StatsReport.cpp @@ -14,11 +14,10 @@ // //************************************************************************* -#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 7c2465dad..3a43b05a8 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -22,10 +22,9 @@ // //************************************************************************* -#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 583db4ab4..85c2c575d 100644 --- a/src/V3TSP.cpp +++ b/src/V3TSP.cpp @@ -19,12 +19,11 @@ // //************************************************************************* -#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 cfdc10717..30c0850db 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -21,10 +21,9 @@ // //************************************************************************* -#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 a410f06a6..ceeed9e00 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -23,14 +23,13 @@ // //************************************************************************* -#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 65948a526..a875d5dc3 100644 --- a/src/V3Timing.cpp +++ b/src/V3Timing.cpp @@ -60,14 +60,13 @@ // //************************************************************************* -#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 653ba6548..36a4bb0e3 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -35,13 +35,12 @@ // //************************************************************************* -#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 284936660..7e287f5fe 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -20,14 +20,13 @@ // //************************************************************************* -#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 a584d1748..84788265b 100644 --- a/src/V3Tristate.cpp +++ b/src/V3Tristate.cpp @@ -115,12 +115,11 @@ // 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 09d6e5043..2c2df44ff 100644 --- a/src/V3Undriven.cpp +++ b/src/V3Undriven.cpp @@ -23,10 +23,9 @@ // //************************************************************************* -#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 625055393..3d429998e 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -28,11 +28,10 @@ // //************************************************************************* -#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 f2a7af31b..3a5beea92 100644 --- a/src/V3Unroll.cpp +++ b/src/V3Unroll.cpp @@ -24,11 +24,10 @@ // //************************************************************************* -#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 2fbea7c75..4275f5499 100644 --- a/src/V3VariableOrder.cpp +++ b/src/V3VariableOrder.cpp @@ -20,12 +20,11 @@ // //************************************************************************* -#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 f5f9c85e8..533da7a26 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -63,13 +63,12 @@ // 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 abfb20bab..16813f88a 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 8c8aa4bb4..f2c875738 100644 --- a/src/V3WidthSel.cpp +++ b/src/V3WidthSel.cpp @@ -26,9 +26,8 @@ // //************************************************************************* -#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT - #include "V3Const.h" +#include "V3PchAstNoMT.h" // VL_MT_DISABLED_CODE_UNIT #include "V3Width.h" VL_DEFINE_DEBUG_FUNCTIONS;