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

* src/analysis/*.c: Removed register keywords, as they are 

useless with the current compilers.
This commit is contained in:
arno 2000-06-17 14:42:03 +00:00
parent 9827360a33
commit 4df9e9a410
46 changed files with 97 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/analysis/acan.c
View File

@ -225,11 +225,11 @@ endsweep:
int
CKTacLoad(register CKTcircuit *ckt)
CKTacLoad(CKTcircuit *ckt)
{
extern SPICEdev *DEVices[];
register int i;
register int size;
int i;
int size;
int error;
#ifdef PARALLEL_ARCH
long type = MT_ACLOAD, length = 1;

4
src/analysis/cktaccpt.c
View File

@ -18,11 +18,11 @@ Author: 1985 Thomas L. Quarles
int
CKTaccept(register CKTcircuit *ckt)
CKTaccept(CKTcircuit *ckt)
{
extern SPICEdev *DEVices[];
register int i;
int i;
int error;
for (i=0;i<DEVmaxnum;i++) {

10
src/analysis/cktacdum.c
View File

@ -18,12 +18,12 @@ Author: 1985 Thomas L. Quarles
int
CKTacDump(register CKTcircuit *ckt, double freq, void *plot)
CKTacDump(CKTcircuit *ckt, double freq, void *plot)
{
register double *rhsold;
register double *irhsold;
register int i;
register IFcomplex *data;
double *rhsold;
double *irhsold;
int i;
IFcomplex *data;
IFvalue freqData;
IFvalue valueData;

2
src/analysis/cktask.c
View File

@ -20,7 +20,7 @@ extern SPICEdev *DEVices[];
int
CKTask(void *ckt, void *fast, int which, IFvalue *value, IFvalue *selector)
{
register int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
int error;
#ifdef PARALLEL_ARCH
long msgtype, length;

2
src/analysis/cktaskaq.c
View File

@ -18,7 +18,7 @@ extern SPICEanalysis *analInfo[];
int
CKTaskAnalQ(void *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector)
{
register int type = ((JOB *)analPtr)->JOBtype;
int type = ((JOB *)analPtr)->JOBtype;
if((analInfo[type]->askQuest) == NULL) return(E_BADPARM);
return( (*(analInfo[type]->askQuest))((CKTcircuit*)ckt,analPtr,parm,value));

2
src/analysis/cktbindn.c
View File

@ -24,7 +24,7 @@ int
CKTbindNode(void *ckt, void *fast, int term, void *node)
{
int mappednode;
register int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
int type = ((GENinstance *)fast)->GENmodPtr->GENmodType;
mappednode = ((CKTnode *)node)->number;

2
src/analysis/cktbkdum.c
View File

@ -18,7 +18,7 @@ Author: 1985 Thomas L. Quarles
void
CKTbreakDump(CKTcircuit *ckt)
{
register int i;
int i;
for(i=0;i<ckt->CKTbreakSize;i++) {
(void)printf("breakpoint table entry %d is %g\n",i,*(ckt->CKTbreaks+i));
}

4
src/analysis/cktclrbk.c
View File

@ -17,10 +17,10 @@ Author: 1985 Thomas L. Quarles
int
CKTclrBreak(register CKTcircuit *ckt)
CKTclrBreak(CKTcircuit *ckt)
{
double *tmp;
register int j;
int j;
if(ckt->CKTbreakSize >2) {
tmp = (double *)MALLOC((ckt->CKTbreakSize-1)*sizeof(double));

8
src/analysis/cktdest.c
View File

@ -24,10 +24,10 @@ extern SPICEdev *DEVices[];
int
CKTdestroy(void *inCkt)
{
register CKTcircuit *ckt = (CKTcircuit *)inCkt;
register int i;
register CKTnode *node;
register CKTnode *nnode;
CKTcircuit *ckt = (CKTcircuit *)inCkt;
int i;
CKTnode *node;
CKTnode *nnode;
#ifdef WANT_SENSE2

14
src/analysis/cktdisto.c
View File

@ -20,11 +20,11 @@ Author: 1988 Jaijeet S Roychowdhury
int
CKTdisto (register CKTcircuit *ckt, int mode)
CKTdisto (CKTcircuit *ckt, int mode)
{
extern SPICEdev *DEVices[];
register DISTOAN* cv = (DISTOAN*) (ckt->CKTcurJob);
register int i;
DISTOAN* cv = (DISTOAN*) (ckt->CKTcurJob);
int i;
int error=0;
int size;
@ -88,8 +88,8 @@ CKTdisto (register CKTcircuit *ckt, int mode)
if(vcode >= 0) {
/* voltage sources are in this version, so use them */
register VSRCinstance *here;
register VSRCmodel *model;
VSRCinstance *here;
VSRCmodel *model;
for(model = (VSRCmodel *)ckt->CKThead[vcode];model != NULL;
model=model->VSRCnextModel){
for(here=model->VSRCinstances;here!=NULL;
@ -123,8 +123,8 @@ if (((here->VSRCdF1given) && (mode == D_RHSF1)) ||
}
if(icode >= 0 ) {
/* current sources are in this version, so use them */
register ISRCinstance *here;
register ISRCmodel *model;
ISRCinstance *here;
ISRCmodel *model;
for(model= (ISRCmodel *)ckt->CKThead[icode];model != NULL;
model=model->ISRCnextModel){

2
src/analysis/cktdump.c
View File

@ -17,7 +17,7 @@ Author: 1985 Thomas L. Quarles
void
CKTdump(register CKTcircuit *ckt, double ref, void *plot)
CKTdump(CKTcircuit *ckt, double ref, void *plot)
{
IFvalue refData;
IFvalue valData;

4
src/analysis/cktfbran.c
View File

@ -19,11 +19,11 @@ Author: 1985 Thomas L. Quarles
int
CKTfndBranch(register CKTcircuit *ckt, IFuid name)
CKTfndBranch(CKTcircuit *ckt, IFuid name)
{
extern SPICEdev *DEVices[];
register int i;
int i;
int j;
for (i=0;i<DEVmaxnum;i++) {

6
src/analysis/cktfdev.c
View File

@ -14,9 +14,9 @@ Author: 1985 Thomas L. Quarles
int
CKTfndDev(void *Ckt, int *type, void **fast, IFuid name, void *modfast, IFuid modname)
{
register CKTcircuit *ckt=(CKTcircuit *)Ckt;
register GENinstance *here;
register GENmodel *mods;
CKTcircuit *ckt=(CKTcircuit *)Ckt;
GENinstance *here;
GENmodel *mods;
if((GENinstance **)fast != (GENinstance **)NULL &&
*(GENinstance **)fast != (GENinstance *)NULL) {

2
src/analysis/cktfnda.c
View File

@ -24,7 +24,7 @@ int
CKTfndAnal(void *ckt, int *analIndex, void **anal, IFuid name, void *inTask, IFuid taskName)
{
TSKtask *task = (TSKtask *)inTask;
register JOB *here;
JOB *here;
for (here = ((TSKtask *)task)->jobs;here;here = here->JOBnextJob) {
if(strcmp(here->JOBname,name)==0) {

2
src/analysis/cktfndm.c
View File

@ -16,7 +16,7 @@ Author: 1985 Thomas L. Quarles
int
CKTfndMod(void *ckt, int *type, void **modfast, IFuid modname)
{
register GENmodel *mods;
GENmodel *mods;
if(modfast != NULL && *(GENmodel **)modfast != NULL) {
/* already have modfast, so nothing to do */

2
src/analysis/cktfnode.c
View File

@ -21,7 +21,7 @@ Author: 1985 Thomas L. Quarles
int
CKTfndNode(void *ckt, void **node, IFuid name)
{
register CKTnode *here;
CKTnode *here;
for (here = ((CKTcircuit *)ckt)->CKTnodes; here; here = here->next) {
if(here->name == name) {

2
src/analysis/cktgrnd.c
View File

@ -20,7 +20,7 @@ Author: 1985 Thomas L. Quarles
int
CKTground(void *inCkt, void **node, IFuid name)
{
register CKTcircuit *ckt = (CKTcircuit *)inCkt;
CKTcircuit *ckt = (CKTcircuit *)inCkt;
if(ckt->CKTnodes) {
if(ckt->CKTnodes->name) {

2
src/analysis/ckti2nod.c
View File

@ -26,7 +26,7 @@ int
CKTinst2Node(void *ckt, void *instPtr, int terminal, void **node, IFuid *nodeName)
{
int nodenum;
register int type;
int type;
CKTnode *here;
type = ((GENinstance *)instPtr)->GENmodPtr->GENmodType;

4
src/analysis/cktinit.c
View File

@ -15,8 +15,8 @@ int
CKTinit(void **ckt)
/* new circuit to create */
{
register int i;
register CKTcircuit *sckt;
int i;
CKTcircuit *sckt;
sckt = (CKTcircuit *)( *ckt = (char *)MALLOC(sizeof(CKTcircuit)) );
if(sckt == NULL) return(E_NOMEM);

6
src/analysis/cktload.c
View File

@ -22,11 +22,11 @@ Author: 1985 Thomas L. Quarles
static int ZeroNoncurRow(SMPmatrix *matrix, CKTnode *nodes, int rownum);
int
CKTload(register CKTcircuit *ckt)
CKTload(CKTcircuit *ckt)
{
extern SPICEdev *DEVices[];
register int i;
register int size;
int i;
int size;
double startTime;
CKTnode *node;
int error;

2
src/analysis/cktmapn.c
View File

@ -22,7 +22,7 @@ Author: 1985 Thomas L. Quarles
int
CKTmapNode(void *ckt, void **node, IFuid name)
{
register CKTnode *here;
CKTnode *here;
int error;
IFuid uid;
CKTnode *mynode;

2
src/analysis/cktmpar.c
View File

@ -21,7 +21,7 @@ extern SPICEdev *DEVices[];
int
CKTmodParam(void *ckt, void *modfast, int param, IFvalue *val, IFvalue *selector)
{
register int type = ((GENmodel *)modfast)->GENmodType;
int type = ((GENmodel *)modfast)->GENmodType;
if (((*DEVices[type]).DEVmodParam)) {
return(((*((*DEVices[type]).DEVmodParam)) (param,val,

8
src/analysis/cktnames.c
View File

@ -17,10 +17,10 @@ Author: 1988 Thomas L. Quarles
int
CKTnames(register CKTcircuit *ckt, int *numNames, register IFuid **nameList)
CKTnames(CKTcircuit *ckt, int *numNames, IFuid **nameList)
{
register CKTnode *here;
register int i;
CKTnode *here;
int i;
*numNames = ckt->CKTmaxEqNum-1;
*nameList = (IFuid *)MALLOC(*numNames * sizeof(IFuid ));
if ((*nameList) == (IFuid *)NULL) return(E_NOMEM);
@ -35,7 +35,7 @@ int
CKTdnames(CKTcircuit *ckt)
{
CKTnode *here;
register int i;
int i;
i=0;
for (here = ckt->CKTnodes->next; here; here = here->next) {

2
src/analysis/cktneweq.c
View File

@ -23,7 +23,7 @@ int
CKTnewEq(void *inCkt, void **node, IFuid name)
{
CKTnode *mynode;
register CKTcircuit *ckt = (CKTcircuit *)inCkt;
CKTcircuit *ckt = (CKTcircuit *)inCkt;
int error;
error = CKTmkNode(ckt,&mynode);

2
src/analysis/cktnewn.c
View File

@ -23,7 +23,7 @@ Author: 1985 Thomas L. Quarles
int
CKTnewNode(void *inCkt, void **node, IFuid name)
{
register CKTcircuit *ckt = (CKTcircuit *)inCkt;
CKTcircuit *ckt = (CKTcircuit *)inCkt;
if(!(ckt->CKTnodes)) { /* starting the list - allocate both ground and 1 */
ckt->CKTnodes = (CKTnode *) MALLOC(sizeof(CKTnode));
if(ckt->CKTnodes == (CKTnode *)NULL) return(E_NOMEM);

4
src/analysis/cktnodn.c
View File

@ -18,9 +18,9 @@ Author: 1985 Thomas L. Quarles
IFuid
CKTnodName(CKTcircuit *ckt, register int nodenum)
CKTnodName(CKTcircuit *ckt, int nodenum)
{
register CKTnode *here;
CKTnode *here;
for(here = ckt->CKTnodes;here; here = here->next) {
if(here->number == nodenum) {

3
src/analysis/cktntask.c
View File

@ -17,7 +17,8 @@ Author: 1985 Thomas L. Quarles
int
CKTnewTask(void *ckt, void **taskPtr, IFuid taskName)
{
register TSKtask *tsk;
TSKtask *tsk;
*taskPtr = (void *)MALLOC(sizeof(TSKtask));
if(*taskPtr==NULL) return(E_NOMEM);
tsk = *(TSKtask **)taskPtr;

2
src/analysis/cktnum2n.c
View File

@ -21,7 +21,7 @@ Author: 1985 Thomas L. Quarles
CKTnode *
CKTnum2nod(CKTcircuit *ckt, int node)
{
register CKTnode *here;
CKTnode *here;
for (here = ((CKTcircuit *)ckt)->CKTnodes; here; here = here->next) {
if(here->number == node) {

4
src/analysis/cktop.c
View File

@ -104,10 +104,10 @@ CKTop(CKTcircuit *ckt, long int firstmode, long int continuemode, int iterlim)
*/
int
CKTconvTest(register CKTcircuit *ckt)
CKTconvTest(CKTcircuit *ckt)
{
extern SPICEdev *DEVices[];
register int i;
int i;
int error = OK;
#ifdef PARALLEL_ARCH
int ibuf[2];

2
src/analysis/cktparam.c
View File

@ -22,7 +22,7 @@ extern SPICEdev *DEVices[];
int
CKTparam(void *ckt, void *fast, int param, IFvalue *val, IFvalue *selector)
{
register int type;
int type;
GENinstance *myfast = (GENinstance *)fast;
type = myfast->GENmodPtr->GENmodType;
if(((*DEVices[type]).DEVparam)) {

8
src/analysis/cktpartn.c
View File

@ -21,11 +21,11 @@ Author: 1992 David A. Gates, UC Berkeley CADgroup
extern SPICEdev *DEVices[];
int
CKTpartition(register CKTcircuit *ckt)
CKTpartition(CKTcircuit *ckt)
{
register int i, instNum = 0;
register GENmodel *model;
register GENinstance *inst;
int i, instNum = 0;
GENmodel *model;
GENinstance *inst;
for (i=0;i<DEVmaxnum;i++) {
if ( (ckt->CKThead[i] != NULL) ) {

2
src/analysis/cktpzset.c
View File

@ -17,7 +17,7 @@ Copyright 1990 Regents of the University of California. All rights reserved.
int
CKTpzSetup(register CKTcircuit *ckt, int type)
CKTpzSetup(CKTcircuit *ckt, int type)
{
extern SPICEdev *DEVices[];
PZAN *pzan = (PZAN *) ckt->CKTcurJob;

2
src/analysis/cktsetap.c
View File

@ -18,7 +18,7 @@ extern SPICEanalysis *analInfo[];
int
CKTsetAnalPm(void *ckt, void *analPtr, int parm, IFvalue *value, IFvalue *selector)
{
register int type = ((JOB *)analPtr)->JOBtype;
int type = ((JOB *)analPtr)->JOBtype;
if((analInfo[type]->setParm)==NULL) return(E_BADPARM);
return( (*(analInfo[type]->setParm))(ckt,analPtr,parm,value) );
}

4
src/analysis/cktsetbk.c
View File

@ -18,10 +18,10 @@ Author: 1985 Thomas L. Quarles
int
CKTsetBreak(register CKTcircuit *ckt, double time)
CKTsetBreak(CKTcircuit *ckt, double time)
{
double *tmp;
register int i,j;
int i,j;
if(ckt->CKTtime > time) {
(*(SPfrontEnd->IFerror))(ERR_PANIC,"breakpoint in the past - HELP!",

6
src/analysis/cktsetup.c
View File

@ -26,12 +26,12 @@ Author: 1985 Thomas L. Quarles
extern SPICEdev *DEVices[];
int
CKTsetup(register CKTcircuit *ckt)
CKTsetup(CKTcircuit *ckt)
{
register int i;
int i;
int error;
register SMPmatrix *matrix;
SMPmatrix *matrix;
ckt->CKTnumStates=0;
#ifdef WANT_SENSE2

2
src/analysis/cktsopt.c
View File

@ -23,7 +23,7 @@ Author: 1985 Thomas L. Quarles
int
CKTsetOpt(void *ckt, void *anal, int opt, IFvalue *val)
{
register TSKtask *task = (TSKtask *)anal;
TSKtask *task = (TSKtask *)anal;
switch(opt) {

4
src/analysis/ckttemp.c
View File

@ -22,10 +22,10 @@ Author: 1985 Thomas L. Quarles
extern SPICEdev *DEVices[];
int
CKTtemp(register CKTcircuit *ckt)
CKTtemp(CKTcircuit *ckt)
{
int error;
register int i;
int i;
ckt->CKTvt = CONSTKoverQ * ckt->CKTtemp;

6
src/analysis/cktterr.c
View File

@ -12,7 +12,7 @@ Author: 1985 Thomas L. Quarles
#define ccap (qcap+1)
void
CKTterr(register int qcap, register CKTcircuit *ckt, register double *timeStep)
CKTterr(int qcap, CKTcircuit *ckt, double *timeStep)
{
double volttol;
double chargetol;
@ -21,8 +21,8 @@ CKTterr(register int qcap, register CKTcircuit *ckt, register double *timeStep)
double diff[8];
double deltmp[8];
double factor;
register int i;
register int j;
int i;
int j;
static double gearCoeff[] = {
.5,
.2222222222,

8
src/analysis/ckttrunc.c
View File

@ -21,10 +21,10 @@ Author: 1985 Thomas L. Quarles
extern SPICEdev *DEVices[];
int
CKTtrunc(register CKTcircuit *ckt, double *timeStep)
CKTtrunc(CKTcircuit *ckt, double *timeStep)
{
#ifndef NEWTRUNC
register int i;
int i;
double timetemp;
#ifdef PARALLEL_ARCH
long type = MT_TRUNC, length = 1;
@ -66,8 +66,8 @@ CKTtrunc(register CKTcircuit *ckt, double *timeStep)
ckt->CKTstat->STATtranTruncTime += SPfrontEnd->IFseconds() - startTime;
return(OK);
#else /* NEWTRUNC */
register int i;
register CKTnode *node;
int i;
CKTnode *node;
double timetemp;
double tmp;
double diff;

2
src/analysis/dcop.c
View File

@ -13,7 +13,7 @@ Author: 1985 Thomas L. Quarles
int
DCop(CKTcircuit *ckt)
{
int CKTload(register CKTcircuit *ckt);
int CKTload(CKTcircuit *ckt);
int converged;
int error;
IFuid *nameList;

16
src/analysis/dctrcurv.c
View File

@ -21,7 +21,7 @@ DCtrCurv(CKTcircuit *ckt, int restart)
/* forced restart flag */
{
register TRCV* cv = (TRCV*)ckt->CKTcurJob; /* Where we get the job to do */
TRCV* cv = (TRCV*)ckt->CKTcurJob; /* Where we get the job to do */
int i;
double *temp;
int converged;
@ -68,8 +68,9 @@ DCtrCurv(CKTcircuit *ckt, int restart)
for(i=0;i<=cv->TRCVnestLevel;i++) {
if(rcode >= 0) {
/* resistances are in this version, so use them */
register RESinstance *here;
register RESmodel *model;
RESinstance *here;
RESmodel *model;
for(model = (RESmodel *)ckt->CKThead[rcode];model != NULL;
model=model->RESnextModel){
for(here=model->RESinstances;here!=NULL;
@ -89,8 +90,9 @@ DCtrCurv(CKTcircuit *ckt, int restart)
}
if(vcode >= 0) {
/* voltage sources are in this version, so use them */
register VSRCinstance *here;
register VSRCmodel *model;
VSRCinstance *here;
VSRCmodel *model;
for(model = (VSRCmodel *)ckt->CKThead[vcode];model != NULL;
model=model->VSRCnextModel){
for(here=model->VSRCinstances;here!=NULL;
@ -109,8 +111,8 @@ DCtrCurv(CKTcircuit *ckt, int restart)
}
if(icode >= 0 ) {
/* current sources are in this version, so use them */
register ISRCinstance *here;
register ISRCmodel *model;
ISRCinstance *here;
ISRCmodel *model;
for(model= (ISRCmodel *)ckt->CKThead[icode];model != NULL;
model=model->ISRCnextModel){

2
src/analysis/dctsetp.c
View File

@ -15,7 +15,7 @@ Author: 1985 Thomas L. Quarles
int
DCTsetParm(CKTcircuit *ckt, void *anal, int which, IFvalue *value)
{
register TRCV* cv= (TRCV*)anal;
TRCV* cv= (TRCV*)anal;
switch(which) {
case DCT_START1:

4
src/analysis/distoan.c
View File

@ -39,7 +39,7 @@ DstorAlloc(double ***header, int size)
extern int CKTdisto(CKTcircuit*, int);
extern int DkerProc(int,double*,double*,int,DISTOan*);
#else
extern int CKTdisto(register CKTcircuit *ckt, int mode);
extern int CKTdisto(CKTcircuit *ckt, int mode);
extern int DkerProc(int type, double *rPtr, double *iPtr, int size, DISTOAN *job);
#endif
@ -59,7 +59,7 @@ DISTOan(CKTcircuit *ckt, int restart)
IFuid *nameList;
IFuid freqUid;
void *acPlot;
register DISTOAN* job = (DISTOAN *) (ckt->CKTcurJob);
DISTOAN* job = (DISTOAN *) (ckt->CKTcurJob);
static char *nof2src = "No source with f2 distortion input";
#ifdef DISTODEBUG
double time,time1;

2
src/analysis/ninteg.c
View File

@ -24,7 +24,7 @@ Author: 1987 Gary W. Ng
double
Nintegrate (double noizDens, double lnNdens, double lnNlstDens, register Ndata *data)
Nintegrate (double noizDens, double lnNdens, double lnNlstDens, Ndata *data)
{
double exponent;
double a;

10
src/analysis/noisean.c
View File

@ -1,14 +1,11 @@
/* Patch to noisean.c by Richard D. McRoberts.
* Patched with modifications from Weidong Lu (2000)
* There is a strange #ifdef near the end of the file.
*/
/**********
Copyright 1990 Regents of the University of California. All rights reserved.
Author: 1987 Gary W. Ng
**********/
#define INT_NOISE /* Inserted to compile the ifdef'd code */
#include "ngspice.h"
#include <stdio.h>
#include "acdefs.h"
@ -22,7 +19,7 @@ Author: 1987 Gary W. Ng
int
NOISEan (CKTcircuit *ckt, int restart)
{
register Ndata *data;
Ndata *data;
double realVal;
double imagVal;
int error;
@ -30,12 +27,11 @@ NOISEan (CKTcircuit *ckt, int restart)
int negOutNode;
int code;
int step;
/* register CKTnode *node; WL but not used ???? */
IFuid freqUid;
void *inst; /* PN fixes incompatible pointer type warning */
double freqTol; /* tolerence parameter for finding final frequency; hack */
register NOISEAN *job = (NOISEAN*) (ckt->CKTcurJob);
NOISEAN *job = (NOISEAN*) (ckt->CKTcurJob);
static char *noacinput = "noise input source has no AC value";
posOutNode = ((CKTnode*) (job->output))->number;
@ -258,7 +254,6 @@ NOISEan (CKTcircuit *ckt, int restart)
error = CKTnoise(ckt,N_DENS,N_CLOSE,data);
if (error) return(error);
#ifdef INT_NOISE /* WL */
data->numPlots = 0;
data->outNumber = 0;
@ -278,7 +273,6 @@ NOISEan (CKTcircuit *ckt, int restart)
error = CKTnoise(ckt,INT_NOIZ,N_CLOSE,data);
if (error) return(error);
}
#endif
FREE(data);
return(OK);

2
src/analysis/tfanal.c
View File

@ -28,7 +28,7 @@ TFanal(CKTcircuit *ckt, int restart)
IFvalue refval; /* structure for 'reference' value (not used here) */
int error;
int converged;
register int i;
int i;
void *plotptr; /* pointer to out plot */
void *ptr = NULL;
IFuid uids[3];