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 bplane 

Conflicts:
	VERSION

Merged changes from master into the bplane branch.
This commit is contained in:
Tim Edwards 2020-03-18 10:43:45 -04:00
parent be1c0d1368 f4174d3670
commit 311c223114
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extract/ExtBasic.c
View File

@ -226,11 +226,14 @@ extBasic(def, outFile)
/* when, for example, a device contact is placed in another */ /* when, for example, a device contact is placed in another */
/* cell, which can happen for devices like capacitors and */ /* cell, which can happen for devices like capacitors and */
/* diodes, where the device identifier layer may include */ /* diodes, where the device identifier layer may include */
/* a contact type. */ /* a contact type. NOTE: This routine needs to limit the */
/* search to devices in the same plane as the transistor under */
/* consideration. */
SearchContext scontext; SearchContext scontext;
CellUse dummy; CellUse dummy;
int extFoundFunc(); int extFoundFunc();
TileTypeBitMask transPlaneMask;
scontext.scx_use = &dummy; scontext.scx_use = &dummy;
dummy.cu_def = def; dummy.cu_def = def;
@ -240,8 +243,11 @@ extBasic(def, outFile)
scontext.scx_area.r_ur.p_x++; scontext.scx_area.r_ur.p_x++;
scontext.scx_area.r_ur.p_y++; scontext.scx_area.r_ur.p_y++;
if (DBTreeSrTiles(&scontext, &ExtCurStyle->exts_deviceMask, 0, TTMaskAndMask3(&transPlaneMask, &ExtCurStyle->exts_deviceMask,
extFoundFunc, (ClientData)def) != 0) &DBPlaneTypes[reg->treg_pnum]);
if (DBTreeSrTiles(&scontext, &transPlaneMask, 0, extFoundFunc,
(ClientData)def) != 0)
reg->treg_type = TT_SPACE; /* Disables the trans record */ reg->treg_type = TT_SPACE; /* Disables the trans record */
} }