luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename AstTimingControl to AstEventControl (#3425) 

Signed-off-by: Krzysztof Bieganski <kbieganski@antmicro.com>
This commit is contained in:
Krzysztof Bieganski 2022-05-16 21:44:41 +02:00 committed by GitHub
parent 99bdc27be3
commit ecaa07a72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/V3AstNodes.h
View File

@ -5243,15 +5243,15 @@ public:
} }
}; };
class AstTimingControl final : public AstNodeStmt { class AstEventControl final : public AstNodeStmt {
// Parents: stmtlist // Parents: stmtlist
public: public:
AstTimingControl(FileLine* fl, AstSenTree* sensesp, AstNode* stmtsp) AstEventControl(FileLine* fl, AstSenTree* sensesp, AstNode* stmtsp)
: ASTGEN_SUPER_TimingControl(fl) { : ASTGEN_SUPER_EventControl(fl) {
setNOp1p(sensesp); setNOp1p(sensesp);
setNOp2p(stmtsp); setNOp2p(stmtsp);
} }
ASTNODE_NODE_FUNCS(TimingControl) ASTNODE_NODE_FUNCS(EventControl)
virtual string verilogKwd() const override { return "@(%l) %r"; } virtual string verilogKwd() const override { return "@(%l) %r"; }
virtual bool isGateOptimizable() const override { return false; } virtual bool isGateOptimizable() const override { return false; }
virtual bool isPredictOptimizable() const override { return false; } virtual bool isPredictOptimizable() const override { return false; }

4
src/V3LinkParse.cpp
View File

@ -582,12 +582,12 @@ private:
iterateChildren(nodep); iterateChildren(nodep);
nodep->timeunit(m_modp->timeunit()); nodep->timeunit(m_modp->timeunit());
} }
virtual void visit(AstTimingControl* nodep) override { virtual void visit(AstEventControl* nodep) override {
cleanFileline(nodep); cleanFileline(nodep);
iterateChildren(nodep); iterateChildren(nodep);
AstAlways* const alwaysp = VN_CAST(nodep->backp(), Always); AstAlways* const alwaysp = VN_CAST(nodep->backp(), Always);
if (alwaysp && alwaysp->keyword() == VAlwaysKwd::ALWAYS_COMB) { if (alwaysp && alwaysp->keyword() == VAlwaysKwd::ALWAYS_COMB) {
alwaysp->v3error("Timing control statements not legal under always_comb " alwaysp->v3error("Event control statements not legal under always_comb "
"(IEEE 1800-2017 9.2.2.2.2)\n" "(IEEE 1800-2017 9.2.2.2.2)\n"
<< nodep->warnMore() << "... Suggest use a normal 'always'"); << nodep->warnMore() << "... Suggest use a normal 'always'");
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);

6
src/V3Width.cpp
View File

@ -1323,10 +1323,10 @@ private:
nodep->replaceWith(newp); nodep->replaceWith(newp);
VL_DO_DANGLING(nodep->deleteTree(), nodep); VL_DO_DANGLING(nodep->deleteTree(), nodep);
} }
virtual void visit(AstTimingControl* nodep) override { virtual void visit(AstEventControl* nodep) override {
nodep->v3warn(E_UNSUPPORTED, "Unsupported: timing control statement in this location\n" nodep->v3warn(E_UNSUPPORTED, "Unsupported: event control statement in this location\n"
<< nodep->warnMore() << nodep->warnMore()
<< "... Suggest have one timing control statement " << "... Suggest have one event control statement "
<< "per procedure, at the top of the procedure"); << "per procedure, at the top of the procedure");
VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep); VL_DO_DANGLING(nodep->unlinkFrBack()->deleteTree(), nodep);
} }

2
src/verilog.y
View File

@ -3252,7 +3252,7 @@ statement_item<nodep>: // IEEE: statement_item
| par_block { $$ = $1; } | par_block { $$ = $1; }
// // IEEE: procedural_timing_control_statement + procedural_timing_control // // IEEE: procedural_timing_control_statement + procedural_timing_control
| delay_control stmtBlock { $$ = new AstDelay($1->fileline(), $1); $$->addNextNull($2); } | delay_control stmtBlock { $$ = new AstDelay($1->fileline(), $1); $$->addNextNull($2); }
| event_control stmtBlock { $$ = new AstTimingControl(FILELINE_OR_CRE($1), $1, $2); } | event_control stmtBlock { $$ = new AstEventControl(FILELINE_OR_CRE($1), $1, $2); }
//UNSUP cycle_delay stmtBlock { UNSUP } //UNSUP cycle_delay stmtBlock { UNSUP }
// //
| seq_block { $$ = $1; } | seq_block { $$ = $1; }

8
test_regress/t/t_event_control_unsup.out
View File

@ -1,12 +1,12 @@
%Error-UNSUPPORTED: t/t_event_control_unsup.v:14:7: Unsupported: timing control statement in this location %Error-UNSUPPORTED: t/t_event_control_unsup.v:14:7: Unsupported: event control statement in this location
: ... In instance t : ... In instance t
: ... Suggest have one timing control statement per procedure, at the top of the procedure : ... Suggest have one event control statement per procedure, at the top of the procedure
14 | @(clk); 14 | @(clk);
| ^ | ^
... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest
%Error-UNSUPPORTED: t/t_event_control_unsup.v:16:7: Unsupported: timing control statement in this location %Error-UNSUPPORTED: t/t_event_control_unsup.v:16:7: Unsupported: event control statement in this location
: ... In instance t : ... In instance t
: ... Suggest have one timing control statement per procedure, at the top of the procedure : ... Suggest have one event control statement per procedure, at the top of the procedure
16 | @(clk); 16 | @(clk);
| ^ | ^
%Error: Exiting due to %Error: Exiting due to

2
test_regress/t/t_lint_comb_bad.out
View File

@ -1,4 +1,4 @@
%Error: t/t_lint_comb_bad.v:14:4: Timing control statements not legal under always_comb (IEEE 1800-2017 9.2.2.2.2) %Error: t/t_lint_comb_bad.v:14:4: Event control statements not legal under always_comb (IEEE 1800-2017 9.2.2.2.2)
: ... Suggest use a normal 'always' : ... Suggest use a normal 'always'
14 | always_comb @(*) begin 14 | always_comb @(*) begin
| ^~~~~~~~~~~ | ^~~~~~~~~~~