Rename new include/verilated files for readability

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 \

include/verilated.cpp

@@ -24,7 +24,7 @@
 //=========================================================================
 
 #define _VERILATED_CPP_
-#include "verilatedimp.h"
+#include "verilated_imp.h"
 #include <cctype>
 #include <vector>
 

include/verilated.h

@@ -36,7 +36,7 @@
 #include <cstdlib>
 #include <cstring>
 // <iostream> avoided to reduce compile time
-// <string> avoided and instead in verilatedheavy.h to reduce compile time
+// <string> avoided and instead in verilated_heavy.h to reduce compile time
 using namespace std;
 
 //=========================================================================

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

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"
 

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 <map>
 #include <vector>

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"

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");
     }

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");
     }
 };
 

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 <string> via verilatedheavy.h when we create symbol file
+	    v3Global.needHeavy(true);  // #include <string> via verilated_heavy.h when we create symbol file
 	}
     }
 

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");
     }

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

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: