github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-06 12:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix over-permissive parsing of UDPs without identifiers

Browse Source
This commit is contained in:
Wilson Snyder 2024-09-24 18:53:32 -04:00
parent 5a65d27851
commit 4ec75b2618
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/V3ParseImp.cpp
View File

@ -656,7 +656,8 @@ int V3ParseImp::tokenToBison() {
m_bisonLastFileline = yylval.fl; m_bisonLastFileline = yylval.fl;
// yylval.scp = nullptr; // Symbol table not yet needed - no packages // yylval.scp = nullptr; // Symbol table not yet needed - no packages
if (debugFlex() >= 6 || debugBison() >= 6) { // --debugi-flex and --debugi-bison if (debug() >= 6 || debugFlex() >= 6
|| debugBison() >= 6) { // --debugi-flex and --debugi-bison
cout << "tokenToBison " << yylval << endl; cout << "tokenToBison " << yylval << endl;
} }
return yylval.token; return yylval.token;

18
src/verilog.y
View File

@ -3242,7 +3242,9 @@ instDecl<nodep>:
// // Currently disambiguated from data_declaration based on // // Currently disambiguated from data_declaration based on
// // VARs being type, and cells non-type. // // VARs being type, and cells non-type.
// // IEEE requires a '(' to disambiguate, we need TODO force this // // IEEE requires a '(' to disambiguate, we need TODO force this
id parameter_value_assignmentE {INSTPREP($<fl>1, *$1, $2);} instnameList ';' id parameter_value_assignmentE
/*mid*/ { INSTPREP($<fl>1, *$1, $2); }
/*cont*/ instnameList ';'
{ $$ = $4; { $$ = $4;
GRAMMARP->m_impliedDecl = false; GRAMMARP->m_impliedDecl = false;
if (GRAMMARP->m_instParamp) { if (GRAMMARP->m_instParamp) {
@ -3257,6 +3259,12 @@ instDecl<nodep>:
/*cont*/ mpInstnameList ';' /*cont*/ mpInstnameList ';'
{ $$ = VARDONEP($5, nullptr, nullptr); } { $$ = VARDONEP($5, nullptr, nullptr); }
//UNSUP: strengthSpecE for udp_instantiations //UNSUP: strengthSpecE for udp_instantiations
// // IEEE: part of udp_instance when no name_of_instance
// // Note no unpacked dimension nor list of instances
| id
/*mid*/ { INSTPREP($<fl>1, *$1, nullptr); }
/*cont*/ instnameParenUdpn ';'
{ $$ = $3; GRAMMARP->m_impliedDecl = false; }
; ;
mpInstnameList<nodep>: // Similar to instnameList, but for modport instantiations which have no parenthesis mpInstnameList<nodep>: // Similar to instnameList, but for modport instantiations which have no parenthesis
@ -3278,7 +3286,10 @@ instnameParen<nodep>:
{ $$ = GRAMMARP->createCellOrIfaceRef($<fl>1, *$1, $4, $2, true); } { $$ = GRAMMARP->createCellOrIfaceRef($<fl>1, *$1, $4, $2, true); }
| id instRangeListE | id instRangeListE
{ $$ = GRAMMARP->createCellOrIfaceRef($<fl>1, *$1, nullptr, $2, false); } { $$ = GRAMMARP->createCellOrIfaceRef($<fl>1, *$1, nullptr, $2, false); }
| '(' cellpinListE ')' // When UDP has empty name, unpacked dimensions must not be used ;
instnameParenUdpn<nodep>: // IEEE: part of udp_instance when no name_of_instance
'(' cellpinListE ')' // When UDP has empty name, unpacked dimensions must not be used
{ $$ = GRAMMARP->createCellOrIfaceRef($<fl>1, "", $2, nullptr, true); } { $$ = GRAMMARP->createCellOrIfaceRef($<fl>1, "", $2, nullptr, true); }
; ;
@ -6552,9 +6563,6 @@ boolean_abbrev<nodeExprp>: // ==IEEE: boolean_abbrev
{ $$ = $2; BBUNSUP($<fl>1, "Unsupported: [-> boolean abbrev expression"); } { $$ = $2; BBUNSUP($<fl>1, "Unsupported: [-> boolean abbrev expression"); }
; ;
//************************************************
// Let
//************************************************ //************************************************
// Covergroup // Covergroup

2
test_regress/t/t_preproc_inc_bad.out
View File

@ -1,4 +1,4 @@
%Error: t/t_preproc_inc_inc_bad.vh:11:1: syntax error, unexpected endmodule, expecting IDENTIFIER or '(' or randomize %Error: t/t_preproc_inc_inc_bad.vh:11:1: syntax error, unexpected endmodule, expecting IDENTIFIER or randomize
11 | endmodule 11 | endmodule
| ^~~~~~~~~ | ^~~~~~~~~
t/t_preproc_inc_bad.v:10:1: ... note: In file included from 't_preproc_inc_bad.v' t/t_preproc_inc_bad.v:10:1: ... note: In file included from 't_preproc_inc_bad.v'

2
test_regress/t/t_vams_kwd_bad.out
View File

@ -2,7 +2,7 @@
12 | int above; 12 | int above;
| ^~~~~ | ^~~~~
... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest
%Error: t/t_vams_kwd_bad.v:12:13: syntax error, unexpected ';', expecting IDENTIFIER or '(' or randomize %Error: t/t_vams_kwd_bad.v:12:13: syntax error, unexpected ';', expecting IDENTIFIER or randomize
12 | int above; 12 | int above;
| ^ | ^
%Error-UNSUPPORTED: t/t_vams_kwd_bad.v:13:8: Unsupported: AMS reserved word not implemented: 'abs' %Error-UNSUPPORTED: t/t_vams_kwd_bad.v:13:8: Unsupported: AMS reserved word not implemented: 'abs'