From 595419b370c723f4fff4e46f5d86924fed1387a7 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 14 Oct 2018 07:04:18 -0400 Subject: [PATCH] Internals: Sort includes for clang-tidy. No functional change intended. --- include/verilated_cov.cpp | 2 +- include/verilated_fst_c.cpp | 8 ++++---- include/verilated_fst_c.h | 4 ++-- include/verilated_lxt2_c.cpp | 6 +++--- include/verilated_lxt2_c.h | 2 +- include/verilated_save.cpp | 2 +- include/verilated_vcd_c.cpp | 6 +++--- include/verilated_vpi.cpp | 2 +- src/V3Active.cpp | 8 ++++---- src/V3ActiveTop.cpp | 6 +++--- src/V3Assert.cpp | 6 +++--- src/V3AssertPre.cpp | 6 +++--- src/V3Ast.cpp | 2 +- src/V3Ast.h | 2 +- src/V3AstNodes.cpp | 4 ++-- src/V3Begin.cpp | 6 +++--- src/V3Branch.cpp | 4 ++-- src/V3Broken.cpp | 6 +++--- src/V3CCtors.cpp | 12 ++++++------ src/V3Case.cpp | 6 +++--- src/V3Cast.cpp | 6 +++--- src/V3Cdc.cpp | 10 +++++----- src/V3Changed.cpp | 6 +++--- src/V3Clean.cpp | 6 +++--- src/V3ClkGater.cpp | 8 ++++---- src/V3Clock.cpp | 6 +++--- src/V3Combine.cpp | 8 ++++---- src/V3Config.cpp | 2 +- src/V3Const.cpp | 8 ++++---- src/V3Coverage.cpp | 4 ++-- src/V3CoverageJoin.cpp | 2 +- src/V3Dead.cpp | 4 ++-- src/V3Delayed.cpp | 8 ++++---- src/V3Depth.cpp | 6 +++--- src/V3DepthBlock.cpp | 6 +++--- src/V3Descope.cpp | 4 ++-- src/V3EmitC.cpp | 12 ++++++------ src/V3EmitCInlines.cpp | 6 +++--- src/V3EmitCSyms.cpp | 8 ++++---- src/V3EmitMk.cpp | 12 ++++++------ src/V3EmitV.cpp | 12 ++++++------ src/V3EmitXml.cpp | 12 ++++++------ src/V3Error.cpp | 2 +- src/V3Expand.cpp | 6 +++--- src/V3File.cpp | 10 +++++----- src/V3FileLine.cpp | 2 +- src/V3Gate.cpp | 8 ++++---- src/V3GenClk.cpp | 2 +- src/V3Graph.cpp | 8 ++++---- src/V3GraphAcyc.cpp | 8 ++++---- src/V3GraphDfa.cpp | 6 +++--- src/V3GraphTest.cpp | 2 +- src/V3Hashed.cpp | 6 +++--- src/V3Inline.cpp | 6 +++--- src/V3Inst.cpp | 6 +++--- src/V3Life.cpp | 4 ++-- src/V3LifePost.cpp | 2 +- src/V3LinkCells.cpp | 8 ++++---- src/V3LinkDot.cpp | 8 ++++---- src/V3LinkJump.cpp | 6 +++--- src/V3LinkLValue.cpp | 8 ++++---- src/V3LinkLevel.cpp | 8 ++++---- src/V3LinkParse.cpp | 6 +++--- src/V3LinkResolve.cpp | 8 ++++---- src/V3Localize.cpp | 2 +- src/V3Name.cpp | 6 +++--- src/V3Number.cpp | 7 ++++--- src/V3Options.cpp | 4 ++-- src/V3Order.cpp | 12 ++++++------ src/V3Os.cpp | 16 ++++++++-------- src/V3Param.cpp | 8 ++++---- src/V3ParseImp.cpp | 4 ++-- src/V3ParseLex.cpp | 4 ++-- src/V3Partition.cpp | 2 +- src/V3PreProc.cpp | 10 +++++----- src/V3PreShell.cpp | 8 ++++---- src/V3Premit.cpp | 6 +++--- src/V3Reloop.cpp | 6 +++--- src/V3Scope.cpp | 6 +++--- src/V3Slice.cpp | 2 +- src/V3Split.cpp | 8 ++++---- src/V3SplitAs.cpp | 8 ++++---- src/V3Stats.cpp | 6 +++--- src/V3StatsReport.cpp | 6 +++--- src/V3Subst.cpp | 6 +++--- src/V3Table.cpp | 6 +++--- src/V3Task.cpp | 4 ++-- src/V3Trace.cpp | 6 +++--- src/V3TraceDecl.cpp | 2 +- src/V3Tristate.cpp | 6 +++--- src/V3Undriven.cpp | 6 +++--- src/V3Unknown.cpp | 6 +++--- src/V3Unroll.cpp | 6 +++--- src/V3Width.cpp | 2 +- src/V3WidthSel.cpp | 2 +- src/VlcMain.cpp | 8 ++++---- 96 files changed, 289 insertions(+), 288 deletions(-) diff --git a/include/verilated_cov.cpp b/include/verilated_cov.cpp index 2681f3775..bd186f13e 100644 --- a/include/verilated_cov.cpp +++ b/include/verilated_cov.cpp @@ -24,9 +24,9 @@ #include "verilated_cov.h" #include "verilated_cov_key.h" -#include #include #include +#include //============================================================================= // VerilatedCovImpBase diff --git a/include/verilated_fst_c.cpp b/include/verilated_fst_c.cpp index 6e307ce17..867570828 100644 --- a/include/verilated_fst_c.cpp +++ b/include/verilated_fst_c.cpp @@ -28,13 +28,13 @@ #include "gtkwave/fastlz.c" #include "gtkwave/lz4.c" -#include -#include +#include #include #include -#include -#include +#include #include +#include +#include #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) # include diff --git a/include/verilated_fst_c.h b/include/verilated_fst_c.h index 0bd2d232b..4ae0d3e95 100644 --- a/include/verilated_fst_c.h +++ b/include/verilated_fst_c.h @@ -27,10 +27,10 @@ #include "verilated.h" #include "gtkwave/fstapi.h" -#include -#include #include #include +#include +#include class VerilatedFst; class VerilatedFstCallInfo; diff --git a/include/verilated_lxt2_c.cpp b/include/verilated_lxt2_c.cpp index f968d6dfb..ef452deae 100644 --- a/include/verilated_lxt2_c.cpp +++ b/include/verilated_lxt2_c.cpp @@ -26,12 +26,12 @@ // Include the GTKWave implementation directly #include "gtkwave/lxt2_write.cpp" -#include -#include +#include #include #include -#include +#include #include +#include #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) # include diff --git a/include/verilated_lxt2_c.h b/include/verilated_lxt2_c.h index bd665e465..828fc7b1f 100644 --- a/include/verilated_lxt2_c.h +++ b/include/verilated_lxt2_c.h @@ -27,9 +27,9 @@ #include "verilated.h" #include "gtkwave/lxt2_write.h" +#include #include #include -#include class VerilatedLxt2; class VerilatedLxt2CallInfo; diff --git a/include/verilated_save.cpp b/include/verilated_save.cpp index 2fba125f4..3768244e4 100644 --- a/include/verilated_save.cpp +++ b/include/verilated_save.cpp @@ -23,8 +23,8 @@ #include "verilated.h" #include "verilated_save.h" -#include #include +#include #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) # include diff --git a/include/verilated_vcd_c.cpp b/include/verilated_vcd_c.cpp index 2160870e1..f872fc547 100644 --- a/include/verilated_vcd_c.cpp +++ b/include/verilated_vcd_c.cpp @@ -24,11 +24,11 @@ #include "verilated.h" #include "verilated_vcd_c.h" -#include -#include +#include #include #include -#include +#include +#include #if defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) # include diff --git a/include/verilated_vpi.cpp b/include/verilated_vpi.cpp index d22189538..f36405720 100644 --- a/include/verilated_vpi.cpp +++ b/include/verilated_vpi.cpp @@ -33,8 +33,8 @@ #include "verilated_vpi.h" #include -#include #include +#include //====================================================================== // Internal constants diff --git a/src/V3Active.cpp b/src/V3Active.cpp index f72e5177f..d46a91ac1 100644 --- a/src/V3Active.cpp +++ b/src/V3Active.cpp @@ -32,11 +32,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index a532bb04c..484e404a5 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3Assert.cpp b/src/V3Assert.cpp index 5fb149f4f..2f4123421 100644 --- a/src/V3Assert.cpp +++ b/src/V3Assert.cpp @@ -20,11 +20,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include +#include #include +#include +#include #include "V3Global.h" #include "V3Assert.h" diff --git a/src/V3AssertPre.cpp b/src/V3AssertPre.cpp index 4f1964343..eee9a3d31 100644 --- a/src/V3AssertPre.cpp +++ b/src/V3AssertPre.cpp @@ -23,11 +23,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include +#include #include +#include +#include #include "V3Global.h" #include "V3AssertPre.h" diff --git a/src/V3Ast.cpp b/src/V3Ast.cpp index ed39790a9..11275da47 100644 --- a/src/V3Ast.cpp +++ b/src/V3Ast.cpp @@ -18,8 +18,8 @@ // //************************************************************************* -#include #include +#include #include #include #include diff --git a/src/V3Ast.h b/src/V3Ast.h index fa5b50b2c..faf661299 100644 --- a/src/V3Ast.h +++ b/src/V3Ast.h @@ -26,9 +26,9 @@ #include "V3FileLine.h" #include "V3Number.h" #include "V3Global.h" -#include #include #include +#include #include VL_INCLUDE_UNORDERED_SET #include "V3Ast__gen_classes.h" // From ./astgen diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp index da74a01cc..abe04d3b8 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -20,12 +20,12 @@ #include "config_build.h" #include "verilatedos.h" -#include +#include #include +#include #include #include #include -#include #include VL_INCLUDE_UNORDERED_SET #include "V3Ast.h" diff --git a/src/V3Begin.cpp b/src/V3Begin.cpp index 139040816..0279a42b9 100644 --- a/src/V3Begin.cpp +++ b/src/V3Begin.cpp @@ -31,10 +31,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3Branch.cpp b/src/V3Branch.cpp index bf51d7041..e52b616d6 100644 --- a/src/V3Branch.cpp +++ b/src/V3Branch.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include +#include #include "V3Global.h" #include "V3Branch.h" diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index 14d21e00e..d3472297e 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -27,10 +27,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include VL_INCLUDE_UNORDERED_MAP #include "V3Global.h" diff --git a/src/V3CCtors.cpp b/src/V3CCtors.cpp index faf1a9fc7..1e9d92485 100644 --- a/src/V3CCtors.cpp +++ b/src/V3CCtors.cpp @@ -29,13 +29,13 @@ //************************************************************************* #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include "V3Global.h" #include "V3EmitCBase.h" diff --git a/src/V3Case.cpp b/src/V3Case.cpp index 29fc58ac9..694ccec85 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -39,10 +39,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Case.h" diff --git a/src/V3Cast.cpp b/src/V3Cast.cpp index 1b7c91123..638e39ada 100644 --- a/src/V3Cast.cpp +++ b/src/V3Cast.cpp @@ -43,10 +43,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Cast.h" diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp index e9696886f..9efb40f6a 100644 --- a/src/V3Cdc.cpp +++ b/src/V3Cdc.cpp @@ -27,15 +27,15 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include -#include +#include +#include #include +#include #include #include +#include +#include #include "V3Global.h" #include "V3Cdc.h" diff --git a/src/V3Changed.cpp b/src/V3Changed.cpp index 222ef6811..bc1de9273 100644 --- a/src/V3Changed.cpp +++ b/src/V3Changed.cpp @@ -32,11 +32,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include +#include #include "V3Global.h" #include "V3Ast.h" diff --git a/src/V3Clean.cpp b/src/V3Clean.cpp index 8e7ddb101..f4e9c9b9f 100644 --- a/src/V3Clean.cpp +++ b/src/V3Clean.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Clean.h" diff --git a/src/V3ClkGater.cpp b/src/V3ClkGater.cpp index fc5e5dfd9..a8b1fbba5 100644 --- a/src/V3ClkGater.cpp +++ b/src/V3ClkGater.cpp @@ -33,11 +33,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index 870bc60fc..84a4a983d 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -33,10 +33,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Clock.h" diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index 9c287c014..c7e7a0774 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -36,12 +36,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include +#include +#include #include "V3Global.h" #include "V3Combine.h" diff --git a/src/V3Config.cpp b/src/V3Config.cpp index 0d2b8584e..bc4759259 100644 --- a/src/V3Config.cpp +++ b/src/V3Config.cpp @@ -20,9 +20,9 @@ #include "config_build.h" #include "verilatedos.h" -#include #include #include +#include #include "V3Global.h" #include "V3String.h" diff --git a/src/V3Const.cpp b/src/V3Const.cpp index 86c3675ce..7a9208dd7 100644 --- a/src/V3Const.cpp +++ b/src/V3Const.cpp @@ -26,11 +26,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include "V3Global.h" #include "V3String.h" diff --git a/src/V3Coverage.cpp b/src/V3Coverage.cpp index 7e27a1197..ce36243dc 100644 --- a/src/V3Coverage.cpp +++ b/src/V3Coverage.cpp @@ -30,10 +30,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include +#include #include "V3Global.h" #include "V3Coverage.h" diff --git a/src/V3CoverageJoin.cpp b/src/V3CoverageJoin.cpp index 592c74ef4..9b6e79e39 100644 --- a/src/V3CoverageJoin.cpp +++ b/src/V3CoverageJoin.cpp @@ -24,8 +24,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include diff --git a/src/V3Dead.cpp b/src/V3Dead.cpp index a332c9db9..4de40f1e5 100644 --- a/src/V3Dead.cpp +++ b/src/V3Dead.cpp @@ -40,11 +40,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include +#include #include #include -#include #include "V3Global.h" #include "V3Dead.h" diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index 18e712a78..9e4caaa8d 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -53,12 +53,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include +#include +#include #include "V3Global.h" #include "V3Delayed.h" diff --git a/src/V3Depth.cpp b/src/V3Depth.cpp index b590dfcc1..409ef02ad 100644 --- a/src/V3Depth.cpp +++ b/src/V3Depth.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Depth.h" diff --git a/src/V3DepthBlock.cpp b/src/V3DepthBlock.cpp index 63bbd357f..cdfb9e3f5 100644 --- a/src/V3DepthBlock.cpp +++ b/src/V3DepthBlock.cpp @@ -26,10 +26,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3DepthBlock.h" diff --git a/src/V3Descope.cpp b/src/V3Descope.cpp index ebf7b6408..5d044438e 100644 --- a/src/V3Descope.cpp +++ b/src/V3Descope.cpp @@ -28,10 +28,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include +#include #include "V3Global.h" #include "V3Descope.h" diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index 31fe61574..a9d3cf1bf 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -20,13 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp index ff7cf8965..19ff1196a 100644 --- a/src/V3EmitCInlines.cpp +++ b/src/V3EmitCInlines.cpp @@ -20,11 +20,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include +#include #include #include "V3Global.h" diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index 049ed9bf4..7a8f53c79 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -20,14 +20,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include +#include #include +#include +#include #include #include +#include #include -#include #include "V3Global.h" #include "V3EmitC.h" diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp index 8e08d5cc5..c9cc6dc03 100644 --- a/src/V3EmitMk.cpp +++ b/src/V3EmitMk.cpp @@ -20,13 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include "V3Global.h" #include "V3Os.h" diff --git a/src/V3EmitV.cpp b/src/V3EmitV.cpp index 1d25a5dee..28ada1122 100644 --- a/src/V3EmitV.cpp +++ b/src/V3EmitV.cpp @@ -20,13 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include "V3Global.h" #include "V3EmitV.h" diff --git a/src/V3EmitXml.cpp b/src/V3EmitXml.cpp index 4963cae82..d7fb97625 100644 --- a/src/V3EmitXml.cpp +++ b/src/V3EmitXml.cpp @@ -20,13 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include "V3Global.h" #include "V3String.h" diff --git a/src/V3Error.cpp b/src/V3Error.cpp index a56d76db0..4336e9a22 100644 --- a/src/V3Error.cpp +++ b/src/V3Error.cpp @@ -18,8 +18,8 @@ // //************************************************************************* -#include #include +#include #include #include #include "V3Error.h" diff --git a/src/V3Expand.cpp b/src/V3Expand.cpp index 55db1b12e..95b5f0e25 100644 --- a/src/V3Expand.cpp +++ b/src/V3Expand.cpp @@ -31,10 +31,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Expand.h" diff --git a/src/V3File.cpp b/src/V3File.cpp index e77bbd2c3..6b9e47222 100644 --- a/src/V3File.cpp +++ b/src/V3File.cpp @@ -20,15 +20,15 @@ #include "config_build.h" #include "verilatedos.h" +#include #include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include #if defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) # define INFILTER_PIPE // Allow pipe filtering. Needs fork() diff --git a/src/V3FileLine.cpp b/src/V3FileLine.cpp index f690cbb18..4f06471b9 100644 --- a/src/V3FileLine.cpp +++ b/src/V3FileLine.cpp @@ -20,8 +20,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index 06c868ac5..87f252ad2 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -27,14 +27,14 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include -#include #include #include +#include +#include #include VL_INCLUDE_UNORDERED_SET #include "V3Global.h" diff --git a/src/V3GenClk.cpp b/src/V3GenClk.cpp index e9d376dd8..f5131ba61 100644 --- a/src/V3GenClk.cpp +++ b/src/V3GenClk.cpp @@ -25,8 +25,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include "V3Global.h" diff --git a/src/V3Graph.cpp b/src/V3Graph.cpp index 7a293bb1d..56c1f505d 100644 --- a/src/V3Graph.cpp +++ b/src/V3Graph.cpp @@ -20,13 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include #include +#include +#include #include "V3Global.h" #include "V3File.h" diff --git a/src/V3GraphAcyc.cpp b/src/V3GraphAcyc.cpp index 5886ae905..9152b076e 100644 --- a/src/V3GraphAcyc.cpp +++ b/src/V3GraphAcyc.cpp @@ -20,12 +20,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include +#include +#include #include "V3Global.h" #include "V3Graph.h" diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp index 3eb6b5e8b..332cd9354 100644 --- a/src/V3GraphDfa.cpp +++ b/src/V3GraphDfa.cpp @@ -20,12 +20,12 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include +#include #include #include +#include +#include #include "V3Global.h" #include "V3GraphDfa.h" diff --git a/src/V3GraphTest.cpp b/src/V3GraphTest.cpp index 963e9b05a..f7371efed 100644 --- a/src/V3GraphTest.cpp +++ b/src/V3GraphTest.cpp @@ -20,8 +20,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include "V3Global.h" diff --git a/src/V3Hashed.cpp b/src/V3Hashed.cpp index a32193467..5a6fac63a 100644 --- a/src/V3Hashed.cpp +++ b/src/V3Hashed.cpp @@ -27,13 +27,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include #include #include +#include #include "V3Global.h" #include "V3Hashed.h" diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index 7de1565fa..f4aa8ff6a 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -30,10 +30,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3Inst.cpp b/src/V3Inst.cpp index 6f1e3e463..16923f8a3 100644 --- a/src/V3Inst.cpp +++ b/src/V3Inst.cpp @@ -27,10 +27,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Inst.h" diff --git a/src/V3Life.cpp b/src/V3Life.cpp index fb7a0601d..99bd7ba33 100644 --- a/src/V3Life.cpp +++ b/src/V3Life.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include +#include #include #include "V3Global.h" diff --git a/src/V3LifePost.cpp b/src/V3LifePost.cpp index e55fa64e0..e510f2038 100644 --- a/src/V3LifePost.cpp +++ b/src/V3LifePost.cpp @@ -30,8 +30,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include // for vl_unique_ptr -> auto_ptr or unique_ptr #include #include VL_INCLUDE_UNORDERED_MAP diff --git a/src/V3LinkCells.cpp b/src/V3LinkCells.cpp index fdb23d683..827f745b0 100644 --- a/src/V3LinkCells.cpp +++ b/src/V3LinkCells.cpp @@ -29,11 +29,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 19c70e5fb..e990639a3 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -65,11 +65,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3LinkJump.cpp b/src/V3LinkJump.cpp index c5b57b4ec..93c04a0b9 100644 --- a/src/V3LinkJump.cpp +++ b/src/V3LinkJump.cpp @@ -28,10 +28,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3LinkLValue.cpp b/src/V3LinkLValue.cpp index 2775e3731..10b6e6c32 100644 --- a/src/V3LinkLValue.cpp +++ b/src/V3LinkLValue.cpp @@ -24,11 +24,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3LinkLevel.cpp b/src/V3LinkLevel.cpp index bd859cf25..e0ac8bbe7 100644 --- a/src/V3LinkLevel.cpp +++ b/src/V3LinkLevel.cpp @@ -25,11 +25,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3LinkParse.cpp b/src/V3LinkParse.cpp index 96f80e513..e2b61e4ff 100644 --- a/src/V3LinkParse.cpp +++ b/src/V3LinkParse.cpp @@ -24,12 +24,12 @@ #include "config_build.h" #include "verilatedos.h" -#include +#include #include -#include +#include #include #include -#include +#include #include #include "V3Global.h" diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index b97ffce80..3f973375d 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -30,11 +30,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3Localize.cpp b/src/V3Localize.cpp index 86fa7e26d..5427f32e7 100644 --- a/src/V3Localize.cpp +++ b/src/V3Localize.cpp @@ -28,8 +28,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include diff --git a/src/V3Name.cpp b/src/V3Name.cpp index fbfe6ede8..764c3417d 100644 --- a/src/V3Name.cpp +++ b/src/V3Name.cpp @@ -25,10 +25,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Name.h" diff --git a/src/V3Number.cpp b/src/V3Number.cpp index b8fe78399..77470d155 100644 --- a/src/V3Number.cpp +++ b/src/V3Number.cpp @@ -20,11 +20,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include + #include "V3Global.h" #include "V3Number.h" diff --git a/src/V3Options.cpp b/src/V3Options.cpp index 6952efce1..703b732fe 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -27,12 +27,12 @@ #endif #include #include -#include #include -#include #include #include #include +#include +#include #include "V3Global.h" #include "V3String.h" diff --git a/src/V3Order.cpp b/src/V3Order.cpp index bc7afaf9c..b8d0d65f4 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -78,16 +78,16 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include -#include #include -#include +#include #include +#include +#include +#include #include "V3Ast.h" #include "V3Const.h" diff --git a/src/V3Os.cpp b/src/V3Os.cpp index 46f3ade89..f747533c9 100644 --- a/src/V3Os.cpp +++ b/src/V3Os.cpp @@ -20,18 +20,18 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include #if defined(WIN32) || defined(__MINGW32__) # include // mkdir diff --git a/src/V3Param.cpp b/src/V3Param.cpp index d258c193f..4ae35d039 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -50,12 +50,12 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include -#include +#include #include +#include +#include +#include #include "V3Global.h" #include "V3Param.h" diff --git a/src/V3ParseImp.cpp b/src/V3ParseImp.cpp index 1a0d4405a..4a9e105b2 100644 --- a/src/V3ParseImp.cpp +++ b/src/V3ParseImp.cpp @@ -28,11 +28,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include #include +#include #include "V3Error.h" #include "V3Global.h" diff --git a/src/V3ParseLex.cpp b/src/V3ParseLex.cpp index 72053a38e..240e990a0 100644 --- a/src/V3ParseLex.cpp +++ b/src/V3ParseLex.cpp @@ -20,10 +20,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include +#include #include "V3Error.h" #include "V3Global.h" diff --git a/src/V3Partition.cpp b/src/V3Partition.cpp index ad6a1a46e..49ba02e9b 100644 --- a/src/V3Partition.cpp +++ b/src/V3Partition.cpp @@ -20,9 +20,9 @@ #include "config_build.h" #include "verilatedos.h" +#include #include #include -#include #include "V3Os.h" #include "V3File.h" diff --git a/src/V3PreProc.cpp b/src/V3PreProc.cpp index 40d512b35..32ada81e8 100644 --- a/src/V3PreProc.cpp +++ b/src/V3PreProc.cpp @@ -20,15 +20,15 @@ #include "config_build.h" #include "verilatedos.h" +#include #include #include -#include -#include #include -#include -#include -#include #include +#include +#include +#include +#include #include "V3Error.h" #include "V3Global.h" diff --git a/src/V3PreShell.cpp b/src/V3PreShell.cpp index a0c605771..d7a66472d 100644 --- a/src/V3PreShell.cpp +++ b/src/V3PreShell.cpp @@ -20,13 +20,13 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include -#include #include +#include +#include +#include #include #include +#include #include "V3Global.h" #include "V3PreShell.h" diff --git a/src/V3Premit.cpp b/src/V3Premit.cpp index 7b2ab8b93..7a30bb4a1 100644 --- a/src/V3Premit.cpp +++ b/src/V3Premit.cpp @@ -30,11 +30,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include +#include #include "V3Global.h" #include "V3Premit.h" diff --git a/src/V3Reloop.cpp b/src/V3Reloop.cpp index 8c5d0cd4d..9fb26d485 100644 --- a/src/V3Reloop.cpp +++ b/src/V3Reloop.cpp @@ -35,10 +35,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Reloop.h" diff --git a/src/V3Scope.cpp b/src/V3Scope.cpp index 61b9d2998..2b1b53f99 100644 --- a/src/V3Scope.cpp +++ b/src/V3Scope.cpp @@ -27,12 +27,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include #include +#include #include VL_INCLUDE_UNORDERED_MAP #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3Slice.cpp b/src/V3Slice.cpp index ad0c93d1b..be75fca1c 100644 --- a/src/V3Slice.cpp +++ b/src/V3Slice.cpp @@ -41,8 +41,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include "V3Global.h" diff --git a/src/V3Split.cpp b/src/V3Split.cpp index 4ff81a567..67b358dbe 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -83,12 +83,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include +#include +#include #include VL_INCLUDE_UNORDERED_MAP #include VL_INCLUDE_UNORDERED_SET diff --git a/src/V3SplitAs.cpp b/src/V3SplitAs.cpp index c5cf5bdd3..86f854993 100644 --- a/src/V3SplitAs.cpp +++ b/src/V3SplitAs.cpp @@ -27,12 +27,12 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include -#include +#include +#include #include +#include +#include #include "V3Global.h" #include "V3SplitAs.h" diff --git a/src/V3Stats.cpp b/src/V3Stats.cpp index d42803840..cd41d908c 100644 --- a/src/V3Stats.cpp +++ b/src/V3Stats.cpp @@ -20,11 +20,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include +#include #include +#include +#include #include "V3Global.h" #include "V3Stats.h" diff --git a/src/V3StatsReport.cpp b/src/V3StatsReport.cpp index 3c3791d6a..89e36c0ea 100644 --- a/src/V3StatsReport.cpp +++ b/src/V3StatsReport.cpp @@ -20,11 +20,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include +#include #include +#include +#include #include VL_INCLUDE_UNORDERED_MAP #include "V3Global.h" diff --git a/src/V3Subst.cpp b/src/V3Subst.cpp index 4993230de..9b8ea5657 100644 --- a/src/V3Subst.cpp +++ b/src/V3Subst.cpp @@ -28,10 +28,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3Table.cpp b/src/V3Table.cpp index b54eb37a0..69160eb9c 100644 --- a/src/V3Table.cpp +++ b/src/V3Table.cpp @@ -27,11 +27,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include +#include #include "V3Global.h" #include "V3Table.h" diff --git a/src/V3Task.cpp b/src/V3Task.cpp index 596416a1a..9ba343f67 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include +#include #include +#include #include "V3Global.h" #include "V3Const.h" diff --git a/src/V3Trace.cpp b/src/V3Trace.cpp index 2dc054c36..9c8aac714 100644 --- a/src/V3Trace.cpp +++ b/src/V3Trace.cpp @@ -48,11 +48,11 @@ #include "config_build.h" #include "verilatedos.h" -#include #include -#include -#include +#include #include +#include +#include #include "V3Global.h" #include "V3Trace.h" diff --git a/src/V3TraceDecl.cpp b/src/V3TraceDecl.cpp index d8be40079..f2274f752 100644 --- a/src/V3TraceDecl.cpp +++ b/src/V3TraceDecl.cpp @@ -26,8 +26,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include "V3Global.h" diff --git a/src/V3Tristate.cpp b/src/V3Tristate.cpp index d0287545a..d1a6b262c 100644 --- a/src/V3Tristate.cpp +++ b/src/V3Tristate.cpp @@ -59,11 +59,11 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include #include +#include #include "V3Global.h" #include "V3Tristate.h" diff --git a/src/V3Undriven.cpp b/src/V3Undriven.cpp index bc0a12503..cb957eb21 100644 --- a/src/V3Undriven.cpp +++ b/src/V3Undriven.cpp @@ -29,10 +29,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include #include "V3Global.h" diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index 50595587a..affff96c4 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -33,10 +33,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Unknown.h" diff --git a/src/V3Unroll.cpp b/src/V3Unroll.cpp index 0442e0b28..b11790178 100644 --- a/src/V3Unroll.cpp +++ b/src/V3Unroll.cpp @@ -30,10 +30,10 @@ #include "config_build.h" #include "verilatedos.h" -#include -#include -#include #include +#include +#include +#include #include "V3Global.h" #include "V3Unroll.h" diff --git a/src/V3Width.cpp b/src/V3Width.cpp index d69d7a874..aa520ee3e 100644 --- a/src/V3Width.cpp +++ b/src/V3Width.cpp @@ -69,8 +69,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include "V3Global.h" diff --git a/src/V3WidthSel.cpp b/src/V3WidthSel.cpp index ef0b57db6..e4dd5661a 100644 --- a/src/V3WidthSel.cpp +++ b/src/V3WidthSel.cpp @@ -32,8 +32,8 @@ #include "config_build.h" #include "verilatedos.h" -#include #include +#include #include #include "V3Global.h" diff --git a/src/VlcMain.cpp b/src/VlcMain.cpp index cfae2ea3c..f76efe8c1 100644 --- a/src/VlcMain.cpp +++ b/src/VlcMain.cpp @@ -26,6 +26,10 @@ #include "verilatedos.h" +#include +#include +#include + #define _V3ERROR_NO_GLOBAL_ 1 #include "V3Error.cpp" #include "V3String.cpp" @@ -35,10 +39,6 @@ #include "VlcOptions.h" #include "VlcTop.h" -#include -#include -#include - //###################################################################### // VlcOptions