From 898c08c8e0eab250884864fbad0498ac5347a44f Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sun, 24 Jan 2010 08:38:17 -0500 Subject: [PATCH] Rename new include/verilated files for readability --- Makefile.in | 2 +- include/verilated.cpp | 2 +- include/verilated.h | 2 +- include/{verilateddpi.cpp => verilated_dpi.cpp} | 4 ++-- include/{verilatedheavy.h => verilated_heavy.h} | 4 ++-- include/{verilatedimp.h => verilated_imp.h} | 10 +++++----- include/{verilatedsc.h => verilated_sc.h} | 4 ++-- src/V3EmitC.cpp | 2 +- src/V3EmitCBase.h | 4 ++-- src/V3EmitCInlines.cpp | 2 +- src/V3EmitCSyms.cpp | 2 +- src/V3EmitMk.cpp | 2 +- src/V3Global.h | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) rename include/{verilateddpi.cpp => verilated_dpi.cpp} (99%) rename include/{verilatedheavy.h => verilated_heavy.h} (95%) rename include/{verilatedimp.h => verilated_imp.h} (96%) rename include/{verilatedsc.h => verilated_sc.h} (96%) diff --git a/Makefile.in b/Makefile.in index 77618dce6..3db334b50 100644 --- a/Makefile.in +++ b/Makefile.in @@ -136,7 +136,7 @@ INST_PROJ_FILES = \ include/verilated.[chv]* \ include/verilated.mk \ include/verilatedos.[chv]* \ - include/verilatedsc.[chv]* \ + include/verilated_sc.[chv]* \ INST_PROJ_BIN_FILES = \ verilator_bin \ diff --git a/include/verilated.cpp b/include/verilated.cpp index 0487deb41..dd46f54cb 100644 --- a/include/verilated.cpp +++ b/include/verilated.cpp @@ -24,7 +24,7 @@ //========================================================================= #define _VERILATED_CPP_ -#include "verilatedimp.h" +#include "verilated_imp.h" #include #include diff --git a/include/verilated.h b/include/verilated.h index 7c3663657..c20756e82 100644 --- a/include/verilated.h +++ b/include/verilated.h @@ -36,7 +36,7 @@ #include #include // avoided to reduce compile time -// avoided and instead in verilatedheavy.h to reduce compile time +// avoided and instead in verilated_heavy.h to reduce compile time using namespace std; //========================================================================= diff --git a/include/verilateddpi.cpp b/include/verilated_dpi.cpp similarity index 99% rename from include/verilateddpi.cpp rename to include/verilated_dpi.cpp index 4bc8da179..1d46a80dd 100644 --- a/include/verilateddpi.cpp +++ b/include/verilated_dpi.cpp @@ -23,9 +23,9 @@ /// //========================================================================= -#define _VERILATEDDPI_CPP_ +#define _VERILATED_DPI_CPP_ #include "verilatedos.h" -#include "verilatedimp.h" +#include "verilated_imp.h" // On MSVC++ we need svdpi.h to declare exports, not imports #define DPI_PROTOTYPES diff --git a/include/verilatedheavy.h b/include/verilated_heavy.h similarity index 95% rename from include/verilatedheavy.h rename to include/verilated_heavy.h index 5c12686fe..98132ca23 100644 --- a/include/verilatedheavy.h +++ b/include/verilated_heavy.h @@ -26,8 +26,8 @@ //************************************************************************* -#ifndef _VERILATEDHEAVY_H_ -#define _VERILATEDHEAVY_H_ 1 ///< Header Guard +#ifndef _VERILATED_HEAVY_H_ +#define _VERILATED_HEAVY_H_ 1 ///< Header Guard #include "verilated.h" diff --git a/include/verilatedimp.h b/include/verilated_imp.h similarity index 96% rename from include/verilatedimp.h rename to include/verilated_imp.h index 7ad0651c0..843dba947 100644 --- a/include/verilatedimp.h +++ b/include/verilated_imp.h @@ -21,16 +21,16 @@ //========================================================================= -#ifndef _VERILATEDIMP_H_ -#define _VERILATEDIMP_H_ 1 ///< Header Guard +#ifndef _VERILATED_IMP_H_ +#define _VERILATED_IMP_H_ 1 ///< Header Guard -#if !defined(_VERILATED_CPP_) && !defined(_VERILATEDDPI_CPP_) -# error "verilatedimp.h only to be included by verilated*.cpp internals" +#if !defined(_VERILATED_CPP_) && !defined(_VERILATED_DPI_CPP_) +# error "verilated_imp.h only to be included by verilated*.cpp internals" #endif #include "verilatedos.h" #include "verilated.h" -#include "verilatedheavy.h" +#include "verilated_heavy.h" #include #include diff --git a/include/verilatedsc.h b/include/verilated_sc.h similarity index 96% rename from include/verilatedsc.h rename to include/verilated_sc.h index c689ae6b3..acc6cc5e7 100644 --- a/include/verilatedsc.h +++ b/include/verilated_sc.h @@ -24,8 +24,8 @@ //************************************************************************* -#ifndef _VERILATEDSC_H_ -#define _VERILATEDSC_H_ 1 ///< Header Guard +#ifndef _VERILATED_SC_H_ +#define _VERILATED_SC_H_ 1 ///< Header Guard #include "verilatedos.h" #include "systemc.h" diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index b4beefc56..0a2bef4b4 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -1594,7 +1594,7 @@ void EmitCImp::emitInt(AstNodeModule* modp) { ofp()->putsIntTopInclude(); if (v3Global.needHeavy()) { - puts("#include \"verilatedheavy.h\"\n"); + puts("#include \"verilated_heavy.h\"\n"); } else { puts("#include \"verilated.h\"\n"); } diff --git a/src/V3EmitCBase.h b/src/V3EmitCBase.h index 28b49f6b4..d42bd6543 100644 --- a/src/V3EmitCBase.h +++ b/src/V3EmitCBase.h @@ -70,7 +70,7 @@ public: virtual void putsHeader() { puts("// Verilated -*- SystemC -*-\n"); } virtual void putsIntTopInclude() { puts("#include \"systemc.h\"\n"); - puts("#include \"verilatedsc.h\"\n"); + puts("#include \"verilated_sc.h\"\n"); } }; @@ -81,7 +81,7 @@ public: virtual void putsHeader() { puts("// Verilated -*- SystemC -*-\n"); } virtual void putsIntTopInclude() { puts("#include \"systemperl.h\"\n"); - puts("#include \"verilatedsc.h\"\n"); + puts("#include \"verilated_sc.h\"\n"); } }; diff --git a/src/V3EmitCInlines.cpp b/src/V3EmitCInlines.cpp index c4d24b686..8c8b6dddd 100644 --- a/src/V3EmitCInlines.cpp +++ b/src/V3EmitCInlines.cpp @@ -58,7 +58,7 @@ class EmitCInlines : EmitCBaseVisitor { } virtual void visit(AstBasicDType* nodep, AstNUser*) { if (nodep->keyword() == AstBasicDTypeKwd::STRING) { - v3Global.needHeavy(true); // #include via verilatedheavy.h when we create symbol file + v3Global.needHeavy(true); // #include via verilated_heavy.h when we create symbol file } } diff --git a/src/V3EmitCSyms.cpp b/src/V3EmitCSyms.cpp index c4fe992cf..359a6724a 100644 --- a/src/V3EmitCSyms.cpp +++ b/src/V3EmitCSyms.cpp @@ -182,7 +182,7 @@ void EmitCSyms::emitSymHdr() { puts("\n"); if (v3Global.needHeavy()) { - puts("#include \"verilatedheavy.h\"\n"); + puts("#include \"verilated_heavy.h\"\n"); } else { puts("#include \"verilated.h\"\n"); } diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp index 47ceaef55..83232a55d 100644 --- a/src/V3EmitMk.cpp +++ b/src/V3EmitMk.cpp @@ -79,7 +79,7 @@ public: if (support==2 && !slow) { putMakeClassEntry(of, "verilated.cpp"); if (v3Global.dpi()) { - putMakeClassEntry(of, "verilateddpi.cpp"); + putMakeClassEntry(of, "verilated_dpi.cpp"); } if (v3Global.opt.systemPerl()) { putMakeClassEntry(of, "Sp.cpp"); // Note Sp.cpp includes SpTraceVcdC diff --git a/src/V3Global.h b/src/V3Global.h index d632aaf46..878dffb9e 100644 --- a/src/V3Global.h +++ b/src/V3Global.h @@ -44,7 +44,7 @@ class V3Global { int m_debugFileNumber; // Number to append to debug files created bool m_assertWidthsSame; // Tree should have width()==widthMin() bool m_needHInlines; // Need __Inlines file - bool m_needHeavy; // Need verilatedheavy.h include + bool m_needHeavy; // Need verilated_heavy.h include bool m_dpi; // Need __Dpi include files public: