mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-11-03 21:09:12 +00:00
Code Activity

Merge pull request #2203 from antmicro/fix-grammar

Browse source 
Signed and macro grammar update
This commit is contained in:
clairexen 2020-07-01 16:41:32 +02:00 • committed by GitHub
commit 7450ee7f8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
frontends/verilog/verilog_parser.y
View file

@ -747,7 +747,7 @@ module_body:
module_body_stmt: module_body_stmt:
task_func_decl | specify_block | param_decl | localparam_decl | typedef_decl | defparam_decl | specparam_declaration | wire_decl | assign_stmt | cell_stmt | task_func_decl | specify_block | param_decl | localparam_decl | typedef_decl | defparam_decl | specparam_declaration | wire_decl | assign_stmt | cell_stmt |
enum_decl | struct_decl | enum_decl | struct_decl |
always_stmt | TOK_GENERATE module_gen_body TOK_ENDGENERATE | defattr | assert_property | checker_decl | ignored_specify_block; always_stmt | TOK_GENERATE module_gen_body TOK_ENDGENERATE | defattr | assert_property | checker_decl | ignored_specify_block | /* empty statement */ ';';
checker_decl: checker_decl:
TOK_CHECKER TOK_ID ';' { TOK_CHECKER TOK_ID ';' {
@ -1331,6 +1331,8 @@ ignspec_id:
param_signed: param_signed:
TOK_SIGNED { TOK_SIGNED {
astbuf1->is_signed = true; astbuf1->is_signed = true;
} | TOK_UNSIGNED {
astbuf1->is_signed = false;
} | /* empty */; } | /* empty */;
param_integer: param_integer:
@ -1341,14 +1343,14 @@ param_integer:
astbuf1->children.back()->children.push_back(AstNode::mkconst_int(31, true)); astbuf1->children.back()->children.push_back(AstNode::mkconst_int(31, true));
astbuf1->children.back()->children.push_back(AstNode::mkconst_int(0, true)); astbuf1->children.back()->children.push_back(AstNode::mkconst_int(0, true));
astbuf1->is_signed = true; astbuf1->is_signed = true;
} | /* empty */; }
param_real: param_real:
TOK_REAL { TOK_REAL {
if (astbuf1->children.size() != 1) if (astbuf1->children.size() != 1)
frontend_verilog_yyerror("Parameter already declared as integer, cannot set to real."); frontend_verilog_yyerror("Parameter already declared as integer, cannot set to real.");
astbuf1->children.push_back(new AstNode(AST_REALVALUE)); astbuf1->children.push_back(new AstNode(AST_REALVALUE));
} | /* empty */; }
param_range: param_range:
range { range {
@ -1359,8 +1361,12 @@ param_range:
} }
}; };
param_integer_type: param_integer param_signed
param_range_type: type_vec param_signed param_range
param_implicit_type: param_signed param_range
param_type: param_type:
param_signed param_integer param_real param_range | param_integer_type | param_real | param_range_type | param_implicit_type |
hierarchical_type_id { hierarchical_type_id {
astbuf1->is_custom_type = true; astbuf1->is_custom_type = true;
astbuf1->children.push_back(new AstNode(AST_WIRETYPE)); astbuf1->children.push_back(new AstNode(AST_WIRETYPE));

28
tests/various/signed.ys Normal file
View file

@ -0,0 +1,28 @@
# SV LRM A2.2.1
read_verilog -sv <<EOT
module test_signed();
parameter integer signed a = 0;
parameter integer unsigned b = 0;
endmodule
EOT
design -reset
read_verilog -sv <<EOT
module test_signed();
parameter logic signed [7:0] a = 0;
parameter logic unsigned [7:0] b = 0;
endmodule
EOT
design -reset
logger -expect error "syntax error, unexpected TOK_INTEGER" 1
read_verilog -sv <<EOT
module test_signed();
parameter signed integer a = 0;
parameter unsigned integer b = 0;
endmodule
EOT