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

Merge branch 'master' into magic-8.2

This commit is contained in:
Tim Edwards 2019-05-17 03:00:03 -04:00
parent 49590fda3c 704f1dc69f
commit 4ab54a1e6c
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cif/CIFtech.c
View File

@ -1846,6 +1846,24 @@ CIFTechFinal()
} }
} }
/* Added by Tim, 5/16/19 */
/* Layers that depend on hierarchically generated layers */
/* (i.e., templayers) must themselves be hierarchically */
/* processed. */
for (i = 0; i < style->cs_nLayers; i++)
{
TileTypeBitMask ourDepend, mmask;
ourDepend = DBZeroTypeBits;
for (op = style->cs_layers[i]->cl_ops; op != NULL; op = op->co_next)
TTMaskSetMask(&ourDepend, &op->co_cifMask);
TTMaskAndMask3(&mmask, &ourDepend, &style->cs_hierLayers);
if (!TTMaskIsZero(&mmask))
TTMaskSetType(&style->cs_hierLayers, i);
}
/* Added by Tim, 10/18/04 */ /* Added by Tim, 10/18/04 */
/* Go through the layer operators looking for those that */ /* Go through the layer operators looking for those that */

2
commands/CmdTZ.c
View File

@ -1411,7 +1411,7 @@ CmdWire(w, cmd)
else else
{ {
width = DRCGetDefaultLayerWidth(type); width = DRCGetDefaultLayerWidth(type);
WireAddContact(type, width); WireAddContact(type, (WireWidth < width) ? width : WireWidth);
} }
} }
else if (!strcmp(cmd->tx_argv[2], "width")) else if (!strcmp(cmd->tx_argv[2], "width"))

8
wiring/wireOps.c
View File

@ -816,22 +816,22 @@ WireAddContact(newType, newWidth)
switch (oldDir) switch (oldDir)
{ {
case GEO_NORTH: case GEO_NORTH:
i = contactArea.r_ytop - totalSize; i = contactArea.r_ytop - WireWidth;
if (i > contactArea.r_ybot) if (i > contactArea.r_ybot)
contactArea.r_ybot = i; contactArea.r_ybot = i;
break; break;
case GEO_SOUTH: case GEO_SOUTH:
i = contactArea.r_ybot + totalSize; i = contactArea.r_ybot + WireWidth;
if (i < contactArea.r_ytop) if (i < contactArea.r_ytop)
contactArea.r_ytop = i; contactArea.r_ytop = i;
break; break;
case GEO_EAST: case GEO_EAST:
i = contactArea.r_xtop - totalSize; i = contactArea.r_xtop - WireWidth;
if (i > contactArea.r_xbot) if (i > contactArea.r_xbot)
contactArea.r_xbot = i; contactArea.r_xbot = i;
break; break;
case GEO_WEST: case GEO_WEST:
i = contactArea.r_xbot + totalSize; i = contactArea.r_xbot + WireWidth;
if (i < contactArea.r_xtop) if (i < contactArea.r_xtop)
contactArea.r_xtop = i; contactArea.r_xtop = i;
break; break;