From 0b6a55733449fcbfcebf2218876cbb9a7c60efa7 Mon Sep 17 00:00:00 2001 From: rlar Date: Wed, 27 Apr 2011 18:30:15 +0000 Subject: [PATCH] code cleanup --- ChangeLog | 11 ++- doc/ngspice.texi | 6 +- src/frontend/arg.c | 4 +- src/frontend/control.c | 4 +- src/frontend/device.c | 16 ++-- src/frontend/display.c | 32 +++---- src/frontend/evaluate.c | 8 +- src/frontend/gens.c | 4 +- src/frontend/shyu.c | 22 ++--- src/frontend/spiceif.c | 57 ++++++----- src/frontend/vectors.c | 4 +- src/frontend/where.c | 4 +- src/maths/ni/niiter.c | 18 ++-- src/maths/sparse/spbuild.c | 2 +- src/misc/hash.c | 22 ++--- src/spicelib/analysis/acan.c | 24 ++--- src/spicelib/analysis/cktacdum.c | 2 +- src/spicelib/analysis/cktaskaq.c | 2 +- src/spicelib/analysis/cktdest.c | 4 +- src/spicelib/analysis/cktdisto.c | 8 +- src/spicelib/analysis/cktdltm.c | 4 +- src/spicelib/analysis/cktdltn.c | 2 +- src/spicelib/analysis/cktdojob.c | 12 +-- src/spicelib/analysis/cktdump.c | 12 +-- src/spicelib/analysis/cktfbran.c | 4 +- src/spicelib/analysis/ckti2nod.c | 2 +- src/spicelib/analysis/cktic.c | 4 +- src/spicelib/analysis/cktload.c | 8 +- src/spicelib/analysis/cktmapn.c | 2 +- src/spicelib/analysis/cktmask.c | 4 +- src/spicelib/analysis/cktmkcur.c | 2 +- src/spicelib/analysis/cktmkvol.c | 2 +- src/spicelib/analysis/cktmpar.c | 5 +- src/spicelib/analysis/cktnoise.c | 18 ++-- src/spicelib/analysis/cktop.c | 50 +++++----- src/spicelib/analysis/cktparam.c | 4 +- src/spicelib/analysis/cktpmnam.c | 8 +- src/spicelib/analysis/cktpname.c | 9 +- src/spicelib/analysis/cktpzld.c | 2 +- src/spicelib/analysis/cktpzset.c | 2 +- src/spicelib/analysis/cktpzstr.c | 8 +- src/spicelib/analysis/cktsens.c | 30 +++--- src/spicelib/analysis/cktsetap.c | 2 +- src/spicelib/analysis/cktsetbk.c | 2 +- src/spicelib/analysis/cktsetup.c | 8 +- src/spicelib/analysis/ckttemp.c | 5 +- src/spicelib/analysis/ckttrunc.c | 8 +- src/spicelib/analysis/ckttyplk.c | 2 +- src/spicelib/analysis/dcop.c | 6 +- src/spicelib/analysis/dctran.c | 28 +++--- src/spicelib/analysis/dctrcurv.c | 22 ++--- src/spicelib/analysis/distoan.c | 94 +++++++++---------- src/spicelib/analysis/noisean.c | 14 +-- src/spicelib/analysis/pzan.c | 14 +-- src/spicelib/analysis/tfanal.c | 16 ++-- src/spicelib/devices/asrc/asrcconv.c | 2 +- src/spicelib/devices/asrc/asrcload.c | 2 +- src/spicelib/devices/asrc/asrcpzld.c | 2 +- src/spicelib/devices/asrc/asrcset.c | 4 +- src/spicelib/devices/bjt/bjtdisto.c | 32 +++---- src/spicelib/devices/bjt/bjtnoise.c | 6 +- src/spicelib/devices/bjt/bjttemp.c | 2 +- src/spicelib/devices/bjt2/bjt2disto.c | 32 +++---- src/spicelib/devices/bjt2/bjt2noise.c | 6 +- src/spicelib/devices/bjt2/bjt2temp.c | 2 +- src/spicelib/devices/bsim1/b1noi.c | 6 +- src/spicelib/devices/bsim1/b1temp.c | 4 +- src/spicelib/devices/bsim2/b2noi.c | 6 +- src/spicelib/devices/bsim2/b2temp.c | 4 +- src/spicelib/devices/bsim3/b3noi.c | 6 +- src/spicelib/devices/bsim3/b3temp.c | 10 +- src/spicelib/devices/bsim3soi/b4soinoi.c | 6 +- src/spicelib/devices/bsim3soi/b4soitemp.c | 14 +-- src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c | 6 +- .../devices/bsim3soi_dd/b3soiddtemp.c | 10 +- src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c | 6 +- .../devices/bsim3soi_fd/b3soifdtemp.c | 10 +- src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c | 6 +- .../devices/bsim3soi_pd/b3soipdtemp.c | 14 +-- src/spicelib/devices/bsim3v0/b3v0noi.c | 6 +- src/spicelib/devices/bsim3v0/b3v0temp.c | 8 +- src/spicelib/devices/bsim3v1/b3v1noi.c | 6 +- src/spicelib/devices/bsim3v1/b3v1temp.c | 10 +- src/spicelib/devices/bsim3v32/b3v32noi.c | 6 +- src/spicelib/devices/bsim3v32/b3v32temp.c | 10 +- src/spicelib/devices/bsim4/b4noi.c | 6 +- src/spicelib/devices/bsim4/b4temp.c | 12 +-- src/spicelib/devices/bsim4v2/b4v2noi.c | 6 +- src/spicelib/devices/bsim4v2/b4v2temp.c | 12 +-- src/spicelib/devices/bsim4v3/b4v3noi.c | 6 +- src/spicelib/devices/bsim4v3/b4v3temp.c | 12 +-- src/spicelib/devices/bsim4v4/b4v4noi.c | 6 +- src/spicelib/devices/bsim4v4/b4v4temp.c | 12 +-- src/spicelib/devices/bsim4v5/b4v5noi.c | 6 +- src/spicelib/devices/bsim4v5/b4v5temp.c | 12 +-- src/spicelib/devices/cccs/cccsset.c | 2 +- src/spicelib/devices/ccvs/ccvsset.c | 4 +- src/spicelib/devices/cktaccept.c | 4 +- src/spicelib/devices/cktask.c | 2 +- src/spicelib/devices/cktbindnode.c | 2 +- src/spicelib/devices/cpl/cplsetup.c | 10 +- src/spicelib/devices/csw/cswnoise.c | 6 +- src/spicelib/devices/csw/cswsetup.c | 2 +- src/spicelib/devices/dio/dionoise.c | 6 +- src/spicelib/devices/dio/diotemp.c | 16 ++-- src/spicelib/devices/hisim/hsm1noi.c | 9 +- src/spicelib/devices/ind/mutsetup.c | 6 +- src/spicelib/devices/isrc/isrctemp.c | 4 +- src/spicelib/devices/jfet/jfetnoi.c | 6 +- src/spicelib/devices/jfet/jfettemp.c | 2 +- src/spicelib/devices/jfet2/jfet2noi.c | 6 +- src/spicelib/devices/jfet2/jfet2temp.c | 2 +- src/spicelib/devices/ltra/ltraset.c | 24 ++--- src/spicelib/devices/mes/mesnoise.c | 6 +- src/spicelib/devices/mos1/mos1noi.c | 6 +- src/spicelib/devices/mos1/mos1temp.c | 4 +- src/spicelib/devices/mos2/mos2noi.c | 6 +- src/spicelib/devices/mos2/mos2temp.c | 4 +- src/spicelib/devices/mos3/mos3noi.c | 6 +- src/spicelib/devices/mos3/mos3temp.c | 6 +- src/spicelib/devices/mos6/mos6temp.c | 4 +- src/spicelib/devices/mos9/mos9noi.c | 6 +- src/spicelib/devices/mos9/mos9temp.c | 6 +- src/spicelib/devices/res/resnoise.c | 6 +- src/spicelib/devices/res/restemp.c | 2 +- src/spicelib/devices/soi3/soi3nois.c | 6 +- src/spicelib/devices/soi3/soi3set.c | 2 +- src/spicelib/devices/soi3/soi3temp.c | 10 +- src/spicelib/devices/sw/swnoise.c | 6 +- src/spicelib/devices/tra/trasetup.c | 2 +- src/spicelib/devices/txl/txlsetup.c | 10 +- src/spicelib/devices/urc/urcsetup.c | 24 ++--- src/spicelib/devices/vbic/vbicnoise.c | 6 +- src/spicelib/devices/vcvs/vcvsset.c | 2 +- src/spicelib/devices/vsrc/vsrcset.c | 2 +- src/spicelib/devices/vsrc/vsrctemp.c | 4 +- src/spicelib/parser/inp2dot.c | 4 +- src/spicelib/parser/inpaname.c | 4 +- src/spicelib/parser/inpapnam.c | 2 +- src/spicelib/parser/inpdoopt.c | 2 +- src/spicelib/parser/inpdpar.c | 2 +- src/spicelib/parser/inpgmod.c | 8 +- src/spicelib/parser/inpgtitl.c | 2 +- src/spicelib/parser/inppname.c | 2 +- src/spicelib/parser/inpsymt.c | 4 +- src/tclspice.c | 12 +-- src/unsupported/cktsenup.c | 5 +- src/unsupported/cktsnld.c | 10 +- src/unsupported/cktsnprt.c | 4 +- src/unsupported/cktsnset.c | 5 +- src/xspice/evt/evtdeque.c | 12 +-- src/xspice/evt/evtdump.c | 6 +- src/xspice/evt/evtiter.c | 12 +-- src/xspice/evt/evtload.c | 18 ++-- src/xspice/evt/evtnode_copy.c | 12 +-- src/xspice/evt/evtop.c | 4 +- src/xspice/evt/evtplot.c | 2 +- src/xspice/evt/evtsetup.c | 24 ++--- src/xspice/mif/mifgetmod.c | 4 +- src/xspice/mif/mifload.c | 6 +- src/xspice/mif/mifsetup.c | 2 +- xgraph/alloc.c | 9 +- xgraph/st.c | 4 +- xgraph/xgraph.c | 7 +- xgraph/xtb.c | 8 +- 165 files changed, 723 insertions(+), 725 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f5796cef..90b4bfa67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ +2011-04-27 Robert Larice + * */** : + code cleanup + function pointer invocation, (*p)(...) ---> p(...) + structure access, (*p).foo ---> p->foo + some casts, etc + 2011-04-17 Dietmar Warning * /bsim3v2/b3v2set.c, /bsim3/b3set.c: allow multiple call to setup w/ correct node collapsing - - 2011-04-15 Robert Larice + +2011-04-15 Robert Larice * src/spicelib/analysis/cktsens.c : fix allocation and ownership of auxiliary CKTmatrix CKTrhs etc objects FIXME: invoke release_context() when returning due to errors diff --git a/doc/ngspice.texi b/doc/ngspice.texi index ad088dde4..90f559059 100644 --- a/doc/ngspice.texi +++ b/doc/ngspice.texi @@ -11448,7 +11448,7 @@ Another function modified to support the new parameters is the @example if(here->MOS3l - 2 * model->MOS3latDiff <=0) @{ - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel length less than zero", &(here->MOS3name)); return(E_BADPARM); @@ -11462,7 +11462,7 @@ And the new one: ... if(here->MOS3l - 2 * model->MOS3latDiff + model->MOS3lengthAdjust <1e-6) @{ - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel length less than zero", &(here->MOS3name)); return(E_PARMVAL); @@ -11471,7 +11471,7 @@ And the new one: if(here->MOS3w - 2 * model->MOS3widthNarrow + model->MOS3widthAdjust <1e-6) @{ - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel width less than zero", &(here->MOS3name)); return(E_PARMVAL); diff --git a/src/frontend/arg.c b/src/frontend/arg.c index df748e8f1..5edae7382 100644 --- a/src/frontend/arg.c +++ b/src/frontend/arg.c @@ -76,7 +76,7 @@ void arg_plot(wordlist *wl, struct comm *command) void arg_load(wordlist *wl, struct comm *command) { /* just call com_load */ - (*command->co_func) (wl); + command->co_func (wl); } @@ -122,7 +122,7 @@ common(char *string, struct wordlist *wl, struct comm *command) w = process(w); /* O.K. now call fn */ - (*command->co_func) (w); + command->co_func (w); } } diff --git a/src/frontend/control.c b/src/frontend/control.c index 3cc13d4f1..b8d652960 100644 --- a/src/frontend/control.c +++ b/src/frontend/control.c @@ -228,14 +228,14 @@ docommand(wordlist *wlist) { if (nargs < command->co_minargs) { if (command->co_argfn) { - (*command->co_argfn) (wlist->wl_next, command); + command->co_argfn (wlist->wl_next, command); } else { fprintf(cp_err, "%s: too few args.\n", s); } } else if (nargs > command->co_maxargs) { fprintf(cp_err, "%s: too many args.\n", s); } else { - (*command->co_func) (wlist->wl_next); + command->co_func (wlist->wl_next); } } diff --git a/src/frontend/device.c b/src/frontend/device.c index fc4604e47..fa25aa8e3 100644 --- a/src/frontend/device.c +++ b/src/frontend/device.c @@ -598,10 +598,10 @@ printvals(dgen *dg, IFparm *p, int i) int n; if (dg->flags & DGEN_INSTANCE) - (*ft_sim->askInstanceQuest)(ft_curckt->ci_ckt, dg->instance, + ft_sim->askInstanceQuest (ft_curckt->ci_ckt, dg->instance, p->id, &val, &val); else - (*ft_sim->askModelQuest)(ft_curckt->ci_ckt, dg->model, + ft_sim->askModelQuest (ft_curckt->ci_ckt, dg->model, p->id, &val, &val); if (p->dataType & IF_VECTOR) @@ -685,10 +685,10 @@ printvals_old(dgen *dg, IFparm *p, int i) int n, error; if (dg->flags & DGEN_INSTANCE) - error = (*ft_sim->askInstanceQuest)(ft_curckt->ci_ckt, dg->instance, + error = ft_sim->askInstanceQuest (ft_curckt->ci_ckt, dg->instance, p->id, &val, &val); else - error = (*ft_sim->askModelQuest)(ft_curckt->ci_ckt, dg->model, + error = ft_sim->askModelQuest (ft_curckt->ci_ckt, dg->model, p->id, &val, &val); if (p->dataType & IF_VECTOR) @@ -822,10 +822,10 @@ old_show(wordlist *wl) if (parms) { for (tw = parms; tw; tw = tw->wl_next) { nn = copy(devs->wl_word); - v = (*if_getparam)(ft_curckt->ci_ckt, + v = if_getparam (ft_curckt->ci_ckt, &nn, tw->wl_word, 0, 0); if (!v) - v = (*if_getparam)(ft_curckt->ci_ckt, + v = if_getparam (ft_curckt->ci_ckt, &nn, tw->wl_word, 0, 1); if (v) { out_printf("\t%s =", tw->wl_word); @@ -837,9 +837,9 @@ old_show(wordlist *wl) } } else { nn = copy(devs->wl_word); - v = (*if_getparam)(ft_curckt->ci_ckt, &nn, "all", 0, 0); + v = if_getparam (ft_curckt->ci_ckt, &nn, "all", 0, 0); if (!v) - v = (*if_getparam)(ft_curckt->ci_ckt, &nn, "all", 0, 1); + v = if_getparam (ft_curckt->ci_ckt, &nn, "all", 0, 1); while (v) { out_printf("\t%s =", v->va_name); for (ww = cp_varwl(v); ww; ww = ww->wl_next) diff --git a/src/frontend/display.c b/src/frontend/display.c index 00adadb6e..e3fae3df8 100644 --- a/src/frontend/display.c +++ b/src/frontend/display.c @@ -172,7 +172,7 @@ DevInit(void) externalerror( "no graphics interface;\n please check if X-server is running, \n or ngspice is compiled properly (see INSTALL)"); dispdev = FindDev("error"); - } else if ((*(dispdev->Init))()) { + } else if (dispdev->Init()) { fprintf(cp_err, "Warning: can't initialize display device for graphics.\n"); dispdev = FindDev("error"); @@ -185,69 +185,69 @@ int NewViewport(GRAPH *pgraph) { - return (*(dispdev->NewViewport))(pgraph); + return dispdev->NewViewport (pgraph); } void DevClose(void) { - (*(dispdev->Close))(); + dispdev->Close(); } void DevClear(void) { - (*(dispdev->Clear))(); + dispdev->Clear(); } void DevDrawLine(int x1, int y1, int x2, int y2) { - (*(dispdev->DrawLine))(x1, y1, x2, y2); + dispdev->DrawLine (x1, y1, x2, y2); } void DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta) { - (*(dispdev->DrawArc))(x0, y0, radius, theta, delta_theta); + dispdev->DrawArc (x0, y0, radius, theta, delta_theta); } void DevDrawText(char *text, int x, int y) { - (*(dispdev->DrawText))(text, x, y); + dispdev->DrawText (text, x, y); } void DefineColor(int colorid, double red, double green, double blue) { - (*(dispdev->DefineColor))(colorid, red, green, blue); + dispdev->DefineColor (colorid, red, green, blue); } void DefineLinestyle(int linestyleid, int mask) { - (*(dispdev->DefineLinestyle))(linestyleid, mask); + dispdev->DefineLinestyle (linestyleid, mask); } void SetLinestyle(int linestyleid) { - (*(dispdev->SetLinestyle))(linestyleid); + dispdev->SetLinestyle (linestyleid); } void SetColor(int colorid) { - (*(dispdev->SetColor))(colorid); + dispdev->SetColor (colorid); } @@ -255,7 +255,7 @@ void DevUpdate(void) { if (dispdev) - (*(dispdev->Update))(); + dispdev->Update(); } @@ -303,14 +303,14 @@ gen_DatatoScreen(GRAPH *graph, double x, double y, int *screenx, int *screeny) void DatatoScreen(GRAPH *graph, double x, double y, int *screenx, int *screeny) { - (*(dispdev->DatatoScreen))(graph, x, y, screenx, screeny); + dispdev->DatatoScreen (graph, x, y, screenx, screeny); } void Input(REQUEST *request, RESPONSE *response) { - (*(dispdev->Input))(request, response); + dispdev->Input (request, response); } @@ -393,9 +393,9 @@ int DevSwitch(char *devname) lastdev = NULL; return (1); } - (*(dispdev->Init))(); + dispdev->Init(); } else { - (*(dispdev->Close))(); + dispdev->Close(); dispdev = lastdev; lastdev = NULL; } diff --git a/src/frontend/evaluate.c b/src/frontend/evaluate.c index bcc649f14..a87cc29b7 100644 --- a/src/frontend/evaluate.c +++ b/src/frontend/evaluate.c @@ -64,7 +64,7 @@ ft_evaluate(struct pnode *node) if(node->pn_op->op_num == PT_OP_TERNARY) d = ft_ternary(node); else - d = (*node->pn_op->op_func.binary) (node->pn_left, node->pn_right); + d = node->pn_op->op_func.binary (node->pn_left, node->pn_right); } } else { fprintf(cp_err, "ft_evaluate: Internal Error: bad node\n"); @@ -168,7 +168,7 @@ doop_funcall( (void) signal(SIGILL, (SIGNAL_FUNCTION) sig_matherr); - data = (*func) (data1, data2, datatype1, datatype2, length); + data = func (data1, data2, datatype1, datatype2, length); /* Back to normal */ (void) signal(SIGILL, SIG_DFL); @@ -842,14 +842,14 @@ apply_func_funcall(struct func *func, struct dvec *v, int *newlength, short int { void *(*f)(void *data, short int type, int length, int *newlength, short int *newtype, struct plot *, struct plot *, int) = (void *(*)(void *, short int, int, int *, short int *, struct plot *, struct plot *, int)) func->fu_func; - data = (*f) ( + data = f ( isreal(v) ? (void *) v->v_realdata : (void *) v->v_compdata, (short) (isreal(v) ? VF_REAL : VF_COMPLEX), v->v_length, newlength, newtype, v->v_plot, plot_cur, v->v_dims[0]); } else { - data = (*func->fu_func) ( + data = func->fu_func ( isreal(v) ? (void *) v->v_realdata : (void *) v->v_compdata, (short) (isreal(v) ? VF_REAL : VF_COMPLEX), v->v_length, diff --git a/src/frontend/gens.c b/src/frontend/gens.c index 014179b99..89876afae 100644 --- a/src/frontend/gens.c +++ b/src/frontend/gens.c @@ -19,7 +19,7 @@ void wl_forall(wordlist *wl, void (*fn)(wordlist*, dgen*), dgen *data) { while (wl) { - (*fn)(wl, data); + fn (wl, data); wl = wl->wl_next; } } @@ -74,7 +74,7 @@ dgen_for_n(dgen *dg, int n, int (*fn) (dgen*, IFparm*, int), IFparm *data, int s k = 0; for (i = 0; dgxp && dgxp->dev_type_no == dnum && i < n; i++) { /*printf("Loop at %d\n", i);*/ - j = (*fn)(dgxp, data, subindex); + j = fn (dgxp, data, subindex); if (j > k) k = j; dgen_next(&dgxp); diff --git a/src/frontend/shyu.c b/src/frontend/shyu.c index 400ec1a0b..33eb89bfe 100644 --- a/src/frontend/shyu.c +++ b/src/frontend/shyu.c @@ -61,14 +61,14 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) INPgetTok(&line,&token,1); if(ft_curckt->ci_specTask) { - err=(*(ft_sim->deleteTask))(ft_curckt->ci_ckt, + err = ft_sim->deleteTask (ft_curckt->ci_ckt, ft_curckt->ci_specTask); if(err) { ft_sperror(err,"deleteTask"); return(0); /* temporary */ } } - err = (*(ft_sim->newTask))(ft_curckt->ci_ckt, + err = ft_sim->newTask (ft_curckt->ci_ckt, &(ft_curckt->ci_specTask), "special", &(ft_curckt->ci_defTask)); if(err) { @@ -82,7 +82,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) } } if(which != -1) { - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"options", + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "options", &(ft_curckt->ci_specOpt), ft_curckt->ci_specTask); if(err) { ft_sperror(err,"createOptions"); @@ -103,7 +103,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) } } if(which != -1) { - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"sense", + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "sense", &(senseJob),ft_curckt->ci_specTask); if(err) { ft_sperror(err,"createSense"); @@ -126,7 +126,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) } } if(which != -1) { - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"acan", + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "acan", &(acJob),ft_curckt->ci_specTask); if(err) { ft_sperror(err,"createAC"); /* or similar error message */ @@ -170,7 +170,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) "DC operating point analysis unsupported\n")); } else { - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"dcop", + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "dcop", &(opJob),ft_curckt->ci_specTask); if(err) { ft_sperror(err,"createOP"); /* or similar error message */ @@ -192,7 +192,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) current->error = INPerrCat(current->error,INPmkTemp( "DC transfer curve analysis unsupported\n")); } - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"DCtransfer", + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "DCtransfer", &(dcJob),ft_curckt->ci_specTask); if(err) { ft_sperror(err,"createOP"); /* or similar error message */ @@ -239,7 +239,7 @@ if_sens_run(CKTcircuit *t, wordlist *args, INPtables *tab) } } if(which != -1) { - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,"tranan", + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, "tranan", &(tranJob),ft_curckt->ci_specTask); if(err) { ft_sperror(err,"createTRAN"); @@ -304,7 +304,7 @@ next: dataType & IF_FLAG) { /* one of the keywords! */ ptemp.iValue = 1; - error = (*(ft_sim->setAnalysisParm))(ckt, + error = ft_sim->setAnalysisParm (ckt, senseJob, ft_sim->analyses[save]-> analysisParms[i].id,&ptemp,(IFvalue*)NULL); if(error) current->error = INPerrCat( @@ -314,7 +314,7 @@ next: parm = INPgetValue(ckt,&line,ft_sim-> analyses[save]->analysisParms[i]. dataType,tab); - error = (*(ft_sim->setAnalysisParm))(ckt, + error = ft_sim->setAnalysisParm (ckt, senseJob, ft_sim->analyses[save]-> analysisParms[i].id,parm,(IFvalue*)NULL); if(error) current->error = INPerrCat( @@ -333,7 +333,7 @@ next: - if((err = (*(ft_sim->doAnalyses))(ckt, 1, ft_curckt->ci_curTask))!=OK){ + if((err = ft_sim->doAnalyses (ckt, 1, ft_curckt->ci_curTask)) != OK) { ft_sperror(err, "doAnalyses"); return(0);/* temporary */ } diff --git a/src/frontend/spiceif.c b/src/frontend/spiceif.c index 8627d5814..536f96d62 100644 --- a/src/frontend/spiceif.c +++ b/src/frontend/spiceif.c @@ -103,7 +103,7 @@ if_inpdeck(struct line *deck, INPtables **tab) *tab = INPtabInit(i); ft_curckt->ci_symtab = *tab; - err = (*(ft_sim->newCircuit))(&ckt); + err = ft_sim->newCircuit (&ckt); if (err != OK) { ft_sperror(err, "CKTinit"); return (NULL); @@ -117,12 +117,9 @@ if_inpdeck(struct line *deck, INPtables **tab) return(NULL); } #if (0) - err = - (*(ft_sim->newTask))(ckt, &(ft_curckt->ci_defTask), taskUid); + err = ft_sim->newTask (ckt, &(ft_curckt->ci_defTask), taskUid); #else /*CDHW*/ - err = - (*(ft_sim->newTask))(ckt, &(ft_curckt->ci_defTask), taskUid, - NULL); + err = ft_sim->newTask (ckt, &(ft_curckt->ci_defTask), taskUid, NULL); #endif if(err) { ft_sperror(err,"newTask"); @@ -146,7 +143,7 @@ if_inpdeck(struct line *deck, INPtables **tab) return(NULL); } - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,optUid, + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, optUid, &(ft_curckt->ci_defOpt), ft_curckt->ci_defTask); @@ -236,7 +233,7 @@ if_run(CKTcircuit *t, char *what, wordlist *args, INPtables *tab) if (ft_curckt->ci_specTask == ft_curckt->ci_defTask) { /*CDHW*/ printf("Oh dear...something bad has happened to the options.\n"); } - err=(*(ft_sim->deleteTask))(ft_curckt->ci_ckt, + err = ft_sim->deleteTask (ft_curckt->ci_ckt, ft_curckt->ci_specTask); if(err) { ft_sperror(err,"deleteTask"); @@ -255,10 +252,10 @@ ci_specTask will point to it CDHW*/ return(2); } #if (0) - err = (*(ft_sim->newTask))(ft_curckt->ci_ckt, + err = ft_sim->newTask (ft_curckt->ci_ckt, &(ft_curckt->ci_specTask), specUid); #else /*CDHW*/ - err = (*(ft_sim->newTask))(ft_curckt->ci_ckt, + err = ft_sim->newTask (ft_curckt->ci_ckt, &(ft_curckt->ci_specTask), specUid, &(ft_curckt->ci_defTask)); #endif @@ -282,7 +279,7 @@ ci_specTask will point to it CDHW*/ ft_sperror(err,"newUid"); return(2); } - err = (*(ft_sim->newAnalysis))(ft_curckt->ci_ckt,which,optUid, + err = ft_sim->newAnalysis (ft_curckt->ci_ckt, which, optUid, &(ft_curckt->ci_specOpt), ft_curckt->ci_specTask); @@ -339,7 +336,7 @@ ci_specTask will point to it CDHW*/ /*CDHW Run the analysis pointed to by ci_curTask CDHW*/ ft_curckt->ci_curOpt = ft_curckt->ci_defOpt; - if ((err = (*(ft_sim->doAnalyses))(ckt, 1, ft_curckt->ci_curTask))!=OK){ + if ((err = ft_sim->doAnalyses (ckt, 1, ft_curckt->ci_curTask)) != OK){ ft_sperror(err, "doAnalyses"); /* wrd_end(); */ if (err == E_PAUSE) @@ -348,7 +345,7 @@ ci_specTask will point to it CDHW*/ return (2); } } else if (eq(what, "resume")) { - if ((err = (*(ft_sim->doAnalyses))(ckt, 0, ft_curckt->ci_curTask))!=OK){ + if ((err = ft_sim->doAnalyses (ckt, 0, ft_curckt->ci_curTask)) != OK){ ft_sperror(err, "doAnalyses"); /* wrd_end(); */ if (err == E_PAUSE) @@ -497,12 +494,12 @@ if_option(CKTcircuit *ckt, char *name, enum cp_types type, void *value) } #if (0) - if ((err = (*(ft_sim->setAnalysisParm))(cc, ft_curckt->ci_curOpt, + if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_curOpt, ft_sim->analyses[which]->analysisParms[i].id, &pval, (IFvalue *)NULL)) != OK) ft_sperror(err, "setAnalysisParm(options) ci_curOpt"); #else /*CDHW*/ - if ((err = (*(ft_sim->setAnalysisParm))(cc, ft_curckt->ci_defOpt, + if ((err = ft_sim->setAnalysisParm (cc, ft_curckt->ci_defOpt, ft_sim->analyses[which]->analysisParms[i].id, &pval, (IFvalue *)NULL)) != OK) ft_sperror(err, "setAnalysisParm(options) ci_curOpt"); @@ -551,7 +548,7 @@ if_cktfree(CKTcircuit *ckt, INPtables *tab) { CKTcircuit *cc = /* fixme, drop that */ ckt; - (*(ft_sim->deleteCircuit))(cc); + ft_sim->deleteCircuit (cc); INPtabEnd(tab); return; } @@ -587,7 +584,7 @@ finddev_special( int err; int type = -1; - err = (*(ft_sim->findInstance))(ck,&type,devptr,name,NULL,NULL); + err = ft_sim->findInstance (ck, &type, devptr, name, NULL, NULL); if(err == OK) { *device_or_model=0; @@ -595,7 +592,7 @@ finddev_special( } type = -1; *devptr = (GENinstance *)NULL; - err = (*(ft_sim->findModel))(ck,&type,modptr,name); + err = ft_sim->findModel (ck, &type, modptr, name); if(err == OK) { *device_or_model=1; @@ -1080,10 +1077,10 @@ doask(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op /* fprintf(cp_err, "Calling doask(%d, %x, %x, %x)\n", typecode, dev, mod, opt); */ if (dev) - err = (*(ft_sim->askInstanceQuest))(ckt, dev, + err = ft_sim->askInstanceQuest (ckt, dev, opt->id, &pv, (IFvalue *)NULL); else - err = (*(ft_sim->askModelQuest))(ckt, mod, + err = ft_sim->askModelQuest (ckt, mod, opt->id, &pv, (IFvalue *)NULL); if (err != OK) { ft_sperror(err, "if_getparam"); @@ -1165,10 +1162,10 @@ doset(CKTcircuit *ckt, int typecode, GENinstance *dev, GENmodel *mod, IFparm *op typecode, dev, mod, opt); */ if (dev) - err = (*(ft_sim->setInstanceParm))(ckt, dev, + err = ft_sim->setInstanceParm (ckt, dev, opt->id, &nval, (IFvalue *)NULL); else - err = (*(ft_sim->setModelParm))(ckt, mod, + err = ft_sim->setModelParm (ckt, mod, opt->id, &nval, (IFvalue *)NULL); return err; @@ -1186,11 +1183,11 @@ finddev(CKTcircuit *ck, char *name, GENinstance **devptr, GENmodel **modptr) int err; int type = -1; - err = (*(ft_sim->findInstance))(ck,&type,devptr,name,NULL,NULL); + err = ft_sim->findInstance (ck, &type, devptr, name, NULL, NULL); if(err == OK) return(type); type = -1; *devptr = (GENinstance *)NULL; - err = (*(ft_sim->findModel))(ck,&type,modptr,name); + err = ft_sim->findModel (ck, &type, modptr, name); if(err == OK) return(type); *modptr = (GENmodel *)NULL; return(-1); @@ -1204,7 +1201,7 @@ if_analQbyName(CKTcircuit *ckt, int which, JOB *anal, char *name, IFvalue *parm) int i; for(i=0;ianalyses[which]->numParms;i++) { if(strcmp(ft_sim->analyses[which]->analysisParms[i].keyword,name)==0) { - return( (*(ft_sim->askAnalysisQuest))(ckt,anal, + return( ft_sim->askAnalysisQuest (ckt, anal, ft_sim->analyses[which]->analysisParms[i].id,parm, (IFvalue *)NULL) ); } @@ -1238,7 +1235,7 @@ if_tranparams(struct circ *ci, double *start, double *stop, double *step) err = IFnewUid(ci->ci_ckt,&tranUid,(IFuid)NULL,"Transient Analysis", UID_ANALYSIS, NULL); if(err != OK) return(FALSE); - err =(*(ft_sim->findAnalysis))(ci->ci_ckt,&which, &anal,tranUid, + err = ft_sim->findAnalysis (ci->ci_ckt, &which, &anal, tranUid, ci->ci_curTask,(IFuid )NULL); if(err != OK) return(FALSE); err = if_analQbyName(ci->ci_ckt,which,anal,"tstart",&tmp); @@ -1282,7 +1279,7 @@ if_getstat(CKTcircuit *ckt, char *name) break; if (i == ft_sim->analyses[which]->numParms) return (NULL); - if ((*(ft_sim->askAnalysisQuest))(ckt, &(ft_curckt->ci_curTask->taskOptions), + if (ft_sim->askAnalysisQuest (ckt, &(ft_curckt->ci_curTask->taskOptions), ft_sim->analyses[which]->analysisParms[i].id, &parm, (IFvalue *)NULL) == -1) { fprintf(cp_err, @@ -1296,7 +1293,7 @@ if_getstat(CKTcircuit *ckt, char *name) if(!(ft_sim->analyses[which]->analysisParms[i].dataType&IF_ASK)) { continue; } - if ((*(ft_sim->askAnalysisQuest))(ckt, &(ft_curckt->ci_curTask->taskOptions), + if (ft_sim->askAnalysisQuest (ckt, &(ft_curckt->ci_curTask->taskOptions), ft_sim->analyses[which]->analysisParms[i].id, &parm, (IFvalue *)NULL) == -1) { fprintf(cp_err, @@ -1556,9 +1553,9 @@ do {\ fprintf(cp_err,"error in CKTnames\n"); return; } - (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &timeUid, (IFuid)NULL, "time", UID_OTHER, NULL); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList, IF_REAL,&(((TRANan*)ckt->CKTcurJob)->TRANplot)); diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c index 17d7a13c1..201612021 100644 --- a/src/frontend/vectors.c +++ b/src/frontend/vectors.c @@ -445,8 +445,8 @@ vec_get(const char *vec_name) * if_setparam(ft_curckt->ci_ckt, &dev, param, dv, do_model); */ - /* vv = (*if_getparam)(ft_curckt->ci_ckt, &name, param, 0, 0); */ - vv = (*if_getparam)(ft_curckt->ci_ckt, &name, param, 0, 0); + /* vv = if_getparam (ft_curckt->ci_ckt, &name, param, 0, 0); */ + vv = if_getparam (ft_curckt->ci_ckt, &name, param, 0, 0); if (!vv) { tfree(whole); tfree(wd); diff --git a/src/frontend/where.c b/src/frontend/where.c index 54992440a..e23310a28 100644 --- a/src/frontend/where.c +++ b/src/frontend/where.c @@ -28,7 +28,7 @@ com_where(wordlist *wl) fprintf(cp_err, "No unconverged node found.\n"); return; } - msg = (*ft_sim->nonconvErr)(ft_curckt->ci_ckt, 0); + msg = ft_sim->nonconvErr (ft_curckt->ci_ckt, 0); printf("%s", msg); @@ -37,7 +37,7 @@ com_where(wordlist *wl) /* if (ft_curckt) { - msg = (*ft_sim->nonconvErr)((void *) (ft_curckt->ci_ckt), 0); + msg = ft_sim->nonconvErr (ft_curckt->ci_ckt, 0); fprintf(cp_out, "%s", msg); } else { fprintf(cp_err, "Error: no circuit loaded.\n"); diff --git a/src/maths/ni/niiter.c b/src/maths/ni/niiter.c index 2009f5e3c..0a56f528b 100644 --- a/src/maths/ni/niiter.c +++ b/src/maths/ni/niiter.c @@ -112,11 +112,11 @@ NIiter(CKTcircuit *ckt, int maxIter) } if(ckt->CKTniState & NISHOULDREORDER) { - startTime = (*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); error = SMPreorder(ckt->CKTmatrix,ckt->CKTpivotAbsTol, ckt->CKTpivotRelTol,ckt->CKTdiagGmin); - ckt->CKTstat->STATreorderTime += - (*(SPfrontEnd->IFseconds))()-startTime; + ckt->CKTstat->STATreorderTime += + SPfrontEnd->IFseconds() - startTime; if(error) { /* new feature - we can now find out something about what is * wrong - so we ask for the troublesome entry @@ -126,7 +126,7 @@ NIiter(CKTcircuit *ckt, int maxIter) (void)sprintf(message, "singular matrix: check nodes %s and %s\n", NODENAME(ckt,i),NODENAME(ckt,j)); - (*(SPfrontEnd->IFerror))(ERR_WARNING,message,(IFuid *)NULL); + SPfrontEnd->IFerror (ERR_WARNING, message, (IFuid *)NULL); FREE(message); ckt->CKTstat->STATnumIter += iterno; #ifdef STEPDEBUG @@ -137,11 +137,11 @@ NIiter(CKTcircuit *ckt, int maxIter) } ckt->CKTniState &= ~NISHOULDREORDER; } else { - startTime = (*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); error=SMPluFac(ckt->CKTmatrix,ckt->CKTpivotAbsTol, ckt->CKTdiagGmin); - ckt->CKTstat->STATdecompTime += - (*(SPfrontEnd->IFseconds))()-startTime; + ckt->CKTstat->STATdecompTime += + SPfrontEnd->IFseconds() - startTime; if(error) { if( error == E_SINGULAR ) { ckt->CKTniState |= NISHOULDREORDER; @@ -167,9 +167,9 @@ NIiter(CKTcircuit *ckt, int maxIter) *(OldCKTstate0+i) = *(ckt->CKTstate0+i); } - startTime = (*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); SMPsolve(ckt->CKTmatrix,ckt->CKTrhs,ckt->CKTrhsSpare); - ckt->CKTstat->STATsolveTime += (*(SPfrontEnd->IFseconds))()- + ckt->CKTstat->STATsolveTime += SPfrontEnd->IFseconds() - startTime; #ifdef STEPDEBUG /*XXXX*/ diff --git a/src/maths/sparse/spbuild.c b/src/maths/sparse/spbuild.c index 10b937c79..f6032bb89 100644 --- a/src/maths/sparse/spbuild.c +++ b/src/maths/sparse/spbuild.c @@ -1183,7 +1183,7 @@ spInitialize(MatrixPtr eMatrix, int (*pInit)(RealNumber*, void *InitInfo, int , } else { - Error = (*pInit)((RealNumber *)pElement, pElement->pInitInfo, + Error = pInit ((RealNumber *)pElement, pElement->pInitInfo, Matrix->IntToExtRowMap[pElement->Row], Col); if (Error) { diff --git a/src/misc/hash.c b/src/misc/hash.c index 78a48f407..3de2c599e 100644 --- a/src/misc/hash.c +++ b/src/misc/hash.c @@ -178,13 +178,13 @@ void nghash_empty(NGHASHPTR hashtable, void (*delete_data) (void *), /* execute user define delete function if requested */ if( delete_data ){ - (*delete_data)(zapptr->data) ; + delete_data (zapptr->data); } if( hashtable->hash_func == (void *) NGHASH_DEF_HASH_STR ) { /* we allocated this ourselves we can delete it */ NGFREE( zapptr->key ) ; } else if( delete_key ){ - (*delete_key)(zapptr->key) ; + delete_key (zapptr->key); } NGFREE( zapptr ) ; } @@ -267,7 +267,7 @@ void * _nghash_find(NGHASHPTR hashtable, void * user_key,BOOL *status) ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key ); } else { compare_func = (COMPARE_FUNC) hashtable->compare_func ; - ret_code = (*(compare_func))(curPtr->key, user_key ) ; + ret_code = compare_func (curPtr->key, user_key); } if( ret_code == STRINGEQ ){ /* ---------------------------------------------------- @@ -319,7 +319,7 @@ void * _nghash_find_again(NGHASHPTR hashtable, void * user_key,BOOL *status) ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key ); } else { compare_func = (COMPARE_FUNC) hashtable->compare_func ; - ret_code = (*(compare_func))(curPtr->key, user_key ) ; + ret_code = compare_func (curPtr->key, user_key); } if( ret_code == STRINGEQ ){ hashtable->searchPtr = curPtr ; @@ -387,7 +387,7 @@ void * nghash_delete(NGHASHPTR hashtable, void * user_key) ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key ); } else { compare_func = (COMPARE_FUNC) hashtable->compare_func ; - ret_code = (*(compare_func))(curPtr->key, user_key ) ; + ret_code = compare_func (curPtr->key, user_key); } if( ret_code == STRINGEQ ){ if( curPtr->thread_prev ){ /* no sentinel */ @@ -457,10 +457,10 @@ void * nghash_insert(NGHASHPTR hashtable, void * user_key, void * data) ret_code = strcmp((char *)curPtr->key, (char *) user_key ) ; } else if ( hashtable->compare_func == (void *) NGHASH_DEF_CMP_PTR|| hashtable->compare_func == (void *) NGHASH_DEF_CMP_NUM ){ - ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key ); + ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key); } else { compare_func = (COMPARE_FUNC) hashtable->compare_func ; - ret_code = (*(compare_func))(curPtr->key, user_key ) ; + ret_code = compare_func (curPtr->key, user_key); } if( ret_code == STRINGEQ ){ if( hashtable->unique ){ @@ -547,10 +547,10 @@ static NGTABLEPTR _nghash_find_item(NGHASHPTR htable,void * user_key,void * data ret_code = strcmp((char *)curPtr->key, (char *) user_key ) ; } else if ( htable->compare_func == (void *) NGHASH_DEF_CMP_PTR|| htable->compare_func == (void *) NGHASH_DEF_CMP_NUM ){ - ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key ); + ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key); } else { compare_func = (COMPARE_FUNC) htable->compare_func ; - ret_code = (*(compare_func))(curPtr->key, user_key ) ; + ret_code = compare_func (curPtr->key, user_key); } if( ret_code == STRINGEQ ){ if( data ){ @@ -730,7 +730,7 @@ void nghash_dump(NGHASHPTR htable, void (*print_key) (void *)) fprintf( stderr, " key:%0lx ", (unsigned long) hptr->key ) ; } if( print_key) { - (*print_key)(hptr->data) ; + print_key (hptr->data); } else { fprintf( stderr, " data:%0lx ", (unsigned long) hptr->data ) ; } @@ -792,7 +792,7 @@ BOOL nghash_deleteItem(NGHASHPTR hashtable, void * user_key, void * data) ret_code = NGHASH_PTR_COMPARE_FUNC( curPtr->key, user_key ); } else { compare_func = (COMPARE_FUNC) hashtable->compare_func ; - ret_code = (*(compare_func))(curPtr->key, user_key ) ; + ret_code = compare_func (curPtr->key, user_key); } if( ret_code == STRINGEQ ){ if( curPtr->data == data ){ diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index 35bd63400..cd5dafc48 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -129,7 +129,7 @@ ACan(CKTcircuit *ckt, int restart) * Moreover the begin plot has not even been done yet at this * point... */ - (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,(IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&acPlot); tfree(nameList); @@ -138,7 +138,7 @@ ACan(CKTcircuit *ckt, int restart) CKTdump(ckt,(double)0,acPlot); ipc_send_dcop_suffix(); - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); } /* gtri - end - wbk */ #endif @@ -152,18 +152,18 @@ ACan(CKTcircuit *ckt, int restart) if (ckt->CKTkeepOpInfo) { /* Dump operating point. */ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "AC Operating Point", (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot); if(error) return(error); CKTdump(ckt,(double)0,plot); - (*(SPfrontEnd->OUTendPlot))(plot); + SPfrontEnd->OUTendPlot (plot); plot = NULL; } - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList, IF_COMPLEX,&acPlot); @@ -171,7 +171,7 @@ ACan(CKTcircuit *ckt, int restart) if(error) return(error); if (((ACAN*)ckt->CKTcurJob)->ACstepType != LINEAR) { - (*(SPfrontEnd->OUTattributes))((void *)acPlot,NULL, + SPfrontEnd->OUTattributes (acPlot, NULL, OUT_SCALE_LOG, NULL); } freq = ((ACAN*)ckt->CKTcurJob)->ACstartFreq; @@ -180,7 +180,7 @@ ACan(CKTcircuit *ckt, int restart) freq = ((ACAN*)ckt->CKTcurJob)->ACsaveFreq; ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = 0; /* clear the 'old' frequency */ /* fix resume? saj*/ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,freqUid,IF_REAL,numNames,nameList, IF_COMPLEX,&acPlot); @@ -222,7 +222,7 @@ ACan(CKTcircuit *ckt, int restart) /* main loop through all scheduled frequencies */ while(freq <= ((ACAN*)ckt->CKTcurJob)->ACstopFreq+freqTol) { - if( (*(SPfrontEnd->IFpauseTest))() ) { + if(SPfrontEnd->IFpauseTest()) { /* user asked us to pause via an interrupt */ ((ACAN*)ckt->CKTcurJob)->ACsaveFreq = freq; return(E_PAUSE); @@ -373,7 +373,7 @@ ACan(CKTcircuit *ckt, int restart) } endsweep: - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; ckt->CKTcurrentAnalysis = 0; ckt->CKTstat->STATacTime += SPfrontEnd->IFseconds() - startTime; @@ -418,8 +418,8 @@ CKTacLoad(CKTcircuit *ckt) SMPcClear(ckt->CKTmatrix); for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVacLoad))(ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVacLoad && ckt->CKThead[i] ) { + error = DEVices[i]->DEVacLoad (ckt->CKThead[i], ckt); #ifdef PARALLEL_ARCH if (error) goto combine; #else diff --git a/src/spicelib/analysis/cktacdum.c b/src/spicelib/analysis/cktacdum.c index 2c10cf34e..16ed73ad3 100644 --- a/src/spicelib/analysis/cktacdum.c +++ b/src/spicelib/analysis/cktacdum.c @@ -36,7 +36,7 @@ CKTacDump(CKTcircuit *ckt, double freq, void *plot) data[i].real = rhsold[i+1]; data[i].imag = irhsold[i+1]; } - (*(SPfrontEnd->OUTpData))(plot,&freqData,&valueData); + SPfrontEnd->OUTpData (plot, &freqData, &valueData); FREE(data); return(OK); } diff --git a/src/spicelib/analysis/cktaskaq.c b/src/spicelib/analysis/cktaskaq.c index 13c77c764..15f27d9e5 100644 --- a/src/spicelib/analysis/cktaskaq.c +++ b/src/spicelib/analysis/cktaskaq.c @@ -23,5 +23,5 @@ CKTaskAnalQ(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *se NG_IGNORE(selector); if((analInfo[type]->askQuest) == NULL) return(E_BADPARM); - return( (*(analInfo[type]->askQuest))(ckt,analPtr,parm,value)); + return( analInfo[type]->askQuest (ckt, analPtr, parm, value)); } diff --git a/src/spicelib/analysis/cktdest.c b/src/spicelib/analysis/cktdest.c index 068eb5631..47bf5d955 100644 --- a/src/spicelib/analysis/cktdest.c +++ b/src/spicelib/analysis/cktdest.c @@ -37,8 +37,8 @@ CKTdestroy(CKTcircuit *inCkt) #endif for (i=0;iCKThead[i] != NULL) ){ - (*((*DEVices[i]).DEVdestroy))(&(ckt->CKThead[i])); + if ( DEVices[i] && DEVices[i]->DEVdestroy && ckt->CKThead[i] ) { + DEVices[i]->DEVdestroy (&(ckt->CKThead[i])); } } for(i=0;i<=ckt->CKTmaxOrder+1;i++){ diff --git a/src/spicelib/analysis/cktdisto.c b/src/spicelib/analysis/cktdisto.c index 140fae289..29b444dad 100644 --- a/src/spicelib/analysis/cktdisto.c +++ b/src/spicelib/analysis/cktdisto.c @@ -31,8 +31,8 @@ CKTdisto (CKTcircuit *ckt, int mode) case D_SETUP: for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVdisto))(mode,ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVdisto && ckt->CKThead[i] ) { + error = DEVices[i]->DEVdisto (mode, ckt->CKThead[i], ckt); if(error) return(error); } } @@ -52,8 +52,8 @@ CKTdisto (CKTcircuit *ckt, int mode) } for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVdisto))(mode,ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVdisto && ckt->CKThead[i] ) { + error = DEVices[i]->DEVdisto (mode, ckt->CKThead[i], ckt); if(error) return(error); } } diff --git a/src/spicelib/analysis/cktdltm.c b/src/spicelib/analysis/cktdltm.c index b1b0cb443..d9eaa8736 100644 --- a/src/spicelib/analysis/cktdltm.c +++ b/src/spicelib/analysis/cktdltm.c @@ -34,11 +34,11 @@ CKTdltMod(CKTcircuit *cktp, GENmodel *modPtr) for (h = m->GENinstances; h; h = next_i) { next_i = h->GENnextInstance; - error = (*(SPfrontEnd->IFdelUid))(ckt,h->GENname, + error = SPfrontEnd->IFdelUid (ckt, h->GENname, UID_INSTANCE); tfree(h); } - error = (*(SPfrontEnd->IFdelUid))(ckt,m->GENmodName, UID_MODEL); + error = SPfrontEnd->IFdelUid (ckt, m->GENmodName, UID_MODEL); tfree(m); return(OK); } diff --git a/src/spicelib/analysis/cktdltn.c b/src/spicelib/analysis/cktdltn.c index 794b5ab48..20bca346a 100644 --- a/src/spicelib/analysis/cktdltn.c +++ b/src/spicelib/analysis/cktdltn.c @@ -49,7 +49,7 @@ CKTdltNNum(CKTcircuit *cktp, int num) if (node == ckt->CKTlastNode) ckt->CKTlastNode = sprev; - error = (*(SPfrontEnd->IFdelUid))(ckt,node->name, UID_SIGNAL); + error = SPfrontEnd->IFdelUid (ckt, node->name, UID_SIGNAL); tfree(node); return error; diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c index b1a4e7ce3..95cfa2bf5 100644 --- a/src/spicelib/analysis/cktdojob.c +++ b/src/spicelib/analysis/cktdojob.c @@ -48,7 +48,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask) ANALmaxnum = spice_num_analysis(); - startTime = (*(SPfrontEnd->IFseconds))( ); + startTime = SPfrontEnd->IFseconds(); ckt->CKTtemp = task->TSKtemp; ckt->CKTnomTemp = task->TSKnomTemp; @@ -119,7 +119,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask) senflag = 1; ckt->CKTcurJob = job; ckt->CKTsenInfo = (SENstruct *) job; - error = (*(analInfo[sens_num]->an_func))(ckt, reset); + error = analInfo[sens_num]->an_func (ckt, reset); } } @@ -193,7 +193,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask) ckt->CKTcurJob=job; error = OK; if (analInfo[i]->an_init) - error = (*(analInfo[i]->an_init))(ckt, job); + error = analInfo[i]->an_init (ckt, job); if (!error && analInfo[i]->do_ic) error = CKTic(ckt); if (!error){ @@ -202,12 +202,12 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask) error = EVTsetup(ckt); if(error) { ckt->CKTstat->STATtotAnalTime += - (*(SPfrontEnd->IFseconds))()-startTime; + SPfrontEnd->IFseconds() - startTime; return(error); } /* gtri - end - 6/10/91 - wbk - Setup event-driven data */ #endif - error = (*(analInfo[i]->an_func))(ckt, reset); + error = analInfo[i]->an_func (ckt, reset); /* txl, cpl addition */ if (error == 1111) break; } @@ -217,7 +217,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask) } } - ckt->CKTstat->STATtotAnalTime += (*(SPfrontEnd->IFseconds))( ) - startTime; + ckt->CKTstat->STATtotAnalTime += SPfrontEnd->IFseconds() - startTime; #ifdef WANT_SENSE2 if (ckt->CKTsenInfo) diff --git a/src/spicelib/analysis/cktdump.c b/src/spicelib/analysis/cktdump.c index 4f5e10fb2..0f0024abf 100644 --- a/src/spicelib/analysis/cktdump.c +++ b/src/spicelib/analysis/cktdump.c @@ -41,7 +41,7 @@ CKTdump(CKTcircuit *ckt, double ref, void *plot) refData.rValue = ref; valData.v.numValue = ckt->CKTmaxEqNum-1; valData.v.vec.rVec = ckt->CKTrhsOld+1; - (*(SPfrontEnd->OUTpData))(plot,&refData,&valData); + SPfrontEnd->OUTpData (plot, &refData, &valData); #ifdef CIDER /* @@ -54,9 +54,8 @@ CKTdump(CKTcircuit *ckt, double ref, void *plot) */ for (i=0; iCKThead[i] != NULL) ){ - (*((*DEVices[i]).DEVdump))(ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVdump && ckt->CKThead[i] ) { + DEVices[i]->DEVdump (ckt->CKThead[i], ckt); } } /* End cider integration */ @@ -87,9 +86,8 @@ NDEVacct(CKTcircuit *ckt, FILE *file) } for (i=0; iCKThead[i] != NULL) ){ - (*((*DEVices[i]).DEVacct))(ckt->CKThead[i],ckt, file); + if ( DEVices[i] && DEVices[i]->DEVacct && ckt->CKThead[i] ) { + DEVices[i]->DEVacct (ckt->CKThead[i], ckt, file); } } return; diff --git a/src/spicelib/analysis/cktfbran.c b/src/spicelib/analysis/cktfbran.c index 722e78626..6f7028f0d 100644 --- a/src/spicelib/analysis/cktfbran.c +++ b/src/spicelib/analysis/cktfbran.c @@ -24,8 +24,8 @@ CKTfndBranch(CKTcircuit *ckt, IFuid name) int j; for (i=0;iCKThead[i] != NULL ) { - j = (*((*DEVices[i]).DEVfindBranch))(ckt,ckt->CKThead[i],name); + if ( DEVices[i] && DEVices[i]->DEVfindBranch && ckt->CKThead[i] ) { + j = DEVices[i]->DEVfindBranch (ckt, ckt->CKThead[i], name); if(j != 0) return(j); } } diff --git a/src/spicelib/analysis/ckti2nod.c b/src/spicelib/analysis/ckti2nod.c index abbcf4bbe..fbdd1ddcd 100644 --- a/src/spicelib/analysis/ckti2nod.c +++ b/src/spicelib/analysis/ckti2nod.c @@ -28,7 +28,7 @@ CKTinst2Node(CKTcircuit *ckt, void *instPtr, int terminal, CKTnode **node, IFuid type = ((GENinstance *)instPtr)->GENmodPtr->GENmodType; - if(*((*DEVices[type]).DEVpublic.terms) >= terminal && terminal >0 ) { + if(*(DEVices[type]->DEVpublic.terms) >= terminal && terminal > 0) { switch(terminal) { default: return(E_NOTERM); case 1: diff --git a/src/spicelib/analysis/cktic.c b/src/spicelib/analysis/cktic.c index 083a186c1..e218e701b 100644 --- a/src/spicelib/analysis/cktic.c +++ b/src/spicelib/analysis/cktic.c @@ -42,8 +42,8 @@ CKTic(CKTcircuit *ckt) if(ckt->CKTmode & MODEUIC) { for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVsetic))(ckt->CKThead[i],ckt); + if( DEVices[i] && DEVices[i]->DEVsetic && ckt->CKThead[i] ) { + error = DEVices[i]->DEVsetic (ckt->CKThead[i], ckt); if(error) return(error); } } diff --git a/src/spicelib/analysis/cktload.c b/src/spicelib/analysis/cktload.c index 894782bd4..cf7bcf3a1 100644 --- a/src/spicelib/analysis/cktload.c +++ b/src/spicelib/analysis/cktload.c @@ -52,7 +52,7 @@ CKTload(CKTcircuit *ckt) /* gtri - begin - Put resistors to ground at all nodes */ #endif - startTime = (*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); size = SMPmatSize(ckt->CKTmatrix); for (i=0;i<=size;i++) { *(ckt->CKTrhs+i)=0; @@ -63,14 +63,14 @@ CKTload(CKTcircuit *ckt) #endif /* STEPDEBUG */ for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVload))(ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVload && ckt->CKThead[i] ) { + error = DEVices[i]->DEVload (ckt->CKThead[i], ckt); if (ckt->CKTnoncon) ckt->CKTtroubleNode = 0; #ifdef STEPDEBUG if(noncon != ckt->CKTnoncon) { printf("device type %s nonconvergence\n", - (*DEVices[i]).DEVpublic.name); + DEVices[i]->DEVpublic.name); noncon = ckt->CKTnoncon; } #endif /* STEPDEBUG */ diff --git a/src/spicelib/analysis/cktmapn.c b/src/spicelib/analysis/cktmapn.c index b93282f95..449d74dd9 100644 --- a/src/spicelib/analysis/cktmapn.c +++ b/src/spicelib/analysis/cktmapn.c @@ -35,7 +35,7 @@ CKTmapNode(CKTcircuit *ckt, CKTnode **node, IFuid name) /* not found, so must be a new one */ error = CKTmkNode(ckt,&mynode); /*allocate the node*/ if(error) return(error); - error = (*(SPfrontEnd->IFnewUid))(ckt, + error = SPfrontEnd->IFnewUid (ckt, &uid, (IFuid) NULL, name, diff --git a/src/spicelib/analysis/cktmask.c b/src/spicelib/analysis/cktmask.c index 199e8c654..cb70019b8 100644 --- a/src/spicelib/analysis/cktmask.c +++ b/src/spicelib/analysis/cktmask.c @@ -22,8 +22,8 @@ CKTmodAsk(CKTcircuit *ckt, GENmodel *modfast, int which, IFvalue *value, IFvalue NG_IGNORE(selector); - if((*DEVices[type]).DEVmodAsk) { - return( (*((*DEVices[type]).DEVmodAsk)) (ckt, + if(DEVices[type]->DEVmodAsk) { + return( DEVices[type]->DEVmodAsk (ckt, modfast, which, value) ); } return(E_BADPARM); diff --git a/src/spicelib/analysis/cktmkcur.c b/src/spicelib/analysis/cktmkcur.c index 7c015dbec..30f631383 100644 --- a/src/spicelib/analysis/cktmkcur.c +++ b/src/spicelib/analysis/cktmkcur.c @@ -29,7 +29,7 @@ CKTmkCur(CKTcircuit *ckt, CKTnode **node, IFuid basename, char *suffix) error = CKTmkNode(ckt,&mynode); if(error) return(error); checknode = mynode; - error = (*(SPfrontEnd->IFnewUid))(ckt,&uid,basename, + error = SPfrontEnd->IFnewUid (ckt, &uid, basename, suffix, UID_SIGNAL, &checknode); if(error) { FREE(mynode); diff --git a/src/spicelib/analysis/cktmkvol.c b/src/spicelib/analysis/cktmkvol.c index c5bf80cd4..945cd89f9 100644 --- a/src/spicelib/analysis/cktmkvol.c +++ b/src/spicelib/analysis/cktmkvol.c @@ -27,7 +27,7 @@ CKTmkVolt(CKTcircuit *ckt, CKTnode **node, IFuid basename, char *suffix) error = CKTmkNode(ckt,&mynode); if(error) return(error); checknode = mynode; - error = (*(SPfrontEnd->IFnewUid))(ckt,&uid,basename, + error = SPfrontEnd->IFnewUid (ckt, &uid, basename, suffix, UID_SIGNAL, &checknode); if(error) { FREE(mynode); diff --git a/src/spicelib/analysis/cktmpar.c b/src/spicelib/analysis/cktmpar.c index d651618fa..fb613c090 100644 --- a/src/spicelib/analysis/cktmpar.c +++ b/src/spicelib/analysis/cktmpar.c @@ -23,9 +23,8 @@ CKTmodParam(CKTcircuit *ckt, GENmodel *modfast, int param, IFvalue *val, IFvalue NG_IGNORE(ckt); NG_IGNORE(selector); - if (((*DEVices[type]).DEVmodParam)) { - return(((*((*DEVices[type]).DEVmodParam)) (param,val, - modfast))); + if (DEVices[type]->DEVmodParam) { + return(DEVices[type]->DEVmodParam (param, val, modfast)); } else { return(E_BADPARM); } diff --git a/src/spicelib/analysis/cktnoise.c b/src/spicelib/analysis/cktnoise.c index 0bf8df303..b8678222d 100644 --- a/src/spicelib/analysis/cktnoise.c +++ b/src/spicelib/analysis/cktnoise.c @@ -34,8 +34,8 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) /* let each device decide how many and what type of noise sources it has */ for (i=0; i < DEVmaxnum; i++) { - if ( DEVices[i] && ((*DEVices[i]).DEVnoise != NULL) && (ckt->CKThead[i] != NULL) ) { - error = (*((*DEVices[i]).DEVnoise))(mode,operation,ckt->CKThead[i], + if ( DEVices[i] && DEVices[i]->DEVnoise && ckt->CKThead[i] ) { + error = DEVices[i]->DEVnoise (mode, operation, ckt->CKThead[i], ckt,data, &outNdens); if (error) return (error); } @@ -53,12 +53,12 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, "onoise_spectrum", UID_OTHER, NULL); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, "inoise_spectrum", UID_OTHER, NULL); /* we've added two more plots */ @@ -70,11 +70,11 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) case INT_NOIZ: data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, "onoise_total", UID_OTHER, NULL); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, "inoise_total", UID_OTHER, NULL); /* we've added two more plots */ @@ -103,7 +103,7 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) refVal.rValue = data->freq; /* the reference is the freq */ outData.v.numValue = data->outNumber; /* vector number */ outData.v.vec.rVec = data->outpVector; /* vector of outputs */ - (*(SPfrontEnd->OUTpData))(data->NplotPtr,&refVal,&outData); + SPfrontEnd->OUTpData (data->NplotPtr, &refVal, &outData); } break; @@ -112,7 +112,7 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) data->outpVector[data->outNumber++] = data->inNoise; outData.v.vec.rVec = data->outpVector; /* vector of outputs */ outData.v.numValue = data->outNumber; /* vector number */ - (*(SPfrontEnd->OUTpData))(data->NplotPtr,&refVal,&outData); + SPfrontEnd->OUTpData (data->NplotPtr, &refVal, &outData); break; default: @@ -121,7 +121,7 @@ CKTnoise (CKTcircuit *ckt, int mode, int operation, Ndata *data) break; case N_CLOSE: - (*(SPfrontEnd->OUTendPlot))(data->NplotPtr); + SPfrontEnd->OUTendPlot (data->NplotPtr); FREE(data->namelist); FREE(data->outpVector); break; diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c index 61118d2ab..2c5ecc6ac 100644 --- a/src/spicelib/analysis/cktop.c +++ b/src/spicelib/analysis/cktop.c @@ -102,9 +102,9 @@ CKTconvTest (CKTcircuit * ckt) for (i = 0; i < DEVmaxnum; i++) { - if (DEVices[i] && ((*DEVices[i]).DEVconvTest != NULL) && (ckt->CKThead[i] != NULL)) + if (DEVices[i] && DEVices[i]->DEVconvTest && ckt->CKThead[i]) { - error = (*((*DEVices[i]).DEVconvTest)) (ckt->CKThead[i], ckt); + error = DEVices[i]->DEVconvTest (ckt->CKThead[i], ckt); } #ifdef PARALLEL_ARCH if (error || ckt->CKTnoncon) @@ -115,7 +115,7 @@ CKTconvTest (CKTcircuit * ckt) if (ckt->CKTnoncon) { /* printf("convTest: device %s failed\n", - * (*DEVices[i]).DEVpublic.name); */ + * DEVices[i]->DEVpublic.name); */ return (OK); } #endif /* PARALLEL_ARCH */ @@ -162,7 +162,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode, CKTnode *n; ckt->CKTmode = firstmode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Starting dynamic gmin stepping", (IFuid *) NULL); NumNodes = 0; @@ -195,7 +195,7 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode, if (converged == 0){ ckt->CKTmode = continuemode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "One successful gmin step", (IFuid *) NULL); if (ckt->CKTdiagGmin <= gtarget){ @@ -232,11 +232,11 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode, } else { if (factor < 1.00005){ failed = 1; - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Last gmin step failed", (IFuid *) NULL); } else { - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Further gmin increment", (IFuid *) NULL); factor = sqrt (sqrt (factor)); @@ -271,11 +271,11 @@ dynamic_gmin (CKTcircuit * ckt, long int firstmode, converged = NIiter (ckt, iterlim); if (converged != 0){ - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Dynamic gmin stepping failed", (IFuid *) NULL); } else { - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Dynamic gmin stepping completed", (IFuid *) NULL); #ifdef XSPICE @@ -309,7 +309,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode, int converged, i; ckt->CKTmode = firstmode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Starting gmin stepping", (IFuid *) NULL); if (ckt->CKTgshunt == 0) @@ -328,7 +328,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode, if (converged != 0){ ckt->CKTdiagGmin = ckt->CKTgshunt; - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "gmin step failed", (IFuid *) NULL); break; } @@ -336,7 +336,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode, ckt->CKTdiagGmin /= ckt->CKTgminFactor; ckt->CKTmode = continuemode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "One successful gmin step", (IFuid *) NULL); } @@ -354,7 +354,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode, converged = NIiter (ckt, iterlim); if (converged == 0){ - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "gmin stepping completed", (IFuid *) NULL); #ifdef XSPICE @@ -364,7 +364,7 @@ spice3_gmin (CKTcircuit * ckt, long int firstmode, #endif } else { - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "gmin stepping failed", (IFuid *) NULL); } @@ -396,7 +396,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode, NG_IGNORE(iterlim); ckt->CKTmode = firstmode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Starting source stepping", (IFuid *) NULL); ckt->CKTsrcFact = 0; @@ -450,7 +450,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode, if (converged != 0){ ckt->CKTdiagGmin = ckt->CKTgshunt; - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "gmin step failed", (IFuid *) NULL); #ifdef XSPICE /* gtri - begin - wbk - add convergence problem reporting flags */ @@ -462,7 +462,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode, ckt->CKTdiagGmin /= 10; ckt->CKTmode = continuemode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "One successful gmin step", (IFuid *) NULL); } @@ -482,7 +482,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode, *(OldCKTstate0 + i) = *(ckt->CKTstate0 + i); - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "One successful source step", (IFuid *) NULL); ckt->CKTsrcFact = ConvFact + raise; } @@ -518,7 +518,7 @@ gillespie_src (CKTcircuit * ckt, long int firstmode, for (i = 0; i < ckt->CKTnumStates; i++) *(OldCKTstate0 + i) = *(ckt->CKTstate0 + i); - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "One successful source step", (IFuid *) NULL); @@ -571,13 +571,13 @@ gillespie_src (CKTcircuit * ckt, long int firstmode, { ckt->CKTsrcFact = 1; ckt->CKTcurrentAnalysis = DOING_TRAN; - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "source stepping failed", (IFuid *) NULL); return (E_ITERLIM); } else { - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Source stepping completed", (IFuid *) NULL); return (0); } @@ -604,7 +604,7 @@ spice3_src (CKTcircuit * ckt, long int firstmode, NG_IGNORE(iterlim); ckt->CKTmode = firstmode; - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Starting source stepping", (IFuid *) NULL); for (i = 0; i <= ckt->CKTnumSrcSteps; i++) @@ -621,7 +621,7 @@ spice3_src (CKTcircuit * ckt, long int firstmode, { ckt->CKTsrcFact = 1; ckt->CKTcurrentAnalysis = DOING_TRAN; - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "source stepping failed", (IFuid *) NULL); #ifdef XSPICE /* gtri - begin - wbk - add convergence problem reporting flags */ @@ -630,10 +630,10 @@ spice3_src (CKTcircuit * ckt, long int firstmode, #endif return (converged); } - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "One successful source step", (IFuid *) NULL); } - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "Source stepping completed", (IFuid *) NULL); ckt->CKTsrcFact = 1; #ifdef XSPICE diff --git a/src/spicelib/analysis/cktparam.c b/src/spicelib/analysis/cktparam.c index d8447aaef..76502be2f 100644 --- a/src/spicelib/analysis/cktparam.c +++ b/src/spicelib/analysis/cktparam.c @@ -24,8 +24,8 @@ CKTparam(CKTcircuit *ckt, GENinstance *fast, int param, IFvalue *val, IFvalue *s NG_IGNORE(ckt); type = myfast->GENmodPtr->GENmodType; - if(((*DEVices[type]).DEVparam)) { - return(((*((*DEVices[type]).DEVparam)) (param,val,myfast,selector))); + if(DEVices[type]->DEVparam) { + return(DEVices[type]->DEVparam (param, val, myfast, selector)); } else { return(E_BADPARM); } diff --git a/src/spicelib/analysis/cktpmnam.c b/src/spicelib/analysis/cktpmnam.c index 71c706cc4..e49147b55 100644 --- a/src/spicelib/analysis/cktpmnam.c +++ b/src/spicelib/analysis/cktpmnam.c @@ -33,16 +33,16 @@ CKTpModName(char *parm, IFvalue *val, CKTcircuit *ckt, int type, IFuid name, GEN NG_IGNORE(name); - for(i=0;i<(*(*DEVices[type]).DEVpublic.numModelParms);i++) { - if(strcmp(parm,((*DEVices[type]).DEVpublic.modelParms[i].keyword))==0){ + for(i = 0 ; i < *(DEVices[type]->DEVpublic.numModelParms) ; i++) { + if(!strcmp(parm, DEVices[type]->DEVpublic.modelParms[i].keyword)) { error = CKTmodParam(ckt, *modfast, - (*DEVices[type]).DEVpublic.modelParms[i].id,val, + DEVices[type]->DEVpublic.modelParms[i].id, val, (IFvalue*)NULL); if(error) return(error); break; } } - if(i==(*(*DEVices[type]).DEVpublic.numModelParms)) { + if(i == *(DEVices[type]->DEVpublic.numModelParms)) { return(E_BADPARM); } return(OK); diff --git a/src/spicelib/analysis/cktpname.c b/src/spicelib/analysis/cktpname.c index 7531044e6..20dc433d0 100644 --- a/src/spicelib/analysis/cktpname.c +++ b/src/spicelib/analysis/cktpname.c @@ -35,17 +35,16 @@ CKTpName(char *parm, IFvalue *val, CKTcircuit *ckt, int dev, char *name, GENinst NG_IGNORE(name); - for(i=0;i<(*(*DEVices[dev]).DEVpublic.numInstanceParms);i++) { - if(strcmp(parm, - ((*DEVices[dev]).DEVpublic.instanceParms[i].keyword))==0) { + for(i = 0 ; i < *(DEVices[dev]->DEVpublic.numInstanceParms) ; i++) { + if(!strcmp(parm, DEVices[dev]->DEVpublic.instanceParms[i].keyword)) { error = CKTparam(ckt, *fast, - (*DEVices[dev]).DEVpublic.instanceParms[i].id,val, + DEVices[dev]->DEVpublic.instanceParms[i].id, val, (IFvalue *)NULL); if(error) return(error); break; } } - if(i==(*(*DEVices[dev]).DEVpublic.numInstanceParms)) { + if(i == *(DEVices[dev]->DEVpublic.numInstanceParms)) { return(E_BADPARM); } return(OK); diff --git a/src/spicelib/analysis/cktpzld.c b/src/spicelib/analysis/cktpzld.c index d4f9c20ad..d7700804b 100644 --- a/src/spicelib/analysis/cktpzld.c +++ b/src/spicelib/analysis/cktpzld.c @@ -29,7 +29,7 @@ CKTpzLoad(CKTcircuit *ckt, SPcomplex *s) SMPcClear(ckt->CKTmatrix); for (i = 0; i < DEVmaxnum; i++) { if (DEVices[i] && DEVices[i]->DEVpzLoad != NULL && ckt->CKThead[i] != NULL) { - error = (*DEVices[i]->DEVpzLoad)(ckt->CKThead[i], ckt, s); + error = DEVices[i]->DEVpzLoad (ckt->CKThead[i], ckt, s); #ifdef PARALLEL_ARCH if (error) goto combine; #else diff --git a/src/spicelib/analysis/cktpzset.c b/src/spicelib/analysis/cktpzset.c index b00caede4..bed641d4f 100644 --- a/src/spicelib/analysis/cktpzset.c +++ b/src/spicelib/analysis/cktpzset.c @@ -35,7 +35,7 @@ CKTpzSetup(CKTcircuit *ckt, int type) for (i = 0; i < DEVmaxnum; i++) { if (DEVices[i] && DEVices[i]->DEVpzSetup != NULL && ckt->CKThead[i] != NULL) { - error = (*DEVices[i]->DEVpzSetup)(matrix, ckt->CKThead[i], + error = DEVices[i]->DEVpzSetup (matrix, ckt->CKThead[i], ckt, &ckt->CKTnumStates); if (error != OK) return(error); diff --git a/src/spicelib/analysis/cktpzstr.c b/src/spicelib/analysis/cktpzstr.c index a43dc4b70..1cdfad932 100644 --- a/src/spicelib/analysis/cktpzstr.c +++ b/src/spicelib/analysis/cktpzstr.c @@ -183,11 +183,11 @@ CKTpzFindZeros(CKTcircuit *ckt, PZtrial **rootinfo, int *rootcount) CKTpzUpdateSet(neighborhood, new_trial); /* Replace a value */ } - if ((*(SPfrontEnd->IFpauseTest))( )) { + if (SPfrontEnd->IFpauseTest()) { sprintf(ebuf, "Pole-Zero analysis interrupted; %d trials, %d roots\n", Seq_Num, NZeros); - (*(SPfrontEnd->IFerror))(ERR_WARNING, ebuf, 0); + SPfrontEnd->IFerror (ERR_WARNING, ebuf, 0); error = E_PAUSE; break; } @@ -221,14 +221,14 @@ CKTpzFindZeros(CKTcircuit *ckt, PZtrial **rootinfo, int *rootcount) sprintf(ebuf, "Pole-zero converging to numerical aberrations; giving up after %d trials", Seq_Num); - (*(SPfrontEnd->IFerror))(ERR_WARNING, ebuf, 0); + SPfrontEnd->IFerror (ERR_WARNING, ebuf, 0); } if (NIter >= NITER_LIM) { sprintf(ebuf, "Pole-zero iteration limit reached; giving up after %d trials", Seq_Num); - (*(SPfrontEnd->IFerror))(ERR_WARNING, ebuf, 0); + SPfrontEnd->IFerror (ERR_WARNING, ebuf, 0); } return error; diff --git a/src/spicelib/analysis/cktsens.c b/src/spicelib/analysis/cktsens.c index f1be0c7c9..37cfd830f 100644 --- a/src/spicelib/analysis/cktsens.c +++ b/src/spicelib/analysis/cktsens.c @@ -179,7 +179,7 @@ int sens_sens(CKTcircuit *ckt, int restart) sg->ptable[sg->param].keyword); } - (*SPfrontEnd->IFnewUid)(ckt, + SPfrontEnd->IFnewUid (ckt, output_names + k, NULL, namebuf, UID_OTHER, NULL); k += 1; @@ -190,12 +190,12 @@ int sens_sens(CKTcircuit *ckt, int restart) freq_name = NULL; } else { type = IF_COMPLEX; - (*SPfrontEnd->IFnewUid)(ckt, + SPfrontEnd->IFnewUid (ckt, &freq_name, NULL, "frequency", UID_OTHER, NULL); } - error = (*SPfrontEnd->OUTpBeginPlot)(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname, freq_name, IF_REAL, num_vars, output_names, type, (void **) &sen_data); @@ -210,7 +210,7 @@ int sens_sens(CKTcircuit *ckt, int restart) output_values = NULL; output_cvalues = NEWN(IFcomplex, num_vars); if (sen_info->step_type != SENS_LINEAR) - (*(SPfrontEnd->OUTattributes))((void *)sen_data, + SPfrontEnd->OUTattributes (sen_data, NULL, OUT_SCALE_LOG, NULL); } @@ -256,7 +256,7 @@ int sens_sens(CKTcircuit *ckt, int restart) n = 0; - if ((*SPfrontEnd->IFpauseTest)( )) { + if (SPfrontEnd->IFpauseTest()) { /* XXX Save State */ return E_PAUSE; } @@ -363,7 +363,7 @@ int sens_sens(CKTcircuit *ckt, int restart) fn = DEVices[sg->dev]->DEVsetup; if (fn) - (*fn)(delta_Y, sg->model, ckt, + fn (delta_Y, sg->model, ckt, /* XXXX insert old state base here ?? */ &ckt->CKTnumStates); @@ -578,14 +578,14 @@ int sens_sens(CKTcircuit *ckt, int restart) nvalue.v.vec.cVec = output_cvalues; value.rValue = freq; - - (*(SPfrontEnd->OUTpData))(sen_data, &value, &nvalue); + + SPfrontEnd->OUTpData (sen_data, &value, &nvalue); freq = inc_freq(freq, sen_info->step_type, step_size); } - (*SPfrontEnd->OUTendPlot)((void *) sen_data); + SPfrontEnd->OUTendPlot (sen_data); if (is_dc) { FREE(output_values); /* XXX free various vectors */ @@ -711,7 +711,7 @@ sens_load(sgen *sg, CKTcircuit *ckt, int is_dc) fn = DEVices[sg->dev]->DEVload; if (fn) - error = (*fn)(sg->model, ckt); + error = fn (sg->model, ckt); else return 1; @@ -729,7 +729,7 @@ sens_temp(sgen *sg, CKTcircuit *ckt) fn = DEVices[sg->dev]->DEVtemperature; if (fn) - error = (*fn)(sg->model, ckt); + error = fn (sg->model, ckt); else return 1; @@ -751,7 +751,7 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val) fn = DEVices[sg->dev]->DEVask; pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id; if (fn) - error = (*fn)(ckt, sg->instance, pid, val, NULL); + error = fn (ckt, sg->instance, pid, val, NULL); else return 1; } else { @@ -759,7 +759,7 @@ sens_getp(sgen *sg, CKTcircuit *ckt, IFvalue *val) fn = DEVices[sg->dev]->DEVmodAsk; pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id; if (fn) - error = (*fn)(ckt, sg->model, pid, val); + error = fn (ckt, sg->model, pid, val); else return 1; } @@ -797,7 +797,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val) fn = DEVices[sg->dev]->DEVparam; pid = DEVices[sg->dev]->DEVpublic.instanceParms[sg->param].id; if (fn) - error = (*fn)(pid, val, sg->instance, NULL); + error = fn (pid, val, sg->instance, NULL); else return 1; } else { @@ -805,7 +805,7 @@ sens_setp(sgen *sg, CKTcircuit *ckt, IFvalue *val) fn = DEVices[sg->dev]->DEVmodParam; pid = DEVices[sg->dev]->DEVpublic.modelParms[sg->param].id; if (fn) - error = (*fn)(pid, val, sg->model); + error = fn (pid, val, sg->model); else return 1; } diff --git a/src/spicelib/analysis/cktsetap.c b/src/spicelib/analysis/cktsetap.c index 6d14f4390..c6467aa53 100644 --- a/src/spicelib/analysis/cktsetap.c +++ b/src/spicelib/analysis/cktsetap.c @@ -23,5 +23,5 @@ CKTsetAnalPm(CKTcircuit *ckt, JOB *analPtr, int parm, IFvalue *value, IFvalue *s NG_IGNORE(selector); if((analInfo[type]->setParm)==NULL) return(E_BADPARM); - return( (*(analInfo[type]->setParm))(ckt,analPtr,parm,value) ); + return( analInfo[type]->setParm (ckt, analPtr, parm, value) ); } diff --git a/src/spicelib/analysis/cktsetbk.c b/src/spicelib/analysis/cktsetbk.c index 3d3cbb292..7b16330a4 100644 --- a/src/spicelib/analysis/cktsetbk.c +++ b/src/spicelib/analysis/cktsetbk.c @@ -28,7 +28,7 @@ CKTsetBreak(CKTcircuit *ckt, double time) #endif if(ckt->CKTtime > time) { - (*(SPfrontEnd->IFerror))(ERR_PANIC,"breakpoint in the past - HELP!", + SPfrontEnd->IFerror (ERR_PANIC, "breakpoint in the past - HELP!", (IFuid *)NULL); return(E_INTERN); } diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c index 8d42ff710..a80969722 100644 --- a/src/spicelib/analysis/cktsetup.c +++ b/src/spicelib/analysis/cktsetup.c @@ -62,8 +62,8 @@ CKTsetup(CKTcircuit *ckt) #ifdef HAS_WINDOWS SetAnalyse( "Device Setup", 0 ); #endif - if ( DEVices[i] && ((*DEVices[i]).DEVsetup != NULL) && (ckt->CKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVsetup))(matrix,ckt->CKThead[i],ckt, + if ( DEVices[i] && DEVices[i]->DEVsetup && ckt->CKThead[i] ) { + error = DEVices[i]->DEVsetup (matrix, ckt->CKThead[i], ckt, &ckt->CKTnumStates); if(error) return(error); } @@ -141,8 +141,8 @@ CKTunsetup(CKTcircuit *ckt) } for (i=0;iCKThead[i] != NULL) ){ - e2 = (*((*DEVices[i]).DEVunsetup))(ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVunsetup && ckt->CKThead[i] ) { + e2 = DEVices[i]->DEVunsetup (ckt->CKThead[i], ckt); if (!error && e2) error = e2; } diff --git a/src/spicelib/analysis/ckttemp.c b/src/spicelib/analysis/ckttemp.c index 2fa7f18e1..dd82b9b53 100644 --- a/src/spicelib/analysis/ckttemp.c +++ b/src/spicelib/analysis/ckttemp.c @@ -26,9 +26,8 @@ CKTtemp(CKTcircuit *ckt) ckt->CKTvt = CONSTKoverQ * ckt->CKTtemp; for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVtemperature))(ckt->CKThead[i],ckt); + if ( DEVices[i] && DEVices[i]->DEVtemperature && ckt->CKThead[i] ) { + error = DEVices[i]->DEVtemperature (ckt->CKThead[i], ckt); if(error) return(error); } } diff --git a/src/spicelib/analysis/ckttrunc.c b/src/spicelib/analysis/ckttrunc.c index 48d1c928f..c5005f134 100644 --- a/src/spicelib/analysis/ckttrunc.c +++ b/src/spicelib/analysis/ckttrunc.c @@ -35,11 +35,11 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep) timetemp = HUGE; for (i=0;iCKThead[i] != NULL) { + if (DEVices[i] && DEVices[i]->DEVtrunc && ckt->CKThead[i]) { #ifdef STEPDEBUG debugtemp = timetemp; #endif /* STEPDEBUG */ - error = (*((*DEVices[i]).DEVtrunc))(ckt->CKThead[i],ckt,&timetemp); + error = DEVices[i]->DEVtrunc (ckt->CKThead[i], ckt, &timetemp); if(error) { ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime; @@ -48,7 +48,7 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep) #ifdef STEPDEBUG if(debugtemp != timetemp) { printf("timestep cut by device type %s from %g to %g\n", - (*DEVices[i]).DEVpublic.name, debugtemp,timetemp); + DEVices[i]->DEVpublic.name, debugtemp, timetemp); } #endif /* STEPDEBUG */ } @@ -71,7 +71,7 @@ CKTtrunc(CKTcircuit *ckt, double *timeStep) double startTime; int size; - startTime = (*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); timetemp = HUGE; size = SMPmatSize(ckt->CKTmatrix); diff --git a/src/spicelib/analysis/ckttyplk.c b/src/spicelib/analysis/ckttyplk.c index 9f8f77f0b..4f7181585 100644 --- a/src/spicelib/analysis/ckttyplk.c +++ b/src/spicelib/analysis/ckttyplk.c @@ -18,7 +18,7 @@ CKTtypelook(char *type) int i; for(i=0;iDEVpublic.name)) { /*found the device - return it */ return(i); } diff --git a/src/spicelib/analysis/dcop.c b/src/spicelib/analysis/dcop.c index 311507da4..897d3811e 100644 --- a/src/spicelib/analysis/dcop.c +++ b/src/spicelib/analysis/dcop.c @@ -45,7 +45,7 @@ DCop(CKTcircuit *ckt, int notused) error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname, (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot); tfree(nameList); /* va: nameList not used any longer, it was a memory leak */ @@ -108,7 +108,7 @@ DCop(CKTcircuit *ckt, int notused) i++; } fprintf(stdout,"\n"); - (*(SPfrontEnd->OUTendPlot))(plot); */ + SPfrontEnd->OUTendPlot (plot); */ return(converged); } @@ -157,6 +157,6 @@ DCop(CKTcircuit *ckt, int notused) fprintf(stderr,"error: circuit reload failed.\n"); } #endif - (*(SPfrontEnd->OUTendPlot))(plot); + SPfrontEnd->OUTendPlot (plot); return(converged); } diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index 34b7eea37..0cf8debbc 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -142,9 +142,9 @@ DCtran(CKTcircuit *ckt, #endif error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &timeUid, (IFuid)NULL, "time", UID_OTHER, NULL); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,numNames,nameList, IF_REAL,&(((TRANan*)ckt->CKTcurJob)->TRANplot)); @@ -322,7 +322,7 @@ DCtran(CKTcircuit *ckt, } #endif - startTime=(*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); startIters = ckt->CKTstat->STATnumIter; startdTime = ckt->CKTstat->STATdecompTime; startsTime = ckt->CKTstat->STATsolveTime; @@ -336,7 +336,7 @@ DCtran(CKTcircuit *ckt, /* saj As traninit resets CKTmode */ ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODETRAN | MODEINITPRED; /* saj */ - startTime=(*(SPfrontEnd->IFseconds))(); + startTime = SPfrontEnd->IFseconds(); startIters = ckt->CKTstat->STATnumIter; startdTime = ckt->CKTstat->STATdecompTime; startsTime = ckt->CKTstat->STATsolveTime; @@ -350,9 +350,9 @@ DCtran(CKTcircuit *ckt, error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); /* get timeUiD again */ - (*(SPfrontEnd->IFnewUid))(ckt,&timeUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &timeUid, (IFuid)NULL, "time", UID_OTHER, NULL); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname,timeUid,IF_REAL,666,nameList, 666,&(((TRANan*)ckt->CKTcurJob)->TRANplot));/* magic 666 nums as flags */ tfree(nameList); @@ -409,7 +409,7 @@ DCtran(CKTcircuit *ckt, /* XXX Error will cause single process to bail. */ if(error) { ckt->CKTcurrentAnalysis = DOING_TRAN; - ckt->CKTstat->STATtranTime += (*(SPfrontEnd->IFseconds))()-startTime; + ckt->CKTstat->STATtranTime += SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters; ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime - startdTime; @@ -492,9 +492,9 @@ DCtran(CKTcircuit *ckt, printf(" done: time is %g, final time is %g, and tol is %g\n", ckt->CKTtime,ckt->CKTfinalTime,ckt->CKTminBreak); #endif - (*(SPfrontEnd->OUTendPlot))( (((TRANan*)ckt->CKTcurJob)->TRANplot)); + SPfrontEnd->OUTendPlot (((TRANan*)ckt->CKTcurJob)->TRANplot); ckt->CKTcurrentAnalysis = 0; - ckt->CKTstat->STATtranTime += (*(SPfrontEnd->IFseconds))()-startTime; + ckt->CKTstat->STATtranTime += SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters; ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime - startdTime; @@ -516,10 +516,10 @@ DCtran(CKTcircuit *ckt, #endif return(OK); } - if( (*(SPfrontEnd->IFpauseTest))() ) { + if(SPfrontEnd->IFpauseTest()) { /* user requested pause... */ ckt->CKTcurrentAnalysis = DOING_TRAN; - ckt->CKTstat->STATtranTime += (*(SPfrontEnd->IFseconds))()-startTime; + ckt->CKTstat->STATtranTime += SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters; ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime - startdTime; @@ -859,7 +859,7 @@ resume: if(error) { ckt->CKTcurrentAnalysis = DOING_TRAN; ckt->CKTstat->STATtranTime += - (*(SPfrontEnd->IFseconds))() - startTime; + SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters; ckt->CKTstat->STATtranDecompTime += ckt->CKTstat->STATdecompTime @@ -882,7 +882,7 @@ resume: if(error) { ckt->CKTcurrentAnalysis = DOING_TRAN; ckt->CKTstat->STATtranTime += - (*(SPfrontEnd->IFseconds))() - startTime; + SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters; ckt->CKTstat->STATtranDecompTime += @@ -962,7 +962,7 @@ resume: } else { ckt->CKTcurrentAnalysis = DOING_TRAN; ckt->CKTstat->STATtranTime += - (*(SPfrontEnd->IFseconds))()-startTime; + SPfrontEnd->IFseconds() - startTime; ckt->CKTstat->STATtranIter += ckt->CKTstat->STATnumIter - startIters; ckt->CKTstat->STATtranDecompTime += diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index ec0e52b7d..da24155bf 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -66,7 +66,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) /* continuing */ i = cv->TRCVnestState; /* resume to work? saj*/ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname, varUid,IF_REAL,666,nameList, 666,&plot); goto resume; @@ -156,8 +156,8 @@ DCtrCurv(CKTcircuit *ckt, int restart) CKTtemp(ckt); goto found; } - - (*(SPfrontEnd->IFerror))(ERR_FATAL, + + SPfrontEnd->IFerror (ERR_FATAL, "DCtrCurv: source / resistor %s not in circuit", &(cv->TRCVvName[i])); return(E_NODEV); @@ -190,32 +190,32 @@ found:; if (cv->TRCVvType[i]==vcode) - (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, + SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL, "v-sweep", UID_OTHER, NULL); else { if (cv->TRCVvType[i]==icode) - (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, + SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL, "i-sweep", UID_OTHER, NULL); else { if (cv->TRCVvType[i]==TEMP_CODE) - (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, + SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL, "temp-sweep", UID_OTHER, NULL); else { if (cv->TRCVvType[i]==rcode) - (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, + SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL, "res-sweep", UID_OTHER, NULL); else - (*(SPfrontEnd->IFnewUid))(ckt,&varUid,(IFuid )NULL, + SPfrontEnd->IFnewUid (ckt, &varUid, (IFuid )NULL, "?-sweep", UID_OTHER, NULL); } /* icode */ } /* TEMP_CODE */ } /* rcode*/ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ckt->CKTcurJob->JOBname, varUid,IF_REAL,numNames,nameList, IF_REAL,&plot); @@ -508,7 +508,7 @@ nextstep:; CKTtemp(ckt); } /* else not possible */ - if( (*(SPfrontEnd->IFpauseTest))() ) { + if(SPfrontEnd->IFpauseTest()) { /* user asked us to pause, so save state */ cv->TRCVnestState = i; return(E_PAUSE); @@ -551,7 +551,7 @@ nextstep:; CKTtemp(ckt); } /* else not possible */ } - (*(SPfrontEnd->OUTendPlot))(plot); + SPfrontEnd->OUTendPlot (plot); return(OK); } diff --git a/src/spicelib/analysis/distoan.c b/src/spicelib/analysis/distoan.c index 265c7278d..49daf8e0d 100644 --- a/src/spicelib/analysis/distoan.c +++ b/src/spicelib/analysis/distoan.c @@ -62,7 +62,7 @@ DISTOan(CKTcircuit *ckt, int restart) /* start at beginning */ #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))(); +time1 = SPfrontEnd->IFseconds(); #endif switch(job->DstepType) { @@ -107,26 +107,26 @@ time1 = (*(SPfrontEnd->IFseconds))(); if (ckt->CKTkeepOpInfo) { /* Dump operating point. */ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "Distortion Operating Point", (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&acPlot); if(error) return(error); CKTdump(ckt,(double)0,acPlot); - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; } #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))() - time1; +time1 = SPfrontEnd->IFseconds() - time1; printf("Time for initial work (including op. pt.): %g seconds \n", time1); #endif #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))(); +time1 = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_SETUP); #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))() - time1; +time1 = SPfrontEnd->IFseconds() - time1; printf("Time outside D_SETUP: %g seconds \n", time1); #endif if (error) return(error); @@ -134,7 +134,7 @@ printf("Time outside D_SETUP: %g seconds \n", time1); displacement = 0; #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))(); +time1 = SPfrontEnd->IFseconds(); #endif freq = job->DstartF1; if (job->Df2wanted) { @@ -244,19 +244,19 @@ time1 = (*(SPfrontEnd->IFseconds))(); } #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))() - time1; +time1 = SPfrontEnd->IFseconds() - time1; printf("Time for other setup (storage allocation etc.): %g seconds \n", time1); #endif #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))(); +time1 = SPfrontEnd->IFseconds(); #endif while(freq <= job->DstopF1+freqTol) { /* - if( (*(SPfrontEnd->IFpauseTest))() ) { + if(SPfrontEnd->IFpauseTest()) { job->DsaveF1 = freq; return(E_PAUSE); } @@ -265,30 +265,30 @@ time1 = (*(SPfrontEnd->IFseconds))(); job->Domega1 = ckt->CKTomega; ckt->CKTmode = (ckt->CKTmode&MODEUIC) | MODEAC; #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTacLoad(ckt); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for CKTacLoad: %g seconds \n", time); #endif if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_RHSF1); /* sets up the RHS vector for all inputs corresponding to F1 */ #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside DISTO_RHSFIX: %g seconds \n", time); #endif if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = NIdIter(ckt); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for NIdIter: %g seconds \n", time); #endif if (error) return(error); @@ -299,11 +299,11 @@ printf("Time for NIdIter: %g seconds \n", time); error = CKTacLoad(ckt); if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_TWOF1); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside D_TWOF1: %g seconds \n", time); #endif if (error) return(error); @@ -320,11 +320,11 @@ printf("Time outside D_TWOF1: %g seconds \n", time); error = CKTacLoad(ckt); if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_THRF1); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside D_THRF1: %g seconds \n", time); #endif if (error) return(error); @@ -347,11 +347,11 @@ printf("Time outside D_THRF1: %g seconds \n", time); error = CKTacLoad(ckt); if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_RHSF2); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside DISTO_RHSFIX: %g seconds \n", time); #endif if (error) return(error); @@ -366,11 +366,11 @@ printf("Time outside DISTO_RHSFIX: %g seconds \n", time); error = CKTacLoad(ckt); if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_F1PF2); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside D_F1PF2: %g seconds \n", time); #endif if (error) return(error); @@ -386,11 +386,11 @@ printf("Time outside D_F1PF2: %g seconds \n", time); error = CKTacLoad(ckt); if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_F1MF2); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside D_F1MF2: %g seconds \n", time); #endif if (error) return(error); @@ -405,11 +405,11 @@ printf("Time outside D_F1MF2: %g seconds \n", time); error = CKTacLoad(ckt); if (error) return(error); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif error = CKTdisto(ckt,D_2F1MF2); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time outside D_2F1MF2: %g seconds \n", time); #endif if (error) return(error); @@ -496,7 +496,7 @@ printf("Time outside D_2F1MF2: %g seconds \n", time); } } #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))() - time1; +time1 = SPfrontEnd->IFseconds() - time1; printf("Time inside frequency loop: %g seconds \n", time1); #endif @@ -506,7 +506,7 @@ endsweep: /* output routines to process the H's and output actual ckt variable values */ #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))(); +time1 = SPfrontEnd->IFseconds(); #endif @@ -514,13 +514,13 @@ time1 = (*(SPfrontEnd->IFseconds))(); if (! job->Df2wanted) { error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); - (*(SPfrontEnd->OUTpBeginPlot))(ckt, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "DISTORTION - 2nd harmonic", freqUid,IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); if (job->DstepType != LINEAR) { - (*(SPfrontEnd->OUTattributes))((void *)acPlot,NULL, + SPfrontEnd->OUTattributes (acPlot, NULL, OUT_SCALE_LOG, NULL); } for (i=0; i< displacement ; i++) @@ -533,14 +533,14 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot); if(error) return(error); } - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); - (*(SPfrontEnd->OUTpBeginPlot))(ckt, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "DISTORTION - 3rd harmonic", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) @@ -552,7 +552,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); ckt->CKTirhsOld = *((job->i3H11stor) + i); error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot); } - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; } else { @@ -560,9 +560,9 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); - (*(SPfrontEnd->OUTpBeginPlot))(ckt, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "DISTORTION - IM: f1+f2", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) @@ -575,14 +575,14 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot); if(error) return(error); } - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); - (*(SPfrontEnd->OUTpBeginPlot))(ckt, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "DISTORTION - IM: f1-f2", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) @@ -596,14 +596,14 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot); if(error) return(error); } - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); - (*(SPfrontEnd->OUTpBeginPlot))(ckt, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "DISTORTION - IM: 2f1-f2", freqUid, IF_REAL, numNames,nameList,IF_COMPLEX,&acPlot); for (i=0; i< displacement ; i++) @@ -617,7 +617,7 @@ time1 = (*(SPfrontEnd->IFseconds))(); error = CKTacDump(ckt,ckt->CKTrhsOld[0],acPlot); if(error) return(error); } - (*(SPfrontEnd->OUTendPlot))(acPlot); + SPfrontEnd->OUTendPlot (acPlot); acPlot = NULL; } @@ -660,7 +660,7 @@ FREE(job->i2H1m2stor); FREE(job->i3H1m2stor); } #ifdef D_DBG_BLOCKTIMES -time1 = (*(SPfrontEnd->IFseconds))() - time1; +time1 = SPfrontEnd->IFseconds() - time1; printf("Time for output and deallocation: %g seconds \n", time1); #endif return(OK); diff --git a/src/spicelib/analysis/noisean.c b/src/spicelib/analysis/noisean.c index 0781bc9d7..9bf835e4c 100644 --- a/src/spicelib/analysis/noisean.c +++ b/src/spicelib/analysis/noisean.c @@ -63,7 +63,7 @@ NOISEan (CKTcircuit *ckt, int restart) job->input, (GENmodel *)NULL, (IFuid)NULL); if (error) { /* XXX ??? */ - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Noise input source %s not in circuit", &job->input); return (E_NOTFOUND); @@ -120,7 +120,7 @@ NOISEan (CKTcircuit *ckt, int restart) /* the current front-end needs the namelist to be fully declared before an OUTpBeginplot */ - (*(SPfrontEnd->IFnewUid))(ckt,&freqUid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &freqUid, (IFuid)NULL, "frequency", UID_OTHER, NULL); data->numPlots = 0; /* we don't have any plots yet */ @@ -132,14 +132,14 @@ NOISEan (CKTcircuit *ckt, int restart) * plot */ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "Noise Spectral Density Curves - (V^2 or A^2)/Hz", freqUid,IF_REAL,data->numPlots,data->namelist,IF_REAL, &(data->NplotPtr)); if (error) return(error); if (job->NstpType != LINEAR) { - (*(SPfrontEnd->OUTattributes))((void *)data->NplotPtr,NULL, + SPfrontEnd->OUTattributes (data->NplotPtr, NULL, OUT_SCALE_LOG, NULL); } @@ -166,7 +166,7 @@ NOISEan (CKTcircuit *ckt, int restart) data->outNoiz = job->NsavOnoise; data->inNoise = job->NsavInoise; /* saj resume rawfile fix*/ - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "Noise Spectral Density Curves - (V^2 or A^2)/Hz", freqUid,IF_REAL,666,data->namelist,666, &(data->NplotPtr)); @@ -190,7 +190,7 @@ NOISEan (CKTcircuit *ckt, int restart) /* do the noise analysis over all frequencies */ while (data->freq <= job->NstopFreq + freqTol) { - if( (*(SPfrontEnd->IFpauseTest))() ) { + if(SPfrontEnd->IFpauseTest()) { job->NsavFstp = step; /* save our results */ job->NsavOnoise = data->outNoiz; /* up until now */ job->NsavInoise = data->inNoise; @@ -277,7 +277,7 @@ NOISEan (CKTcircuit *ckt, int restart) if (error) return(error); - (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, + SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "Integrated Noise - V^2 or A^2", (IFuid)NULL,(int)0,data->numPlots,data->namelist,IF_REAL, &(data->NplotPtr)); diff --git a/src/spicelib/analysis/pzan.c b/src/spicelib/analysis/pzan.c index 8eef2a681..1e763ad4c 100644 --- a/src/spicelib/analysis/pzan.c +++ b/src/spicelib/analysis/pzan.c @@ -45,12 +45,12 @@ PZan(CKTcircuit *ckt, int reset) /* Dump operating point. */ error = CKTnames(ckt,&numNames,&nameList); if(error) return(error); - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, "Distortion Operating Point", (IFuid)NULL,IF_REAL,numNames,nameList, IF_REAL,&plot); if(error) return(error); CKTdump(ckt,(double)0,plot); - (*(SPfrontEnd->OUTendPlot))(plot); + SPfrontEnd->OUTendPlot (plot); } if (pzan->PZwhich & PZ_DO_POLES) { @@ -138,16 +138,16 @@ PZpost(CKTcircuit *ckt) j = 0; for (i = 0; i < pzan->PZnPoles; i++) { sprintf(name, "pole(%-u)", i+1); - (*(SPfrontEnd->IFnewUid))(ckt,&(namelist[j++]),(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), (IFuid)NULL, name, UID_OTHER, NULL); } for (i = 0; i < pzan->PZnZeros; i++) { sprintf(name, "zero(%-u)", i+1); - (*(SPfrontEnd->IFnewUid))(ckt,&(namelist[j++]),(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &(namelist[j++]), (IFuid)NULL, name, UID_OTHER, NULL); } - (*SPfrontEnd->OUTpBeginPlot)(ckt, (JOB *)pzan, pzan->JOBname, + SPfrontEnd->OUTpBeginPlot (ckt, (JOB *)pzan, pzan->JOBname, (IFuid)NULL, (int)0, pzan->PZnPoles + pzan->PZnZeros, namelist, IF_COMPLEX, &pzPlotPtr); @@ -189,8 +189,8 @@ PZpost(CKTcircuit *ckt) outData.v.numValue = pzan->PZnPoles + pzan->PZnZeros; outData.v.vec.cVec = out_list; - (*SPfrontEnd->OUTpData)(pzPlotPtr, (IFvalue *) 0, &outData); - (*(SPfrontEnd->OUTendPlot))(pzPlotPtr); + SPfrontEnd->OUTpData (pzPlotPtr, (IFvalue *) NULL, &outData); + SPfrontEnd->OUTendPlot (pzPlotPtr); return(OK); } diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c index 80e963c58..d31576b46 100644 --- a/src/spicelib/analysis/tfanal.c +++ b/src/spicelib/analysis/tfanal.c @@ -66,7 +66,7 @@ TFanal(CKTcircuit *ckt, int restart) ((TFan*)ckt->CKTcurJob)->TFinIsV = 1; ((TFan*)ckt->CKTcurJob)->TFinIsI = 0; if(error !=0) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Transfer function source %s not in circuit", &(((TFan*)ckt->CKTcurJob)->TFinSrc)); ((TFan*)ckt->CKTcurJob)->TFinIsV = 0; @@ -92,26 +92,26 @@ TFanal(CKTcircuit *ckt, int restart) ckt->CKTrhs[0]=0; /* make a UID for the transfer function output */ - (*(SPfrontEnd->IFnewUid))(ckt,&tfuid,(IFuid)NULL,"Transfer_function", + SPfrontEnd->IFnewUid (ckt, &tfuid, (IFuid)NULL, "Transfer_function", UID_OTHER, NULL); /* make a UID for the input impedance */ - (*(SPfrontEnd->IFnewUid))(ckt,&inuid,((TFan*)ckt->CKTcurJob)->TFinSrc, + SPfrontEnd->IFnewUid (ckt, &inuid, ((TFan*)ckt->CKTcurJob)->TFinSrc, "Input_impedance", UID_OTHER, NULL); /* make a UID for the output impedance */ if(((TFan*)ckt->CKTcurJob)->TFoutIsI) { - (*(SPfrontEnd->IFnewUid))(ckt,&outuid,((TFan*)ckt->CKTcurJob)->TFoutSrc + SPfrontEnd->IFnewUid (ckt, &outuid, ((TFan*)ckt->CKTcurJob)->TFoutSrc ,"Output_impedance", UID_OTHER, NULL); } else { name = TMALLOC(char, strlen(((TFan*)ckt->CKTcurJob)->TFoutName) + 22); (void)sprintf(name,"output_impedance_at_%s", ((TFan*)ckt->CKTcurJob)->TFoutName); - (*(SPfrontEnd->IFnewUid))(ckt,&outuid,(IFuid)NULL, + SPfrontEnd->IFnewUid (ckt, &outuid, (IFuid)NULL, name, UID_OTHER, NULL); } - error = (*(SPfrontEnd->OUTpBeginPlot))(ckt, ckt->CKTcurJob, + error = SPfrontEnd->OUTpBeginPlot (ckt, ckt->CKTcurJob, ((TFan*)(ckt->CKTcurJob))->JOBname,(IFuid)NULL,(int)0,3, uids,IF_REAL,&plotptr); if(error) return(error); @@ -167,8 +167,8 @@ done: outdata.v.numValue=3; outdata.v.vec.rVec=outputs; refval.rValue = 0; - (*(SPfrontEnd->OUTpData))(plotptr,&refval,&outdata); - (*(SPfrontEnd->OUTendPlot))(plotptr); + SPfrontEnd->OUTpData (plotptr, &refval, &outdata); + SPfrontEnd->OUTendPlot (plotptr); return(OK); } diff --git a/src/spicelib/devices/asrc/asrcconv.c b/src/spicelib/devices/asrc/asrcconv.c index 81a9abc76..8b135a92f 100644 --- a/src/spicelib/devices/asrc/asrcconv.c +++ b/src/spicelib/devices/asrc/asrcconv.c @@ -47,7 +47,7 @@ ASRCconvTest(GENmodel *inModel, CKTcircuit *ckt) } } - if( (*(here->ASRCtree->IFeval))(here->ASRCtree, ckt->CKTgmin, &rhs, + if( here->ASRCtree->IFeval (here->ASRCtree, ckt->CKTgmin, &rhs, asrc_vals,asrc_derivs) == OK){ prev = here->ASRCprev_value; diff --git a/src/spicelib/devices/asrc/asrcload.c b/src/spicelib/devices/asrc/asrcload.c index 8c97bbf64..41ac1c3aa 100644 --- a/src/spicelib/devices/asrc/asrcload.c +++ b/src/spicelib/devices/asrc/asrcload.c @@ -67,7 +67,7 @@ ASRCload(GENmodel *inModel, CKTcircuit *ckt) asrc_vals[i] = *(ckt->CKTrhsOld + node_num); } - if ((*(here->ASRCtree->IFeval))(here->ASRCtree,ckt->CKTgmin, &rhs, asrc_vals,asrc_derivs) != OK) + if (here->ASRCtree->IFeval (here->ASRCtree, ckt->CKTgmin, &rhs, asrc_vals, asrc_derivs) != OK) return(E_BADPARM); /* The convergence test */ diff --git a/src/spicelib/devices/asrc/asrcpzld.c b/src/spicelib/devices/asrc/asrcpzld.c index 9ba479650..3fc31fec4 100644 --- a/src/spicelib/devices/asrc/asrcpzld.c +++ b/src/spicelib/devices/asrc/asrcpzld.c @@ -60,7 +60,7 @@ ASRCpzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s) } } - if((*(here->ASRCtree->IFeval))(here->ASRCtree, ckt->CKTgmin, &value, asrc_vals, asrc_derivs) != OK) + if(here->ASRCtree->IFeval (here->ASRCtree, ckt->CKTgmin, &value, asrc_vals, asrc_derivs) != OK) return(E_BADPARM); if( here->ASRCtype == ASRC_VOLTAGE) { diff --git a/src/spicelib/devices/asrc/asrcset.c b/src/spicelib/devices/asrc/asrcset.c index 9129fc405..3c8188ed5 100644 --- a/src/spicelib/devices/asrc/asrcset.c +++ b/src/spicelib/devices/asrc/asrcset.c @@ -68,7 +68,7 @@ if((here->ptr = SMPmakeElt(matrix, here->first, (second)->number))\ if( here->ASRCtype == ASRC_VOLTAGE) { if(here->ASRCposNode == here->ASRCnegNode) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "instance %s is a shorted ASRC", &here->ASRCname); return(E_UNSUPP); } @@ -89,7 +89,7 @@ if((here->ptr = SMPmakeElt(matrix, here->first, (second)->number))\ IFuid namarray[2]; namarray[0] = here->ASRCname; namarray[1] = here->ASRCtree->vars[i].uValue; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: unknown controlling source %s",namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bjt/bjtdisto.c b/src/spicelib/devices/bjt/bjtdisto.c index 3a7d4894c..dab8e0472 100644 --- a/src/spicelib/devices/bjt/bjtdisto.c +++ b/src/spicelib/devices/bjt/bjtdisto.c @@ -191,7 +191,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) /* ic term */ #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = DFn2F1( here->ic_x2, here->ic_y2, @@ -219,7 +219,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r1h1z, i1h1z); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for DFn2F1: %g seconds \n", time); #endif @@ -352,7 +352,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r1h1z = r1h1z + r1h1y; i1h1z = i1h1z + i1h1y; #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1i2F1(here->capbx2, @@ -363,7 +363,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r1h1z, i1h1z); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for D1n2F1: %g seconds \n", time); #endif @@ -429,7 +429,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) /* ic term */ #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = DFn3F1( here->ic_x2, here->ic_y2, @@ -489,7 +489,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r2h11z, i2h11z); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for DFn3F1: %g seconds \n", time); #endif @@ -725,7 +725,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r2h11z = r2h11z + r2h11y; i2h11z = i2h11z + i2h11y; #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1i3F1(here->capbx2, @@ -742,7 +742,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r2h11z, i2h11z); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for D1n3F1: %g seconds \n", time); #endif @@ -872,7 +872,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) /* loading ib term */ /* x and y still the same */ #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = DFnF12( here->ib_x2, here->ib_y2, @@ -912,7 +912,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) 0.0, 0.0); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for DFnF12: %g seconds \n", time); #endif @@ -1042,7 +1042,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r1h2z = r1h2z + r1h2y; i1h2z = i1h2z + i1h2y; #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1iF12(here->capbx2, @@ -1057,7 +1057,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r1h2z, i1h2z); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for D1nF12: %g seconds \n", time); #endif @@ -1469,14 +1469,14 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) pass.h2f1f2z = r2h1m2z; pass.ih2f1f2z = i2h1m2z; #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = DFn2F12(&pass); itemp = DFi2F12(&pass); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for DFn2F12: %g seconds \n", time); #endif } @@ -1691,7 +1691,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r2h1m2z = r2h1m2z + r2h1m2y; i2h1m2z = i2h1m2z + i2h1m2y; #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))(); + time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1i2F12(here->capbx2, @@ -1716,7 +1716,7 @@ BJTdisto(int mode, GENmodel *genmodel, CKTcircuit *ckt) r2h1m2z, i2h1m2z); #ifdef D_DBG_SMALLTIMES - time = (*(SPfrontEnd->IFseconds))() - time; + time = SPfrontEnd->IFseconds() - time; printf("Time for D1n2F12: %g seconds \n", time); #endif diff --git a/src/spicelib/devices/bjt/bjtnoise.c b/src/spicelib/devices/bjt/bjtnoise.c index 2a4a7ae6f..66ba5dc40 100644 --- a/src/spicelib/devices/bjt/bjtnoise.c +++ b/src/spicelib/devices/bjt/bjtnoise.c @@ -72,7 +72,7 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) { data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -86,7 +86,7 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) { data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -96,7 +96,7 @@ for (model=firstModel; model != NULL; model=model->BJTnextModel) { data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/bjt/bjttemp.c b/src/spicelib/devices/bjt/bjttemp.c index f17ef4152..1208f7696 100644 --- a/src/spicelib/devices/bjt/bjttemp.c +++ b/src/spicelib/devices/bjt/bjttemp.c @@ -82,7 +82,7 @@ BJTtemp(GENmodel *inModel, CKTcircuit *ckt) if(model->BJTdepletionCapCoeffGiven) { if(model->BJTdepletionCapCoeff>.9999) { model->BJTdepletionCapCoeff=.9999; - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "BJT model %s, parameter fc limited to 0.9999", &(model->BJTmodName)); } diff --git a/src/spicelib/devices/bjt2/bjt2disto.c b/src/spicelib/devices/bjt2/bjt2disto.c index 914de149c..fe1fddbaa 100644 --- a/src/spicelib/devices/bjt2/bjt2disto.c +++ b/src/spicelib/devices/bjt2/bjt2disto.c @@ -193,7 +193,7 @@ for( ; model != NULL; model = model->BJT2nextModel ) { /* ic term */ #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = DFn2F1( here->ic_x2, here->ic_y2, @@ -221,7 +221,7 @@ time = (*(SPfrontEnd->IFseconds))(); r1h1z, i1h1z); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for DFn2F1: %g seconds \n", time); #endif @@ -354,7 +354,7 @@ printf("Time for DFn2F1: %g seconds \n", time); r1h1z = r1h1z + r1h1y; i1h1z = i1h1z + i1h1y; #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1i2F1(here->capbx2, @@ -365,7 +365,7 @@ time = (*(SPfrontEnd->IFseconds))(); r1h1z, i1h1z); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for D1n2F1: %g seconds \n", time); #endif @@ -431,7 +431,7 @@ printf("Time for D1n2F1: %g seconds \n", time); /* ic term */ #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = DFn3F1( here->ic_x2, here->ic_y2, @@ -491,7 +491,7 @@ time = (*(SPfrontEnd->IFseconds))(); r2h11z, i2h11z); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for DFn3F1: %g seconds \n", time); #endif @@ -727,7 +727,7 @@ printf("Time for DFn3F1: %g seconds \n", time); r2h11z = r2h11z + r2h11y; i2h11z = i2h11z + i2h11y; #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1i3F1(here->capbx2, @@ -744,7 +744,7 @@ time = (*(SPfrontEnd->IFseconds))(); r2h11z, i2h11z); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for D1n3F1: %g seconds \n", time); #endif @@ -874,7 +874,7 @@ printf("Time for D1n3F1: %g seconds \n", time); /* loading ib term */ /* x and y still the same */ #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = DFnF12( here->ib_x2, here->ib_y2, @@ -914,7 +914,7 @@ time = (*(SPfrontEnd->IFseconds))(); 0.0, 0.0); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for DFnF12: %g seconds \n", time); #endif @@ -1044,7 +1044,7 @@ printf("Time for DFnF12: %g seconds \n", time); r1h2z = r1h2z + r1h2y; i1h2z = i1h2z + i1h2y; #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1iF12(here->capbx2, @@ -1059,7 +1059,7 @@ time = (*(SPfrontEnd->IFseconds))(); r1h2z, i1h2z); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for D1nF12: %g seconds \n", time); #endif @@ -1471,14 +1471,14 @@ printf("Time for D1nF12: %g seconds \n", time); pass.h2f1f2z = r2h1m2z; pass.ih2f1f2z = i2h1m2z; #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = DFn2F12(&pass); itemp = DFi2F12(&pass); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for DFn2F12: %g seconds \n", time); #endif } @@ -1693,7 +1693,7 @@ printf("Time for DFn2F12: %g seconds \n", time); r2h1m2z = r2h1m2z + r2h1m2y; i2h1m2z = i2h1m2z + i2h1m2y; #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))(); +time = SPfrontEnd->IFseconds(); #endif temp = - ckt->CKTomega * D1i2F12(here->capbx2, @@ -1718,7 +1718,7 @@ time = (*(SPfrontEnd->IFseconds))(); r2h1m2z, i2h1m2z); #ifdef D_DBG_SMALLTIMES -time = (*(SPfrontEnd->IFseconds))() - time; +time = SPfrontEnd->IFseconds() - time; printf("Time for D1n2F12: %g seconds \n", time); #endif diff --git a/src/spicelib/devices/bjt2/bjt2noise.c b/src/spicelib/devices/bjt2/bjt2noise.c index 36fe327de..511a4d341 100644 --- a/src/spicelib/devices/bjt2/bjt2noise.c +++ b/src/spicelib/devices/bjt2/bjt2noise.c @@ -70,7 +70,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -84,7 +84,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -94,7 +94,7 @@ BJT2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/bjt2/bjt2temp.c b/src/spicelib/devices/bjt2/bjt2temp.c index 1ae7e4d89..7041a6163 100644 --- a/src/spicelib/devices/bjt2/bjt2temp.c +++ b/src/spicelib/devices/bjt2/bjt2temp.c @@ -114,7 +114,7 @@ BJT2temp(GENmodel *inModel, CKTcircuit *ckt) if(model->BJT2depletionCapCoeffGiven) { if(model->BJT2depletionCapCoeff>.9999) { model->BJT2depletionCapCoeff=.9999; - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "BJT2 model %s, parameter fc limited to 0.9999", &(model->BJT2modName)); } diff --git a/src/spicelib/devices/bsim1/b1noi.c b/src/spicelib/devices/bsim1/b1noi.c index 649495abf..53d84d21c 100644 --- a/src/spicelib/devices/bsim1/b1noi.c +++ b/src/spicelib/devices/bsim1/b1noi.c @@ -65,7 +65,7 @@ B1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -81,7 +81,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -92,7 +92,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/bsim1/b1temp.c b/src/spicelib/devices/bsim1/b1temp.c index eca350008..fbf02fc6a 100644 --- a/src/spicelib/devices/bsim1/b1temp.c +++ b/src/spicelib/devices/bsim1/b1temp.c @@ -54,7 +54,7 @@ B1temp(GENmodel *inModel, CKTcircuit *ckt) IFuid namarray[2]; namarray[0] = model->B1modName; namarray[1] = here->B1name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B1: mosfet %s, model %s: Effective channel length <=0", namarray); return(E_BADPARM); @@ -63,7 +63,7 @@ B1temp(GENmodel *inModel, CKTcircuit *ckt) IFuid namarray[2]; namarray[0] = model->B1modName; namarray[1] = here->B1name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B1: mosfet %s, model %s: Effective channel width <=0", namarray); return(E_BADPARM); diff --git a/src/spicelib/devices/bsim2/b2noi.c b/src/spicelib/devices/bsim2/b2noi.c index 909b8caf3..3bf233572 100644 --- a/src/spicelib/devices/bsim2/b2noi.c +++ b/src/spicelib/devices/bsim2/b2noi.c @@ -65,7 +65,7 @@ B2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -81,7 +81,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -92,7 +92,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/bsim2/b2temp.c b/src/spicelib/devices/bsim2/b2temp.c index 49aec821c..8da29b743 100644 --- a/src/spicelib/devices/bsim2/b2temp.c +++ b/src/spicelib/devices/bsim2/b2temp.c @@ -84,7 +84,7 @@ B2temp(GENmodel *inModel, CKTcircuit *ckt) { IFuid namarray[2]; namarray[0] = model->B2modName; namarray[1] = here->B2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B2: mosfet %s, model %s: Effective channel length <=0", namarray); return(E_BADPARM); @@ -94,7 +94,7 @@ B2temp(GENmodel *inModel, CKTcircuit *ckt) { IFuid namarray[2]; namarray[0] = model->B2modName; namarray[1] = here->B2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B2: mosfet %s, model %s: Effective channel width <=0", namarray); return(E_BADPARM); diff --git a/src/spicelib/devices/bsim3/b3noi.c b/src/spicelib/devices/bsim3/b3noi.c index ddd188a6b..65067a944 100644 --- a/src/spicelib/devices/bsim3/b3noi.c +++ b/src/spicelib/devices/bsim3/b3noi.c @@ -157,7 +157,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -172,7 +172,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -184,7 +184,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3/b3temp.c b/src/spicelib/devices/bsim3/b3temp.c index 06da08818..883e01b1c 100644 --- a/src/spicelib/devices/bsim3/b3temp.c +++ b/src/spicelib/devices/bsim3/b3temp.c @@ -198,7 +198,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3modName; namarray[1] = here->BSIM3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -209,7 +209,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3modName; namarray[1] = here->BSIM3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -220,7 +220,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3modName; namarray[1] = here->BSIM3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -231,7 +231,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3modName; namarray[1] = here->BSIM3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -610,7 +610,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3modName; namarray[1] = here->BSIM3name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.2 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.2 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim3soi/b4soinoi.c b/src/spicelib/devices/bsim3soi/b4soinoi.c index c30fe2e0d..2fcd4b69e 100644 --- a/src/spicelib/devices/bsim3soi/b4soinoi.c +++ b/src/spicelib/devices/bsim3soi/b4soinoi.c @@ -166,7 +166,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -181,7 +181,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -193,7 +193,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3soi/b4soitemp.c b/src/spicelib/devices/bsim3soi/b4soitemp.c index c15924d86..d0d4d3919 100644 --- a/src/spicelib/devices/bsim3soi/b4soitemp.c +++ b/src/spicelib/devices/bsim3soi/b4soitemp.c @@ -233,7 +233,7 @@ B4SOItemp( { IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B4SOI: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -246,7 +246,7 @@ B4SOItemp( { IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B4SOI: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -262,7 +262,7 @@ B4SOItemp( { IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B4SOI: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -275,7 +275,7 @@ B4SOItemp( { IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B4SOI: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -293,7 +293,7 @@ B4SOItemp( IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B4SOI: mosfet %s, model %s: Effective channel length for C-V (body) <= 0", namarray); return(E_BADPARM); @@ -305,7 +305,7 @@ B4SOItemp( IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B4SOI: mosfet %s, model %s: Effective channel length for C-V (backgate) <= 0", namarray); return(E_BADPARM); @@ -1190,7 +1190,7 @@ B4SOItemp( { IFuid namarray[2]; namarray[0] = model->B4SOImodName; namarray[1] = here->B4SOIname; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B4SOIV3 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B4SOIV3 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c index f4d9d1d50..b513c4c1e 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddnoi.c @@ -150,7 +150,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -165,7 +165,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -177,7 +177,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c index 04cb111e1..c773be2a2 100644 --- a/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c +++ b/src/spicelib/devices/bsim3soi_dd/b3soiddtemp.c @@ -132,7 +132,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIDDmodName; namarray[1] = here->B3SOIDDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIDD: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -143,7 +143,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIDDmodName; namarray[1] = here->B3SOIDDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIDD: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -154,7 +154,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIDDmodName; namarray[1] = here->B3SOIDDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIDD: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -165,7 +165,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIDDmodName; namarray[1] = here->B3SOIDDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIDD: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -560,7 +560,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIDDmodName; namarray[1] = here->B3SOIDDname; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B3SOIDDV3 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B3SOIDDV3 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c index 227da33a8..17b95a216 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdnoi.c @@ -150,7 +150,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -165,7 +165,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -177,7 +177,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c index 907058c0b..01acb8e71 100644 --- a/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c +++ b/src/spicelib/devices/bsim3soi_fd/b3soifdtemp.c @@ -131,7 +131,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIFDmodName; namarray[1] = here->B3SOIFDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIFD: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -142,7 +142,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIFDmodName; namarray[1] = here->B3SOIFDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIFD: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -153,7 +153,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIFDmodName; namarray[1] = here->B3SOIFDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIFD: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -164,7 +164,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIFDmodName; namarray[1] = here->B3SOIFDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIFD: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -559,7 +559,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->B3SOIFDmodName; namarray[1] = here->B3SOIFDname; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B3SOIFDV3 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B3SOIFDV3 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c index eef8e593a..7597e764b 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdnoi.c @@ -154,7 +154,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -169,7 +169,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -181,7 +181,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c index 0f104fd88..3d9d8dcac 100644 --- a/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c +++ b/src/spicelib/devices/bsim3soi_pd/b3soipdtemp.c @@ -161,7 +161,7 @@ double tmp3, T7; { IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIPD: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -173,7 +173,7 @@ double tmp3, T7; { IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIPD: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -187,7 +187,7 @@ double tmp3, T7; { IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIPD: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -199,7 +199,7 @@ double tmp3, T7; { IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIPD: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -214,7 +214,7 @@ double tmp3, T7; IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIPD: mosfet %s, model %s: Effective channel length for C-V (body) <= 0", namarray); return(E_BADPARM); @@ -226,7 +226,7 @@ double tmp3, T7; IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "B3SOIPD: mosfet %s, model %s: Effective channel length for C-V (backgate) <= 0", namarray); return(E_BADPARM); @@ -673,7 +673,7 @@ double tmp3, T7; { IFuid namarray[2]; namarray[0] = model->B3SOIPDmodName; namarray[1] = here->B3SOIPDname; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during B3SOIPDV3 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during B3SOIPDV3 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim3v0/b3v0noi.c b/src/spicelib/devices/bsim3v0/b3v0noi.c index 3fe209477..596a81bf3 100644 --- a/src/spicelib/devices/bsim3v0/b3v0noi.c +++ b/src/spicelib/devices/bsim3v0/b3v0noi.c @@ -123,7 +123,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -138,7 +138,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -150,7 +150,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3v0/b3v0temp.c b/src/spicelib/devices/bsim3v0/b3v0temp.c index 96e82ac1a..f619cf962 100644 --- a/src/spicelib/devices/bsim3v0/b3v0temp.c +++ b/src/spicelib/devices/bsim3v0/b3v0temp.c @@ -101,7 +101,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v0modName; namarray[1] = here->BSIM3v0name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v0: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -112,7 +112,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v0modName; namarray[1] = here->BSIM3v0name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v0: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -123,7 +123,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v0modName; namarray[1] = here->BSIM3v0name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v0: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -134,7 +134,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v0modName; namarray[1] = here->BSIM3v0name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v0: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); diff --git a/src/spicelib/devices/bsim3v1/b3v1noi.c b/src/spicelib/devices/bsim3v1/b3v1noi.c index 4c9df925e..1b6a9ef65 100644 --- a/src/spicelib/devices/bsim3v1/b3v1noi.c +++ b/src/spicelib/devices/bsim3v1/b3v1noi.c @@ -148,7 +148,7 @@ int i; data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -165,7 +165,7 @@ int i; data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -179,7 +179,7 @@ int i; data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3v1/b3v1temp.c b/src/spicelib/devices/bsim3v1/b3v1temp.c index f787dd6cf..e5a478fa6 100644 --- a/src/spicelib/devices/bsim3v1/b3v1temp.c +++ b/src/spicelib/devices/bsim3v1/b3v1temp.c @@ -143,7 +143,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v1modName; namarray[1] = here->BSIM3v1name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v1: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -154,7 +154,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v1modName; namarray[1] = here->BSIM3v1name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v1: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -165,7 +165,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v1modName; namarray[1] = here->BSIM3v1name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v1: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -176,7 +176,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v1modName; namarray[1] = here->BSIM3v1name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v1: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -530,7 +530,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v1modName; namarray[1] = here->BSIM3v1name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.1 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM3V3.1 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim3v32/b3v32noi.c b/src/spicelib/devices/bsim3v32/b3v32noi.c index dd601a858..1108e5410 100644 --- a/src/spicelib/devices/bsim3v32/b3v32noi.c +++ b/src/spicelib/devices/bsim3v32/b3v32noi.c @@ -226,7 +226,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -241,7 +241,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -253,7 +253,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim3v32/b3v32temp.c b/src/spicelib/devices/bsim3v32/b3v32temp.c index 771499e10..cff3492d9 100644 --- a/src/spicelib/devices/bsim3v32/b3v32temp.c +++ b/src/spicelib/devices/bsim3v32/b3v32temp.c @@ -267,7 +267,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v32modName; namarray[1] = here->BSIM3v32name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v32: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -278,7 +278,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v32modName; namarray[1] = here->BSIM3v32name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v32: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -289,7 +289,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v32modName; namarray[1] = here->BSIM3v32name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v32: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -300,7 +300,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v32modName; namarray[1] = here->BSIM3v32name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM3v32: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -679,7 +679,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM3v32modName; namarray[1] = here->BSIM3v32name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM3v32V3.2 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM3v32V3.2 parameter checking for %s in model %s", namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/bsim4/b4noi.c b/src/spicelib/devices/bsim4/b4noi.c index d9511116f..ababa637d 100644 --- a/src/spicelib/devices/bsim4/b4noi.c +++ b/src/spicelib/devices/bsim4/b4noi.c @@ -138,7 +138,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -153,7 +153,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -165,7 +165,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim4/b4temp.c b/src/spicelib/devices/bsim4/b4temp.c index a7398b4b0..da25e8d85 100644 --- a/src/spicelib/devices/bsim4/b4temp.c +++ b/src/spicelib/devices/bsim4/b4temp.c @@ -447,7 +447,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4modName; namarray[1] = here->BSIM4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -458,7 +458,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4modName; namarray[1] = here->BSIM4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -469,7 +469,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4modName; namarray[1] = here->BSIM4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -480,7 +480,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4modName; namarray[1] = here->BSIM4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -491,7 +491,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4modName; namarray[1] = here->BSIM4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4: mosfet %s, model %s: Effective channel width for S/D junctions <= 0", namarray); return(E_BADPARM); @@ -2191,7 +2191,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4modName; namarray[1] = here->BSIM4name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4.6.4 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4.6.4 parameter checking for %s in model %s", namarray); return(E_BADPARM); } } /* End instance */ diff --git a/src/spicelib/devices/bsim4v2/b4v2noi.c b/src/spicelib/devices/bsim4v2/b4v2noi.c index 32fa95164..9b8c9a9c4 100644 --- a/src/spicelib/devices/bsim4v2/b4v2noi.c +++ b/src/spicelib/devices/bsim4v2/b4v2noi.c @@ -132,7 +132,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -147,7 +147,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -159,7 +159,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim4v2/b4v2temp.c b/src/spicelib/devices/bsim4v2/b4v2temp.c index f48a05692..711505067 100644 --- a/src/spicelib/devices/bsim4v2/b4v2temp.c +++ b/src/spicelib/devices/bsim4v2/b4v2temp.c @@ -378,7 +378,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM4v2modName; namarray[1] = here->BSIM4v2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v2: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -389,7 +389,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM4v2modName; namarray[1] = here->BSIM4v2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v2: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -400,7 +400,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM4v2modName; namarray[1] = here->BSIM4v2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v2: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -411,7 +411,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM4v2modName; namarray[1] = here->BSIM4v2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v2: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -422,7 +422,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM4v2modName; namarray[1] = here->BSIM4v2name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v2: mosfet %s, model %s: Effective channel width for S/D junctions <= 0", namarray); return(E_BADPARM); @@ -1488,7 +1488,7 @@ int Size_Not_Found; { IFuid namarray[2]; namarray[0] = model->BSIM4v2modName; namarray[1] = here->BSIM4v2name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4v2.2.1 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4v2.2.1 parameter checking for %s in model %s", namarray); return(E_BADPARM); } } /* End instance */ diff --git a/src/spicelib/devices/bsim4v3/b4v3noi.c b/src/spicelib/devices/bsim4v3/b4v3noi.c index 936f1bdea..af0305b47 100644 --- a/src/spicelib/devices/bsim4v3/b4v3noi.c +++ b/src/spicelib/devices/bsim4v3/b4v3noi.c @@ -134,7 +134,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -149,7 +149,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -161,7 +161,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim4v3/b4v3temp.c b/src/spicelib/devices/bsim4v3/b4v3temp.c index fca472681..4339ff856 100644 --- a/src/spicelib/devices/bsim4v3/b4v3temp.c +++ b/src/spicelib/devices/bsim4v3/b4v3temp.c @@ -386,7 +386,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v3modName; namarray[1] = here->BSIM4v3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v3: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -397,7 +397,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v3modName; namarray[1] = here->BSIM4v3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v3: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -408,7 +408,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v3modName; namarray[1] = here->BSIM4v3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v3: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -419,7 +419,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v3modName; namarray[1] = here->BSIM4v3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v3: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -430,7 +430,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v3modName; namarray[1] = here->BSIM4v3name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v3: mosfet %s, model %s: Effective channel width for S/D junctions <= 0", namarray); return(E_BADPARM); @@ -1637,7 +1637,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v3modName; namarray[1] = here->BSIM4v3name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4v3.3.0 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4v3.3.0 parameter checking for %s in model %s", namarray); return(E_BADPARM); } } /* End instance */ diff --git a/src/spicelib/devices/bsim4v4/b4v4noi.c b/src/spicelib/devices/bsim4v4/b4v4noi.c index 0471026c3..a3232779b 100644 --- a/src/spicelib/devices/bsim4v4/b4v4noi.c +++ b/src/spicelib/devices/bsim4v4/b4v4noi.c @@ -135,7 +135,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -150,7 +150,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -162,7 +162,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim4v4/b4v4temp.c b/src/spicelib/devices/bsim4v4/b4v4temp.c index 568a607bb..bd81cd686 100644 --- a/src/spicelib/devices/bsim4v4/b4v4temp.c +++ b/src/spicelib/devices/bsim4v4/b4v4temp.c @@ -396,7 +396,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v4modName; namarray[1] = here->BSIM4v4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v4: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -407,7 +407,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v4modName; namarray[1] = here->BSIM4v4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v4: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -418,7 +418,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v4modName; namarray[1] = here->BSIM4v4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v4: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); fprintf(stderr,"BSIM4v4: mosfet %s, model %s: Effective channel length for C-V <= 0 (Lnew - 2.0*BSIM4v4dlc == %g - 2.0*%g)\n", @@ -431,7 +431,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v4modName; namarray[1] = here->BSIM4v4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v4: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -442,7 +442,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v4modName; namarray[1] = here->BSIM4v4name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v4: mosfet %s, model %s: Effective channel width for S/D junctions <= 0", namarray); return(E_BADPARM); @@ -1695,7 +1695,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v4modName; namarray[1] = here->BSIM4v4name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4.4.0 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4.4.0 parameter checking for %s in model %s", namarray); return(E_BADPARM); } } /* End instance */ diff --git a/src/spicelib/devices/bsim4v5/b4v5noi.c b/src/spicelib/devices/bsim4v5/b4v5noi.c index 95a15ea5d..18aac1b73 100644 --- a/src/spicelib/devices/bsim4v5/b4v5noi.c +++ b/src/spicelib/devices/bsim4v5/b4v5noi.c @@ -137,7 +137,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -152,7 +152,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); @@ -164,7 +164,7 @@ int i; data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) (ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); diff --git a/src/spicelib/devices/bsim4v5/b4v5temp.c b/src/spicelib/devices/bsim4v5/b4v5temp.c index 29f4233ee..36b4719e5 100644 --- a/src/spicelib/devices/bsim4v5/b4v5temp.c +++ b/src/spicelib/devices/bsim4v5/b4v5temp.c @@ -399,7 +399,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v5modName; namarray[1] = here->BSIM4v5name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v5: mosfet %s, model %s: Effective channel length <= 0", namarray); return(E_BADPARM); @@ -410,7 +410,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v5modName; namarray[1] = here->BSIM4v5name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v5: mosfet %s, model %s: Effective channel width <= 0", namarray); return(E_BADPARM); @@ -421,7 +421,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v5modName; namarray[1] = here->BSIM4v5name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v5: mosfet %s, model %s: Effective channel length for C-V <= 0", namarray); return(E_BADPARM); @@ -432,7 +432,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v5modName; namarray[1] = here->BSIM4v5name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v5: mosfet %s, model %s: Effective channel width for C-V <= 0", namarray); return(E_BADPARM); @@ -443,7 +443,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v5modName; namarray[1] = here->BSIM4v5name; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "BSIM4v5: mosfet %s, model %s: Effective channel width for S/D junctions <= 0", namarray); return(E_BADPARM); @@ -1826,7 +1826,7 @@ int Size_Not_Found, i; { IFuid namarray[2]; namarray[0] = model->BSIM4v5modName; namarray[1] = here->BSIM4v5name; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, "Fatal error(s) detected during BSIM4v5.5.0 parameter checking for %s in model %s", namarray); + SPfrontEnd->IFerror (ERR_FATAL, "Fatal error(s) detected during BSIM4v5.5.0 parameter checking for %s in model %s", namarray); return(E_BADPARM); } } /* End instance */ diff --git a/src/spicelib/devices/cccs/cccsset.c b/src/spicelib/devices/cccs/cccsset.c index 583e53f56..9c4532c1c 100644 --- a/src/spicelib/devices/cccs/cccsset.c +++ b/src/spicelib/devices/cccs/cccsset.c @@ -38,7 +38,7 @@ CCCSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) IFuid namarray[2]; namarray[0] = here->CCCSname; namarray[1] = here->CCCScontName; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: unknown controlling source %s",namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/ccvs/ccvsset.c b/src/spicelib/devices/ccvs/ccvsset.c index 11590e889..3b587f6f2 100644 --- a/src/spicelib/devices/ccvs/ccvsset.c +++ b/src/spicelib/devices/ccvs/ccvsset.c @@ -32,7 +32,7 @@ CCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here=here->CCVSnextInstance) { if(here->CCVSposNode == here->CCVSnegNode) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "instance %s is a shorted CCVS", &here->CCVSname); return(E_UNSUPP); } @@ -47,7 +47,7 @@ CCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) IFuid namarray[2]; namarray[0] = here->CCVSname; namarray[1] = here->CCVScontName; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: unknown controlling source %s",namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/cktaccept.c b/src/spicelib/devices/cktaccept.c index dae3e307a..85458db02 100644 --- a/src/spicelib/devices/cktaccept.c +++ b/src/spicelib/devices/cktaccept.c @@ -30,8 +30,8 @@ CKTaccept(CKTcircuit *ckt) devs = devices(); for (i = 0; i < DEVmaxnum; i++) { - if ( devs[i] && ((*devs[i]).DEVaccept != NULL) && (ckt->CKThead[i] != NULL) ){ - error = (*((*devs[i]).DEVaccept))(ckt,ckt->CKThead[i]); + if ( devs[i] && devs[i]->DEVaccept && ckt->CKThead[i] ) { + error = devs[i]->DEVaccept (ckt, ckt->CKThead[i]); if (error) return(error); } diff --git a/src/spicelib/devices/cktask.c b/src/spicelib/devices/cktask.c index 7500f626b..0c9068169 100644 --- a/src/spicelib/devices/cktask.c +++ b/src/spicelib/devices/cktask.c @@ -27,7 +27,7 @@ CKTask(CKTcircuit *ckt, GENinstance *fast, int which, IFvalue *value, IFvalue *s SPICEdev **DEVices; DEVices = devices(); - if((*DEVices[type]).DEVask) { + if(DEVices[type]->DEVask) { error = DEVices[type]->DEVask(ckt, fast, which, value, selector); } else { diff --git a/src/spicelib/devices/cktbindnode.c b/src/spicelib/devices/cktbindnode.c index 87ae46d6c..88effcbd2 100644 --- a/src/spicelib/devices/cktbindnode.c +++ b/src/spicelib/devices/cktbindnode.c @@ -26,7 +26,7 @@ CKTbindNode(CKTcircuit *ckt, GENinstance *fast, int term, CKTnode *node) devs = devices(); mappednode = node->number; - if (*((*devs[type]).DEVpublic.terms) >= term && term >0 ) { + if (*(devs[type]->DEVpublic.terms) >= term && term > 0) { switch(term) { default: return E_NOTERM; diff --git a/src/spicelib/devices/cpl/cplsetup.c b/src/spicelib/devices/cpl/cplsetup.c index 855900b22..6e649b9f2 100644 --- a/src/spicelib/devices/cpl/cplsetup.c +++ b/src/spicelib/devices/cpl/cplsetup.c @@ -151,27 +151,27 @@ CPLsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) for( ; model != NULL; model = model->CPLnextModel ) { if (!model->Rmgiven) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line series resistance not given", &(model->CPLmodName)); return(E_BADPARM); } if (!model->Gmgiven) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line parallel conductance not given", &(model->CPLmodName)); return(E_BADPARM); } if (!model->Lmgiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line series inductance not given", &(model->CPLmodName)); return (E_BADPARM); } if (!model->Cmgiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line parallel capacitance not given", &(model->CPLmodName)); return (E_BADPARM); } if (!model->lengthgiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line length must be given", &(model->CPLmodName)); return (E_BADPARM); } diff --git a/src/spicelib/devices/csw/cswnoise.c b/src/spicelib/devices/csw/cswnoise.c index 7c3f3d7ef..1c6341937 100644 --- a/src/spicelib/devices/csw/cswnoise.c +++ b/src/spicelib/devices/csw/cswnoise.c @@ -55,7 +55,7 @@ CSWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -67,7 +67,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -77,7 +77,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/csw/cswsetup.c b/src/spicelib/devices/csw/cswsetup.c index e7504080e..d8bed59c6 100644 --- a/src/spicelib/devices/csw/cswsetup.c +++ b/src/spicelib/devices/csw/cswsetup.c @@ -55,7 +55,7 @@ matrixpointers: IFuid namarray[2]; namarray[0] = here->CSWname; namarray[1] = here->CSWcontName; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: unknown controlling source %s",namarray); return(E_BADPARM); } diff --git a/src/spicelib/devices/dio/dionoise.c b/src/spicelib/devices/dio/dionoise.c index f8f9d23a9..39337ed30 100644 --- a/src/spicelib/devices/dio/dionoise.c +++ b/src/spicelib/devices/dio/dionoise.c @@ -65,7 +65,7 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -78,7 +78,7 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -86,7 +86,7 @@ DIOnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/dio/diotemp.c b/src/spicelib/devices/dio/diotemp.c index 9ccb6def0..146db219d 100644 --- a/src/spicelib/devices/dio/diotemp.c +++ b/src/spicelib/devices/dio/diotemp.c @@ -42,28 +42,28 @@ DIOtemp(GENmodel *inModel, CKTcircuit *ckt) vtnom = CONSTKoverQ * model->DIOnomTemp; /* limit grading coeff to max of .9 */ if(model->DIOgradingCoeff>.9) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: grading coefficient too large, limited to 0.9", &(model->DIOmodName)); model->DIOgradingCoeff=.9; } /* limit activation energy to min of .1 */ if(model->DIOactivationEnergy<.1) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: activation energy too small, limited to 0.1", &(model->DIOmodName)); model->DIOactivationEnergy=.1; } /* limit depletion cap coeff to max of .95 */ if(model->DIOdepletionCapCoeff>.95) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: coefficient Fc too large, limited to 0.95", &(model->DIOmodName)); model->DIOdepletionCapCoeff=.95; } /* limit sidewall depletion cap coeff to max of .95 */ if(model->DIOdepletionSWcapCoeff>.95) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: coefficient Fcs too large, limited to 0.95", &(model->DIOmodName)); model->DIOdepletionSWcapCoeff=.95; @@ -99,7 +99,7 @@ DIOtemp(GENmodel *inModel, CKTcircuit *ckt) * to max of .9 */ if(here->DIOtGradingCoeff>.9) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: temperature adjusted grading coefficient too large, limited to 0.9", &(here->DIOname)); here->DIOtGradingCoeff=.9; @@ -190,9 +190,9 @@ DIOtemp(GENmodel *inModel, CKTcircuit *ckt) (void)sprintf(emsg, "%%s: breakdown current increased to %g to resolve", cbv); - (*(SPfrontEnd->IFerror))(ERR_WARNING,emsg,&(here->DIOname)); + SPfrontEnd->IFerror (ERR_WARNING, emsg, &(here->DIOname)); FREE(emsg); - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "incompatibility with specified saturation current",(IFuid*)NULL); #endif xbv=model->DIObreakdownVoltage; @@ -214,7 +214,7 @@ DIOtemp(GENmodel *inModel, CKTcircuit *ckt) (void)sprintf(emsg, "%%s: unable to match forward and reverse diode regions: bv = %g, ibv = %g", xbv,xcbv); - (*(SPfrontEnd->IFerror))(ERR_WARNING,emsg,&here->DIOname); + SPfrontEnd->IFerror (ERR_WARNING, emsg, &here->DIOname); FREE(emsg); #endif } diff --git a/src/spicelib/devices/hisim/hsm1noi.c b/src/spicelib/devices/hisim/hsm1noi.c index c91f3a357..031d2c88f 100644 --- a/src/spicelib/devices/hisim/hsm1noi.c +++ b/src/spicelib/devices/hisim/hsm1noi.c @@ -94,8 +94,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) - (ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); } break; @@ -107,8 +106,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) - (ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); (void) sprintf(name, "inoise_total.%s%s", @@ -117,8 +115,7 @@ HSM1noise (int mode, int operation, GENmodel *inModel, CKTcircuit *ckt, TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid)) - (ckt, &(data->namelist[data->numPlots++]), + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid) NULL, name, UID_OTHER, NULL); } break; diff --git a/src/spicelib/devices/ind/mutsetup.c b/src/spicelib/devices/ind/mutsetup.c index 8be8d6808..b51815424 100644 --- a/src/spicelib/devices/ind/mutsetup.c +++ b/src/spicelib/devices/ind/mutsetup.c @@ -37,7 +37,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) ktype = CKTtypelook("Inductor"); if(ktype <= 0) { - (*(SPfrontEnd->IFerror))(ERR_PANIC, + SPfrontEnd->IFerror (ERR_PANIC, "mutual inductor, but inductors not available!", (IFuid *)NULL); return(E_INTERN); @@ -50,7 +50,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) IFuid namarray[2]; namarray[0]=here->MUTname; namarray[1]=here->MUTindName1; - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: coupling to non-existant inductor %s.", namarray); } @@ -61,7 +61,7 @@ MUTsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) IFuid namarray[2]; namarray[0]=here->MUTname; namarray[1]=here->MUTindName2; - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: coupling to non-existant inductor %s.", namarray); } diff --git a/src/spicelib/devices/isrc/isrctemp.c b/src/spicelib/devices/isrc/isrctemp.c index 21188b9dc..a869a52e7 100644 --- a/src/spicelib/devices/isrc/isrctemp.c +++ b/src/spicelib/devices/isrc/isrctemp.c @@ -39,11 +39,11 @@ ISRCtemp(GENmodel *inModel, CKTcircuit *ckt) if(!here->ISRCdcGiven) { /* no DC value - either have a transient value, or none */ if(here->ISRCfuncTGiven) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: no DC value, transient time 0 value used", &(here->ISRCname)); } else { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: has no value, DC 0 assumed", &(here->ISRCname)); } diff --git a/src/spicelib/devices/jfet/jfetnoi.c b/src/spicelib/devices/jfet/jfetnoi.c index 351c6ae98..894081414 100644 --- a/src/spicelib/devices/jfet/jfetnoi.c +++ b/src/spicelib/devices/jfet/jfetnoi.c @@ -65,7 +65,7 @@ JFETnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -81,7 +81,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -92,7 +92,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/jfet/jfettemp.c b/src/spicelib/devices/jfet/jfettemp.c index 03b76f159..eee809637 100644 --- a/src/spicelib/devices/jfet/jfettemp.c +++ b/src/spicelib/devices/jfet/jfettemp.c @@ -62,7 +62,7 @@ JFETtemp(GENmodel *inModel, CKTcircuit *ckt) model->JFETsourceConduct = 0; } if(model->JFETdepletionCapCoeff >.95) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: Depletion cap. coefficient too large, limited to .95", &(model->JFETmodName)); model->JFETdepletionCapCoeff = .95; diff --git a/src/spicelib/devices/jfet2/jfet2noi.c b/src/spicelib/devices/jfet2/jfet2noi.c index 1c9cafa9a..0b5831aba 100644 --- a/src/spicelib/devices/jfet2/jfet2noi.c +++ b/src/spicelib/devices/jfet2/jfet2noi.c @@ -70,7 +70,7 @@ JFET2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -86,7 +86,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -97,7 +97,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/jfet2/jfet2temp.c b/src/spicelib/devices/jfet2/jfet2temp.c index 361b4d65a..cd215c5d7 100644 --- a/src/spicelib/devices/jfet2/jfet2temp.c +++ b/src/spicelib/devices/jfet2/jfet2temp.c @@ -67,7 +67,7 @@ JFET2temp(GENmodel *inModel, CKTcircuit *ckt) model->JFET2sourceConduct = 0; } if(model->JFET2fc >.95) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: Depletion cap. coefficient too large, limited to .95", &(model->JFET2modName)); model->JFET2fc = .95; diff --git a/src/spicelib/devices/ltra/ltraset.c b/src/spicelib/devices/ltra/ltraset.c index 1f9e39b8e..c53981005 100644 --- a/src/spicelib/devices/ltra/ltraset.c +++ b/src/spicelib/devices/ltra/ltraset.c @@ -40,7 +40,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) model->LTRAabstol = 1; } if (!model->LTRAresistGiven) { - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: lossy line series resistance not given, assumed zero", &(model->LTRAmodName)); model->LTRAresist = 0.0; @@ -63,7 +63,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) */ if (ckt->CKTtryToCompact) { model->LTRAhowToInterp = LTRA_MOD_LININTERP; - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: using linear interpolation because trytocompact option specified", &(model->LTRAmodName)); } else { @@ -85,21 +85,21 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) /* return(E_BADPARM); */ } if (!model->LTRAinductGiven) { - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: lossy line series inductance not given, assumed zero", &(model->LTRAmodName)); model->LTRAinduct = 0.0; /* return(E_BADPARM); */ } if (!model->LTRAcapacGiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: lossy line parallel capacitance not given, assumed zero", &(model->LTRAmodName)); model->LTRAcapac = 0.0; /* return(E_BADPARM); */ } if (!model->LTRAlengthGiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: lossy line length must be given", &(model->LTRAmodName)); return (E_BADPARM); @@ -108,7 +108,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (model->LTRAcapac != 0) && (model->LTRAinduct != 0)) { model->LTRAspecialCase = LTRA_MOD_LC; #ifdef LTRADEBUG - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "%s: lossless line", &(model->LTRAmodName)); #endif @@ -117,7 +117,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (model->LTRAcapac != 0) && (model->LTRAinduct != 0)) { model->LTRAspecialCase = LTRA_MOD_RLC; #ifdef LTRADEBUG - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "%s: RLC line", &(model->LTRAmodName)); #endif @@ -126,7 +126,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (model->LTRAcapac != 0) && (model->LTRAinduct == 0)) { model->LTRAspecialCase = LTRA_MOD_RC; #ifdef LTRADEBUG - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "%s: RC line", &(model->LTRAmodName)); #endif @@ -134,7 +134,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if ((model->LTRAresist != 0) && (model->LTRAconduct == 0) && (model->LTRAcapac == 0) && (model->LTRAinduct != 0)) { model->LTRAspecialCase = LTRA_MOD_RL; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: RL line not supported yet", &(model->LTRAmodName)); return (E_BADPARM); @@ -145,7 +145,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) (model->LTRAcapac == 0) && (model->LTRAinduct == 0)) { model->LTRAspecialCase = LTRA_MOD_RG; #ifdef LTRADEBUG - (*(SPfrontEnd->IFerror)) (ERR_INFO, + SPfrontEnd->IFerror (ERR_INFO, "%s: RG line", &(model->LTRAmodName)); #endif @@ -153,7 +153,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if ((model->LTRAconduct != 0) && ((model->LTRAcapac != 0) || (model->LTRAinduct != 0))) { model->LTRAspecialCase = LTRA_MOD_LTRA; - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nonzero G (except RG) line not supported yet", &(model->LTRAmodName)); return (E_BADPARM); @@ -163,7 +163,7 @@ LTRAsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if ((model->LTRAresist == 0.0 ? 0 : 1) + (model->LTRAconduct == 0.0 ? 0 : 1) + (model->LTRAinduct == 0.0 ? 0 : 1) + (model->LTRAcapac == 0.0 ? 0 : 1) <= 1) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: At least two of R,L,G,C must be specified and nonzero", &(model->LTRAmodName)); return (E_BADPARM); diff --git a/src/spicelib/devices/mes/mesnoise.c b/src/spicelib/devices/mes/mesnoise.c index ad4374e3d..f74989f04 100644 --- a/src/spicelib/devices/mes/mesnoise.c +++ b/src/spicelib/devices/mes/mesnoise.c @@ -65,7 +65,7 @@ MESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *d data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -81,7 +81,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -96,7 +96,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos1/mos1noi.c b/src/spicelib/devices/mos1/mos1noi.c index 77410bf6c..b3de164ab 100644 --- a/src/spicelib/devices/mos1/mos1noi.c +++ b/src/spicelib/devices/mos1/mos1noi.c @@ -76,7 +76,7 @@ MOS1noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -92,7 +92,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -103,7 +103,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos1/mos1temp.c b/src/spicelib/devices/mos1/mos1temp.c index dca6fb7dd..2cdecf34a 100644 --- a/src/spicelib/devices/mos1/mos1temp.c +++ b/src/spicelib/devices/mos1/mos1temp.c @@ -99,7 +99,7 @@ MOS1temp(GENmodel *inModel, CKTcircuit *ckt) } } else { model->MOS1substrateDoping = 0; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nsub < Ni",&model->MOS1modName); return(E_BADPARM); } @@ -153,7 +153,7 @@ MOS1temp(GENmodel *inModel, CKTcircuit *ckt) } if(here->MOS1l - 2 * model->MOS1latDiff <=0) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: effective channel length less than zero", &(model->MOS1modName)); } diff --git a/src/spicelib/devices/mos2/mos2noi.c b/src/spicelib/devices/mos2/mos2noi.c index b130217de..536a42e8b 100644 --- a/src/spicelib/devices/mos2/mos2noi.c +++ b/src/spicelib/devices/mos2/mos2noi.c @@ -66,7 +66,7 @@ MOS2noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -82,7 +82,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -93,7 +93,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos2/mos2temp.c b/src/spicelib/devices/mos2/mos2temp.c index 465d7e7fe..9cb515af5 100644 --- a/src/spicelib/devices/mos2/mos2temp.c +++ b/src/spicelib/devices/mos2/mos2temp.c @@ -103,7 +103,7 @@ MOS2temp(GENmodel *inModel, CKTcircuit *ckt) (CHARGE*model->MOS2substrateDoping *1e6 /*(cm**3/m**3)*/)); } else { model->MOS2substrateDoping = 0; - (*(SPfrontEnd->IFerror))(ERR_FATAL,"%s: Nsub < Ni", + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nsub < Ni", &(model->MOS2modName)); return(E_BADPARM); } @@ -201,7 +201,7 @@ MOS2temp(GENmodel *inModel, CKTcircuit *ckt) here->MOS2sourceConductance = 0; } if(here->MOS2l - 2 * model->MOS2latDiff <=0) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: effective channel length less than zero", &(here->MOS2name)); } diff --git a/src/spicelib/devices/mos3/mos3noi.c b/src/spicelib/devices/mos3/mos3noi.c index a68898bb3..cc5743b70 100644 --- a/src/spicelib/devices/mos3/mos3noi.c +++ b/src/spicelib/devices/mos3/mos3noi.c @@ -66,7 +66,7 @@ MOS3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -82,7 +82,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -93,7 +93,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos3/mos3temp.c b/src/spicelib/devices/mos3/mos3temp.c index a3a3aaea5..58c26e320 100644 --- a/src/spicelib/devices/mos3/mos3temp.c +++ b/src/spicelib/devices/mos3/mos3temp.c @@ -98,7 +98,7 @@ MOS3temp(GENmodel *inModel, CKTcircuit *ckt) model->MOS3coeffDepLayWidth = sqrt(model->MOS3alpha); } else { model->MOS3substrateDoping = 0; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nsub < Ni ",&(model->MOS3modName)); return(E_BADPARM); } @@ -193,7 +193,7 @@ MOS3temp(GENmodel *inModel, CKTcircuit *ckt) if(here->MOS3l - 2 * model->MOS3latDiff + model->MOS3lengthAdjust <= 0) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel length less than zero", &(here->MOS3name)); return(E_PARMVAL); @@ -201,7 +201,7 @@ MOS3temp(GENmodel *inModel, CKTcircuit *ckt) if(here->MOS3w - 2 * model->MOS3widthNarrow + model->MOS3widthAdjust <= 0) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel width less than zero", &(here->MOS3name)); return(E_PARMVAL); diff --git a/src/spicelib/devices/mos6/mos6temp.c b/src/spicelib/devices/mos6/mos6temp.c index 8c7e72289..8e038ca1c 100644 --- a/src/spicelib/devices/mos6/mos6temp.c +++ b/src/spicelib/devices/mos6/mos6temp.c @@ -101,7 +101,7 @@ MOS6temp(GENmodel *inModel, CKTcircuit *ckt) } } else { model->MOS6substrateDoping = 0; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nsub < Ni",&model->MOS6modName); return(E_BADPARM); } @@ -153,7 +153,7 @@ MOS6temp(GENmodel *inModel, CKTcircuit *ckt) } if(here->MOS6l - 2 * model->MOS6latDiff <=0) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: effective channel length less than zero", &(model->MOS6modName)); } diff --git a/src/spicelib/devices/mos9/mos9noi.c b/src/spicelib/devices/mos9/mos9noi.c index a49d99f06..cc194a4bc 100644 --- a/src/spicelib/devices/mos9/mos9noi.c +++ b/src/spicelib/devices/mos9/mos9noi.c @@ -66,7 +66,7 @@ MOS9noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -82,7 +82,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -93,7 +93,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/mos9/mos9temp.c b/src/spicelib/devices/mos9/mos9temp.c index c0985a790..4a6b7e068 100644 --- a/src/spicelib/devices/mos9/mos9temp.c +++ b/src/spicelib/devices/mos9/mos9temp.c @@ -103,7 +103,7 @@ MOS9temp(GENmodel *inModel, CKTcircuit *ckt) model->MOS9coeffDepLayWidth = sqrt(model->MOS9alpha); } else { model->MOS9substrateDoping = 0; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nsub < Ni ",&(model->MOS9modName)); return(E_BADPARM); } @@ -198,7 +198,7 @@ MOS9temp(GENmodel *inModel, CKTcircuit *ckt) if(here->MOS9l - 2 * model->MOS9latDiff + model->MOS9lengthAdjust <1e-6) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel length less than zero", &(here->MOS9name)); return(E_PARMVAL); @@ -206,7 +206,7 @@ MOS9temp(GENmodel *inModel, CKTcircuit *ckt) if(here->MOS9w - 2 * model->MOS9widthNarrow + model->MOS9widthAdjust <1e-6) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: effective channel width less than zero", &(here->MOS9name)); return(E_PARMVAL); diff --git a/src/spicelib/devices/res/resnoise.c b/src/spicelib/devices/res/resnoise.c index 50a6a4a99..7999074e9 100644 --- a/src/spicelib/devices/res/resnoise.c +++ b/src/spicelib/devices/res/resnoise.c @@ -78,7 +78,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -93,7 +93,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -105,7 +105,7 @@ RESnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/res/restemp.c b/src/spicelib/devices/res/restemp.c index 057045aac..914359f04 100644 --- a/src/spicelib/devices/res/restemp.c +++ b/src/spicelib/devices/res/restemp.c @@ -67,7 +67,7 @@ REStemp(GENmodel *inModel, CKTcircuit *ckt) here->RESresist = model->RESsheetRes * (here->RESlength - model->RESshort) / (here->RESwidth - model->RESnarrow); } else { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: resistance = 0 ohm, set to 1000 ohm",&(here->RESname)); here->RESresist=1000; } diff --git a/src/spicelib/devices/soi3/soi3nois.c b/src/spicelib/devices/soi3/soi3nois.c index 2c2c71ff5..f9bdefc2b 100644 --- a/src/spicelib/devices/soi3/soi3nois.c +++ b/src/spicelib/devices/soi3/soi3nois.c @@ -91,7 +91,7 @@ SOI3noise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -107,7 +107,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -117,7 +117,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/soi3/soi3set.c b/src/spicelib/devices/soi3/soi3set.c index c9223049e..10e925ece 100644 --- a/src/spicelib/devices/soi3/soi3set.c +++ b/src/spicelib/devices/soi3/soi3set.c @@ -265,7 +265,7 @@ SOI3setup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) if((model->SOI3lx != 0) && (model->SOI3lambda != 0)) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: Non-zero values for BOTH LAMBDA and LX. \nDefaulting to simple LAMBDA model", &model->SOI3modName); diff --git a/src/spicelib/devices/soi3/soi3temp.c b/src/spicelib/devices/soi3/soi3temp.c index dee40dd7f..f45ebdbb4 100644 --- a/src/spicelib/devices/soi3/soi3temp.c +++ b/src/spicelib/devices/soi3/soi3temp.c @@ -95,7 +95,7 @@ SOI3temp(GENmodel *inModel, CKTcircuit *ckt) model->SOI3bodyThickness == 0) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: SOI3 device film thickness must be supplied", &model->SOI3modName); return(E_BADPARM); @@ -142,7 +142,7 @@ SOI3temp(GENmodel *inModel, CKTcircuit *ckt) if(model->SOI3bodyThickness < xd_max) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: Body Film thickness may be too small \nfor this model to be valid", &model->SOI3modName); /* return(E_PAUSE); don't want to stop, @@ -232,7 +232,7 @@ SOI3temp(GENmodel *inModel, CKTcircuit *ckt) else /* Substrate doping less than intrinsic silicon, so set to zero. */ { model->SOI3substrateDoping = 0; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: Nsub < Ni",&model->SOI3modName); return(E_BADPARM); } @@ -243,7 +243,7 @@ SOI3temp(GENmodel *inModel, CKTcircuit *ckt) (model->SOI3gamma*model->SOI3frontOxideCapFactor); if(model->SOI3bodyThickness < xd_max) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s :Body Film thickness may be too small \nfor this model to be valid", &model->SOI3modName); /* return(E_PAUSE); */ @@ -353,7 +353,7 @@ SOI3temp(GENmodel *inModel, CKTcircuit *ckt) if(here->SOI3l - 2 * model->SOI3latDiff <=0) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: Effective channel length less than zero \nIncreasing \ this instance length by 2*LD to remove effect of LD", &(here->SOI3name)); diff --git a/src/spicelib/devices/sw/swnoise.c b/src/spicelib/devices/sw/swnoise.c index f54f47aa1..e092cb63e 100644 --- a/src/spicelib/devices/sw/swnoise.c +++ b/src/spicelib/devices/sw/swnoise.c @@ -55,7 +55,7 @@ SWnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata *da data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -69,7 +69,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -80,7 +80,7 @@ if (!data->namelist) return(E_NOMEM); data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/tra/trasetup.c b/src/spicelib/devices/tra/trasetup.c index 8071230b8..cc3b2826a 100644 --- a/src/spicelib/devices/tra/trasetup.c +++ b/src/spicelib/devices/tra/trasetup.c @@ -104,7 +104,7 @@ if((here->ptr = SMPmakeElt(matrix,here->first,here->second))==(double *)NULL){\ here->TRAabstol = 1; } if(!here->TRAimpedGiven) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: transmission line z0 must be given", &(here->TRAname)); return(E_BADPARM); diff --git a/src/spicelib/devices/txl/txlsetup.c b/src/spicelib/devices/txl/txlsetup.c index 9970240c1..aff2cda55 100644 --- a/src/spicelib/devices/txl/txlsetup.c +++ b/src/spicelib/devices/txl/txlsetup.c @@ -88,27 +88,27 @@ TXLsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit*ckt, int *state) for( ; model != NULL; model = model->TXLnextModel ) { if (!model->Rgiven) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line series resistance not given", &(model->TXLmodName)); return(E_BADPARM); } if (!model->Ggiven) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line parallel conductance not given", &(model->TXLmodName)); return(E_BADPARM); } if (!model->Lgiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line series inductance not given", &(model->TXLmodName)); return (E_BADPARM); } if (!model->Cgiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line parallel capacitance not given", &(model->TXLmodName)); return (E_BADPARM); } if (!model->lengthgiven) { - (*(SPfrontEnd->IFerror)) (ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "model %s: lossy line length must be given", &(model->TXLmodName)); return (E_BADPARM); } diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c index 78e15e740..e1b29459d 100644 --- a/src/spicelib/devices/urc/urcsetup.c +++ b/src/spicelib/devices/urc/urcsetup.c @@ -95,7 +95,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) prop=1; if(model->URCisPerLGiven) { - error = (*(SPfrontEnd->IFnewUid))(ckt,&dioUid,here->URCname, + error = SPfrontEnd->IFnewUid (ckt, &dioUid, here->URCname, "diodemod", UID_MODEL, NULL); if(error) return(error); modfast = (GENmodel *)NULL; @@ -112,7 +112,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) error = CKTpModName("is",&ptemp,ckt,dtype,dioUid,&modfast); if(error) return(error); } else { - error = (*(SPfrontEnd->IFnewUid))(ckt,&capUid, + error = SPfrontEnd->IFnewUid (ckt, &capUid, here->URCname, "capmod", UID_MODEL, NULL); if(error) return(error); modfast = (GENmodel *)NULL; @@ -121,7 +121,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) if(error) return(error); } - error = (*(SPfrontEnd->IFnewUid))(ckt,&resUid,here->URCname, + error = SPfrontEnd->IFnewUid (ckt, &resUid, here->URCname, "resmod", UID_MODEL, NULL); if(error) return(error); rmodfast = (GENmodel *)NULL; @@ -150,7 +150,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"rlo%d",i); - error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid,here->URCname, + error = SPfrontEnd->IFnewUid (ckt, &eltUid, here->URCname, nameelt, UID_INSTANCE, NULL); if(error) return(error); error = CKTcrtElt(ckt,rmodfast, @@ -167,7 +167,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"rhi%d",i); - error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid,here->URCname, + error = SPfrontEnd->IFnewUid (ckt, &eltUid, here->URCname, nameelt, UID_INSTANCE, NULL); if(error) return(error); error = CKTcrtElt(ckt,rmodfast, @@ -186,7 +186,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) /* use diode */ nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"dlo%d",i); - error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid, + error = SPfrontEnd->IFnewUid (ckt, &eltUid, here->URCname,nameelt,UID_INSTANCE, NULL); if(error) return(error); @@ -206,7 +206,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) /* use simple capacitor */ nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"clo%d",i); - error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid,here->URCname + error = SPfrontEnd->IFnewUid (ckt, &eltUid, here->URCname ,nameelt, UID_INSTANCE, NULL); if(error) return(error); error = CKTcrtElt(ckt,modfast, @@ -229,7 +229,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) /* use diode */ nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"dhi%d",i); - error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid, + error = SPfrontEnd->IFnewUid (ckt, &eltUid, here->URCname,nameelt,UID_INSTANCE, NULL); if(error) return(error); @@ -249,7 +249,7 @@ URCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) /* use simple capacitor */ nameelt = TMALLOC(char, 10); (void)sprintf(nameelt,"chi%d",i); - error = (*(SPfrontEnd->IFnewUid))(ckt,&eltUid, + error = SPfrontEnd->IFnewUid (ckt, &eltUid, here->URCname,nameelt,UID_INSTANCE, NULL); if(error) return(error); @@ -296,14 +296,14 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt) { if(model->URCisPerLGiven) { /* Diodes */ - error = (*(SPfrontEnd->IFnewUid))(ckt, &varUid, + error = SPfrontEnd->IFnewUid (ckt, &varUid, here->URCname, "diodemod", UID_MODEL, NULL); } else { /* Capacitors */ - error = (*(SPfrontEnd->IFnewUid))(ckt, &varUid, + error = SPfrontEnd->IFnewUid (ckt, &varUid, here->URCname, "capmod", UID_MODEL, @@ -324,7 +324,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt) CKTdltMod(ckt, modfast); /* Does the elements too */ /* Resistors */ - error = (*(SPfrontEnd->IFnewUid))(ckt,&varUid,here->URCname, + error = SPfrontEnd->IFnewUid (ckt, &varUid, here->URCname, "resmod", UID_MODEL, NULL); if (error && error != E_EXISTS) return error; diff --git a/src/spicelib/devices/vbic/vbicnoise.c b/src/spicelib/devices/vbic/vbicnoise.c index 66ff7ffe8..978d3b067 100644 --- a/src/spicelib/devices/vbic/vbicnoise.c +++ b/src/spicelib/devices/vbic/vbicnoise.c @@ -81,7 +81,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -95,7 +95,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ @@ -105,7 +105,7 @@ VBICnoise (int mode, int operation, GENmodel *genmodel, CKTcircuit *ckt, Ndata * data->namelist = TREALLOC(IFuid, data->namelist, data->numPlots + 1); if (!data->namelist) return(E_NOMEM); - (*(SPfrontEnd->IFnewUid))(ckt, + SPfrontEnd->IFnewUid (ckt, &(data->namelist[data->numPlots++]), (IFuid)NULL, name, UID_OTHER, NULL); /* we've added one more plot */ diff --git a/src/spicelib/devices/vcvs/vcvsset.c b/src/spicelib/devices/vcvs/vcvsset.c index fe007feb7..ececd6f15 100644 --- a/src/spicelib/devices/vcvs/vcvsset.c +++ b/src/spicelib/devices/vcvs/vcvsset.c @@ -33,7 +33,7 @@ VCVSsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *states) here=here->VCVSnextInstance) { if(here->VCVSposNode == here->VCVSnegNode) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "instance %s is a shorted VCVS", &here->VCVSname); return(E_UNSUPP); } diff --git a/src/spicelib/devices/vsrc/vsrcset.c b/src/spicelib/devices/vsrc/vsrcset.c index 87c610948..65f83fb6b 100644 --- a/src/spicelib/devices/vsrc/vsrcset.c +++ b/src/spicelib/devices/vsrc/vsrcset.c @@ -32,7 +32,7 @@ VSRCsetup(SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *state) here=here->VSRCnextInstance) { if(here->VSRCposNode == here->VSRCnegNode) { - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "instance %s is a shorted VSRC", &here->VSRCname); return(E_UNSUPP); } diff --git a/src/spicelib/devices/vsrc/vsrctemp.c b/src/spicelib/devices/vsrc/vsrctemp.c index f45c01841..fff6db3d7 100644 --- a/src/spicelib/devices/vsrc/vsrctemp.c +++ b/src/spicelib/devices/vsrc/vsrctemp.c @@ -39,11 +39,11 @@ VSRCtemp(GENmodel *inModel, CKTcircuit *ckt) if(!here->VSRCdcGiven) { /* no DC value - either have a transient value, or none */ if(here->VSRCfuncTGiven) { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: no DC value, transient time 0 value used", &(here->VSRCname)); } else { - (*(SPfrontEnd->IFerror))(ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "%s: has no value, DC 0 assumed", &(here->VSRCname)); } diff --git a/src/spicelib/parser/inp2dot.c b/src/spicelib/parser/inp2dot.c index 118bd1184..9723f9fc4 100644 --- a/src/spicelib/parser/inp2dot.c +++ b/src/spicelib/parser/inp2dot.c @@ -592,7 +592,7 @@ dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current, /* one of the keywords! */ ptemp.iValue = 1; error = - (*(ft_sim->setAnalysisParm)) (ckt, foo, + ft_sim->setAnalysisParm (ckt, foo, ft_sim->analyses[which]->analysisParms[i].id, &ptemp, (IFvalue *) NULL); @@ -604,7 +604,7 @@ dot_sens2(char *line, CKTcircuit *ckt, INPtables *tab, card *current, INPgetValue(ckt, &line, ft_sim->analyses[which]->analysisParms[i].dataType, tab); error = - (*(ft_sim->setAnalysisParm)) (ckt, foo, + ft_sim->setAnalysisParm (ckt, foo, ft_sim-> analyses [which]->analysisParms diff --git a/src/spicelib/parser/inpaname.c b/src/spicelib/parser/inpaname.c index 662bc88c5..0e1b42eae 100644 --- a/src/spicelib/parser/inpaname.c +++ b/src/spicelib/parser/inpaname.c @@ -40,7 +40,7 @@ INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam, * (name, type, direct pointer) - the type and direct pointer * WILL be set on return unless error is not OK */ - error = (*(sim->findInstance)) (ckt, dev, fast, devnam, (GENmodel *) NULL, + error = sim->findInstance (ckt, dev, fast, devnam, (GENmodel *) NULL, (char *) NULL); if (error) return (error); @@ -58,7 +58,7 @@ INPaName(char *parm, IFvalue * val, CKTcircuit *ckt, int *dev, char *devnam, * above and put the results in the IFvalue structure our caller * gave us originally */ - error = (*(sim->askInstanceQuest)) (ckt, *fast, + error = sim->askInstanceQuest (ckt, *fast, (*(sim->devices)[*dev]). instanceParms[i].id, val, selector); diff --git a/src/spicelib/parser/inpapnam.c b/src/spicelib/parser/inpapnam.c index 03d519bb9..b66a45fda 100644 --- a/src/spicelib/parser/inpapnam.c +++ b/src/spicelib/parser/inpapnam.c @@ -22,7 +22,7 @@ INPapName(CKTcircuit *ckt, int type, JOB *analPtr, char *parmname, if (strcmp(parmname, ft_sim->analyses[type]->analysisParms[i].keyword) == 0) { - return (*(ft_sim->setAnalysisParm)) (ckt, analPtr, + return ft_sim->setAnalysisParm (ckt, analPtr, ft_sim-> analyses[type]-> analysisParms[i].id, diff --git a/src/spicelib/parser/inpdoopt.c b/src/spicelib/parser/inpdoopt.c index 8355f35b8..85ba07750 100644 --- a/src/spicelib/parser/inpdoopt.c +++ b/src/spicelib/parser/inpdoopt.c @@ -66,7 +66,7 @@ INPdoOpts( if(prm->analysisParms[i].dataType & IF_SET) { val = INPgetValue(ckt,&line, prm->analysisParms[i].dataType&IF_VARTYPES, tab); - error = (*(ft_sim->setAnalysisParm))(ckt,anal, + error = ft_sim->setAnalysisParm (ckt, anal, prm->analysisParms[i].id,val,(IFvalue*)NULL); if(error) { errmsg = TMALLOC(char, 35 + strlen(token)); diff --git a/src/spicelib/parser/inpdpar.c b/src/spicelib/parser/inpdpar.c index ae807bd97..3f2c1af3b 100644 --- a/src/spicelib/parser/inpdpar.c +++ b/src/spicelib/parser/inpdpar.c @@ -65,7 +65,7 @@ char *INPdevParse(char **line, CKTcircuit *ckt, int dev, GENinstance *fast, rtn = (INPerror(E_PARMVAL)); goto quit; } - error = (*(ft_sim->setInstanceParm)) (ckt, fast, + error = ft_sim->setInstanceParm (ckt, fast, (*(ft_sim->devices) [dev]). instanceParms[i].id, diff --git a/src/spicelib/parser/inpgmod.c b/src/spicelib/parser/inpgmod.c index 1732d7544..e01c506a8 100644 --- a/src/spicelib/parser/inpgmod.c +++ b/src/spicelib/parser/inpgmod.c @@ -50,7 +50,7 @@ create_model( CKTcircuit* ckt, INPmodel* modtmp, INPtables* tab ) char *endptr; double dval; /* not already defined, so create & give parameters */ - error = (*(ft_sim->newModel))(ckt, (modtmp)->INPmodType, &((modtmp)->INPmodfast), (modtmp)->INPmodName); + error = ft_sim->newModel (ckt, modtmp->INPmodType, &(modtmp->INPmodfast), modtmp->INPmodName); if (error) return error; @@ -98,7 +98,7 @@ create_model( CKTcircuit* ckt, INPmodel* modtmp, INPtables* tab ) val = INPgetValue(ckt, &line, ((* (ft_sim->devices)[(modtmp)->INPmodType]).modelParms[j].dataType), tab); - error = (*(ft_sim->setModelParm)) (ckt, ((modtmp)->INPmodfast), + error = ft_sim->setModelParm (ckt, modtmp->INPmodfast, (* (ft_sim->devices)[(modtmp)->INPmodType]).modelParms[j].id, val, (IFvalue *) NULL); if (error) @@ -377,7 +377,7 @@ INPparseNumMod( CKTcircuit* ckt, INPmodel *model, INPtables *tab, char **errMess if (cardType >= 0) { /* Add card structure to model */ info = INPcardTab[cardType]; - error = (*(info->newCard))( (void **)&tmpCard, + error = info->newCard ((void **) &tmpCard, model->INPmodfast ); if (error) return(error); /* Handle parameter-less cards */ @@ -441,7 +441,7 @@ INPparseNumMod( CKTcircuit* ckt, INPmodel *model, INPtables *tab, char **errMess err = INPerrCat(err, tmp); } } - error = (*(info->setCardParm))( + error = info->setCardParm ( ((info->cardParms)[idx]).id, value, tmpCard ); if (error) return(error); } diff --git a/src/spicelib/parser/inpgtitl.c b/src/spicelib/parser/inpgtitl.c index 9113ce4ef..43e4b304a 100644 --- a/src/spicelib/parser/inpgtitl.c +++ b/src/spicelib/parser/inpgtitl.c @@ -20,7 +20,7 @@ int INPgetTitle(CKTcircuit **ckt, card ** data) { int error; - error = (*(ft_sim->newCircuit)) (ckt); + error = ft_sim->newCircuit (ckt); if (error) return (error); *data = (*data)->nextcard; diff --git a/src/spicelib/parser/inppname.c b/src/spicelib/parser/inppname.c index 994fd181f..c3a57d4ad 100644 --- a/src/spicelib/parser/inppname.c +++ b/src/spicelib/parser/inppname.c @@ -32,7 +32,7 @@ int INPpName(char *parm, IFvalue * val, CKTcircuit *ckt, int dev, GENinstance *f ((*(ft_sim->devices)[dev]).instanceParms[i].keyword)) == 0) { error = - (*(ft_sim->setInstanceParm)) (ckt, fast, + ft_sim->setInstanceParm (ckt, fast, (*(ft_sim->devices)[dev]). instanceParms[i].id, val, (IFvalue *) NULL); diff --git a/src/spicelib/parser/inpsymt.c b/src/spicelib/parser/inpsymt.c index 84907f0f5..5e48a981c 100644 --- a/src/spicelib/parser/inpsymt.c +++ b/src/spicelib/parser/inpsymt.c @@ -60,7 +60,7 @@ int INPtermInsert(CKTcircuit *ckt, char **token, INPtables * tab, CKTnode **node if (t == (struct INPnTab *) NULL) return (E_NOMEM); ZERO(t, struct INPnTab); - error = (*(ft_sim->newNode)) (ckt, &t->t_node, *token); + error = ft_sim->newNode (ckt, &(t->t_node), *token); if (error) return (error); if (node) @@ -126,7 +126,7 @@ int INPgndInsert(CKTcircuit *ckt, char **token, INPtables * tab, CKTnode **node) if (t == (struct INPnTab *) NULL) return (E_NOMEM); ZERO(t, struct INPnTab); - error = (*(ft_sim->groundNode)) (ckt, &t->t_node, *token); + error = ft_sim->groundNode (ckt, &(t->t_node), *token); if (error) return (error); if (node) diff --git a/src/tclspice.c b/src/tclspice.c index 2443d3280..a8a72fae8 100755 --- a/src/tclspice.c +++ b/src/tclspice.c @@ -1235,10 +1235,10 @@ static int get_param TCL_CMDPROCARGS(clientData,interp,argc,argv) { device = (char *)argv[1]; param = (char *)argv[2]; /* copied from old_show(wordlist *) */ - v = (*if_getparam)(ft_curckt->ci_ckt, + v = if_getparam (ft_curckt->ci_ckt, &device, param, 0, 0); if (!v) - v = (*if_getparam)(ft_curckt->ci_ckt, + v = if_getparam (ft_curckt->ci_ckt, &device, param, 0, 1); if (v) { wl = cp_varwl(v); @@ -1296,11 +1296,11 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) { /* get the unique IFuid for name (device/model) */ INPretrieve(&name, ft_curckt->ci_symtab); - err = (*(ft_sim->findInstance))(ft_curckt->ci_ckt,&typecode,&devptr,name,NULL,NULL); + err = ft_sim->findInstance (ft_curckt->ci_ckt, &typecode, &devptr, name, NULL, NULL); if (err != OK) { typecode = -1; devptr = NULL; - err = (*(ft_sim->findModel))(ft_curckt->ci_ckt,&typecode,&modptr,name); + err = ft_sim->findModel (ft_curckt->ci_ckt, &typecode, &modptr, name); } if (err != OK) { sprintf(buf,"No such device or model name %s",name); @@ -1317,10 +1317,10 @@ int get_mod_param TCL_CMDPROCARGS(clientData,interp,argc,argv) { found=TRUE; } else if (strcmp(paramname,opt->keyword)==0) { if (devptr) - err = (*(ft_sim->askInstanceQuest))(ft_curckt->ci_ckt, devptr, + err = ft_sim->askInstanceQuest (ft_curckt->ci_ckt, devptr, opt->id, &pv, (IFvalue *)NULL); else - err = (*(ft_sim->askModelQuest))(ft_curckt->ci_ckt, modptr, + err = ft_sim->askModelQuest (ft_curckt->ci_ckt, modptr, opt->id, &pv, (IFvalue *)NULL); if (err==OK) { sprintf(buf,"%g",pv.rValue); /* dataType is here always real */ diff --git a/src/unsupported/cktsenup.c b/src/unsupported/cktsenup.c index c20d37404..dcec0008c 100644 --- a/src/unsupported/cktsenup.c +++ b/src/unsupported/cktsenup.c @@ -30,9 +30,8 @@ register CKTcircuit *ckt; for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVsenUpdate))(ckt->CKThead[i],ckt); + if ( DEVices[i]->DEVsenUpdate && ckt->CKThead[i] ) { + error = DEVices[i]->DEVsenUpdate (ckt->CKThead[i], ckt); if(error) return(error); } } diff --git a/src/unsupported/cktsnld.c b/src/unsupported/cktsnld.c index 589b2226e..1d2246d78 100644 --- a/src/unsupported/cktsnld.c +++ b/src/unsupported/cktsnld.c @@ -43,9 +43,8 @@ register CKTcircuit *ckt; } } for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVsenLoad))(ckt->CKThead[i],ckt); + if ( DEVices[i]->DEVsenLoad && ckt->CKThead[i] ) { + error = DEVices[i]->DEVsenLoad (ckt->CKThead[i], ckt); if(error) return(error); } } @@ -57,9 +56,8 @@ register CKTcircuit *ckt; } } for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVsenAcLoad))(ckt->CKThead[i],ckt); + if ( DEVices[i]->DEVsenAcLoad && ckt->CKThead[i] ) { + error = DEVices[i]->DEVsenAcLoad (ckt->CKThead[i], ckt); if(error) return(error); } } diff --git a/src/unsupported/cktsnprt.c b/src/unsupported/cktsnprt.c index 79e6aff1e..fc07ce1ee 100644 --- a/src/unsupported/cktsnprt.c +++ b/src/unsupported/cktsnprt.c @@ -28,8 +28,8 @@ register CKTcircuit *ckt; register int i; for (i=0;iCKThead[i] != NULL) ){ - (*((*DEVices[i]).DEVsenPrint))(ckt->CKThead[i],ckt); + if ( DEVices[i]->DEVsenPrint && ckt->CKThead[i] ) { + DEVices[i]->DEVsenPrint (ckt->CKThead[i], ckt); } } } diff --git a/src/unsupported/cktsnset.c b/src/unsupported/cktsnset.c index 1aa9eab4d..1f7f0ee98 100644 --- a/src/unsupported/cktsnset.c +++ b/src/unsupported/cktsnset.c @@ -38,9 +38,8 @@ register CKTcircuit *ckt; info->SENparms = 0; for (i=0;iCKThead[i] != NULL) ){ - error = (*((*DEVices[i]).DEVsenSetup))(info,ckt->CKThead[i]); + if ( DEVices[i]->DEVsenSetup && ckt->CKThead[i] ) { + error = DEVices[i]->DEVsenSetup (info, ckt->CKThead[i]); if(error) return(error); } } diff --git a/src/xspice/evt/evtdeque.c b/src/xspice/evt/evtdeque.c index 3f70ce18b..464c279b3 100755 --- a/src/xspice/evt/evtdeque.c +++ b/src/xspice/evt/evtdeque.c @@ -330,26 +330,26 @@ static void EVTprocess_output( /* we have setup the structures (rhs and rhsold must match)... */ if(num_outputs > 1) { output_subindex = output_table[output_index]->output_subindex; - (*(g_evt_udn_info[udn_index]->compare)) + g_evt_udn_info[udn_index]->compare (value, rhsold[node_index].output_value[output_subindex], &equal); if(! equal) { - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (value, rhs[node_index].output_value[output_subindex]); - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (value, rhsold[node_index].output_value[output_subindex]); } } else { - (*(g_evt_udn_info[udn_index]->compare)) + g_evt_udn_info[udn_index]->compare (value, rhsold[node_index].node_value, &equal); if(! equal) { - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (value, rhs[node_index].node_value); - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (value, rhsold[node_index].node_value); } } diff --git a/src/xspice/evt/evtdump.c b/src/xspice/evt/evtdump.c index 7c5220b47..88e4c581f 100755 --- a/src/xspice/evt/evtdump.c +++ b/src/xspice/evt/evtdump.c @@ -329,17 +329,17 @@ static void EVTsend_line( /* Get the data to send */ if(g_evt_udn_info[udn_index]->plot_val) - (*(g_evt_udn_info[udn_index]->plot_val)) (node_value, "", &dvalue); + g_evt_udn_info[udn_index]->plot_val (node_value, "", &dvalue); else dvalue = 0.0; if(g_evt_udn_info[udn_index]->print_val) - (*(g_evt_udn_info[udn_index]->print_val)) (node_value, "", &svalue); + g_evt_udn_info[udn_index]->print_val (node_value, "", &svalue); else svalue = ""; if(g_evt_udn_info[udn_index]->ipc_val) - (*(g_evt_udn_info[udn_index]->ipc_val)) (node_value, &pvalue, &len); + g_evt_udn_info[udn_index]->ipc_val (node_value, &pvalue, &len); else { pvalue = NULL; len = 0; diff --git a/src/xspice/evt/evtiter.c b/src/xspice/evt/evtiter.c index bdefb399e..4e4c66304 100755 --- a/src/xspice/evt/evtiter.c +++ b/src/xspice/evt/evtiter.c @@ -187,16 +187,16 @@ int EVTiter( /* Resolve the node value if multiple outputs on it */ /* and test if new node value is different than old value */ if(num_outputs > 1) { - (*(g_evt_udn_info[udn_index]->resolve)) + g_evt_udn_info[udn_index]->resolve (num_outputs, rhs[node_index].output_value, rhs[node_index].node_value); - (*(g_evt_udn_info[udn_index]->compare)) + g_evt_udn_info[udn_index]->compare (rhs[node_index].node_value, rhsold[node_index].node_value, &equal); if(! equal) { - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (rhs[node_index].node_value, rhsold[node_index].node_value); } @@ -211,10 +211,10 @@ int EVTiter( /* to the node in the to_call list of inst queue */ if(! equal) { if(node_table[node_index]->invert) { - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (rhsold[node_index].node_value, rhsold[node_index].inverted_value); - (*(g_evt_udn_info[udn_index]->invert)) + g_evt_udn_info[udn_index]->invert (rhsold[node_index].inverted_value); } inst_list = node_table[node_index]->inst_list; @@ -292,7 +292,7 @@ int EVTiter( } FREE(err_msg); - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Too many iteration passes in event-driven circuits", (IFuid *) NULL); return(E_ITERLIM); diff --git a/src/xspice/evt/evtload.c b/src/xspice/evt/evtload.c index d78e1596d..70593285f 100755 --- a/src/xspice/evt/evtload.c +++ b/src/xspice/evt/evtload.c @@ -234,7 +234,7 @@ int EVTload( /* ******************* */ mod_type = inst->MIFmodPtr->MIFmodType; - (*(DEVices[mod_type]->DEVpublic.cm_func)) (&cm_data); + DEVices[mod_type]->DEVpublic.cm_func (&cm_data); /* ****************************** */ @@ -401,7 +401,7 @@ static void EVTcreate_output_event( /* Initialize the value */ node_table = ckt->evt->info.node_table; udn_index = node_table[node_index]->udn_index; - (*(g_evt_udn_info[udn_index]->create)) (&(event->value)); + g_evt_udn_info[udn_index]->create (&(event->value)); /* Put the event onto the free list and return the value pointer */ output_queue->free[output_index] = event; @@ -528,7 +528,7 @@ static void EVTprocess_output( output_queue->free[output_index] = output_event->next; /* Invert the output value if necessary */ if(invert) - (*(g_evt_udn_info[udn_index]->invert)) + g_evt_udn_info[udn_index]->invert (output_event->value); /* Add it to the queue */ EVTqueue_output(ckt, output_index, udn_index, output_event, @@ -557,28 +557,28 @@ static void EVTprocess_output( if(num_outputs > 1) { output_subindex = output_table[output_index]->output_subindex; if(invert) - (*(g_evt_udn_info[udn_index]->invert)) + g_evt_udn_info[udn_index]->invert (rhs[node_index].output_value[output_subindex]); - (*(g_evt_udn_info[udn_index]->compare)) + g_evt_udn_info[udn_index]->compare (rhs[node_index].output_value[output_subindex], rhsold[node_index].output_value[output_subindex], &equal); if(! equal) { - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (rhs[node_index].output_value[output_subindex], rhsold[node_index].output_value[output_subindex]); } } else { if(invert) - (*(g_evt_udn_info[udn_index]->invert)) + g_evt_udn_info[udn_index]->invert (rhs[node_index].node_value); - (*(g_evt_udn_info[udn_index]->compare)) + g_evt_udn_info[udn_index]->compare (rhs[node_index].node_value, rhsold[node_index].node_value, &equal); if(! equal) { - (*(g_evt_udn_info[udn_index]->copy)) + g_evt_udn_info[udn_index]->copy (rhs[node_index].node_value, rhsold[node_index].node_value); } diff --git a/src/xspice/evt/evtnode_copy.c b/src/xspice/evt/evtnode_copy.c index dde0a0558..7d1a21c15 100755 --- a/src/xspice/evt/evtnode_copy.c +++ b/src/xspice/evt/evtnode_copy.c @@ -123,17 +123,17 @@ void EVTnode_copy( for(i = 0; i < num_outputs; i++) { - (*(g_evt_udn_info[udn_index]->create)) + g_evt_udn_info[udn_index]->create ( &(here->output_value[i]) ); } } here->node_value = NULL; - (*(g_evt_udn_info[udn_index]->create)) ( &(here->node_value) ); + g_evt_udn_info[udn_index]->create ( &(here->node_value) ); if(invert) - (*(g_evt_udn_info[udn_index]->create)) ( &(here->inverted_value) ); + g_evt_udn_info[udn_index]->create ( &(here->inverted_value) ); } @@ -146,14 +146,14 @@ void EVTnode_copy( { for(i = 0; i < num_outputs; i++) { - (*(g_evt_udn_info[udn_index]->copy)) (from->output_value[i], + g_evt_udn_info[udn_index]->copy (from->output_value[i], here->output_value[i]); } } - (*(g_evt_udn_info[udn_index]->copy)) (from->node_value, here->node_value); + g_evt_udn_info[udn_index]->copy (from->node_value, here->node_value); if(invert) { - (*(g_evt_udn_info[udn_index]->copy)) (from->inverted_value, + g_evt_udn_info[udn_index]->copy (from->inverted_value, here->inverted_value); } } diff --git a/src/xspice/evt/evtop.c b/src/xspice/evt/evtop.c index 4760c47e8..b0709e238 100755 --- a/src/xspice/evt/evtop.c +++ b/src/xspice/evt/evtop.c @@ -174,7 +174,7 @@ int EVTop( if(ckt->evt->data.statistics->op_alternations >= ckt->evt->limits.max_op_alternations) { - (*(SPfrontEnd->IFerror)) (ERR_WARNING, + SPfrontEnd->IFerror (ERR_WARNING, "Too many analog/event-driven solution alternations", (IFuid *) NULL); @@ -314,7 +314,7 @@ static void EVTnode_compare( /* Do compare based on changes in resolved node value only */ - (*(g_evt_udn_info[udn_index]->compare)) ( + g_evt_udn_info[udn_index]->compare ( node1->node_value, node2->node_value, equal); diff --git a/src/xspice/evt/evtplot.c b/src/xspice/evt/evtplot.c index d88a6e296..1119dca86 100755 --- a/src/xspice/evt/evtplot.c +++ b/src/xspice/evt/evtplot.c @@ -176,7 +176,7 @@ struct dvec *EVTfindvec( /* Get the next value by calling the appropriate UDN plot_val function */ value = 0.0; - (*(g_evt_udn_info[udn_index]->plot_val)) (event->node_value, + g_evt_udn_info[udn_index]->plot_val (event->node_value, member, &value); diff --git a/src/xspice/evt/evtsetup.c b/src/xspice/evt/evtsetup.c index 1db813c7b..358d0072b 100755 --- a/src/xspice/evt/evtsetup.c +++ b/src/xspice/evt/evtsetup.c @@ -355,21 +355,21 @@ static int EVTsetup_data( CKALLOC(rhs->output_value, num_outputs, void *) CKALLOC(rhsold->output_value, num_outputs, void *) for(j = 0; j < num_outputs; j++) { - (*(g_evt_udn_info[udn_index]->create)) (&(rhs->output_value[j])); - (*(g_evt_udn_info[udn_index]->initialize)) (rhs->output_value[j]); - (*(g_evt_udn_info[udn_index]->create)) (&(rhsold->output_value[j])); - (*(g_evt_udn_info[udn_index]->initialize)) (rhsold->output_value[j]); + g_evt_udn_info[udn_index]->create (&(rhs->output_value[j])); + g_evt_udn_info[udn_index]->initialize (rhs->output_value[j]); + g_evt_udn_info[udn_index]->create (&(rhsold->output_value[j])); + g_evt_udn_info[udn_index]->initialize (rhsold->output_value[j]); } } - (*(g_evt_udn_info[udn_index]->create)) (&(rhs->node_value)); - (*(g_evt_udn_info[udn_index]->initialize)) (rhs->node_value); - (*(g_evt_udn_info[udn_index]->create)) (&(rhsold->node_value)); - (*(g_evt_udn_info[udn_index]->initialize)) (rhsold->node_value); + g_evt_udn_info[udn_index]->create (&(rhs->node_value)); + g_evt_udn_info[udn_index]->initialize (rhs->node_value); + g_evt_udn_info[udn_index]->create (&(rhsold->node_value)); + g_evt_udn_info[udn_index]->initialize (rhsold->node_value); if(invert) { - (*(g_evt_udn_info[udn_index]->create)) (&(rhs->inverted_value)); - (*(g_evt_udn_info[udn_index]->initialize)) (rhs->inverted_value); - (*(g_evt_udn_info[udn_index]->create)) (&(rhsold->inverted_value)); - (*(g_evt_udn_info[udn_index]->initialize)) (rhsold->inverted_value); + g_evt_udn_info[udn_index]->create (&(rhs->inverted_value)); + g_evt_udn_info[udn_index]->initialize (rhs->inverted_value); + g_evt_udn_info[udn_index]->create (&(rhsold->inverted_value)); + g_evt_udn_info[udn_index]->initialize (rhsold->inverted_value); } /* Initialize the total load value to zero */ diff --git a/src/xspice/mif/mifgetmod.c b/src/xspice/mif/mifgetmod.c index 9fa8ecef7..b2136883f 100755 --- a/src/xspice/mif/mifgetmod.c +++ b/src/xspice/mif/mifgetmod.c @@ -161,7 +161,7 @@ char *MIFgetMod( if(! ((modtmp)->INPmodUsed )) { /* not already processed, so create data struct */ - error = (*(ft_sim->newModel))( ckt,(modtmp)->INPmodType, + error = ft_sim->newModel ( ckt, modtmp->INPmodType, &((modtmp)->INPmodfast), (modtmp)->INPmodName); if(error) return(INPerror(error)); @@ -203,7 +203,7 @@ char *MIFgetMod( sprintf(err2, "MIF-ERROR - model: %s - %s\n", name, err1); return(err2); } - error = (*(ft_sim->setModelParm))(ckt, + error = ft_sim->setModelParm (ckt, ((modtmp)->INPmodfast), (*(ft_sim->devices)[(modtmp)->INPmodType ]). modelParms[j].id,val,(IFvalue*)NULL); diff --git a/src/xspice/mif/mifload.c b/src/xspice/mif/mifload.c index de2339c10..b36fbe3a4 100755 --- a/src/xspice/mif/mifload.c +++ b/src/xspice/mif/mifload.c @@ -442,7 +442,7 @@ MIFload( /* ******************* */ /* Call the code model */ /* ******************* */ - (*(DEVices[mod_type]->DEVpublic.cm_func)) (&cm_data); + DEVices[mod_type]->DEVpublic.cm_func (&cm_data); /* Automatically compute partials if requested by .options auto_partial */ /* or by model through call to cm_analog_auto_partial() in DC or TRAN analysis */ @@ -829,7 +829,7 @@ static void MIFauto_partial( /* call model to compute new outputs */ - (*cm_func)(cm_data); + cm_func (cm_data); /* ******************************************************* */ @@ -888,7 +888,7 @@ static void MIFauto_partial( /* the model may compute other state values that cannot be restored */ /* to the nominal condition from here */ - (*cm_func)(cm_data); + cm_func (cm_data); } diff --git a/src/xspice/mif/mifsetup.c b/src/xspice/mif/mifsetup.c index 67683f409..6bfa90698 100755 --- a/src/xspice/mif/mifsetup.c +++ b/src/xspice/mif/mifsetup.c @@ -354,7 +354,7 @@ MIFsetup( IFuid names[2]; names[0] = here->MIFname; names[1] = (IFuid) here->conn[i]->port[j]->vsource_str; - (*(SPfrontEnd->IFerror))(ERR_FATAL, + SPfrontEnd->IFerror (ERR_FATAL, "%s: unknown controlling source %s",names); return(E_BADPARM); } diff --git a/xgraph/alloc.c b/xgraph/alloc.c index 357771c05..33660a461 100644 --- a/xgraph/alloc.c +++ b/xgraph/alloc.c @@ -13,7 +13,10 @@ * void MemChain(); * * $Log$ - * Revision 1.1 2004-01-25 09:00:49 pnenzi + * Revision 1.2 2011-04-27 18:30:17 rlar + * code cleanup + * + * Revision 1.1 2004/01/25 09:00:49 pnenzi * * Added xgraph plotting program. * @@ -131,8 +134,8 @@ Ptr tptr; abort(); } - ptr = (tptr == (Ptr) 0) ? (char *) (*routine) (n + OVERHEAD) : - (char *) (*routine) (tptr, n + OVERHEAD); + ptr = (tptr == (Ptr) 0) ? (char *) routine (n + OVERHEAD) : + (char *) routine (tptr, n + OVERHEAD); if (ptr == NIL(char)) { if (tptr != (Ptr) 0) diff --git a/xgraph/st.c b/xgraph/st.c index eb8bd67ec..5e9b4a55b 100644 --- a/xgraph/st.c +++ b/xgraph/st.c @@ -30,7 +30,7 @@ #define do_hash(key, table)\ ((table->hash == st_ptrhash) ? ST_PTRHASH((key),(table)->num_bins) :\ (table->hash == st_numhash) ? ST_NUMHASH((key), (table)->num_bins) :\ - (*table->hash)((key), (table)->num_bins)) + table->hash ((key), (table)->num_bins)) char st_pkg_name[] = "st"; @@ -416,7 +416,7 @@ char *arg; last = &table->bins[i]; ptr = *last; while (ptr != nil(st_table_entry)) { - retval = (*func) (ptr->key, ptr->record, arg); + retval = func (ptr->key, ptr->record, arg); switch (retval) { case ST_CONTINUE: last = &ptr->next; diff --git a/xgraph/xgraph.c b/xgraph/xgraph.c index 4a836e55e..296fdc79e 100644 --- a/xgraph/xgraph.c +++ b/xgraph/xgraph.c @@ -10,7 +10,10 @@ * of this software. * * $Log$ - * Revision 1.1 2004-01-25 09:00:49 pnenzi + * Revision 1.2 2011-04-27 18:30:17 rlar + * code cleanup + * + * Revision 1.1 2004/01/25 09:00:49 pnenzi * * Added xgraph plotting program. * @@ -1179,7 +1182,7 @@ int doc_p; /* Documentation predicate */ flags = 0; if (doc_p) flags |= D_DOCU; - if ((*init_fun) (out_stream, final_w, final_h, ti_fam, ti_size, + if (init_fun (out_stream, final_w, final_h, ti_fam, ti_size, ax_fam, ax_size, flags, &(thisWin.dev_info), ierr)) { DrawWindow(&thisWin); if (thisWin.dev_info.xg_end) { diff --git a/xgraph/xtb.c b/xgraph/xtb.c index 92a19fbe4..f406058dc 100644 --- a/xgraph/xtb.c +++ b/xgraph/xtb.c @@ -236,7 +236,7 @@ XEvent *evt; if (!XFindContext(t_disp, evt->xany.window, h_context, (caddr_t *) & info)) { if (info->func) - return (*info->func) (evt, info->info); + return info->func (evt, info->info); else return XTB_NOTDEF; } @@ -373,7 +373,7 @@ xtb_data info; break; case ButtonRelease: if (!ri->na) - rtn = (*ri->func) (win, ri->flag, ri->val); + rtn = ri->func (win, ri->flag, ri->val); break; default: rtn = XTB_NOTDEF; @@ -546,7 +546,7 @@ xtb_data info; (void) xtb_bt_set(win, 1, (xtb_data) 0, 0); /* Callback */ if (real_info->func) { - return (*real_info->func) (real_info->main_win, + return real_info->func (real_info->main_win, prev, real_info->which_one, real_info->val); } @@ -939,7 +939,7 @@ xtb_data info; (KeySym *) 0, (XComposeStatus *) 0); for (i = 0; i < nbytes; i++) { (void) strcpy(textcopy, ri->text); - if ((rtn = (*ri->func) (win, (int) keys[i], + if ((rtn = ri->func (win, (int) keys[i], textcopy, ri->val)) == XTB_STOP) break; }