luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hfetsetup.c, HFETAunsetup(), bug fix, reorder CKTdltNNum() invocations 

invoke CKTdltNNUM() in revers order of creation.

The guarding of the CKTdltNNum() invocations needed access to node numbers
which have already been killed. (HFETAdrainPrimeNode and HFETAsourcePrimeNode)
This commit is contained in:
rlar 2017-01-06 10:54:14 +01:00
parent dd0a4307d0
commit a9e4dc07c9
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/spicelib/devices/hfet1/hfetsetup.c
View File

@ -405,49 +405,46 @@ HFETAunsetup(GENmodel *inModel, CKTcircuit *ckt)
{
HFETAmodel *model;
HFETAinstance *here;
for (model = (HFETAmodel *)inModel; model != NULL;
model = model->HFETAnextModel)
model = model->HFETAnextModel)
{
for (here = model->HFETAinstances; here != NULL;
here=here->HFETAnextInstance)
here = here->HFETAnextInstance)
{
// ouch, reorder, this is still needed some lines down
if (here->HFETAsourcePrmPrmNode
&& here->HFETAsourcePrmPrmNode != here->HFETAsourcePrimeNode)
{
CKTdltNNum(ckt, here->HFETAsourcePrmPrmNode);
here->HFETAsourcePrmPrmNode = 0;
}
if (here->HFETAdrainPrmPrmNode
&& here->HFETAdrainPrmPrmNode != here->HFETAdrainPrimeNode)
{
CKTdltNNum(ckt, here->HFETAdrainPrmPrmNode);
here->HFETAdrainPrmPrmNode = 0;
}
if (here->HFETAgatePrimeNode
&& here->HFETAgatePrimeNode != here->HFETAgateNode)
{
CKTdltNNum(ckt, here->HFETAgatePrimeNode);
here->HFETAgatePrimeNode = 0;
}
if (here->HFETAdrainPrimeNode
&& here->HFETAdrainPrimeNode != here->HFETAdrainNode)
&& here->HFETAdrainPrimeNode != here->HFETAdrainNode)
{
CKTdltNNum(ckt, here->HFETAdrainPrimeNode);
here->HFETAdrainPrimeNode = 0;
}
// ouch, reorder, this is still needed some lines down
if (here->HFETAsourcePrimeNode
&& here->HFETAsourcePrimeNode != here->HFETAsourceNode)
&& here->HFETAsourcePrimeNode != here->HFETAsourceNode)
{
CKTdltNNum(ckt, here->HFETAsourcePrimeNode);
here->HFETAsourcePrimeNode = 0;
}
if (here->HFETAgatePrimeNode
&& here->HFETAgatePrimeNode != here->HFETAgateNode)
{
CKTdltNNum(ckt, here->HFETAgatePrimeNode);
here->HFETAgatePrimeNode = 0;
}
if (here->HFETAdrainPrmPrmNode
&& here->HFETAdrainPrmPrmNode != here->HFETAdrainPrimeNode)
{
CKTdltNNum(ckt, here->HFETAdrainPrmPrmNode);
here->HFETAdrainPrmPrmNode = 0;
}
if (here->HFETAsourcePrmPrmNode
&& here->HFETAsourcePrmPrmNode != here->HFETAsourcePrimeNode)
{
CKTdltNNum(ckt, here->HFETAsourcePrmPrmNode);
here->HFETAsourcePrmPrmNode = 0;
}
}
}
}
return OK;
}