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

Clean out dead code in model processing.

This commit is contained in:
Brian Taylor 2022-06-06 00:26:37 -07:00 committed by Holger Vogt
parent 1a00a30f18
commit a8f103eebc
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/frontend/udevices.c
View File

@ -378,9 +378,10 @@ static Xlatep create_xlate_instance(
return create_xlate(translated, "", "", xspice, tmodel, mname); return create_xlate(translated, "", "", xspice, tmodel, mname);
} }
/*
static void print_xlate(Xlatep xp) static void print_xlate(Xlatep xp)
{ {
if (xp) { return; } if (!xp) { return; }
printf("translated %s\n", xp->translated); printf("translated %s\n", xp->translated);
printf("delays %s\n", xp->delays); printf("delays %s\n", xp->delays);
printf("utype %s ", xp->utype); printf("utype %s ", xp->utype);
@ -388,6 +389,7 @@ static void print_xlate(Xlatep xp)
printf("tmodel %s ", xp->tmodel); printf("tmodel %s ", xp->tmodel);
printf("mname %s\n", xp->mname); printf("mname %s\n", xp->mname);
} }
*/
static Xlatorp create_xlator(void) static Xlatorp create_xlator(void)
{ {
@ -1217,7 +1219,7 @@ static BOOL gen_timing_model(
xout = find_in_model_xlator(xin); xout = find_in_model_xlator(xin);
if (xout) { if (xout) {
/* Don't delete xout or the model_xlatorp will be corrupted */ /* Don't delete xout or the model_xlatorp will be corrupted */
print_xlate(xout); //print_xlate(xout);
if (xout->delays && strlen(xout->delays) > 0) { if (xout->delays && strlen(xout->delays) > 0) {
s1 = tprintf(".model %s %s%s", newname, xspice, xout->delays); s1 = tprintf(".model %s %s%s", newname, xspice, xout->delays);
} else { } else {
@ -2113,7 +2115,7 @@ static char *get_estimate(struct timing_data *tdp)
These functions are called from u_process_model(), and the delay strings These functions are called from u_process_model(), and the delay strings
are added to the timing model Xlator by add_delays_to_model_xlator(). are added to the timing model Xlator by add_delays_to_model_xlator().
*/ */
static char *get_delays_ugate(char *rem, char *d_name) static char *get_delays_ugate(char *rem)
{ {
char *rising, *falling, *delays = NULL; char *rising, *falling, *delays = NULL;
struct timing_data *tdp1, *tdp2; struct timing_data *tdp1, *tdp2;
@ -2135,7 +2137,7 @@ static char *get_delays_ugate(char *rem, char *d_name)
return delays; return delays;
} }
static char *get_delays_utgate(char *rem, char *d_name) static char *get_delays_utgate(char *rem)
{ {
/* Return estimate of tristate delay (delay = val3) */ /* Return estimate of tristate delay (delay = val3) */
char *rising, *falling, *delays = NULL; char *rising, *falling, *delays = NULL;
@ -2157,7 +2159,7 @@ static char *get_delays_utgate(char *rem, char *d_name)
return delays; return delays;
} }
static char *get_delays_ueff(char *rem, char *d_name) static char *get_delays_ueff(char *rem)
{ {
char *delays = NULL; char *delays = NULL;
char *clkqrise, *clkqfall, *pcqrise, *pcqfall; char *clkqrise, *clkqfall, *pcqrise, *pcqfall;
@ -2300,8 +2302,7 @@ static char *get_delays_ugff(char *rem, char *d_name)
return delays; return delays;
} }
static BOOL u_process_model(char *nline, char *original, static BOOL u_process_model(char *nline, char *original)
char *newname, char *xspice)
{ {
char *tok, *remainder, *delays = NULL, *utype, *tmodel; char *tok, *remainder, *delays = NULL, *utype, *tmodel;
BOOL retval = TRUE; BOOL retval = TRUE;
@ -2321,17 +2322,17 @@ static BOOL u_process_model(char *nline, char *original,
remainder = strchr(original, '('); remainder = strchr(original, '(');
if (remainder) { if (remainder) {
if (eq(utype, "ugate")) { if (eq(utype, "ugate")) {
delays = get_delays_ugate(remainder, xspice); delays = get_delays_ugate(remainder);
add_delays_to_model_xlator((delays ? delays : ""), add_delays_to_model_xlator((delays ? delays : ""),
utype, "", tmodel); utype, "", tmodel);
if (delays) { tfree(delays); } if (delays) { tfree(delays); }
} else if (eq(utype, "utgate")) { } else if (eq(utype, "utgate")) {
delays = get_delays_utgate(remainder, xspice); delays = get_delays_utgate(remainder);
add_delays_to_model_xlator((delays ? delays : ""), add_delays_to_model_xlator((delays ? delays : ""),
utype, "", tmodel); utype, "", tmodel);
if (delays) { tfree(delays); } if (delays) { tfree(delays); }
} else if (eq(utype, "ueff")) { } else if (eq(utype, "ueff")) {
delays = get_delays_ueff(remainder, xspice); delays = get_delays_ueff(remainder);
add_delays_to_model_xlator((delays ? delays : ""), add_delays_to_model_xlator((delays ? delays : ""),
utype, "", tmodel); utype, "", tmodel);
if (delays) { tfree(delays); } if (delays) { tfree(delays); }
@ -3112,7 +3113,7 @@ BOOL u_process_model_line(char *line)
if (strncmp(line, ".model ", strlen(".model ")) == 0) { if (strncmp(line, ".model ", strlen(".model ")) == 0) {
newline = TMALLOC(char, strlen(line) + 1); newline = TMALLOC(char, strlen(line) + 1);
(void) memcpy(newline, line, strlen(line) + 1); (void) memcpy(newline, line, strlen(line) + 1);
retval = u_process_model(newline, line, "model_new_name", "d_xspice"); retval = u_process_model(newline, line);
tfree(newline); tfree(newline);
return retval; return retval;
} else { } else {