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

Support direct packed arrays of structs and enums 

It is possible to directly declare a packed array of a struct or enum,
without having to typedef the struct or enum first. E.g.

```
struct packed {
  int x;
} [1:0] pa;
```

Add support to the parser for handling this.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2022-01-15 14:09:11 +01:00
parent 6222a84d67
commit ae954e5df7
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
parse.y
View File

@ -637,6 +637,7 @@ static void current_function_set_statement(const YYLTYPE&loc, std::vector<Statem
%type <data_type> data_type data_type_or_implicit data_type_or_implicit_or_void %type <data_type> data_type data_type_or_implicit data_type_or_implicit_or_void
%type <data_type> simple_type_or_string let_formal_type %type <data_type> simple_type_or_string let_formal_type
%type <data_type> packed_array_data_type
%type <class_type> class_identifier %type <class_type> class_identifier
%type <struct_member> struct_union_member %type <struct_member> struct_union_member
%type <struct_members> struct_union_member_list %type <struct_members> struct_union_member_list
@ -1170,6 +1171,23 @@ data_declaration /* IEEE1800-2005: A.2.1.3 */
| attribute_list_opt package_import_declaration | attribute_list_opt package_import_declaration
; ;
/* Data types that can have packed dimensions directly attached to it */
packed_array_data_type /* IEEE1800-2005: A.2.2.1 */
: enum_data_type
{ $$ = $1; }
| struct_data_type
{ if (!$1->packed_flag) {
yyerror(@1, "sorry: Unpacked structs not supported.");
}
$$ = $1;
}
| TYPE_IDENTIFIER
{ pform_set_type_referenced(@1, $1.text);
delete[]$1.text;
$$ = $1.type;
}
;
data_type /* IEEE1800-2005: A.2.2.1 */ data_type /* IEEE1800-2005: A.2.2.1 */
: integer_vector_type unsigned_signed_opt dimensions_opt : integer_vector_type unsigned_signed_opt dimensions_opt
{ ivl_variable_type_t use_vtype = $1; { ivl_variable_type_t use_vtype = $1;
@ -1188,14 +1206,6 @@ data_type /* IEEE1800-2005: A.2.2.1 */
FILE_NAME(tmp, @1); FILE_NAME(tmp, @1);
$$ = tmp; $$ = tmp;
} }
| struct_data_type
{ if (!$1->packed_flag) {
yyerror(@1, "sorry: Unpacked structs not supported.");
}
$$ = $1;
}
| enum_data_type
{ $$ = $1; }
| atom2_type signed_unsigned_opt | atom2_type signed_unsigned_opt
{ atom2_type_t*tmp = new atom2_type_t($1, $2); { atom2_type_t*tmp = new atom2_type_t($1, $2);
FILE_NAME(tmp, @1); FILE_NAME(tmp, @1);
@ -1214,14 +1224,14 @@ data_type /* IEEE1800-2005: A.2.2.1 */
tmp->reg_flag = !gn_system_verilog(); tmp->reg_flag = !gn_system_verilog();
$$ = tmp; $$ = tmp;
} }
| TYPE_IDENTIFIER dimensions_opt | packed_array_data_type dimensions_opt
{ pform_set_type_referenced(@1, $1.text); { if ($2) {
if ($2) { parray_type_t*tmp = new parray_type_t($1, $2);
parray_type_t*tmp = new parray_type_t($1.type, $2);
FILE_NAME(tmp, @1); FILE_NAME(tmp, @1);
$$ = tmp; $$ = tmp;
} else $$ = $1.type; } else {
delete[]$1.text; $$ = $1;
}
} }
| PACKAGE_IDENTIFIER K_SCOPE_RES | PACKAGE_IDENTIFIER K_SCOPE_RES
{ lex_in_package_scope($1); } { lex_in_package_scope($1); }