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

Pulled merge request from Jan Belohoubek, but corrected the problem 

of needing to revert parameter definitions after swapping them
during a device source/drain swap.
This commit is contained in:
Tim Edwards 2020-08-09 13:11:38 -04:00
parent 6c508c25b9
commit 18131e26b3
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.48 8.3.49

9
ext2spice/ext2hier.c
View File

@ -439,8 +439,6 @@ subcktHierVisit(use, hierName, is_top)
return subcktVisit(use, hierName, is_top); return subcktVisit(use, hierName, is_top);
} }
extern void swapDrainSource();
/* /*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
@ -487,7 +485,7 @@ spcdevHierVisit(hc, dev, scale)
EFNode *subnode, *snode, *dnode, *subnodeFlat = NULL; EFNode *subnode, *snode, *dnode, *subnodeFlat = NULL;
int l, w, i, parmval; int l, w, i, parmval;
Rect r; Rect r;
bool subAP= FALSE, hierS, hierD, extHierSDAttr() ; bool subAP = FALSE, hierS, hierD, extHierSDAttr(), swapped = FALSE;
float sdM; float sdM;
char devchar; char devchar;
bool has_model = TRUE; bool has_model = TRUE;
@ -519,6 +517,7 @@ spcdevHierVisit(hc, dev, scale)
!strcmp(dev->dev_terms[2].dterm_attrs, "S"))) !strcmp(dev->dev_terms[2].dterm_attrs, "S")))
{ {
swapDrainSource(dev, &source, &drain); swapDrainSource(dev, &source, &drain);
swapped = TRUE;
} }
else else
drain = &dev->dev_terms[2]; drain = &dev->dev_terms[2];
@ -1009,6 +1008,10 @@ spcdevHierVisit(hc, dev, scale)
break; break;
} }
fprintf(esSpiceF, "\n"); fprintf(esSpiceF, "\n");
/* If S/D parameters were swapped, then put them back */
if (swapped) swapDrainSource(dev, NULL, NULL);
return 0; return 0;
} }

31
ext2spice/ext2spice.c
View File

@ -2204,24 +2204,25 @@ swapDrainSource(dev, source, drain)
DevParam *plist; DevParam *plist;
/* swap drain/source ordering */ /* swap drain/source ordering */
*drain = &dev->dev_terms[1]; if (drain) *drain = &dev->dev_terms[1];
*source = &dev->dev_terms[2]; if (source) *source = &dev->dev_terms[2];
/* Swap drain/source-related parameters. Note that the parameter */
/* *definitions* are swapped, so if this is done, it must be */
/* reverted before the next device is processed. */
/* swap drain/source-related parameters */
plist = efGetDeviceParams(EFDevTypes[dev->dev_type]); plist = efGetDeviceParams(EFDevTypes[dev->dev_type]);
while (plist != NULL) while (plist != NULL)
{ {
TxPrintf(" * param: %s; type: %c%c\n", plist->parm_name, plist->parm_type[0], plist->parm_type[1]); // Diagnostic
// TxPrintf(" * param: %s; type: %c%c\n", plist->parm_name, plist->parm_type[0], plist->parm_type[1]);
/* swap drain/source parameters only */ /* Swap drain/source parameters only */
if (!(strcmp(plist->parm_name, "as")) || !(strcmp(plist->parm_name, "ps"))) if (!(strcmp(plist->parm_type, "a1")) || !(strcmp(plist->parm_type, "p1")))
{
plist->parm_type[1] = '0' + 2; plist->parm_type[1] = '0' + 2;
}
else if (!(strcmp(plist->parm_name, "ad")) || !(strcmp(plist->parm_name, "pd"))) else if (!(strcmp(plist->parm_type, "a2")) || !(strcmp(plist->parm_type, "p2")))
{
plist->parm_type[1] = '0' + 1; plist->parm_type[1] = '0' + 1;
}
/* move pointer */ /* move pointer */
plist = plist->parm_next; plist = plist->parm_next;
@ -2275,7 +2276,7 @@ spcdevVisit(dev, hc, scale, trans)
DevTerm *gate, *source, *drain; DevTerm *gate, *source, *drain;
EFNode *subnode, *snode, *dnode, *subnodeFlat = NULL; EFNode *subnode, *snode, *dnode, *subnodeFlat = NULL;
int l, w, i, parmval; int l, w, i, parmval;
bool subAP= FALSE, hierS, hierD, extHierSDAttr() ; bool subAP= FALSE, hierS, hierD, extHierSDAttr(), swapped = FALSE ;
float sdM; float sdM;
char name[12], devchar; char name[12], devchar;
bool has_model = TRUE; bool has_model = TRUE;
@ -2308,8 +2309,8 @@ spcdevVisit(dev, hc, scale, trans)
(dev->dev_terms[2].dterm_attrs && (dev->dev_terms[2].dterm_attrs &&
!strcmp(dev->dev_terms[2].dterm_attrs, "S"))) !strcmp(dev->dev_terms[2].dterm_attrs, "S")))
{ {
/* If D/S should be swapped, also parameters must be swapped */
swapDrainSource(dev, &source, &drain); swapDrainSource(dev, &source, &drain);
swapped = True;
} }
else else
drain = &dev->dev_terms[2]; drain = &dev->dev_terms[2];
@ -2817,6 +2818,10 @@ spcdevVisit(dev, hc, scale, trans)
break; break;
} }
fprintf(esSpiceF, "\n"); fprintf(esSpiceF, "\n");
/* If S/D parameters on a subcircuit were swapped, put them back */
if (swapped) swapDrainSource(dev, NULL, NULL);
return 0; return 0;
} }

1
ext2spice/ext2spice.h
View File

@ -29,6 +29,7 @@ extern EFNode *spcdevSubstrate();
extern char *nodeSpiceName(); extern char *nodeSpiceName();
extern int nodeVisitDebug(); extern int nodeVisitDebug();
extern void topVisit(); extern void topVisit();
extern void swapDrainSource();
extern int _ext2spice_start(); extern int _ext2spice_start();
extern EFNode *spcdevHierSubstrate(); extern EFNode *spcdevHierSubstrate();