riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2044 from YosysHQ/eddie/fix2037 

verilog: allow attributes on behavioural statements (including null statement)
This commit is contained in:
Eddie Hung 2020-05-25 09:14:00 -07:00 committed by GitHub
parent ae11156c90 c5a9abba11
commit 59b355fb85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
frontends/verilog/verilog_parser.y
View File

@ -2203,32 +2203,39 @@ assert_property:
}; };
simple_behavioral_stmt: simple_behavioral_stmt:
lvalue '=' delay expr { attr lvalue '=' delay expr {
AstNode *node = new AstNode(AST_ASSIGN_EQ, $1, $4); AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, $5);
ast_stack.back()->children.push_back(node); ast_stack.back()->children.push_back(node);
SET_AST_NODE_LOC(node, @1, @4); SET_AST_NODE_LOC(node, @2, @5);
append_attr(node, $1);
} | } |
lvalue TOK_INCREMENT { attr lvalue TOK_INCREMENT {
AstNode *node = new AstNode(AST_ASSIGN_EQ, $1, new AstNode(AST_ADD, $1->clone(), AstNode::mkconst_int(1, true))); AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, new AstNode(AST_ADD, $2->clone(), AstNode::mkconst_int(1, true)));
ast_stack.back()->children.push_back(node); ast_stack.back()->children.push_back(node);
SET_AST_NODE_LOC(node, @1, @2); SET_AST_NODE_LOC(node, @2, @3);
append_attr(node, $1);
} | } |
lvalue TOK_DECREMENT { attr lvalue TOK_DECREMENT {
AstNode *node = new AstNode(AST_ASSIGN_EQ, $1, new AstNode(AST_SUB, $1->clone(), AstNode::mkconst_int(1, true))); AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, new AstNode(AST_SUB, $2->clone(), AstNode::mkconst_int(1, true)));
ast_stack.back()->children.push_back(node); ast_stack.back()->children.push_back(node);
SET_AST_NODE_LOC(node, @1, @2); SET_AST_NODE_LOC(node, @2, @3);
append_attr(node, $1);
} | } |
lvalue OP_LE delay expr { attr lvalue OP_LE delay expr {
AstNode *node = new AstNode(AST_ASSIGN_LE, $1, $4); AstNode *node = new AstNode(AST_ASSIGN_LE, $2, $5);
ast_stack.back()->children.push_back(node); ast_stack.back()->children.push_back(node);
SET_AST_NODE_LOC(node, @1, @4); SET_AST_NODE_LOC(node, @2, @5);
append_attr(node, $1);
}; };
// this production creates the obligatory if-else shift/reduce conflict // this production creates the obligatory if-else shift/reduce conflict
behavioral_stmt: behavioral_stmt:
defattr | assert | wire_decl | param_decl | localparam_decl | typedef_decl | defattr | assert | wire_decl | param_decl | localparam_decl | typedef_decl |
non_opt_delay behavioral_stmt | non_opt_delay behavioral_stmt |
attr simple_behavioral_stmt ';' | ';' | simple_behavioral_stmt ';' |
attr ';' {
free_attr($1);
} |
attr hierarchical_id { attr hierarchical_id {
AstNode *node = new AstNode(AST_TCALL); AstNode *node = new AstNode(AST_TCALL);
node->str = *$2; node->str = *$2;
@ -2436,7 +2443,7 @@ gen_case_item:
} case_select { } case_select {
case_type_stack.push_back(0); case_type_stack.push_back(0);
SET_AST_NODE_LOC(ast_stack.back(), @2, @2); SET_AST_NODE_LOC(ast_stack.back(), @2, @2);
} gen_stmt_or_null { } gen_stmt_block {
case_type_stack.pop_back(); case_type_stack.pop_back();
ast_stack.pop_back(); ast_stack.pop_back();
}; };
@ -2528,7 +2535,10 @@ module_gen_body:
/* empty */; /* empty */;
gen_stmt_or_module_body_stmt: gen_stmt_or_module_body_stmt:
gen_stmt | module_body_stmt; gen_stmt | module_body_stmt |
attr ';' {
free_attr($1);
};
// this production creates the obligatory if-else shift/reduce conflict // this production creates the obligatory if-else shift/reduce conflict
gen_stmt: gen_stmt:
@ -2550,7 +2560,7 @@ gen_stmt:
AstNode *block = new AstNode(AST_GENBLOCK); AstNode *block = new AstNode(AST_GENBLOCK);
ast_stack.back()->children.push_back(block); ast_stack.back()->children.push_back(block);
ast_stack.push_back(block); ast_stack.push_back(block);
} gen_stmt_or_null { } gen_stmt_block {
ast_stack.pop_back(); ast_stack.pop_back();
} opt_gen_else { } opt_gen_else {
SET_AST_NODE_LOC(ast_stack.back(), @1, @7); SET_AST_NODE_LOC(ast_stack.back(), @1, @7);
@ -2600,11 +2610,8 @@ gen_stmt_block:
ast_stack.pop_back(); ast_stack.pop_back();
}; };
gen_stmt_or_null:
gen_stmt_block | ';';
opt_gen_else: opt_gen_else:
TOK_ELSE gen_stmt_or_null | /* empty */ %prec FAKE_THEN; TOK_ELSE gen_stmt_block | /* empty */ %prec FAKE_THEN;
expr: expr:
basic_expr { basic_expr {

58
tests/verilog/bug2037.ys Normal file
View File

@ -0,0 +1,58 @@
logger -expect-no-warnings
read_verilog <<EOT
module test ();
localparam y = 1;
always @(*)
if (y) (* foo *) ;
endmodule
EOT
select -assert-none a:* a:src %d
design -reset
logger -expect-no-warnings
read_verilog <<EOT
module test ();
localparam y = 1;
always @(*)
if (y) (* foo *) ; else (* bar *) ;
endmodule
EOT
select -assert-none a:* a:src %d
design -reset
logger -expect-no-warnings
read_verilog <<EOT
module test ();
localparam y = 1;
generate if (y) (* foo *) ; endgenerate
endmodule
EOT
select -assert-none a:*
design -reset
logger -expect-no-warnings
read_verilog <<EOT
module test ();
localparam y = 1;
generate if (y) (* foo *) ; else (* bar *); endgenerate
endmodule
EOT
select -assert-none a:*
design -reset
read_verilog <<EOT
module test ();
localparam y = 1;
reg x = 1'b0;
always @(*) begin
if (y)
(* foo *) x <= 1'b1;
else
(* bar *) x = 1'b0;
end
endmodule
EOT