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

Fixed an error when reading a DEF file using generated vias in a 

non-default rule.  The code was first failing to identify the via
cut type from the generated via record, and then it was failing
to return to the non-default rule width after the route exits the
via.  Both issues have been fixed.  Thanks to Sylvain Munaut for
providing a reproducible test case.
This commit is contained in:
Tim Edwards 2024-03-20 17:19:45 -04:00
parent 54773957c9
commit fede9d5c4d
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.465 8.3.466

22
lef/defRead.c
View File

@ -441,7 +441,11 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
routeList = addRoute; routeList = addRoute;
} }
/* Set paintLayer to the contact cut type */
paintLayer = lefl->type; paintLayer = lefl->type;
if (!DBIsContact(lefl->type))
if (lefl->info.via.lr != NULL)
paintLayer = lefl->info.via.lr->r_type;
newRoute->r_r.r_xbot = refp.p_x + lefl->info.via.area.r_xbot; newRoute->r_r.r_xbot = refp.p_x + lefl->info.via.area.r_xbot;
newRoute->r_r.r_ybot = refp.p_y + lefl->info.via.area.r_ybot; newRoute->r_r.r_ybot = refp.p_y + lefl->info.via.area.r_ybot;
@ -493,12 +497,26 @@ DefAddRoutes(rootDef, f, oscale, special, netname, ruleset, defLayerMap, annotat
DBTypeLongNameTbl[stype]); DBTypeLongNameTbl[stype]);
*/ */
routeLayer = stype; routeLayer = stype;
lefl = defLayerMap[routeLayer].lefInfo; lefl = defLayerMap[routeLayer].lefInfo;
/* Get correct rule for nondefault rules */
if (ruleset)
{
for (rule = ruleset->rule; rule; rule = rule->next)
if (rule->lefInfo == lefl)
break;
}
else
rule = NULL;
if (special) if (special)
paintWidth = saveWidth; paintWidth = saveWidth;
else else
paintWidth = (lefl) ? lefl->info.route.width paintWidth = (rule) ? rule->width :
: DEFAULT_WIDTH * DBLambda[1] / DBLambda[0]; (lefl) ? lefl->info.route.width :
DEFAULT_WIDTH * DBLambda[1] / DBLambda[0];
paintExtend = (special) ? 0 : paintWidth; paintExtend = (special) ? 0 : paintWidth;
break; break;
} }