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

Made corrections to the extraction based on a pull request by 

Dan Moore for preventing integer overflow in the area calculations.
This commit is contained in:
Tim Edwards 2021-01-05 12:25:25 -05:00
parent ebb378da08
commit d6eeb90f6b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extract/ExtBasic.c
View File

@ -67,7 +67,8 @@ char *extDevTable[] = {"fet", "mosfet", "asymmetric", "bjt", "devres",
* used to compute the resistance of each node. Each is
* indexed by sheet resistivity class.
*/
int extResistPerim[NT], extResistArea[NT];
int extResistPerim[NT];
dlong extResistArea[NT];
/*
* The following structure is used in extracting transistors.
@ -575,7 +576,8 @@ void
extSetResist(reg)
NodeRegion *reg;
{
int n, perim, area;
int n, perim;
dlong area;
float s, fperim, v;
for (n = 0; n < ExtCurStyle->exts_numResistClasses; n++)
@ -704,7 +706,7 @@ extOutputNodes(nodeList, outFile)
/* Output its area and perimeter for each resistivity class */
for (n = 0; n < ExtCurStyle->exts_numResistClasses; n++)
fprintf(outFile, " %d %d", reg->nreg_pa[n].pa_area,
fprintf(outFile, " %"DLONG_PREFIX"d %d", reg->nreg_pa[n].pa_area,
reg->nreg_pa[n].pa_perim);
(void) putc('\n', outFile);
@ -3768,7 +3770,8 @@ extNodeAreaFunc(tile, arg)
Tile *tile;
FindRegion *arg;
{
int tilePlaneNum, pNum, len, area, resistClass, n, nclasses;
int tilePlaneNum, pNum, len, resistClass, n, nclasses;
dlong area;
PlaneMask pMask;
CapValue capval;
TileTypeBitMask *mask, *resMask;
@ -3864,9 +3867,9 @@ extNodeAreaFunc(tile, arg)
{
TITORECT(tile, &r);
GEOCLIP(&r, extNodeClipArea);
area = (r.r_xtop - r.r_xbot) * (r.r_ytop - r.r_ybot);
area = (dlong)(r.r_xtop - r.r_xbot) * (dlong)(r.r_ytop - r.r_ybot);
}
else area = TILEAREA(tile);
else area = (dlong)TILEAREA(tile);
if (IsSplit(tile)) area /= 2; /* Split tiles are 1/2 area! */

2
extract/extractInt.h
View File

@ -182,7 +182,7 @@ typedef struct lreg
typedef struct
{
int pa_perim;
int pa_area;
dlong pa_area;
} PerimArea;
typedef struct nreg