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

Added support for parsing attributes on port connections 

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
This commit is contained in:
Maciej Kurc 2019-06-05 16:28:45 +02:00
parent 5bb6c7f53a
commit e6fa2625a4
1 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
parse.y
View File

@ -597,6 +597,7 @@ static void current_function_set_statement(const YYLTYPE&loc, vector<Statement*>
%type <named_pexpr> modport_simple_port port_name parameter_value_byname %type <named_pexpr> modport_simple_port port_name parameter_value_byname
%type <named_pexprs> port_name_list parameter_value_byname_list %type <named_pexprs> port_name_list parameter_value_byname_list
%type <exprs> port_conn_expression_list_with_nuls
%type <named_pexpr> attribute %type <named_pexpr> attribute
%type <named_pexprs> attribute_list attribute_instance_list attribute_list_opt %type <named_pexprs> attribute_list attribute_instance_list attribute_list_opt
@ -3922,7 +3923,7 @@ function_item
/* A gate_instance is a module instantiation or a built in part /* A gate_instance is a module instantiation or a built in part
type. In any case, the gate has a set of connections to ports. */ type. In any case, the gate has a set of connections to ports. */
gate_instance gate_instance
: IDENTIFIER '(' expression_list_with_nuls ')' : IDENTIFIER '(' port_conn_expression_list_with_nuls ')'
{ lgate*tmp = new lgate; { lgate*tmp = new lgate;
tmp->name = $1; tmp->name = $1;
tmp->parms = $3; tmp->parms = $3;
@ -3932,7 +3933,7 @@ gate_instance
$$ = tmp; $$ = tmp;
} }
| IDENTIFIER dimensions '(' expression_list_with_nuls ')' | IDENTIFIER dimensions '(' port_conn_expression_list_with_nuls ')'
{ lgate*tmp = new lgate; { lgate*tmp = new lgate;
list<pform_range_t>*rng = $2; list<pform_range_t>*rng = $2;
tmp->name = $1; tmp->name = $1;
@ -3947,7 +3948,7 @@ gate_instance
$$ = tmp; $$ = tmp;
} }
| '(' expression_list_with_nuls ')' | '(' port_conn_expression_list_with_nuls ')'
{ lgate*tmp = new lgate; { lgate*tmp = new lgate;
tmp->name = ""; tmp->name = "";
tmp->parms = $2; tmp->parms = $2;
@ -5471,34 +5472,38 @@ port_opt
looking for the ports of a module declaration. */ looking for the ports of a module declaration. */
port_name port_name
: '.' IDENTIFIER '(' expression ')' : attribute_list_opt '.' IDENTIFIER '(' expression ')'
{ named_pexpr_t*tmp = new named_pexpr_t; { named_pexpr_t*tmp = new named_pexpr_t;
tmp->name = lex_strings.make($2); tmp->name = lex_strings.make($3);
tmp->parm = $4; tmp->parm = $5;
delete[]$2; delete[]$3;
delete $1;
$$ = tmp; $$ = tmp;
} }
| '.' IDENTIFIER '(' error ')' | attribute_list_opt '.' IDENTIFIER '(' error ')'
{ yyerror(@3, "error: invalid port connection expression."); { yyerror(@3, "error: invalid port connection expression.");
named_pexpr_t*tmp = new named_pexpr_t; named_pexpr_t*tmp = new named_pexpr_t;
tmp->name = lex_strings.make($2); tmp->name = lex_strings.make($3);
tmp->parm = 0; tmp->parm = 0;
delete[]$2; delete[]$3;
delete $1;
$$ = tmp; $$ = tmp;
} }
| '.' IDENTIFIER '(' ')' | attribute_list_opt '.' IDENTIFIER '(' ')'
{ named_pexpr_t*tmp = new named_pexpr_t; { named_pexpr_t*tmp = new named_pexpr_t;
tmp->name = lex_strings.make($2); tmp->name = lex_strings.make($3);
tmp->parm = 0; tmp->parm = 0;
delete[]$2; delete[]$3;
delete $1;
$$ = tmp; $$ = tmp;
} }
| '.' IDENTIFIER | attribute_list_opt '.' IDENTIFIER
{ named_pexpr_t*tmp = new named_pexpr_t; { named_pexpr_t*tmp = new named_pexpr_t;
tmp->name = lex_strings.make($2); tmp->name = lex_strings.make($3);
tmp->parm = new PEIdent(lex_strings.make($2), true); tmp->parm = new PEIdent(lex_strings.make($3), true);
FILE_NAME(tmp->parm, @1); FILE_NAME(tmp->parm, @1);
delete[]$2; delete[]$3;
delete $1;
$$ = tmp; $$ = tmp;
} }
| K_DOTSTAR | K_DOTSTAR
@ -5524,6 +5529,31 @@ port_name_list
} }
; ;
port_conn_expression_list_with_nuls
: port_conn_expression_list_with_nuls ',' attribute_list_opt expression
{ list<PExpr*>*tmp = $1;
tmp->push_back($4);
delete $3;
$$ = tmp;
}
| attribute_list_opt expression
{ list<PExpr*>*tmp = new list<PExpr*>;
tmp->push_back($2);
delete $1;
$$ = tmp;
}
|
{ list<PExpr*>*tmp = new list<PExpr*>;
tmp->push_back(0);
$$ = tmp;
}
| port_conn_expression_list_with_nuls ','
{ list<PExpr*>*tmp = $1;
tmp->push_back(0);
$$ = tmp;
}
;
/* A port reference is an internal (to the module) name of the port, /* A port reference is an internal (to the module) name of the port,
possibly with a part of bit select to attach it to specific bits possibly with a part of bit select to attach it to specific bits