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

Corrected an extraction error that can cause an infinite loop 

depending on the order of extraction devices.  Specifically, the
case of a source-drain tied FET was breaking out of a loop when
it should have been breaking out of a double loop.
This commit is contained in:
Tim Edwards 2023-10-27 14:32:44 -04:00
parent 7a9445ec30
commit 22ea7a924f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.441 8.3.442

7
extract/ExtBasic.c
View File

@ -2041,7 +2041,7 @@ extOutputDevices(def, transList, outFile)
int nsd, length, width, n, i, ntiles, corners, tn, rc, termcount; int nsd, length, width, n, i, ntiles, corners, tn, rc, termcount;
double dres, dcap; double dres, dcap;
char mesg[256]; char mesg[256];
bool isAnnular, hasModel; bool isAnnular, hasModel, sd_is_tied;
for (reg = transList; reg && !SigInterruptPending; reg = reg->treg_next) for (reg = transList; reg && !SigInterruptPending; reg = reg->treg_next)
{ {
@ -2134,6 +2134,7 @@ extOutputDevices(def, transList, outFile)
{ {
if (devptr == NULL) break; /* Bad device */ if (devptr == NULL) break; /* Bad device */
nsd = devptr->exts_deviceSDCount; nsd = devptr->exts_deviceSDCount;
sd_is_tied = FALSE;
for (termcount = 0; termcount < nsd; termcount++) for (termcount = 0; termcount < nsd; termcount++)
{ {
TileTypeBitMask *tmask; TileTypeBitMask *tmask;
@ -2144,11 +2145,10 @@ extOutputDevices(def, transList, outFile)
tmask = &devptr->exts_deviceSDTypes[termcount]; tmask = &devptr->exts_deviceSDTypes[termcount];
if (TTMaskIsZero(tmask)) { if (TTMaskIsZero(tmask)) {
if (termcount < nsd) { if (termcount < nsd) {
ExtDevice *devcheck;
/* Not finding another device record just means that */ /* Not finding another device record just means that */
/* terminals are tied together on the same net, such as */ /* terminals are tied together on the same net, such as */
/* with a MOS cap. Accept this fact and move on. */ /* with a MOS cap. Accept this fact and move on. */
sd_is_tied = TRUE;
} }
break; /* End of SD terminals */ break; /* End of SD terminals */
} }
@ -2219,6 +2219,7 @@ extOutputDevices(def, transList, outFile)
} }
if (termcount == nsd) break; /* All terminals accounted for */ if (termcount == nsd) break; /* All terminals accounted for */
if (devptr == deventry) break; /* No other device records available */ if (devptr == deventry) break; /* No other device records available */
if (sd_is_tied) break; /* Legal case of tied source and drain */
/* Try again with a different device record */ /* Try again with a different device record */
} }
extTransRec.tr_nterm = termcount; extTransRec.tr_nterm = termcount;