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

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2018-03-28 12:10:31 -04:00
parent e0e5fcb6e1 ba2db7bbd3
commit 4893d11ebc
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext2spice/ext2hier.c
View File

@ -1787,8 +1787,26 @@ esHierVisit(hc, cdata)
fprintf(esSpiceF, "* Black-box entry subcircuit for %s abstract view\n", fprintf(esSpiceF, "* Black-box entry subcircuit for %s abstract view\n",
def->def_name); def->def_name);
/* Automatic subcircuit handling for top level: Check if the top */
/* level has any ports defined. If so, make a subcircuit record */
/* for it. If not, don't. */
if ((def == topdef) && (locDoSubckt == AUTO))
{
/* Determine if there are ports */
locDoSubckt = FALSE;
for (snode = (EFNode *) def->def_firstn.efnode_next;
snode != &def->def_firstn;
snode = (EFNode *) snode->efnode_next)
if (snode->efnode_flags & (EF_PORT | EF_SUBS_PORT))
{
locDoSubckt = TRUE;
break;
}
}
/* Generate subcircuit header */ /* Generate subcircuit header */
if ((def != topdef) || (def->def_flags & DEF_SUBCIRCUIT)) if ((def != topdef) || (def->def_flags & DEF_SUBCIRCUIT) || (locDoSubckt == TRUE))
topVisit(def, doStub); topVisit(def, doStub);
else else
fprintf(esSpiceF, "\n* Top level circuit %s\n\n", topdef->def_name); fprintf(esSpiceF, "\n* Top level circuit %s\n\n", topdef->def_name);
@ -1835,7 +1853,7 @@ esHierVisit(hc, cdata)
} }
} }
if ((def != topdef) || (def->def_flags & DEF_SUBCIRCUIT)) if ((def != topdef) || (def->def_flags & DEF_SUBCIRCUIT) || (locDoSubckt == TRUE))
fprintf(esSpiceF, ".ends\n\n"); fprintf(esSpiceF, ".ends\n\n");
else else
fprintf(esSpiceF, ".end\n\n"); fprintf(esSpiceF, ".end\n\n");

6
ext2spice/ext2spice.c
View File

@ -845,13 +845,7 @@ runexttospice:
locDoSubckt = FALSE; locDoSubckt = FALSE;
if (esDoHierarchy) if (esDoHierarchy)
{ {
if ((esDoSubckt == TRUE) || (locDoSubckt == TRUE))
topVisit(efFlatRootDef, FALSE);
ESGenerateHierarchy(inName, flatFlags); ESGenerateHierarchy(inName, flatFlags);
if ((esDoSubckt == TRUE) || (locDoSubckt == TRUE))
fprintf(esSpiceF, ".ends\n");
} }
else else
{ {