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

Merge pull request #957 from larsclausen/module-array-initializer 

Support initializer expression for unpacked array port declarations
This commit is contained in:
Cary R 2023-06-19 10:56:40 -07:00 committed by GitHub
parent ffbcb30127 79fc09717e
commit bb39325fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivtest/ivltests/module_output_port_list_def.v
View File

@ -2,7 +2,7 @@
// output port declaration list.
module M (
output [31:0] x = 1, y = 2
output reg [31:0] x = 1, y = 2
);
`define check(val, exp) \

23
ivtest/ivltests/module_port_array_init1.v Normal file
View File

@ -0,0 +1,23 @@
// Check that initializers values are supported for module array ports
module M (
input [31:0] x[0:1] = '{1, 2},
output reg [31:0] y[0:1] = '{3, 4}
);
initial begin
#1
if (x[0] === 1 && x[1] === 2 && y[0] === 3 && y[1] === 4) begin
$display("PASSED");
end else begin
$display("FAILED");
end
end
endmodule
module test;
M i_m ();
endmodule

1
ivtest/regress-vvp.list
View File

@ -35,6 +35,7 @@ memsynth1 vvp_tests/memsynth1.json
module_ordered_list1 vvp_tests/module_ordered_list1.json
module_ordered_list2 vvp_tests/module_ordered_list2.json
module_port_array1 vvp_tests/module_port_array1.json
module_port_array_init1 vvp_tests/module_port_array_init1.json
param-width vvp_tests/param-width.json
param-width-vlog95 vvp_tests/param-width-vlog95.json
pr1388974 vvp_tests/pr1388974.json

5
ivtest/vvp_tests/module_port_array_init1.json Normal file
View File

@ -0,0 +1,5 @@
{
"type" : "normal",
"source" : "module_port_array_init1.v",
"iverilog-args" : [ "-g2005-sv" ]
}

46
parse.y
View File

@ -4448,10 +4448,13 @@ list_of_port_declarations
;
port_declaration
: attribute_list_opt K_input net_type_or_var_opt data_type_or_implicit IDENTIFIER dimensions_opt
{ Module::port_t*ptmp;
: attribute_list_opt K_input net_type_or_var_opt data_type_or_implicit IDENTIFIER dimensions_opt initializer_opt
{ if ($7)
pform_requires_sv(@7, "Input port default value");
Module::port_t*ptmp;
perm_string name = lex_strings.make($5);
ptmp = pform_module_port_reference(@2, name);
ptmp->default_value = $7;
pform_module_define_port(@2, name, NetNet::PINPUT, $3, $4, $6, nullptr,
$1);
port_declaration_context.port_type = NetNet::PINPUT;
@ -4475,21 +4478,6 @@ port_declaration
delete[]$4;
$$ = ptmp;
}
| attribute_list_opt K_input net_type_or_var_opt data_type_or_implicit IDENTIFIER '=' expression
{ pform_requires_sv(@6, "Default port value");
Module::port_t*ptmp;
perm_string name = lex_strings.make($5);
data_type_t*use_type = $4;
ptmp = pform_module_port_reference(@2, name);
ptmp->default_value = $7;
pform_module_define_port(@2, name, NetNet::PINPUT, $3, use_type,
nullptr, $1);
port_declaration_context.port_type = NetNet::PINPUT;
port_declaration_context.port_net_type = $3;
port_declaration_context.data_type = $4;
delete[]$5;
$$ = ptmp;
}
| attribute_list_opt K_inout net_type_opt data_type_or_implicit IDENTIFIER dimensions_opt
{ Module::port_t*ptmp;
perm_string name = lex_strings.make($5);
@ -4521,7 +4509,7 @@ port_declaration
delete[]$4;
$$ = ptmp;
}
| attribute_list_opt K_output net_type_or_var_opt data_type_or_implicit IDENTIFIER dimensions_opt
| attribute_list_opt K_output net_type_or_var_opt data_type_or_implicit IDENTIFIER dimensions_opt initializer_opt
{ Module::port_t*ptmp;
perm_string name = lex_strings.make($5);
NetNet::Type use_type = $3;
@ -4545,6 +4533,9 @@ port_declaration
port_declaration_context.port_type = NetNet::POUTPUT;
port_declaration_context.port_net_type = use_type;
port_declaration_context.data_type = $4;
if ($7)
pform_make_var_init(@5, name, $7);
delete[]$5;
$$ = ptmp;
}
@ -4563,25 +4554,6 @@ port_declaration
delete[]$4;
$$ = ptmp;
}
| attribute_list_opt K_output net_type_or_var_opt data_type_or_implicit IDENTIFIER '=' expression
{ Module::port_t*ptmp;
perm_string name = lex_strings.make($5);
NetNet::Type use_type = $3;
if (use_type == NetNet::IMPLICIT) {
use_type = NetNet::IMPLICIT_REG;
}
ptmp = pform_module_port_reference(@2, name);
pform_module_define_port(@2, name, NetNet::POUTPUT, use_type, $4,
nullptr, $1);
port_declaration_context.port_type = NetNet::POUTPUT;
port_declaration_context.port_net_type = use_type;
port_declaration_context.data_type = $4;
pform_make_var_init(@5, name, $7);
delete[]$5;
$$ = ptmp;
}
;
/*