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

Corrected ext2spice, which was reversing source and drain for the 

"msubcircuit" extraction model, which would normally not make any
difference except that when source and/or drain are tagged with
terminal attributes, then the source and drain are swapped with
respect to what is expected in the output SPICE netlist.
This commit is contained in:
Tim Edwards 2020-07-29 14:13:23 -04:00
parent 917d7590d3
commit ae3c3d7baf
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ext2spice/ext2spice.c
View File

@ -2443,11 +2443,11 @@ spcdevVisit(dev, hc, scale, trans)
case DEV_MSUBCKT: case DEV_MSUBCKT:
/* MOS-like subcircuit is "Xnnn source gate [drain [sub]]" */ /* MOS-like subcircuit is "Xnnn drain gate [source [sub]]" */
/* to more conveniently handle cases where MOS devices are */ /* to more conveniently handle cases where MOS devices are */
/* modeled by subcircuits with the same pin ordering. */ /* modeled by subcircuits with the same pin ordering. */
spcdevOutNode(hierName, source->dterm_node->efnode_name->efnn_hier, spcdevOutNode(hierName, drain->dterm_node->efnode_name->efnn_hier,
name, esSpiceF); name, esSpiceF);
/* Drop through to below (no break statement) */ /* Drop through to below (no break statement) */
@ -2468,12 +2468,21 @@ spcdevVisit(dev, hc, scale, trans)
/* except that the "gate" node is treated as an identifier */ /* except that the "gate" node is treated as an identifier */
/* only and is not output. */ /* only and is not output. */
if ((dev->dev_nterm > 1) && (dev->dev_class != DEV_MSUBCKT)) if (dev->dev_class != DEV_MSUBCKT)
spcdevOutNode(hierName, source->dterm_node->efnode_name->efnn_hier, {
name, esSpiceF); if (dev->dev_nterm > 1)
if (dev->dev_nterm > 2) spcdevOutNode(hierName, source->dterm_node->efnode_name->efnn_hier,
spcdevOutNode(hierName, drain->dterm_node->efnode_name->efnn_hier, name, esSpiceF);
name, esSpiceF); if (dev->dev_nterm > 2)
spcdevOutNode(hierName, drain->dterm_node->efnode_name->efnn_hier,
name, esSpiceF);
}
else /* class DEV_MSUBCKT */
{
if (dev->dev_nterm > 2)
spcdevOutNode(hierName, source->dterm_node->efnode_name->efnn_hier,
name, esSpiceF);
}
/* The following only applies to DEV_SUBCKT*, which may define as */ /* The following only applies to DEV_SUBCKT*, which may define as */
/* many terminal types as it wants. */ /* many terminal types as it wants. */