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

The switch gates do not support a strength specification. 

This patch splits the switch types out of the gates to allow
them to be defined to not take a strength specification.
This commit is contained in:
Cary R 2010-07-13 16:12:03 -07:00 committed by Stephen Williams
parent 5fe5171e49
commit df4722b92c
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
parse.y
View File

@ -373,7 +373,7 @@ static PECallFunction*make_call_function(perm_string tn, PExpr*arg1, PExpr*arg2)
%type <exprs> range range_opt %type <exprs> range range_opt
%type <dimensions> dimensions_opt dimensions %type <dimensions> dimensions_opt dimensions
%type <nettype> net_type var_type net_type_opt %type <nettype> net_type var_type net_type_opt
%type <gatetype> gatetype %type <gatetype> gatetype switchtype
%type <porttype> port_type %type <porttype> port_type
%type <datatype> primitive_type primitive_type_opt %type <datatype> primitive_type primitive_type_opt
%type <parmvalue> parameter_value_opt %type <parmvalue> parameter_value_opt
@ -1706,7 +1706,10 @@ gatetype
| K_not { $$ = PGBuiltin::NOT; } | K_not { $$ = PGBuiltin::NOT; }
| K_notif0 { $$ = PGBuiltin::NOTIF0; } | K_notif0 { $$ = PGBuiltin::NOTIF0; }
| K_notif1 { $$ = PGBuiltin::NOTIF1; } | K_notif1 { $$ = PGBuiltin::NOTIF1; }
| K_nmos { $$ = PGBuiltin::NMOS; } ;
switchtype
: K_nmos { $$ = PGBuiltin::NMOS; }
| K_rnmos { $$ = PGBuiltin::RNMOS; } | K_rnmos { $$ = PGBuiltin::RNMOS; }
| K_pmos { $$ = PGBuiltin::PMOS; } | K_pmos { $$ = PGBuiltin::PMOS; }
| K_rpmos { $$ = PGBuiltin::RPMOS; } | K_rpmos { $$ = PGBuiltin::RPMOS; }
@ -2244,7 +2247,8 @@ module_item
| K_defparam defparam_assign_list ';' | K_defparam defparam_assign_list ';'
/* Most gate types have an optional drive strength and optional /* Most gate types have an optional drive strength and optional
three-value delay. These rules handle the different cases. */ two/three-value delay. These rules handle the different cases.
We check that the actual number of delays is correct later. */
| attribute_list_opt gatetype gate_instance_list ';' | attribute_list_opt gatetype gate_instance_list ';'
{ pform_makegates($2, str_strength, 0, $3, $1); { pform_makegates($2, str_strength, 0, $3, $1);
@ -2262,6 +2266,15 @@ module_item
{ pform_makegates($2, $3, $4, $5, $1); { pform_makegates($2, $3, $4, $5, $1);
} }
/* The switch type gates do not support a strength. */
| attribute_list_opt switchtype gate_instance_list ';'
{ pform_makegates($2, str_strength, 0, $3, $1);
}
| attribute_list_opt switchtype delay3 gate_instance_list ';'
{ pform_makegates($2, str_strength, $3, $4, $1);
}
/* Pullup and pulldown devices cannot have delays, and their /* Pullup and pulldown devices cannot have delays, and their
strengths are limited. */ strengths are limited. */