From 6739a70f8ccf49b49c0705bbaacf617250f486ff Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:21:06 -0800 Subject: [PATCH 01/13] include SymbolId in files using BadSymbolId --- src/Cache/PPCache.cpp | 1 + src/Cache/ParseCache.cpp | 1 + src/Design/FileContent.cpp | 1 + src/DesignCompile/CompileDesign.cpp | 1 + src/SourceCompile/AnalyzeFile.cpp | 1 + src/SourceCompile/CompileSourceFile.cpp | 1 + src/SourceCompile/PreprocessFile.cpp | 1 + src/SourceCompile/PreprocessHarness.cpp | 1 + src/SourceCompile/SV3_1aTreeShapeListener.cpp | 1 + src/main.cpp | 1 + 10 files changed, 10 insertions(+) diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp index 21df021206..82309e5812 100644 --- a/src/Cache/PPCache.cpp +++ b/src/Cache/PPCache.cpp @@ -39,6 +39,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/TimeInfo.h" diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp index 8852b5d55c..2fda94b55e 100644 --- a/src/Cache/ParseCache.cpp +++ b/src/Cache/ParseCache.cpp @@ -40,6 +40,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/Design/FileContent.h" diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp index 05954821f6..608a01f0a3 100644 --- a/src/Design/FileContent.cpp +++ b/src/Design/FileContent.cpp @@ -34,6 +34,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp index 810f8ca51c..6aec366ee5 100644 --- a/src/DesignCompile/CompileDesign.cpp +++ b/src/DesignCompile/CompileDesign.cpp @@ -25,6 +25,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp index 8c0b923f7c..9f2725eae6 100644 --- a/src/SourceCompile/AnalyzeFile.cpp +++ b/src/SourceCompile/AnalyzeFile.cpp @@ -34,6 +34,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" diff --git a/src/SourceCompile/CompileSourceFile.cpp b/src/SourceCompile/CompileSourceFile.cpp index c7440be56c..1b139ab373 100644 --- a/src/SourceCompile/CompileSourceFile.cpp +++ b/src/SourceCompile/CompileSourceFile.cpp @@ -26,6 +26,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp index 2d9d0b2663..6d1d56be2b 100644 --- a/src/SourceCompile/PreprocessFile.cpp +++ b/src/SourceCompile/PreprocessFile.cpp @@ -41,6 +41,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" diff --git a/src/SourceCompile/PreprocessHarness.cpp b/src/SourceCompile/PreprocessHarness.cpp index 7e4cfc16c5..d3d14be64c 100644 --- a/src/SourceCompile/PreprocessHarness.cpp +++ b/src/SourceCompile/PreprocessHarness.cpp @@ -28,6 +28,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Library/Library.h" #include "Surelog/SourceCompile/CompilationUnit.h" #include "Surelog/SourceCompile/CompileSourceFile.h" diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp index 0fbccde0a1..5bd03c02d0 100644 --- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp +++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp @@ -32,6 +32,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/FileContent.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" diff --git a/src/main.cpp b/src/main.cpp index 8b865ba319..e895fa8910 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,6 +50,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/PlatformFileSystem.h" +#include "Surelog/Common/SumbolId.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" From 6fc7d2edfe8ac7cf9471f7be92d4c20342419839 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:23:32 -0800 Subject: [PATCH 02/13] Include VObject.h in files needing SURELOG::VObject --- src/Cache/PPCache.cpp | 1 + src/Cache/ParseCache.cpp | 1 + src/DesignCompile/CompileClass.cpp | 1 + src/DesignCompile/CompileFileContent.cpp | 1 + src/DesignCompile/CompileHelper.cpp | 1 + src/DesignCompile/CompileModule.cpp | 1 + src/DesignCompile/CompileProgram.cpp | 1 + src/DesignCompile/CompileStmt.cpp | 1 + src/DesignCompile/ResolveSymbols.cpp | 1 + 9 files changed, 9 insertions(+) diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp index 82309e5812..d71bd327f0 100644 --- a/src/Cache/PPCache.cpp +++ b/src/Cache/PPCache.cpp @@ -43,6 +43,7 @@ #include "Surelog/Design/Design.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/TimeInfo.h" +#include "Surelog/Design/VObject.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" #include "Surelog/ErrorReporting/Location.h" #include "Surelog/Library/Library.h" diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp index 2fda94b55e..e0d854d846 100644 --- a/src/Cache/ParseCache.cpp +++ b/src/Cache/ParseCache.cpp @@ -44,6 +44,7 @@ #include "Surelog/Design/Design.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/Design/FileContent.h" +#include "Surelog/Design/VObject.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" #include "Surelog/ErrorReporting/Location.h" diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp index 753e8396ec..9068bbf5d0 100644 --- a/src/DesignCompile/CompileClass.cpp +++ b/src/DesignCompile/CompileClass.cpp @@ -28,6 +28,7 @@ #include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" #include "Surelog/Design/FileContent.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" #include "Surelog/ErrorReporting/Error.h" diff --git a/src/DesignCompile/CompileFileContent.cpp b/src/DesignCompile/CompileFileContent.cpp index 0f302dc0b0..d706c43bed 100644 --- a/src/DesignCompile/CompileFileContent.cpp +++ b/src/DesignCompile/CompileFileContent.cpp @@ -29,6 +29,7 @@ #include "Surelog/Common/NodeId.h" #include "Surelog/Design/FileContent.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileHelper.h" #include "Surelog/SourceCompile/VObjectTypes.h" diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp index 291bc25f1c..35537a5b7e 100644 --- a/src/DesignCompile/CompileHelper.cpp +++ b/src/DesignCompile/CompileHelper.cpp @@ -40,6 +40,7 @@ #include "Surelog/Design/Struct.h" #include "Surelog/Design/TfPortItem.h" #include "Surelog/Design/Union.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/UhdmWriter.h" #include "Surelog/ErrorReporting/Error.h" diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp index 45a436f730..d2424820c9 100644 --- a/src/DesignCompile/CompileModule.cpp +++ b/src/DesignCompile/CompileModule.cpp @@ -30,6 +30,7 @@ #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" #include "Surelog/ErrorReporting/Error.h" diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp index 5a0a66be4a..4cc96fd8cd 100644 --- a/src/DesignCompile/CompileProgram.cpp +++ b/src/DesignCompile/CompileProgram.cpp @@ -32,6 +32,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Design/FileContent.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" #include "Surelog/ErrorReporting/Error.h" diff --git a/src/DesignCompile/CompileStmt.cpp b/src/DesignCompile/CompileStmt.cpp index cef269e774..e78accb578 100644 --- a/src/DesignCompile/CompileStmt.cpp +++ b/src/DesignCompile/CompileStmt.cpp @@ -31,6 +31,7 @@ #include "Surelog/Design/ModuleInstance.h" #include "Surelog/Design/Netlist.h" #include "Surelog/Design/Task.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" #include "Surelog/DesignCompile/UhdmWriter.h" diff --git a/src/DesignCompile/ResolveSymbols.cpp b/src/DesignCompile/ResolveSymbols.cpp index 0b98c52e1f..75c74cd625 100644 --- a/src/DesignCompile/ResolveSymbols.cpp +++ b/src/DesignCompile/ResolveSymbols.cpp @@ -28,6 +28,7 @@ #include "Surelog/Common/SymbolId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" +#include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/Library/Library.h" #include "Surelog/Package/Package.h" From cb3366bb934888a8c7e81e03bb70f9c99321388f Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:25:57 -0800 Subject: [PATCH 03/13] Include corresponding header for files using FileCNodeId --- src/Design/DesignComponent.cpp | 1 + src/DesignCompile/CompileClass.cpp | 1 + src/DesignCompile/CompileFileContent.cpp | 1 + src/DesignCompile/CompileHelper.cpp | 1 + src/DesignCompile/CompileModule.cpp | 1 + src/DesignCompile/CompilePackage.cpp | 1 + src/DesignCompile/CompileProgram.cpp | 1 + src/DesignCompile/DesignElaboration.cpp | 1 + src/DesignCompile/ElaborationStep.cpp | 1 + 9 files changed, 9 insertions(+) diff --git a/src/Design/DesignComponent.cpp b/src/Design/DesignComponent.cpp index 13c32504a2..e58532365f 100644 --- a/src/Design/DesignComponent.cpp +++ b/src/Design/DesignComponent.cpp @@ -28,6 +28,7 @@ #include #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/Parameter.h" #include "Surelog/SourceCompile/VObjectTypes.h" diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp index 9068bbf5d0..a0cbd74224 100644 --- a/src/DesignCompile/CompileClass.cpp +++ b/src/DesignCompile/CompileClass.cpp @@ -27,6 +27,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" diff --git a/src/DesignCompile/CompileFileContent.cpp b/src/DesignCompile/CompileFileContent.cpp index d706c43bed..994aa1a913 100644 --- a/src/DesignCompile/CompileFileContent.cpp +++ b/src/DesignCompile/CompileFileContent.cpp @@ -28,6 +28,7 @@ #include #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileHelper.h" diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp index 35537a5b7e..db81c18b4e 100644 --- a/src/DesignCompile/CompileHelper.cpp +++ b/src/DesignCompile/CompileHelper.cpp @@ -29,6 +29,7 @@ #include "Surelog/Design/DataType.h" #include "Surelog/Design/DummyType.h" #include "Surelog/Design/Enum.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp index d2424820c9..aa62e12c7d 100644 --- a/src/DesignCompile/CompileModule.cpp +++ b/src/DesignCompile/CompileModule.cpp @@ -27,6 +27,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" diff --git a/src/DesignCompile/CompilePackage.cpp b/src/DesignCompile/CompilePackage.cpp index 1ebd292046..f0519d623a 100644 --- a/src/DesignCompile/CompilePackage.cpp +++ b/src/DesignCompile/CompilePackage.cpp @@ -25,6 +25,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp index 4cc96fd8cd..796e4a2477 100644 --- a/src/DesignCompile/CompileProgram.cpp +++ b/src/DesignCompile/CompileProgram.cpp @@ -31,6 +31,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp index 49575142bb..d38d2f7afe 100644 --- a/src/DesignCompile/DesignElaboration.cpp +++ b/src/DesignCompile/DesignElaboration.cpp @@ -30,6 +30,7 @@ #include "Surelog/Design/BindStmt.h" #include "Surelog/Design/DefParam.h" #include "Surelog/Design/DesignElement.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp index 9c359bb944..b5842bffb4 100644 --- a/src/DesignCompile/ElaborationStep.cpp +++ b/src/DesignCompile/ElaborationStep.cpp @@ -42,6 +42,7 @@ #include "Surelog/Design/DataType.h" #include "Surelog/Design/DummyType.h" #include "Surelog/Design/Enum.h" +#include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/Function.h" #include "Surelog/Design/ModuleDefinition.h" From a5ae320a3bb16eeb57d714ec77195f98358a0516 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:29:03 -0800 Subject: [PATCH 04/13] Include NodeId.h for SURELOG::InvalidNodeId --- src/Design/FileContent.cpp | 1 + src/DesignCompile/Builtin.cpp | 1 + src/DesignCompile/CompileAssertion.cpp | 1 + src/DesignCompile/CompileExpression.cpp | 1 + src/DesignCompile/CompileHelper.cpp | 1 + src/DesignCompile/CompileStmt.cpp | 1 + src/DesignCompile/CompileType.cpp | 1 + src/DesignCompile/DesignElaboration.cpp | 1 + 8 files changed, 8 insertions(+) diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp index 608a01f0a3..dacdc900c7 100644 --- a/src/Design/FileContent.cpp +++ b/src/Design/FileContent.cpp @@ -33,6 +33,7 @@ #include #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/SumbolId.h" #include "Surelog/Design/DesignElement.h" diff --git a/src/DesignCompile/Builtin.cpp b/src/DesignCompile/Builtin.cpp index faf17a0c73..91794a8626 100644 --- a/src/DesignCompile/Builtin.cpp +++ b/src/DesignCompile/Builtin.cpp @@ -24,6 +24,7 @@ #include "Surelog/DesignCompile/Builtin.h" #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/FileContent.h" diff --git a/src/DesignCompile/CompileAssertion.cpp b/src/DesignCompile/CompileAssertion.cpp index 44e8c4ca6f..4ed958258b 100644 --- a/src/DesignCompile/CompileAssertion.cpp +++ b/src/DesignCompile/CompileAssertion.cpp @@ -21,6 +21,7 @@ * Created on May 14, 2019, 8:03 PM */ +#include "Surelog/Common/NodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp index be518c78dd..e4b0254a52 100644 --- a/src/DesignCompile/CompileExpression.cpp +++ b/src/DesignCompile/CompileExpression.cpp @@ -37,6 +37,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" #include "Surelog/Design/Enum.h" #include "Surelog/Design/FileContent.h" diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp index db81c18b4e..99914dc0f5 100644 --- a/src/DesignCompile/CompileHelper.cpp +++ b/src/DesignCompile/CompileHelper.cpp @@ -25,6 +25,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" #include "Surelog/Design/DataType.h" #include "Surelog/Design/DummyType.h" diff --git a/src/DesignCompile/CompileStmt.cpp b/src/DesignCompile/CompileStmt.cpp index e78accb578..c948dd6d7e 100644 --- a/src/DesignCompile/CompileStmt.cpp +++ b/src/DesignCompile/CompileStmt.cpp @@ -22,6 +22,7 @@ */ #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Design/BindStmt.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/Enum.h" diff --git a/src/DesignCompile/CompileType.cpp b/src/DesignCompile/CompileType.cpp index 3afae0fade..51769d1580 100644 --- a/src/DesignCompile/CompileType.cpp +++ b/src/DesignCompile/CompileType.cpp @@ -23,6 +23,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Design/DataType.h" #include "Surelog/Design/DummyType.h" #include "Surelog/Design/Enum.h" diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp index d38d2f7afe..dfaf419d9b 100644 --- a/src/DesignCompile/DesignElaboration.cpp +++ b/src/DesignCompile/DesignElaboration.cpp @@ -25,6 +25,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" +#include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" #include "Surelog/Config/ConfigSet.h" #include "Surelog/Design/BindStmt.h" From 5a4d7bc7410363201fa661a8ef9f059359f15305 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:31:11 -0800 Subject: [PATCH 05/13] Include IncludeFileInfo.h for files using the defined class. --- src/Cache/PPCache.cpp | 1 + src/DesignCompile/CompileDesign.cpp | 1 + src/Library/SVLibShapeListener.cpp | 1 + src/SourceCompile/AnalyzeFile.cpp | 1 + src/SourceCompile/ParseFile.cpp | 1 + src/SourceCompile/PreprocessFile.cpp | 1 + src/SourceCompile/SV3_1aPpTreeShapeListener.cpp | 1 + src/SourceCompile/SV3_1aTreeShapeListener.cpp | 1 + 8 files changed, 8 insertions(+) diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp index d71bd327f0..c2fd7fa4b7 100644 --- a/src/Cache/PPCache.cpp +++ b/src/Cache/PPCache.cpp @@ -51,6 +51,7 @@ #include "Surelog/SourceCompile/CompilationUnit.h" #include "Surelog/SourceCompile/CompileSourceFile.h" #include "Surelog/SourceCompile/Compiler.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/MacroInfo.h" #include "Surelog/SourceCompile/PreprocessFile.h" #include "Surelog/SourceCompile/SymbolTable.h" diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp index 6aec366ee5..b64c0a5127 100644 --- a/src/DesignCompile/CompileDesign.cpp +++ b/src/DesignCompile/CompileDesign.cpp @@ -49,6 +49,7 @@ #include "Surelog/Library/Library.h" #include "Surelog/Package/Package.h" #include "Surelog/SourceCompile/Compiler.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/Testbench/ClassDefinition.h" #include "Surelog/Testbench/Program.h" diff --git a/src/Library/SVLibShapeListener.cpp b/src/Library/SVLibShapeListener.cpp index 3a56185675..03d88ce237 100644 --- a/src/Library/SVLibShapeListener.cpp +++ b/src/Library/SVLibShapeListener.cpp @@ -39,6 +39,7 @@ #include "Surelog/Library/Library.h" #include "Surelog/Library/LibrarySet.h" #include "Surelog/Library/ParseLibraryDef.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/ParseFile.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/SourceCompile/VObjectTypes.h" diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp index 9f2725eae6..9217e39ad9 100644 --- a/src/SourceCompile/AnalyzeFile.cpp +++ b/src/SourceCompile/AnalyzeFile.cpp @@ -40,6 +40,7 @@ #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" #include "Surelog/ErrorReporting/Location.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/Utils/StringUtils.h" diff --git a/src/SourceCompile/ParseFile.cpp b/src/SourceCompile/ParseFile.cpp index eee9c19e23..3668fe0b72 100644 --- a/src/SourceCompile/ParseFile.cpp +++ b/src/SourceCompile/ParseFile.cpp @@ -45,6 +45,7 @@ #include "Surelog/SourceCompile/AntlrParserErrorListener.h" #include "Surelog/SourceCompile/AntlrParserHandler.h" #include "Surelog/SourceCompile/CompileSourceFile.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/SV3_1aTreeShapeListener.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/Utils/StringUtils.h" diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp index 6d1d56be2b..aa3196d9a0 100644 --- a/src/SourceCompile/PreprocessFile.cpp +++ b/src/SourceCompile/PreprocessFile.cpp @@ -51,6 +51,7 @@ #include "Surelog/SourceCompile/CompilationUnit.h" #include "Surelog/SourceCompile/CompileSourceFile.h" #include "Surelog/SourceCompile/Compiler.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/MacroInfo.h" #include "Surelog/SourceCompile/SV3_1aPpTreeShapeListener.h" #include "Surelog/SourceCompile/SymbolTable.h" diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp index 45a5d6e3f8..8938c684e8 100644 --- a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp +++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp @@ -35,6 +35,7 @@ #include "Surelog/SourceCompile/CompilationUnit.h" #include "Surelog/SourceCompile/CompileSourceFile.h" #include "Surelog/SourceCompile/Compiler.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/MacroInfo.h" #include "Surelog/SourceCompile/PreprocessFile.h" #include "Surelog/SourceCompile/SymbolTable.h" diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp index 5bd03c02d0..a72f5f299c 100644 --- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp +++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp @@ -38,6 +38,7 @@ #include "Surelog/ErrorReporting/ErrorDefinition.h" #include "Surelog/SourceCompile/CompilationUnit.h" #include "Surelog/SourceCompile/Compiler.h" +#include "Surelog/SourceCompile/IncludeFileInfo.h" #include "Surelog/SourceCompile/ParseFile.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/SourceCompile/VObjectTypes.h" From e25a2b2dededa28d4c570267b918f4bda9a47d78 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:33:16 -0800 Subject: [PATCH 06/13] Fix typo in SymbolId.h --- src/Cache/PPCache.cpp | 2 +- src/Cache/ParseCache.cpp | 2 +- src/Design/FileContent.cpp | 2 +- src/DesignCompile/CompileDesign.cpp | 2 +- src/SourceCompile/AnalyzeFile.cpp | 2 +- src/SourceCompile/CompileSourceFile.cpp | 2 +- src/SourceCompile/PreprocessFile.cpp | 2 +- src/SourceCompile/PreprocessHarness.cpp | 2 +- src/SourceCompile/SV3_1aTreeShapeListener.cpp | 2 +- src/main.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp index c2fd7fa4b7..8c916e5122 100644 --- a/src/Cache/PPCache.cpp +++ b/src/Cache/PPCache.cpp @@ -39,7 +39,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/TimeInfo.h" diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp index e0d854d846..b7b1cd2943 100644 --- a/src/Cache/ParseCache.cpp +++ b/src/Cache/ParseCache.cpp @@ -40,7 +40,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/Design/FileContent.h" diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp index dacdc900c7..0aa71248c7 100644 --- a/src/Design/FileContent.cpp +++ b/src/Design/FileContent.cpp @@ -35,7 +35,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp index b64c0a5127..771887ff3e 100644 --- a/src/DesignCompile/CompileDesign.cpp +++ b/src/DesignCompile/CompileDesign.cpp @@ -25,7 +25,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp index 9217e39ad9..898033f37e 100644 --- a/src/SourceCompile/AnalyzeFile.cpp +++ b/src/SourceCompile/AnalyzeFile.cpp @@ -34,7 +34,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" diff --git a/src/SourceCompile/CompileSourceFile.cpp b/src/SourceCompile/CompileSourceFile.cpp index 1b139ab373..f2cdc0c539 100644 --- a/src/SourceCompile/CompileSourceFile.cpp +++ b/src/SourceCompile/CompileSourceFile.cpp @@ -26,7 +26,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp index aa3196d9a0..dcd9d00d2b 100644 --- a/src/SourceCompile/PreprocessFile.cpp +++ b/src/SourceCompile/PreprocessFile.cpp @@ -41,7 +41,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" diff --git a/src/SourceCompile/PreprocessHarness.cpp b/src/SourceCompile/PreprocessHarness.cpp index d3d14be64c..64276e34fb 100644 --- a/src/SourceCompile/PreprocessHarness.cpp +++ b/src/SourceCompile/PreprocessHarness.cpp @@ -28,7 +28,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Library/Library.h" #include "Surelog/SourceCompile/CompilationUnit.h" #include "Surelog/SourceCompile/CompileSourceFile.h" diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp index a72f5f299c..09bf8a6236 100644 --- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp +++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp @@ -32,7 +32,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/Design/Design.h" #include "Surelog/Design/FileContent.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" diff --git a/src/main.cpp b/src/main.cpp index e895fa8910..729cae0e42 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,7 +50,7 @@ #include "Surelog/CommandLine/CommandLineParser.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/PlatformFileSystem.h" -#include "Surelog/Common/SumbolId.h" +#include "Surelog/Common/SymbolId.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" From 4aefc4ee8e0cf79790aaf1ed61e16e3b19466e55 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:35:01 -0800 Subject: [PATCH 07/13] Include DataType.h in files using SURELOG::DataType --- include/Surelog/Testbench/FunctionMethod.h | 1 + src/Design/DummyType.cpp | 1 + src/Design/Enum.cpp | 1 + src/Design/Parameter.cpp | 1 + src/Design/SimpleType.cpp | 1 + src/Design/Struct.cpp | 1 + src/Design/Union.cpp | 1 + src/Testbench/TypeDef.cpp | 1 + 8 files changed, 8 insertions(+) diff --git a/include/Surelog/Testbench/FunctionMethod.h b/include/Surelog/Testbench/FunctionMethod.h index e162da6b48..56807b5f09 100644 --- a/include/Surelog/Testbench/FunctionMethod.h +++ b/include/Surelog/Testbench/FunctionMethod.h @@ -26,6 +26,7 @@ #pragma once #include +#include #include #include diff --git a/src/Design/DummyType.cpp b/src/Design/DummyType.cpp index 5a776758ec..1666c56327 100644 --- a/src/Design/DummyType.cpp +++ b/src/Design/DummyType.cpp @@ -24,6 +24,7 @@ #include "Surelog/Design/DummyType.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" // UHDM diff --git a/src/Design/Enum.cpp b/src/Design/Enum.cpp index 5ee47409e8..8f3394413c 100644 --- a/src/Design/Enum.cpp +++ b/src/Design/Enum.cpp @@ -26,6 +26,7 @@ #include #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" namespace SURELOG { diff --git a/src/Design/Parameter.cpp b/src/Design/Parameter.cpp index 9a9f3a2e36..6f7532be4b 100644 --- a/src/Design/Parameter.cpp +++ b/src/Design/Parameter.cpp @@ -25,6 +25,7 @@ #include #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" #include "Surelog/SourceCompile/VObjectTypes.h" diff --git a/src/Design/SimpleType.cpp b/src/Design/SimpleType.cpp index 497ae0957f..0a389eb91b 100644 --- a/src/Design/SimpleType.cpp +++ b/src/Design/SimpleType.cpp @@ -25,6 +25,7 @@ #include "Surelog/Design/SimpleType.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" // UHDM diff --git a/src/Design/Struct.cpp b/src/Design/Struct.cpp index 5f54517104..4577b3e642 100644 --- a/src/Design/Struct.cpp +++ b/src/Design/Struct.cpp @@ -24,6 +24,7 @@ #include "Surelog/Design/Struct.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" // UHDM diff --git a/src/Design/Union.cpp b/src/Design/Union.cpp index 5e804dc90e..8bb25e7856 100644 --- a/src/Design/Union.cpp +++ b/src/Design/Union.cpp @@ -24,6 +24,7 @@ #include "Surelog/Design/Union.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" namespace SURELOG { diff --git a/src/Testbench/TypeDef.cpp b/src/Testbench/TypeDef.cpp index 084eaa3aa8..6f24a68d33 100644 --- a/src/Testbench/TypeDef.cpp +++ b/src/Testbench/TypeDef.cpp @@ -26,6 +26,7 @@ #include #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DataType.h" #include "Surelog/Design/FileContent.h" namespace SURELOG { From 672137af595edd1ec5bcdab475dea02a11d3bf80 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:36:26 -0800 Subject: [PATCH 08/13] Include FileSystem.h in files needing SURELOG::FileSystem --- src/Cache/PPCache_test.cpp | 1 + src/CommandLine/CommandLineParser.cpp | 1 + src/CommandLine/CommandLineParser_test.cpp | 1 + src/Common/PathId_test.cpp | 1 + src/Common/PlatformFileSystem_test.cpp | 1 + src/main.cpp | 1 + src/roundtrip.cpp | 1 + 7 files changed, 7 insertions(+) diff --git a/src/Cache/PPCache_test.cpp b/src/Cache/PPCache_test.cpp index 872fa38dbb..0c5be87d63 100644 --- a/src/Cache/PPCache_test.cpp +++ b/src/Cache/PPCache_test.cpp @@ -33,6 +33,7 @@ #include #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/PlatformFileSystem.h" #include "Surelog/Design/Design.h" diff --git a/src/CommandLine/CommandLineParser.cpp b/src/CommandLine/CommandLineParser.cpp index 233877c28f..5a311f2e80 100644 --- a/src/CommandLine/CommandLineParser.cpp +++ b/src/CommandLine/CommandLineParser.cpp @@ -32,6 +32,7 @@ #include #include "Surelog/API/PythonAPI.h" +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/PlatformFileSystem.h" #include "Surelog/Common/SymbolId.h" diff --git a/src/CommandLine/CommandLineParser_test.cpp b/src/CommandLine/CommandLineParser_test.cpp index 13a4cebaf0..2f33bff759 100644 --- a/src/CommandLine/CommandLineParser_test.cpp +++ b/src/CommandLine/CommandLineParser_test.cpp @@ -32,6 +32,7 @@ #include #include +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/PlatformFileSystem.h" #include "Surelog/ErrorReporting/ErrorContainer.h" diff --git a/src/Common/PathId_test.cpp b/src/Common/PathId_test.cpp index ef5a679fb0..84531d1919 100644 --- a/src/Common/PathId_test.cpp +++ b/src/Common/PathId_test.cpp @@ -21,6 +21,7 @@ #include #include +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PlatformFileSystem.h" #include "Surelog/SourceCompile/SymbolTable.h" diff --git a/src/Common/PlatformFileSystem_test.cpp b/src/Common/PlatformFileSystem_test.cpp index bc8516f0e1..553505c41c 100644 --- a/src/Common/PlatformFileSystem_test.cpp +++ b/src/Common/PlatformFileSystem_test.cpp @@ -34,6 +34,7 @@ #include #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/SymbolId.h" #include "Surelog/Design/Design.h" diff --git a/src/main.cpp b/src/main.cpp index 729cae0e42..8fe0928c9b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,6 +48,7 @@ #include "Surelog/API/PythonAPI.h" #include "Surelog/API/Surelog.h" #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/PlatformFileSystem.h" #include "Surelog/Common/SymbolId.h" diff --git a/src/roundtrip.cpp b/src/roundtrip.cpp index 63ba5f17fd..fb5801baca 100644 --- a/src/roundtrip.cpp +++ b/src/roundtrip.cpp @@ -52,6 +52,7 @@ #include "Surelog/API/Surelog.h" #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/FileSystem.h" #include "Surelog/Common/PlatformFileSystem.h" #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/SourceCompile/SymbolTable.h" From ec9937d85698abc9c37576578fe3474711c1ad7a Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:39:09 -0800 Subject: [PATCH 09/13] Include Containers.h in files using SURELOG::ClassNameClassDefinitionMultiMap --- include/Surelog/DesignCompile/UhdmWriter.h | 1 + src/Design/FileContent.cpp | 1 + src/DesignCompile/CompileDesign.cpp | 1 + src/DesignCompile/ElaborationStep.cpp | 1 + src/DesignCompile/TestbenchElaboration.cpp | 1 + src/DesignCompile/UhdmWriter.cpp | 1 + src/Package/Package.cpp | 1 + 7 files changed, 7 insertions(+) diff --git a/include/Surelog/DesignCompile/UhdmWriter.h b/include/Surelog/DesignCompile/UhdmWriter.h index 4f7fc3d68e..0ad4e7e480 100644 --- a/include/Surelog/DesignCompile/UhdmWriter.h +++ b/include/Surelog/DesignCompile/UhdmWriter.h @@ -25,6 +25,7 @@ #define SURELOG_UHDMWRITER_H #pragma once +#include #include #include #include diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp index 0aa71248c7..12bd11d996 100644 --- a/src/Design/FileContent.cpp +++ b/src/Design/FileContent.cpp @@ -32,6 +32,7 @@ #include #include +#include "Surelog/Common/Containers.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp index 771887ff3e..ef6b45cbdf 100644 --- a/src/DesignCompile/CompileDesign.cpp +++ b/src/DesignCompile/CompileDesign.cpp @@ -24,6 +24,7 @@ #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/Containers.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/SymbolId.h" #include "Surelog/Design/FileContent.h" diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp index b5842bffb4..9124d86c5f 100644 --- a/src/DesignCompile/ElaborationStep.cpp +++ b/src/DesignCompile/ElaborationStep.cpp @@ -37,6 +37,7 @@ #include #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/Containers.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Design/DataType.h" diff --git a/src/DesignCompile/TestbenchElaboration.cpp b/src/DesignCompile/TestbenchElaboration.cpp index 285ed53c0d..aad69a0846 100644 --- a/src/DesignCompile/TestbenchElaboration.cpp +++ b/src/DesignCompile/TestbenchElaboration.cpp @@ -23,6 +23,7 @@ #include "Surelog/DesignCompile/TestbenchElaboration.h" +#include "Surelog/Common/Containers.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp index 29e4092862..82fe4f293a 100644 --- a/src/DesignCompile/UhdmWriter.cpp +++ b/src/DesignCompile/UhdmWriter.cpp @@ -38,6 +38,7 @@ #include #include "Surelog/CommandLine/CommandLineParser.h" +#include "Surelog/Common/Containers.h" #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" diff --git a/src/Package/Package.cpp b/src/Package/Package.cpp index c27fe4afc1..81bb12d625 100644 --- a/src/Package/Package.cpp +++ b/src/Package/Package.cpp @@ -26,6 +26,7 @@ #include #include +#include "Surelog/Common/Containers.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Testbench/ClassDefinition.h" From 83cad24c1eef69a7d1ffcb158380247e27100b45 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:41:37 -0800 Subject: [PATCH 10/13] Include Signal.h in files needing SURELOG::Signal --- include/Surelog/Design/ModuleDefinition.h | 1 + include/Surelog/DesignCompile/DesignElaboration.h | 1 + src/Design/ModPort.cpp | 2 ++ src/Design/ModuleDefinition.cpp | 1 + src/DesignCompile/CompileModule.cpp | 1 + src/DesignCompile/CompileType.cpp | 1 + 6 files changed, 7 insertions(+) diff --git a/include/Surelog/Design/ModuleDefinition.h b/include/Surelog/Design/ModuleDefinition.h index 8fb307e1fe..5f0780fcaa 100644 --- a/include/Surelog/Design/ModuleDefinition.h +++ b/include/Surelog/Design/ModuleDefinition.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/include/Surelog/DesignCompile/DesignElaboration.h b/include/Surelog/DesignCompile/DesignElaboration.h index d139944efd..a29b30d733 100644 --- a/include/Surelog/DesignCompile/DesignElaboration.h +++ b/include/Surelog/DesignCompile/DesignElaboration.h @@ -27,6 +27,7 @@ #include #include +#include #include #include diff --git a/src/Design/ModPort.cpp b/src/Design/ModPort.cpp index f034f12726..91cedf0231 100644 --- a/src/Design/ModPort.cpp +++ b/src/Design/ModPort.cpp @@ -16,6 +16,8 @@ #include "Surelog/Design/ModPort.h" +#include "Surelog/Design/Signal.h" + /* * File: ModPort.cpp * Author: alain diff --git a/src/Design/ModuleDefinition.cpp b/src/Design/ModuleDefinition.cpp index e22e8c6691..e09aa81c40 100644 --- a/src/Design/ModuleDefinition.cpp +++ b/src/Design/ModuleDefinition.cpp @@ -30,6 +30,7 @@ #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModPort.h" +#include "Surelog/Design/Signal.h" #include "Surelog/SourceCompile/VObjectTypes.h" namespace SURELOG { diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp index aa62e12c7d..024db1d6fe 100644 --- a/src/DesignCompile/CompileModule.cpp +++ b/src/DesignCompile/CompileModule.cpp @@ -31,6 +31,7 @@ #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" #include "Surelog/Design/ModuleInstance.h" +#include "Surelog/Design/Signal.h" #include "Surelog/Design/VObject.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" diff --git a/src/DesignCompile/CompileType.cpp b/src/DesignCompile/CompileType.cpp index 51769d1580..e0017e0a97 100644 --- a/src/DesignCompile/CompileType.cpp +++ b/src/DesignCompile/CompileType.cpp @@ -34,6 +34,7 @@ #include "Surelog/Design/Netlist.h" #include "Surelog/Design/ParamAssign.h" #include "Surelog/Design/Parameter.h" +#include "Surelog/Design/Signal.h" #include "Surelog/Design/SimpleType.h" #include "Surelog/Design/Struct.h" #include "Surelog/Design/Task.h" From 8b62f7f35936e051c8aa62f2707c43d79579f6d4 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:43:36 -0800 Subject: [PATCH 11/13] Include Value.h for files needing SURELOG::Value --- src/Design/ModuleInstance.cpp | 1 + src/DesignCompile/CompileDesign.cpp | 1 + src/DesignCompile/EvalFunc.cpp | 1 + src/DesignCompile/UhdmWriter.cpp | 1 + src/Expression/ExprBuilder_test.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/src/Design/ModuleInstance.cpp b/src/Design/ModuleInstance.cpp index 320d812af5..36dc5b23fc 100644 --- a/src/Design/ModuleInstance.cpp +++ b/src/Design/ModuleInstance.cpp @@ -35,6 +35,7 @@ #include "Surelog/Design/FileContent.h" #include "Surelog/Design/Netlist.h" #include "Surelog/Expression/ExprBuilder.h" +#include "Surelog/Expression/Value.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/SourceCompile/VObjectTypes.h" diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp index ef6b45cbdf..8fc3b94b47 100644 --- a/src/DesignCompile/CompileDesign.cpp +++ b/src/DesignCompile/CompileDesign.cpp @@ -47,6 +47,7 @@ #include "Surelog/ErrorReporting/ErrorContainer.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" #include "Surelog/ErrorReporting/Location.h" +#include "Surelog/Expression/Value.h" #include "Surelog/Library/Library.h" #include "Surelog/Package/Package.h" #include "Surelog/SourceCompile/Compiler.h" diff --git a/src/DesignCompile/EvalFunc.cpp b/src/DesignCompile/EvalFunc.cpp index 7920e97b8d..24393c557a 100644 --- a/src/DesignCompile/EvalFunc.cpp +++ b/src/DesignCompile/EvalFunc.cpp @@ -26,6 +26,7 @@ #include "Surelog/Design/ParamAssign.h" #include "Surelog/DesignCompile/CompileDesign.h" #include "Surelog/DesignCompile/CompileHelper.h" +#include "Surelog/Expression/Value.h" #include "Surelog/SourceCompile/Compiler.h" #include "Surelog/SourceCompile/SymbolTable.h" #include "Surelog/Utils/StringUtils.h" diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp index 82fe4f293a..b126e8e060 100644 --- a/src/DesignCompile/UhdmWriter.cpp +++ b/src/DesignCompile/UhdmWriter.cpp @@ -56,6 +56,7 @@ #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorDefinition.h" #include "Surelog/ErrorReporting/Location.h" +#include "Surelog/Expression/Value.h" #include "Surelog/Package/Package.h" #include "Surelog/SourceCompile/Compiler.h" #include "Surelog/SourceCompile/SymbolTable.h" diff --git a/src/Expression/ExprBuilder_test.cpp b/src/Expression/ExprBuilder_test.cpp index 0e02f31c5d..97af87a6e7 100644 --- a/src/Expression/ExprBuilder_test.cpp +++ b/src/Expression/ExprBuilder_test.cpp @@ -23,6 +23,7 @@ #include #include "Surelog/Design/FileContent.h" +#include "Surelog/Expression/Value.h" #include "Surelog/SourceCompile/ParserHarness.h" #include "Surelog/SourceCompile/VObjectTypes.h" From d147d9db724bbfddf4405259631798692edad2be Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:45:07 -0800 Subject: [PATCH 12/13] Include DesignComponent.h for files using SURELOG::DesignComponent --- include/Surelog/DesignCompile/DesignElaboration.h | 1 + src/Design/FileContent.cpp | 1 + src/Design/ModuleDefinition.cpp | 1 + src/Package/Package.cpp | 1 + src/Testbench/ClassDefinition.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/include/Surelog/DesignCompile/DesignElaboration.h b/include/Surelog/DesignCompile/DesignElaboration.h index a29b30d733..b09a3c933d 100644 --- a/include/Surelog/DesignCompile/DesignElaboration.h +++ b/include/Surelog/DesignCompile/DesignElaboration.h @@ -27,6 +27,7 @@ #include #include +#include #include #include diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp index 12bd11d996..0604498987 100644 --- a/src/Design/FileContent.cpp +++ b/src/Design/FileContent.cpp @@ -37,6 +37,7 @@ #include "Surelog/Common/NodeId.h" #include "Surelog/Common/PathId.h" #include "Surelog/Common/SymbolId.h" +#include "Surelog/Design/DesignComponent.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/ErrorReporting/Error.h" #include "Surelog/ErrorReporting/ErrorContainer.h" diff --git a/src/Design/ModuleDefinition.cpp b/src/Design/ModuleDefinition.cpp index e09aa81c40..f8a2cdb3ca 100644 --- a/src/Design/ModuleDefinition.cpp +++ b/src/Design/ModuleDefinition.cpp @@ -28,6 +28,7 @@ #include #include +#include "Surelog/Design/DesignComponent.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModPort.h" #include "Surelog/Design/Signal.h" diff --git a/src/Package/Package.cpp b/src/Package/Package.cpp index 81bb12d625..0383cd8a94 100644 --- a/src/Package/Package.cpp +++ b/src/Package/Package.cpp @@ -28,6 +28,7 @@ #include "Surelog/Common/Containers.h" #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DesignComponent.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Testbench/ClassDefinition.h" diff --git a/src/Testbench/ClassDefinition.cpp b/src/Testbench/ClassDefinition.cpp index 1cd2cabae5..a06fa6e934 100644 --- a/src/Testbench/ClassDefinition.cpp +++ b/src/Testbench/ClassDefinition.cpp @@ -28,6 +28,7 @@ #include #include "Surelog/Common/NodeId.h" +#include "Surelog/Design/DesignComponent.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/Parameter.h" #include "Surelog/SourceCompile/VObjectTypes.h" From 7a67a4a9a72bfb9a6999deea049fd14c310760f5 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Wed, 13 Nov 2024 21:47:52 -0800 Subject: [PATCH 13/13] Include ClockingBlock.h for files using SURELOG::ClockingBlock --- include/Surelog/Design/ModuleDefinition.h | 1 + src/Common/ClockingBlockHolder.cpp | 1 + src/Design/ModuleDefinition.cpp | 1 + src/DesignCompile/CompileModule.cpp | 1 + src/DesignCompile/UhdmWriter.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/include/Surelog/Design/ModuleDefinition.h b/include/Surelog/Design/ModuleDefinition.h index 5f0780fcaa..7d926df54f 100644 --- a/include/Surelog/Design/ModuleDefinition.h +++ b/include/Surelog/Design/ModuleDefinition.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/src/Common/ClockingBlockHolder.cpp b/src/Common/ClockingBlockHolder.cpp index a11a15ab24..75570c58d1 100644 --- a/src/Common/ClockingBlockHolder.cpp +++ b/src/Common/ClockingBlockHolder.cpp @@ -24,6 +24,7 @@ #include "Surelog/Common/ClockingBlockHolder.h" #include "Surelog/Common/SymbolId.h" +#include "Surelog/Design/ClockingBlock.h" namespace SURELOG { void ClockingBlockHolder::addClockingBlock(SymbolId blockId, diff --git a/src/Design/ModuleDefinition.cpp b/src/Design/ModuleDefinition.cpp index f8a2cdb3ca..99bed5b92c 100644 --- a/src/Design/ModuleDefinition.cpp +++ b/src/Design/ModuleDefinition.cpp @@ -28,6 +28,7 @@ #include #include +#include "Surelog/Design/ClockingBlock.h" #include "Surelog/Design/DesignComponent.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModPort.h" diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp index 024db1d6fe..1cf1fae7e6 100644 --- a/src/DesignCompile/CompileModule.cpp +++ b/src/DesignCompile/CompileModule.cpp @@ -27,6 +27,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" +#include "Surelog/Design/ClockingBlock.h" #include "Surelog/Design/FileCNodeId.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModuleDefinition.h" diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp index b126e8e060..f7e163ebd3 100644 --- a/src/DesignCompile/UhdmWriter.cpp +++ b/src/DesignCompile/UhdmWriter.cpp @@ -42,6 +42,7 @@ #include "Surelog/Common/FileSystem.h" #include "Surelog/Common/NodeId.h" #include "Surelog/Common/SymbolId.h" +#include "Surelog/Design/ClockingBlock.h" #include "Surelog/Design/DesignElement.h" #include "Surelog/Design/FileContent.h" #include "Surelog/Design/ModPort.h"