github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-08 23:57:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Use mixed case for AstType enums. No functional change.

Browse Source
This commit is contained in:
Wilson Snyder 2016-11-05 09:47:56 -04:00
parent 70ddf32719
commit bda4b326ab
6 changed files with 317 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/V3Ast.h
View File

@ -44,6 +44,8 @@ class VFlagChildDType {}; // Used by parser.y to select constructor that sets c
//######################################################################
//######################################################################
class AstType {
public:
#include "V3Ast__gen_types.h" // From ./astgen

516
src/V3AstNodes.h
View File

File diff suppressed because it is too large Load Diff

12
src/V3EmitC.cpp
View File

@ -1501,7 +1501,7 @@ void EmitCImp::emitCtorImp(AstNodeModule* modp) {
}
putsDecoration("// Reset structure values\n");
puts("_ctor_var_reset();\n");
emitTextSection(AstType::atSCCTOR);
emitTextSection(AstType::atScCtor);
if (optSystemPerl()) puts("SP_AUTO_CTOR;\n");
puts("}\n");
}
@ -1545,7 +1545,7 @@ void EmitCImp::emitCoverageImp(AstNodeModule* modp) {
void EmitCImp::emitDestructorImp(AstNodeModule* modp) {
puts("\n");
puts(modClassName(modp)+"::~"+modClassName(modp)+"() {\n");
emitTextSection(AstType::atSCDTOR);
emitTextSection(AstType::atScDtor);
if (modp->isTop()) puts("delete __VlSymsp; __VlSymsp=NULL;\n");
puts("}\n");
splitSizeInc(10);
@ -1864,7 +1864,7 @@ void EmitCImp::emitInt(AstNodeModule* modp) {
}
puts("\n//----------\n\n");
emitTextSection(AstType::atSCHDR);
emitTextSection(AstType::atScHdr);
if (optSystemC() && modp->isTop()) {
puts("SC_MODULE("+modClassName(modp)+") {\n");
@ -1981,7 +1981,7 @@ void EmitCImp::emitInt(AstNodeModule* modp) {
puts("\n// USER METHODS\n");
if (optSystemPerl()) puts("/*AUTOMETHODS*/\n");
emitTextSection(AstType::atSCINT);
emitTextSection(AstType::atScInt);
puts("\n// API METHODS\n");
if (modp->isTop()) {
@ -2059,7 +2059,7 @@ void EmitCImp::emitImp(AstNodeModule* modp) {
puts("SP_MODULE_CONTINUED("+modClassName(modp)+");\n");
}
emitTextSection(AstType::atSCIMPHDR);
emitTextSection(AstType::atScImpHdr);
if (m_slow && splitFilenum()==0) {
puts("\n//--------------------\n");
@ -2068,7 +2068,7 @@ void EmitCImp::emitImp(AstNodeModule* modp) {
}
if (m_fast && splitFilenum()==0) {
emitTextSection(AstType::atSCIMP);
emitTextSection(AstType::atScImp);
emitStaticDecl(modp);
}

16
src/V3Slice.cpp
View File

@ -147,16 +147,16 @@ class SliceCloneVisitor : public AstNVisitor {
if (!lhsp) lhsp = clonep;
else {
switch (nodep->type()) {
case AstType::atREDOR:
case AstType::atRedOr:
lhsp = new AstOr(nodep->fileline(), lhsp, clonep);
break;
case AstType::atREDAND:
case AstType::atRedAnd:
lhsp = new AstAnd(nodep->fileline(), lhsp, clonep);
break;
case AstType::atREDXOR:
case AstType::atRedXor:
lhsp = new AstXor(nodep->fileline(), lhsp, clonep);
break;
case AstType::atREDXNOR:
case AstType::atRedXnor:
lhsp = new AstXnor(nodep->fileline(), lhsp, clonep);
break;
default:
@ -492,12 +492,12 @@ class SliceVisitor : public AstNVisitor {
if (!logp) logp = clonep;
else {
switch (nodep->type()) {
case AstType::atEQ: // FALLTHRU
case AstType::atEQCASE:
case AstType::atEq: // FALLTHRU
case AstType::atEqCase:
logp = new AstLogAnd(nodep->fileline(), logp, clonep);
break;
case AstType::atNEQ: // FALLTHRU
case AstType::atNEQCASE:
case AstType::atNeq: // FALLTHRU
case AstType::atNeqCase:
logp = new AstLogOr(nodep->fileline(), logp, clonep);
break;
default:

82
src/V3Width.cpp
View File

@ -3162,13 +3162,13 @@ private:
if (!nodep->dtypep()) nodep->dtypeFrom(nodep->lhsp());
// To simplify callers, some node types don't need to change
switch (nodep->type()) {
case AstType::atEQ: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atNEQ: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atEQCASE: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atNEQCASE: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atADD: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atSUB: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atSHIFTL: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atEq: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atNeq: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atEqCase: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atNeqCase: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atAdd: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atSub: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
case AstType::atShiftL: nodep->dtypeChgSigned(signedFlavorNeeded); return NULL;
default: break;
}
FileLine* fl = nodep->fileline();
@ -3176,22 +3176,22 @@ private:
AstNode* rhsp = nodep->rhsp()->unlinkFrBack();
AstNodeBiop* newp = NULL;
switch (nodep->type()) {
case AstType::atGT: newp = new AstGtS (fl,lhsp,rhsp); break;
case AstType::atGTS: newp = new AstGt (fl,lhsp,rhsp); break;
case AstType::atGTE: newp = new AstGteS (fl,lhsp,rhsp); break;
case AstType::atGTES: newp = new AstGte (fl,lhsp,rhsp); break;
case AstType::atLT: newp = new AstLtS (fl,lhsp,rhsp); break;
case AstType::atLTS: newp = new AstLt (fl,lhsp,rhsp); break;
case AstType::atLTE: newp = new AstLteS (fl,lhsp,rhsp); break;
case AstType::atLTES: newp = new AstLte (fl,lhsp,rhsp); break;
case AstType::atDIV: newp = new AstDivS (fl,lhsp,rhsp); break;
case AstType::atDIVS: newp = new AstDiv (fl,lhsp,rhsp); break;
case AstType::atMODDIV: newp = new AstModDivS (fl,lhsp,rhsp); break;
case AstType::atMODDIVS: newp = new AstModDiv (fl,lhsp,rhsp); break;
case AstType::atMUL: newp = new AstMulS (fl,lhsp,rhsp); break;
case AstType::atMULS: newp = new AstMul (fl,lhsp,rhsp); break;
case AstType::atSHIFTR: newp = new AstShiftRS (fl,lhsp,rhsp); break;
case AstType::atSHIFTRS: newp = new AstShiftR (fl,lhsp,rhsp); break;
case AstType::atGt: newp = new AstGtS (fl,lhsp,rhsp); break;
case AstType::atGtS: newp = new AstGt (fl,lhsp,rhsp); break;
case AstType::atGte: newp = new AstGteS (fl,lhsp,rhsp); break;
case AstType::atGteS: newp = new AstGte (fl,lhsp,rhsp); break;
case AstType::atLt: newp = new AstLtS (fl,lhsp,rhsp); break;
case AstType::atLtS: newp = new AstLt (fl,lhsp,rhsp); break;
case AstType::atLte: newp = new AstLteS (fl,lhsp,rhsp); break;
case AstType::atLteS: newp = new AstLte (fl,lhsp,rhsp); break;
case AstType::atDiv: newp = new AstDivS (fl,lhsp,rhsp); break;
case AstType::atDivS: newp = new AstDiv (fl,lhsp,rhsp); break;
case AstType::atModDiv: newp = new AstModDivS (fl,lhsp,rhsp); break;
case AstType::atModDivS: newp = new AstModDiv (fl,lhsp,rhsp); break;
case AstType::atMul: newp = new AstMulS (fl,lhsp,rhsp); break;
case AstType::atMulS: newp = new AstMul (fl,lhsp,rhsp); break;
case AstType::atShiftR: newp = new AstShiftRS (fl,lhsp,rhsp); break;
case AstType::atShiftRS: newp = new AstShiftR (fl,lhsp,rhsp); break;
default:
nodep->v3fatalSrc("Node needs sign change, but bad case: "<<nodep<<endl);
break;
@ -3214,17 +3214,17 @@ private:
AstNodeBiop* newp = NULL;
// No width change on output;... // All below have bool or double outputs
switch (nodep->type()) {
case AstType::atADD: newp = new AstAddD (fl,lhsp,rhsp); break;
case AstType::atSUB: newp = new AstSubD (fl,lhsp,rhsp); break;
case AstType::atPOW: newp = new AstPowD (fl,lhsp,rhsp); break;
case AstType::atEQ: case AstType::atEQCASE: newp = new AstEqD (fl,lhsp,rhsp); break;
case AstType::atNEQ: case AstType::atNEQCASE: newp = new AstNeqD (fl,lhsp,rhsp); break;
case AstType::atGT: case AstType::atGTS: newp = new AstGtD (fl,lhsp,rhsp); break;
case AstType::atGTE: case AstType::atGTES: newp = new AstGteD (fl,lhsp,rhsp); break;
case AstType::atLT: case AstType::atLTS: newp = new AstLtD (fl,lhsp,rhsp); break;
case AstType::atLTE: case AstType::atLTES: newp = new AstLteD (fl,lhsp,rhsp); break;
case AstType::atDIV: case AstType::atDIVS: newp = new AstDivD (fl,lhsp,rhsp); break;
case AstType::atMUL: case AstType::atMULS: newp = new AstMulD (fl,lhsp,rhsp); break;
case AstType::atAdd: newp = new AstAddD (fl,lhsp,rhsp); break;
case AstType::atSub: newp = new AstSubD (fl,lhsp,rhsp); break;
case AstType::atPow: newp = new AstPowD (fl,lhsp,rhsp); break;
case AstType::atEq: case AstType::atEqCase: newp = new AstEqD (fl,lhsp,rhsp); break;
case AstType::atNeq: case AstType::atNeqCase: newp = new AstNeqD (fl,lhsp,rhsp); break;
case AstType::atGt: case AstType::atGtS: newp = new AstGtD (fl,lhsp,rhsp); break;
case AstType::atGte: case AstType::atGteS: newp = new AstGteD (fl,lhsp,rhsp); break;
case AstType::atLt: case AstType::atLtS: newp = new AstLtD (fl,lhsp,rhsp); break;
case AstType::atLte: case AstType::atLteS: newp = new AstLteD (fl,lhsp,rhsp); break;
case AstType::atDiv: case AstType::atDivS: newp = new AstDivD (fl,lhsp,rhsp); break;
case AstType::atMul: case AstType::atMulS: newp = new AstMulD (fl,lhsp,rhsp); break;
default:
nodep->v3fatalSrc("Node needs conversion to double, but bad case: "<<nodep<<endl);
break;
@ -3247,12 +3247,12 @@ private:
AstNodeBiop* newp = NULL;
// No width change on output;... // All below have bool or double outputs
switch (nodep->type()) {
case AstType::atEQ: case AstType::atEQCASE: newp = new AstEqN (fl,lhsp,rhsp); break;
case AstType::atNEQ: case AstType::atNEQCASE: newp = new AstNeqN (fl,lhsp,rhsp); break;
case AstType::atGT: case AstType::atGTS: newp = new AstGtN (fl,lhsp,rhsp); break;
case AstType::atGTE: case AstType::atGTES: newp = new AstGteN (fl,lhsp,rhsp); break;
case AstType::atLT: case AstType::atLTS: newp = new AstLtN (fl,lhsp,rhsp); break;
case AstType::atLTE: case AstType::atLTES: newp = new AstLteN (fl,lhsp,rhsp); break;
case AstType::atEq: case AstType::atEqCase: newp = new AstEqN (fl,lhsp,rhsp); break;
case AstType::atNeq: case AstType::atNeqCase: newp = new AstNeqN (fl,lhsp,rhsp); break;
case AstType::atGt: case AstType::atGtS: newp = new AstGtN (fl,lhsp,rhsp); break;
case AstType::atGte: case AstType::atGteS: newp = new AstGteN (fl,lhsp,rhsp); break;
case AstType::atLt: case AstType::atLtS: newp = new AstLtN (fl,lhsp,rhsp); break;
case AstType::atLte: case AstType::atLteS: newp = new AstLteN (fl,lhsp,rhsp); break;
default:
nodep->v3fatalSrc("Node needs conversion to string, but bad case: "<<nodep<<endl);
break;
@ -3273,7 +3273,7 @@ private:
AstNode* lhsp = nodep->lhsp()->unlinkFrBack();
AstNodeUniop* newp = NULL;
switch (nodep->type()) {
case AstType::atNEGATE: newp = new AstNegateD (fl,lhsp); break;
case AstType::atNegate: newp = new AstNegateD (fl,lhsp); break;
default:
nodep->v3fatalSrc("Node needs conversion to double, but bad case: "<<nodep<<endl);
break;

5
src/astgen
View File

@ -253,8 +253,7 @@ sub write_impl {
printf $fh "inline Ast%-16s AstNode::cast${type}() { return (dynamic_cast<Ast${type}*>(this)); }\n"
,$type."*";
} else {
my $ucType = uc $type;
printf $fh "inline Ast%-16s AstNode::cast${type}() { return (this && this->type() == AstType::at${ucType}) ? static_cast<Ast${type}*>(this) : NULL; }\n"
printf $fh "inline Ast%-16s AstNode::cast${type}() { return (this && this->type() == AstType::at${type}) ? static_cast<Ast${type}*>(this) : NULL; }\n"
,$type."*";
}
}
@ -268,7 +267,7 @@ sub write_types {
# Add "at" prefix to avoid conflicting with FOPEN and other macros in include files
foreach my $type (sort (keys %Classes)) {
next if $type =~ /^Node/;
print $fh "\tat",uc $type,",\n";
print $fh "\tat",$type,",\n";
}
printf $fh "\t_ENUM_END\n";
printf $fh " };\n";