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

Corrected a problem in ext2spice which has been in the code for a 

very long time but never discovered;  in which any implicit port
connection into a subcell (that is otherwise labeled with ports) that
appears at the end of the node list (i.e., after all the declared
ports), will not be output, either in the subcircuit definition or
calls.
This commit is contained in:
Tim Edwards 2021-07-25 13:49:13 -04:00
parent 758a7d72ec
commit cc16b82a79
2 changed files with 12 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.189
8.3.190

13
ext2spice/ext2spice.c
View File

@ -1704,7 +1704,8 @@ topVisit(def, doStub)
HashSearch hs;
HashEntry *he, *hep;
HashTable portNameTable;
int portorder, portmax, tchars;
int portorder, portmax, tchars, implicit;
bool explicit;
DevParam *plist, *pptr;
char *instname;
char *subcktname;
@ -1731,6 +1732,7 @@ topVisit(def, doStub)
HashStartSearch(&hs);
portmax = -1;
implicit = 0;
while (he = HashNext(&def->def_nodes, &hs))
{
@ -1738,11 +1740,14 @@ topVisit(def, doStub)
if (sname == NULL) continue;
snode = sname->efnn_node;
if ((!snode) || (!(snode->efnode_flags & EF_PORT))) continue;
explicit = FALSE;
for (nodeName = sname; nodeName != NULL; nodeName = nodeName->efnn_next)
{
portorder = nodeName->efnn_port;
if (portorder > portmax) portmax = portorder;
if (portorder != -1) explicit = TRUE;
}
if (explicit == FALSE) implicit++;
}
if (portmax < 0)
@ -1791,7 +1796,7 @@ topVisit(def, doStub)
/* They will be printed in numerical order. */
portorder = 0;
while (portorder <= portmax)
while (portorder <= portmax + implicit)
{
HashStartSearch(&hs);
while (he = HashNext(&def->def_nodes, &hs))
@ -1860,7 +1865,11 @@ topVisit(def, doStub)
// and "ext2spice blackbox on" is in effect.
if (esDoBlackBox == FALSE || !(def->def_flags & DEF_ABSTRACT))
{
unnumbered->efnn_port = ++portmax;
implicit--;
portorder--; /* Will loop again */
}
}
}
portorder++;