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

Corrected defRead.c so that "read def" will read multiple "+ ROUTED" 

(and similar) independent routed segments in the SPECIALNETS section
(which was already working correctly for regular NETS).  This solves
github issue tracker issue #264 from Christian Haufe.
This commit is contained in:
Tim Edwards 2023-08-25 12:15:58 -04:00
parent f4d7646c1e
commit cb00ede59d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lef/defRead.c
View File

@ -61,7 +61,8 @@ static char rcsid[] __attribute__ ((unused)) = "$Header: /usr/cvsroot/magic-8.0/
enum def_netspecial_keys {DEF_SPECNET_SHAPE = 0, DEF_SPECNET_STYLE, enum def_netspecial_keys {DEF_SPECNET_SHAPE = 0, DEF_SPECNET_STYLE,
DEF_SPECNET_USE, DEF_SPECNET_VOLTAGE, DEF_SPECNET_FIXEDBUMP, DEF_SPECNET_USE, DEF_SPECNET_VOLTAGE, DEF_SPECNET_FIXEDBUMP,
DEF_SPECNET_ORIGINAL, DEF_SPECNET_PATTERN, DEF_SPECNET_ESTCAP, DEF_SPECNET_ORIGINAL, DEF_SPECNET_PATTERN, DEF_SPECNET_ESTCAP,
DEF_SPECNET_WEIGHT, DEF_SPECNET_PROPERTY}; DEF_SPECNET_WEIGHT, DEF_SPECNET_PROPERTY, DEF_SPECNET_ROUTED,
DEF_SPECNET_FIXED, DEF_SPECNET_COVER, DEF_SPECNET_SHIELD };
enum def_netspecial_shape_keys { enum def_netspecial_shape_keys {
DEF_SPECNET_SHAPE_RING = 0, DEF_SPECNET_SHAPE_RING = 0,
@ -115,6 +116,10 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
"ESTCAP", "ESTCAP",
"WEIGHT", "WEIGHT",
"PROPERTY", "PROPERTY",
"ROUTED",
"FIXED",
"COVER",
"SHIELD",
NULL NULL
}; };
@ -262,6 +267,16 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
case DEF_SPECNET_FIXEDBUMP: case DEF_SPECNET_FIXEDBUMP:
/* Ignore this keyword */ /* Ignore this keyword */
break; break;
case DEF_SPECNET_SHIELD:
/* Treat as the following case except to absorb the next token */
token = LefNextToken(f, TRUE); /* Drop through */
case DEF_SPECNET_ROUTED:
case DEF_SPECNET_COVER:
case DEF_SPECNET_FIXED:
initial = TRUE;
continue;
} }
} }
else if (!strcmp(token, "RECT")) else if (!strcmp(token, "RECT"))