Skip to content

Add state_dependent_path_declaration so that ifnone can be parsed #5121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+51 −8
Open

Add state_dependent_path_declaration so that ifnone can be parsed #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontends/verilog/Makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GENFILES += frontends/verilog/verilog_lexer.cc

frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
$(Q) mkdir -p $(dir $@)
$(P) $(BISON) -Wall -Werror -o $@ -d -r all -b frontends/verilog/verilog_parser $<
$(P) $(BISON) -Wall -Wcex -Werror -o $@ -d -r all -b frontends/verilog/verilog_parser $<
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From https://www.gnu.org/software/bison/manual/html_node/Diagnostics.html:

cex
Provide counterexamples for conflicts. See Generation of Counterexamples. Counterexamples take time to compute. The option -Wcex should be used by the developer when working on the grammar; it hardly makes sense to use it in a CI.

I don't think this should be included.


frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc

Expand Down
1 change: 1 addition & 0 deletions frontends/verilog/verilog_lexer.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ TIME_SCALE_SUFFIX [munpf]?s
"begin" { return TOK_BEGIN; }
"end" { return TOK_END; }
"if" { return TOK_IF; }
"ifnone" { return TOK_IFNONE; }
"else" { return TOK_ELSE; }
"for" { return TOK_FOR; }
"posedge" { return TOK_POSEDGE; }
Expand Down
56 changes: 49 additions & 7 deletions frontends/verilog/verilog_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *
%token TOK_INPUT TOK_OUTPUT TOK_INOUT TOK_WIRE TOK_WAND TOK_WOR TOK_REG TOK_LOGIC
%token TOK_INTEGER TOK_SIGNED TOK_ASSIGN TOK_ALWAYS TOK_INITIAL
%token TOK_ALWAYS_FF TOK_ALWAYS_COMB TOK_ALWAYS_LATCH
%token TOK_BEGIN TOK_END TOK_IF TOK_ELSE TOK_FOR TOK_WHILE TOK_REPEAT
%token TOK_BEGIN TOK_END TOK_IF TOK_ELSE TOK_IFNONE TOK_FOR TOK_WHILE TOK_REPEAT
%token TOK_DPI_FUNCTION TOK_POSEDGE TOK_NEGEDGE TOK_OR TOK_AUTOMATIC
%token TOK_CASE TOK_CASEX TOK_CASEZ TOK_ENDCASE TOK_DEFAULT
%token TOK_FUNCTION TOK_ENDFUNCTION TOK_TASK TOK_ENDTASK TOK_SPECIFY
Expand Down Expand Up @@ -1541,18 +1541,60 @@ list_of_specparam_assignments:
specparam_assignment:
ignspec_id '=' ignspec_expr ;

ignspec_opt_cond:
TOK_IF '(' ignspec_expr ')' | %empty;

path_declaration :
simple_path_declaration ';'
// | edge_sensitive_path_declaration
// | state_dependent_path_declaration
| state_dependent_path_declaration ';'
;

simple_path_declaration :
ignspec_opt_cond parallel_path_description '=' path_delay_value |
ignspec_opt_cond full_path_description '=' path_delay_value
parallel_path_description '=' path_delay_value |
full_path_description '=' path_delay_value
;

state_dependent_path_declaration:
TOK_IF '(' module_path_expression ')' simple_path_declaration
// | TOK_IF '(' module_path_expression ')' edge_sensitive_path_declaration
| TOK_IFNONE simple_path_declaration
;

module_path_expression:
module_path_primary
// Flatten out unary_operator to avoid shift/reduce conflict
| '!' attr module_path_primary { delete $2; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the existing code, these need to be freeattr($2); instead to avoid a memory leak (not that I'm sure why they're being deleted).

| '~' attr module_path_primary { delete $2; }
| '&' attr module_path_primary { delete $2; }
| OP_NAND attr module_path_primary { delete $2; }
| '|' attr module_path_primary { delete $2; }
| OP_NOR attr module_path_primary { delete $2; }
| '^' attr module_path_primary { delete $2; }
| OP_XNOR attr module_path_primary { delete $2; }
// Flatten out binary_operator to avoid shift/reduce conflict
| module_path_expression OP_EQ attr module_path_expression { delete $3; }
| module_path_expression OP_NE attr module_path_expression { delete $3; }
| module_path_expression OP_LAND attr module_path_expression { delete $3; }
| module_path_expression OP_LOR attr module_path_expression { delete $3; }
| module_path_expression '&' attr module_path_expression { delete $3; }
| module_path_expression '|' attr module_path_expression { delete $3; }
| module_path_expression '^' attr module_path_expression { delete $3; }
| module_path_expression OP_XNOR attr module_path_expression { delete $3; }
// | module_path_conditional_expression
;

module_path_primary:
number
| TOK_ID { delete $1; }
// Deviate from specification: Normally string would not be allowed, however they are necessary for the ecp5 tests
| TOK_STRING { delete $1; }
// | module_path_concatenation
// | module_path_multiple_concatenation
// | function_subroutine_call
// | '(' module_path_minmax_expression ')'
;

number:
integral_number { delete $1; }
| TOK_REALVAL { delete $1; }
;

path_delay_value :
Expand Down