lint changes from donn@utah-cs.

[unix-history] / usr / src / old / pcc / c2.vax / c21.c

diff --git a/usr/src/old/pcc/c2.vax/c21.c b/usr/src/old/pcc/c2.vax/c21.c
index 8302c00..e0042b3 100644 (file)
--- a/usr/src/old/pcc/c2.vax/c21.c
+++ b/usr/src/old/pcc/c2.vax/c21.c
@@ -1,4 +1,6 @@
-static char sccsid[] = "@(#)c21.c 4.11 %G%";
+#ifndef lint
+static char sccsid[] = "@(#)c21.c 4.15 %G%";
+#endif

 /* char C21[] = {"@(#)c21.c 1.83 80/10/16 21:18:22 JFR"}; /* sccs ident */
 
 /*
 /* char C21[] = {"@(#)c21.c 1.83 80/10/16 21:18:22 JFR"}; /* sccs ident */
 
 /*


@@ -34,6 +36,7 @@ char *lastrand; /* last operand of instruction */
 struct node *bflow();
 struct node *bicopt();
 char *findcon();
 struct node *bflow();
 struct node *bicopt();
 char *findcon();

+char *strcpy();

 
 redun3(p,split) register struct node *p; int split; {
 /* check for 3 addr instr which should be 2 addr */
 
 redun3(p,split) register struct node *p; int split; {
 /* check for 3 addr instr which should be 2 addr */


@@ -78,7 +81,13 @@ bmove() {
        case CALLS:
                clearuse(); goto std;
        case 0:
        case CALLS:
                clearuse(); goto std;
        case 0:

-               clearuse(); break;
+               /*
+                * Be conservative -- if we don't know what it is, then we
+                *      assume that it can set anything.
+                */
+               for ( r = 0; r < NUSE; ++r )
+                       uses[r] = p;
+               break;

        case SUB:
                if ((p->subop&0xF)!=LONG) goto std; cp1=p->code;
                if (*cp1++!='$') goto std; splitrand(p);
        case SUB:
                if ((p->subop&0xF)!=LONG) goto std; cp1=p->code;
                if (*cp1++!='$') goto std; splitrand(p);


@@ -201,7 +210,7 @@ bmove() {
                if (regs[RT1][0] != '$') goto std;
                if ((shcnt = getnum(&regs[RT1][1])) < 1 || shcnt > 3) goto std;
                if ((shfrom = isreg(regs[RT2])) >= 0)
                if (regs[RT1][0] != '$') goto std;
                if ((shcnt = getnum(&regs[RT1][1])) < 1 || shcnt > 3) goto std;
                if ((shfrom = isreg(regs[RT2])) >= 0)

-                       regfrom = copy(regs[RT2],"]");
+                       regfrom = copy(regs[RT2]);

                if ((shto = isreg(regs[RT3])) >= 0 && shto<NUSE)
                {
                        int     regnum;
                if ((shto = isreg(regs[RT3])) >= 0 && shto<NUSE)
                {
                        int     regnum;


@@ -230,6 +239,8 @@ bmove() {
                                        uses[shto] = NULL; splitrand(pf);
                                        cp2=regs[RT1]; while (*cp2++!='[');
                                        cp1=regfrom; while (*cp2++= *cp1++);
                                        uses[shto] = NULL; splitrand(pf);
                                        cp2=regs[RT1]; while (*cp2++!='[');
                                        cp1=regfrom; while (*cp2++= *cp1++);

+                                       *--cp2 = ']';
+                                       *++cp2 = '\0';

                                        newcode(pf);
                                }
                        }
                                        newcode(pf);
                                }
                        }


@@ -403,14 +414,17 @@ ashadd:
 
 rmove()
 {
 
 rmove()
 {

-       register struct node *p, *lastp;
+       register struct node *p;

        register int r;
        int r1;
 
        clearreg();
        for (p=first.forw; p!=0; p = p->forw) {
        register int r;
        int r1;
 
        clearreg();
        for (p=first.forw; p!=0; p = p->forw) {

-       lastp=p;

        if (debug) {
        if (debug) {

+               if (*conloc) {
+                       r1=conval[0];
+                       printf("Con %s = %d%d %s\n", conloc, r1&0xF, r1>>4, conval+1);
+               }

                printf("Regs:\n");
                for (r=0; r<NREG; r++)
                        if (regs[r][0]) {
                printf("Regs:\n");
                for (r=0; r<NREG; r++)
                        if (regs[r][0]) {


@@ -590,7 +604,7 @@ register struct node *p;
                        if (0<=(r2=isreg(lastrand)) && r2<NUSE) {
                                uses[r2]=uses[r]; uses[r]=0;
                        }
                        if (0<=(r2=isreg(lastrand)) && r2<NUSE) {
                                uses[r2]=uses[r]; uses[r]=0;
                        }

-                       redun3(p,0);
+                       (void) redun3(p,0);

                        newcode(p); redunm++; flow=r;
                } else if (p->op==MOV && p->forw->op!=EXTV && p->forw->op!=EXTZV) {
                        /* superfluous fetch */
                        newcode(p); redunm++; flow=r;
                } else if (p->op==MOV && p->forw->op!=EXTV && p->forw->op!=EXTZV) {
                        /* superfluous fetch */


@@ -616,7 +630,7 @@ register struct node *p;
                                if (0<=(r2=isreg(src)) && r2<NUSE) {
                                        uses[r2]=uses[r]; uses[r]=0;
                                }
                                if (0<=(r2=isreg(src)) && r2<NUSE) {
                                        uses[r2]=uses[r]; uses[r]=0;
                                }

-                               redun3(p,0);
+                               (void) redun3(p,0);

                                newcode(p); redunm++; flow=r;
                        } else splitrand(p);
                }
                                newcode(p); redunm++; flow=r;
                        } else splitrand(p);
                }


@@ -649,14 +663,18 @@ register struct node *p;
                        flow=r;
                }
        }
                        flow=r;
                }
        }

-       if (0<=(r=flow)) {olduse=uses[r]; uses[r]=0; *(short *)(regs[r])=0;}
+       if (0<=(r=flow)) {
+               olduse=uses[r];
+               uses[r]=0;
+               regs[r][0]=regs[r][1]=0;
+       }

                /* these two are here, rather than in bmove(),
                /* because I decided that it was better to go for 3-address code
                /* (save time) rather than fancy jbxx (save 1 byte)
                /* on sequences like  bisl2 $64,r0; movl r0,foo
                */
        if (p->op==BIC) {p=bicopt(p); splitrand(p); lastrand=byondrd(p);}
                /* these two are here, rather than in bmove(),
                /* because I decided that it was better to go for 3-address code
                /* (save time) rather than fancy jbxx (save 1 byte)
                /* on sequences like  bisl2 $64,r0; movl r0,foo
                */
        if (p->op==BIC) {p=bicopt(p); splitrand(p); lastrand=byondrd(p);}

-       if (p->op==BIS) {bixprep(p,JBSS);           lastrand=byondrd(p);}
+       if (p->op==BIS) {(void) bixprep(p,JBSS);    lastrand=byondrd(p);}

        /* now look for 'read' or 'modify' (read & write) uses */
        preg=regs+RT1; 
        while (*(cp1= *preg++)) {
        /* now look for 'read' or 'modify' (read & write) uses */
        preg=regs+RT1; 
        while (*(cp1= *preg++)) {


@@ -757,10 +775,10 @@ bitopt(p) register struct node *p; {
 }
 
 isfield(n) register long n; {/* -1 -> no; else -> position of low bit */
 }
 
 isfield(n) register long n; {/* -1 -> no; else -> position of low bit */

-       register int pos; register long t;
+       register int p; register long t;

        t= ((n-1)|n) +1;
        t= ((n-1)|n) +1;

-       if (n!=0 && (0==t || 0==n || 0<=ispow2(t))) {
-               pos=0; while(!(n&1)) {n >>= 1; ++pos;} return(pos);
+       if (n!=0 && (0==t || 0<=ispow2(t))) {
+               p=0; while(!(n&1)) {n >>= 1; ++p;} return(p);

        } else return(-1);
 }
 
        } else return(-1);
 }
 


@@ -791,7 +809,7 @@ bicopt(p) register struct node *p; {
 */
        register char *cp1,*cp2; int r;
        char src[C2_ASIZE];
 */
        register char *cp1,*cp2; int r;
        char src[C2_ASIZE];

-       char lhssiz, subop;
+       char lhssiz, sop;

        if (!bixprep(p,JBCC)) return(p);
        if (f==0) {/* the BIC isolates low order bits */
                siz=pos; pos=0;
        if (!bixprep(p,JBCC)) return(p);
        if (f==0) {/* the BIC isolates low order bits */
                siz=pos; pos=0;


@@ -802,7 +820,8 @@ bicopt(p) register struct node *p; {
                                splitrand(p->back); cp1=regs[RT1]; cp2=regs[RT3];
                                if (*cp1++=='$' && *(regs[RT2])!='$' && !indexa(regs[RT2])
                                  && 0>(f=getnum(cp1)) && equstr(src,cp2)
                                splitrand(p->back); cp1=regs[RT1]; cp2=regs[RT3];
                                if (*cp1++=='$' && *(regs[RT2])!='$' && !indexa(regs[RT2])
                                  && 0>(f=getnum(cp1)) && equstr(src,cp2)

-                                 && 0<=(r=isreg(cp2)) && r<NUSE) {/* a good ASH */
+                                 && 0<=(r=isreg(cp2)) && r<NUSE
+                                 && siz-f <= 32) {     /* a good ASH */

                                        pos -= f; cp1=regs[RT2]; cp2=src; while (*cp2++= *cp1++);
                                        delnode(p->back);
                                }
                                        pos -= f; cp1=regs[RT2]; cp2=src; while (*cp2++= *cp1++);
                                        delnode(p->back);
                                }


@@ -825,13 +844,13 @@ bicopt(p) register struct node *p; {
                                 * However, if the CVT is from a float or
                                 * double, forget it!
                                 */
                                 * However, if the CVT is from a float or
                                 * double, forget it!
                                 */

-                               subop = p->back->subop&0xF;     /* type of LHS of CVT/MOVZ */
+                               sop = p->back->subop&0xF;       /* type of LHS of CVT/MOVZ */

                                if (equstr(src,cp2) && okio(cp1)
                                if (equstr(src,cp2) && okio(cp1)

-                                 && subop != FFLOAT && subop != DFLOAT
-                                 && subop != GFLOAT && subop != HFLOAT
-                                 && ((!indexa(cp1) && !autoid(cp1)) || lhssiz == subop)
+                                 && sop != FFLOAT && sop != DFLOAT
+                                 && sop != GFLOAT && sop != HFLOAT
+                                 && ((!indexa(cp1) && !autoid(cp1)) || lhssiz == sop)

                                  && 0<=(r=isreg(cp2)) && r<NUSE
                                  && 0<=(r=isreg(cp2)) && r<NUSE

-                                 && bitsize[p->back->subop&0xF]>=(pos+siz)
+                                 && bitsize[sop]>=(pos+siz)

                                  && bitsize[p->back->subop>>4]>=(pos+siz)) {/* good CVT */
                                        cp1=regs[RT1]; cp2=src; while (*cp2++= *cp1++);
                                        delnode(p->back);
                                  && bitsize[p->back->subop>>4]>=(pos+siz)) {/* good CVT */
                                        cp1=regs[RT1]; cp2=src; while (*cp2++= *cp1++);
                                        delnode(p->back);


@@ -865,13 +884,16 @@ bicopt(p) register struct node *p; {
 jumpsw()
 {
        register struct node *p, *p1;
 jumpsw()
 {
        register struct node *p, *p1;

-       register t;
+       register struct node *tp;
+       long tl;
+       char *tcp;
+       int ti;

        int nj;
 
        int nj;
 

-       t = 0;
+       ti = 0;

        nj = 0;
        for (p=first.forw; p!=0; p = p->forw)
        nj = 0;
        for (p=first.forw; p!=0; p = p->forw)

-               p->seq = ++t;
+               p->seq = ++ti;

        for (p=first.forw; p!=0; p = p1) {
                p1 = p->forw;
                if (p->op == CBR && p1->op==JBR && p->ref && p1->ref
        for (p=first.forw; p!=0; p = p1) {
                p1 = p->forw;
                if (p->op == CBR && p1->op==JBR && p->ref && p1->ref


@@ -880,15 +902,17 @@ jumpsw()
                                continue;
                        p->subop = revbr[p->subop];
                        p->pop=0;
                                continue;
                        p->subop = revbr[p->subop];
                        p->pop=0;

-                       t = p1->ref;
+                       tp = p1->ref;

                        p1->ref = p->ref;
                        p1->ref = p->ref;

-                       p->ref = t;
-                       t = p1->labno;
+                       p->ref = tp;
+                       tl = p1->labno;

                        p1->labno = p->labno;
                        p1->labno = p->labno;

-                       p->labno = t;
+                       p->labno = tl;

 #ifdef COPYCODE
                        if (p->labno == 0) {
 #ifdef COPYCODE
                        if (p->labno == 0) {

-                               t = p1->code; p1->code = p->code; p->code = t;
+                               tcp = p1->code;
+                               p1->code = p->code;
+                               p->code = tcp;

                        }
 #endif
                        nrevbr++;
                        }
 #endif
                        nrevbr++;


@@ -949,11 +973,6 @@ addsob()
        }
 }
 
        }
 }
 

-abs(x)
-{
-       return(x<0? -x: x);
-}
-

 equop(p1, p2)
 register struct node *p1;
 struct node *p2;
 equop(p1, p2)
 register struct node *p1;
 struct node *p2;


@@ -964,6 +983,14 @@ struct node *p2;
                return(0);
        if (p1->op>0 && p1->op<MOV)
                return(0);
                return(0);
        if (p1->op>0 && p1->op<MOV)
                return(0);

+       switch (p1->combop) {
+       case EROU:      case JSW:       case TEXT:      case DATA:
+       case BSS:       case ALIGN:     case WGEN:      case END:
+               /*
+                * Consider all pseudo-ops to be unique.
+                */
+               return(0);
+       }

        if (p1->op==MOVA && p1->labno!=p2->labno) return(0);
        cp1 = p1->code;
        cp2 = p2->code;
        if (p1->op==MOVA && p1->labno!=p2->labno) return(0);
        cp1 = p1->code;
        cp2 = p2->code;


@@ -977,11 +1004,14 @@ struct node *p2;
        return(0);
 }
 
        return(0);
 }
 

+#ifndef delnode

 delnode(p) register struct node *p; {
        p->back->forw = p->forw;
        p->forw->back = p->back;
 }
 delnode(p) register struct node *p; {
        p->back->forw = p->forw;
        p->forw->back = p->back;
 }

+#endif

 
 

+#ifndef decref

 decref(p)
 register struct node *p;
 {
 decref(p)
 register struct node *p;
 {


@@ -990,6 +1020,7 @@ register struct node *p;
                delnode(p);
        }
 }
                delnode(p);
        }
 }

+#endif

 
 struct node *
 nonlab(ap)
 
 struct node *
 nonlab(ap)


@@ -1009,9 +1040,13 @@ clearuse() {
 }
 
 clearreg() {
 }
 
 clearreg() {

-       register short **i;
-       for (i=regs+NREG; i>regs;) **--i=0;
-       conloc[0] = 0; ccloc[0] = 0;
+       register char **i;
+       for (i=regs; i<regs+NREG; ++i) {
+               **i = 0;
+               *(*i+1) = 0;
+       }
+       conloc[0] = 0;
+       ccloc[0] = 0;

 }
 
 savereg(ai, s, type)
 }
 
 savereg(ai, s, type)


@@ -1034,59 +1069,71 @@ register char *s;
 {
        register int i;
 
 {
        register int i;
 

-       source(s); /* handle addressing side effects */
+       (void) source(s); /* handle addressing side effects */
+       if (!natural(s)) {
+               /* wild store, everything except constants vanishes */
+               for (i=NREG; --i>=0;)
+                       if (regs[i][1] != '$')
+                               regs[i][0] = regs[i][1] = 0;
+               conloc[0] = 0; ccloc[0] = 0;
+               return;
+       }

        if ((i = isreg(s)) >= 0) {
        if ((i = isreg(s)) >= 0) {

-               *(short *)(regs[i]) = 0; /* if register destination, that reg is a goner */
+               /* if register destination, that reg is a goner */
+               regs[i][0] = regs[i][1] = 0;

                switch(type & 0xF){
                case DFLOAT:    /* clobber two at once */
                        /*FALLTHROUGH*/
                case GFLOAT:
                switch(type & 0xF){
                case DFLOAT:    /* clobber two at once */
                        /*FALLTHROUGH*/
                case GFLOAT:

-                       *(short *)(regs[i+1]) = 0;
+                       regs[i+1][0] = regs[i+1][1] = 0;

                        break;
                case HFLOAT:    /* clobber four at once */
                        break;
                case HFLOAT:    /* clobber four at once */

-                       *(short *)(regs[i+1]) = 0;
-                       *(short *)(regs[i+2]) = 0;
-                       *(short *)(regs[i+3]) = 0;
+                       regs[i+1][0] = regs[i+1][1] = 0;
+                       regs[i+2][0] = regs[i+2][1] = 0;
+                       regs[i+3][0] = regs[i+3][1] = 0;

                        break;
                }
                switch((type>>4)&0xF){
                case DFLOAT:    /* clobber two at once */
                        /*FALLTHROUGH*/
                case GFLOAT:
                        break;
                }
                switch((type>>4)&0xF){
                case DFLOAT:    /* clobber two at once */
                        /*FALLTHROUGH*/
                case GFLOAT:

-                       *(short *)(regs[i+1]) = 0;
+                       regs[i+1][0] = regs[i+1][1] = 0;

                        break;
                case HFLOAT:    /* clobber four at once */
                        break;
                case HFLOAT:    /* clobber four at once */

-                       *(short *)(regs[i+1]) = 0;
-                       *(short *)(regs[i+2]) = 0;
-                       *(short *)(regs[i+3]) = 0;
+                       regs[i+1][0] = regs[i+1][1] = 0;
+                       regs[i+2][0] = regs[i+2][1] = 0;
+                       regs[i+3][0] = regs[i+3][1] = 0;

                        break;
                }
                        break;
                }

-               /*
-               if (DFLOAT==(type&0xF) || DFLOAT==((type>>4)&0xF))
-                       *(short *)(regs[i+1]) = 0;
-               */

        }
        for (i=NREG; --i>=0;)
                if (regs[i][1]=='*' && equstr(s, regs[i]+2))
        }
        for (i=NREG; --i>=0;)
                if (regs[i][1]=='*' && equstr(s, regs[i]+2))

-                       *(short *)(regs[i]) = 0; /* previous indirection through destination is invalid */
+                       regs[i][0] = regs[i][1] = 0; /* previous indirection through destination is invalid */

        while ((i = findrand(s,0)) >= 0) /* previous values of destination are invalid */
        while ((i = findrand(s,0)) >= 0) /* previous values of destination are invalid */

-               *(short *)(regs[i]) = 0;
-       if (!natural(s)) {/* wild store, everything except constants vanishes */
-               for (i=NREG; --i>=0;) if (regs[i][1] != '$') *(short *)(regs[i]) = 0;
-               conloc[0] = 0; ccloc[0] = 0;
-       } else setcc(s,type); /* natural destinations set condition codes */
+               regs[i][0] = regs[i][1] = 0;
+       if (*conloc && equstr(conloc, s))
+               conloc[0] = 0;
+       setcc(s, type); /* natural destinations set condition codes */

 }
 
 }
 

-splitrand(p) struct node *p; {

 /* separate operands at commas, set up 'regs' and 'lastrand' */
 /* separate operands at commas, set up 'regs' and 'lastrand' */

-register char *p1, *p2; register char **preg;
-preg=regs+RT1;
-if (p1=p->code) while (*p1) {
-       lastrand=p2= *preg++;
-       while (*p1) if (','==(*p2++= *p1++)) {--p2; break;}
-       *p2=0;
-}
-while (preg<(regs+RT1+5)) *(*preg++)=0;
+splitrand(p) struct node *p; {
+       register char *p1, *p2;
+       register char **preg;
+
+       preg = regs+RT1;
+       if (p1 = p->code)
+               while (*p1) {
+                       lastrand = p2 = *preg++;
+                       while (*p1)
+                               if (',' == (*p2++ = *p1++)) {
+                                       --p2;
+                                       break;
+                               }
+                       *p2 = 0;
+               }
+       while (preg < (regs+RT1+5))
+               *(*preg++) = 0;

 }
 
 compat(have, want) {
 }
 
 compat(have, want) {


@@ -1126,8 +1173,10 @@ check()
 
        lp = &first;
        for (p=first.forw; p!=0; p = p->forw) {
 
        lp = &first;
        for (p=first.forw; p!=0; p = p->forw) {

-               if (p->back != lp)
-                       abort(-1);
+               if (p->back != lp) {
+                       fprintf(stderr, "c2: failed internal consistency check -- help!\n");
+                       exit(-1);
+               }

                lp = p;
        }
 }
                lp = p;
        }
 }


@@ -1147,8 +1196,12 @@ char *ap;
         || *(p2-2)=='+') {
                while (*p1 && *p1++!='r');
                if (isdigit(*p1++))
         || *(p2-2)=='+') {
                while (*p1 && *p1++!='r');
                if (isdigit(*p1++))

-                       if (isdigit(*p1)) *(short *)(regs[10+*p1-'0'])=0;
-                       else *(short *)(regs[*--p1-'0'])=0;
+                       if (isdigit(*p1))
+                               regs[10+*p1-'0'][0] = regs[10+*p1-'0'][1] = 0;
+                       else {
+                               --p1;
+                               regs[*p1-'0'][0] = regs[*p1-'0'][1] = 0;
+                       }

                return(1);
        }
        return(0);
                return(1);
        }
        return(0);


@@ -1166,7 +1219,7 @@ repladdr(p)
 struct node *p;
 {
        register r;
 struct node *p;
 {
        register r;

-       register char *p1, *p2;
+       register char *p1;

        char **preg; int nrepl;
 
        preg=regs+RT1; nrepl=0;
        char **preg; int nrepl;
 
        preg=regs+RT1; nrepl=0;


@@ -1257,8 +1310,8 @@ register struct node *p;
 #ifdef COPYCODE
                        if (p->labno == 0)
                                p->code = p1->code;
 #ifdef COPYCODE
                        if (p->labno == 0)
                                p->code = p1->code;

-                       if (p->ref)

 #endif
 #endif

+                       if (p->ref)

                                p->ref->refc++;
                }
        } else if (p1->op==TST && equstr(regs[RT1],ccloc+1) &&
                                p->ref->refc++;
                }
        } else if (p1->op==TST && equstr(regs[RT1],ccloc+1) &&


@@ -1284,7 +1337,7 @@ findcon(i, type)
        return(p);
 }
 
        return(p);
 }
 

-compare(op, acp1, acp2)
+compare(opc, acp1, acp2)

 char *acp1, *acp2;
 {
        register char *cp1, *cp2;
 char *acp1, *acp2;
 {
        register char *cp1, *cp2;


@@ -1308,30 +1361,28 @@ char *acp1, *acp2;
                if (*cp1++ != *cp2)
                        return(0);
        } while (*cp2++);
                if (*cp1++ != *cp2)
                        return(0);
        } while (*cp2++);

-       cp1 = n1;
-       cp2 = n2;
-       switch(op) {
+       switch(opc) {

 
        case JEQ:
 
        case JEQ:

-               return(cp1 == cp2);
+               return(n1 == n2);

        case JNE:
        case JNE:

-               return(cp1 != cp2);
+               return(n1 != n2);

        case JLE:
        case JLE:

-               return(((int)cp1) <= ((int)cp2));
+               return(n1 <= n2);

        case JGE:
        case JGE:

-               return(((int)cp1) >= ((int)cp2));
+               return(n1 >= n2);

        case JLT:
        case JLT:

-               return(((int)cp1) < ((int)cp2));
+               return(n1 < n2);

        case JGT:
        case JGT:

-               return(((int)cp1) > ((int)cp2));
+               return(n1 > n2);

        case JLO:
        case JLO:

-               return(cp1 < cp2);
+               return((unsigned) n1 < (unsigned) n2);

        case JHI:
        case JHI:

-               return(cp1 > cp2);
+               return((unsigned) n1 > (unsigned) n2);

        case JLOS:
        case JLOS:

-               return(cp1 <= cp2);
+               return((unsigned) n1 <= (unsigned) n2);

        case JHIS:
        case JHIS:

-               return(cp1 >= cp2);
+               return((unsigned) n1 >= (unsigned) n2);

        }
        return(0);
 }
        }
        return(0);
 }


@@ -1390,11 +1441,11 @@ indexa(p) register char *p; {/* 1-> uses [r] addressing mode; 0->doesn't */
 natural(p)
 register char *p;
 {/* 1->simple local, parameter, global, or register; 0->otherwise */
 natural(p)
 register char *p;
 {/* 1->simple local, parameter, global, or register; 0->otherwise */

-       if (*p=='*' || *p=='(' || *p=='-'&&*(p+1)=='(' || *p=='$'&&getnum(p+1))
+       if (*p=='*' || *p=='(' || *p=='-'&&p[1]=='(' || *p=='$'&&getnum(p+1))

                return(0);
        while (*p++);
        p--;
                return(0);
        while (*p++);
        p--;

-       if (*--p=='+' || *p==']' || *p==')' && *(p-2)!='a' && *(p-2)!='f')
+       if (*--p=='+' || *p==']' || *p==')' && p[-2]!='a' && p[-2]!='f')

                return(0);
        return(1);
 }
                return(0);
        return(1);
 }