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

Add support for PATHPULSE, PATHPULSEPERCENT, and PERIOD in SDF parser. 

As requested on iverilog-devel. These are all parsed then ignored for now.
This commit is contained in:
Martin Whitaker 2019-08-24 00:23:29 +01:00
parent 3bdb50da29
commit b43fcccc0f
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vpi/sdf_lexor.lex
View File

@ -5,7 +5,7 @@
%{ %{
/* /*
* Copyright (c) 2007-2017 Stephen Williams (steve@icarus.com) * Copyright (c) 2007-2019 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -144,6 +144,9 @@ static struct {
{ "INTERCONNECT", K_INTERCONNECT }, { "INTERCONNECT", K_INTERCONNECT },
{ "INSTANCE", K_INSTANCE }, { "INSTANCE", K_INSTANCE },
{ "IOPATH", K_IOPATH }, { "IOPATH", K_IOPATH },
{ "PATHPULSE", K_PATHPULSE },
{ "PATHPULSEPERCENT", K_PATHPULSEPERCENT },
{ "PERIOD", K_PERIOD },
{ "PROCESS", K_PROCESS }, { "PROCESS", K_PROCESS },
{ "PROGRAM", K_PROGRAM }, { "PROGRAM", K_PROGRAM },
{ "RECREM", K_RECREM }, { "RECREM", K_RECREM },

29
vpi/sdf_parse.y
View File

@ -1,7 +1,7 @@
%{ %{
/* /*
* Copyright (c) 1998-2014 Stephen Williams (steve@icarus.com) * Copyright (c) 1998-2019 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -46,7 +46,8 @@ char sdf_use_hchar = '.';
%token K_ABSOLUTE K_CELL K_CELLTYPE K_COND K_CONDELSE K_DATE K_DELAYFILE %token K_ABSOLUTE K_CELL K_CELLTYPE K_COND K_CONDELSE K_DATE K_DELAYFILE
%token K_DELAY K_DESIGN K_DIVIDER K_HOLD K_INCREMENT K_INSTANCE %token K_DELAY K_DESIGN K_DIVIDER K_HOLD K_INCREMENT K_INSTANCE
%token K_INTERCONNECT K_IOPATH K_NEGEDGE K_POSEDGE K_PROCESS K_PROGRAM %token K_INTERCONNECT K_IOPATH K_NEGEDGE K_PATHPULSE K_PATHPULSEPERCENT
%token K_PERIOD K_POSEDGE K_PROCESS K_PROGRAM
%token K_RECREM K_RECOVERY K_REMOVAL K_SDFVERSION K_SETUP K_SETUPHOLD %token K_RECREM K_RECOVERY K_REMOVAL K_SDFVERSION K_SETUP K_SETUPHOLD
%token K_TEMPERATURE K_TIMESCALE K_TIMINGCHECK K_VENDOR K_VERSION %token K_TEMPERATURE K_TIMESCALE K_TIMINGCHECK K_VENDOR K_VERSION
%token K_VOLTAGE K_WIDTH %token K_VOLTAGE K_WIDTH
@ -65,7 +66,7 @@ char sdf_use_hchar = '.';
%type <string_val> port port_instance port_interconnect %type <string_val> port port_instance port_interconnect
%type <real_val> signed_real_number %type <real_val> signed_real_number
%type <delay> delval rvalue rtriple signed_real_number_opt %type <delay> delval rvalue_opt rvalue rtriple signed_real_number_opt
%type <int_val> edge_identifier %type <int_val> edge_identifier
%type <port_with_edge> port_edge port_spec %type <port_with_edge> port_edge port_spec
@ -246,7 +247,9 @@ deltype_list
; ;
deltype deltype
: '(' K_ABSOLUTE del_def_list ')' : '(' K_PATHPULSE input_output_path_opt rvalue rvalue_opt ')'
| '(' K_PATHPULSEPERCENT input_output_path_opt rvalue rvalue_opt ')'
| '(' K_ABSOLUTE del_def_list ')'
| '(' K_INCREMENT del_def_list ')' | '(' K_INCREMENT del_def_list ')'
| '(' error ')' | '(' error ')'
{ vpi_printf("%s:%d: SDF ERROR: Invalid/malformed delay type\n", { vpi_printf("%s:%d: SDF ERROR: Invalid/malformed delay type\n",
@ -324,6 +327,7 @@ tchk_def
| '(' K_RECREM port_tchk port_tchk rvalue rvalue ')' | '(' K_RECREM port_tchk port_tchk rvalue rvalue ')'
| '(' K_REMOVAL port_tchk port_tchk rvalue ')' | '(' K_REMOVAL port_tchk port_tchk rvalue ')'
| '(' K_WIDTH port_tchk rvalue ')' | '(' K_WIDTH port_tchk rvalue ')'
| '(' K_PERIOD port_tchk rvalue ')'
; ;
port_tchk port_tchk
@ -394,6 +398,15 @@ scalar_constant
| K_LOGICAL_ZERO | K_LOGICAL_ZERO
; ;
input_output_path_opt
: input_output_path
|
;
input_output_path
: port_instance port_instance
;
port_spec port_spec
: port_instance { $$.vpi_edge = vpiNoEdge; $$.string_val = $1; } : port_instance { $$.vpi_edge = vpiNoEdge; $$.string_val = $1; }
| port_edge { $$ = $1; } | port_edge { $$ = $1; }
@ -466,6 +479,14 @@ delval
} }
; ;
rvalue_opt
: /* When missing. */
{ $$.value = 0.0;
$$.defined = 0;
}
| rvalue
;
rvalue rvalue
: '(' signed_real_number ')' : '(' signed_real_number ')'
{ $$.defined = 1; { $$.defined = 1;