everyone wants to rename calls to callf (or similar), make it just findcall

SCCS-vsn: usr.bin/gprof/Makefile 5.3
SCCS-vsn: usr.bin/gprof/arcs.c 5.3
SCCS-vsn: usr.bin/gprof/tahoe.c 1.2
SCCS-vsn: usr.bin/gprof/vax.c 5.3

diff --git a/usr/src/usr.bin/gprof/Makefile b/usr/src/usr.bin/gprof/Makefile
index 2f1c6af..a311dbb 100644 (file)
--- a/usr/src/usr.bin/gprof/Makefile
+++ b/usr/src/usr.bin/gprof/Makefile
@@ -3,22 +3,22 @@
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #
 # All rights reserved.  The Berkeley software License Agreement
 # specifies the terms and conditions for redistribution.
 #

-#      @(#)Makefile    5.2 (Berkeley) %G%
+#      @(#)Makefile    5.3 (Berkeley) %G%

 #
 #

-SCCSID = @(#)Makefile  5.2 (Berkeley) %G%
-
-DFLAGS = 
-CFLAGS = -O ${DFLAGS}
-LINTFLAGS = -x -a -n ${DFLAGS}
+DESTDIR=
+DFLAGS= 
+CFLAGS=        -O ${DFLAGS}
+LINTFLAGS= -x -a -n ${DFLAGS}

 
 RM=    /bin/rm -f
 INSTALL=install
 PR=pr
 
 RM=    /bin/rm -f
 INSTALL=install
 PR=pr

-
-GPROFHDRS =    gprof.h vax.h
-GPROFSRCS =    gprof.c arcs.c dfn.c lookup.c calls.c hertz.c \
+#MACHINE=      ${MACHINE}
+MACHINE=       tahoe
+GPROFHDRS=     gprof.h ${MACHINE}.h
+GPROFSRCS=     gprof.c arcs.c dfn.c lookup.c ${MACHINE}.c hertz.c \

                printgprof.c printlist.c
                printgprof.c printlist.c

-GPROFOBJS =    gprof.o arcs.o dfn.o lookup.o calls.o hertz.o \
+GPROFOBJS=     gprof.o arcs.o dfn.o lookup.o ${MACHINE}.o hertz.o \

                printgprof.o printlist.o
 
 gprof: ${GPROFOBJS}
                printgprof.o printlist.o
 
 gprof: ${GPROFOBJS}


@@ -45,11 +45,11 @@ print:
 lint:
        lint ${LINTFLAGS} ${DFLAGS} ${GPROFSRCS}
 
 lint:
        lint ${LINTFLAGS} ${DFLAGS} ${GPROFSRCS}
 

-gprof.o: gprof.c gprof.h vax.h gcrt0.h
-arcs.o: arcs.c gprof.h vax.h gcrt0.h
-lookup.o: lookup.c gprof.h vax.h gcrt0.h
-dfn.o: dfn.c gprof.h vax.h gcrt0.h
-calls.o: calls.c gprof.h vax.h gcrt0.h
-hertz.o: gprof.h vax.h hertz.c
-printgprof.o: printgprof.c gprof.h vax.h gcrt0.h
-printlist.o: printlist.c gprof.h vax.h gcrt0.h
+gprof.o: gprof.c gprof.h ${MACHINE}.h gcrt0.h
+arcs.o: arcs.c gprof.h ${MACHINE}.h gcrt0.h
+lookup.o: lookup.c gprof.h ${MACHINE}.h gcrt0.h
+dfn.o: dfn.c gprof.h ${MACHINE}.h gcrt0.h
+${MACHINE}.o: ${MACHINE}.c gprof.h ${MACHINE}.h gcrt0.h
+hertz.o: gprof.h ${MACHINE}.h hertz.c
+printgprof.o: printgprof.c gprof.h ${MACHINE}.h gcrt0.h
+printlist.o: printlist.c gprof.h ${MACHINE}.h gcrt0.h

diff --git a/usr/src/usr.bin/gprof/arcs.c b/usr/src/usr.bin/gprof/arcs.c
index 71c7ea2..321ce28 100644 (file)
--- a/usr/src/usr.bin/gprof/arcs.c
+++ b/usr/src/usr.bin/gprof/arcs.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)arcs.c     5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)arcs.c     5.3 (Berkeley) %G%";

 #endif not lint
 
 #include "gprof.h"
 #endif not lint
 
 #include "gprof.h"


@@ -105,7 +105,7 @@ doarcs()
        parentp -> cyclehead = parentp;
        parentp -> cnext = 0;
        if ( cflag ) {
        parentp -> cyclehead = parentp;
        parentp -> cnext = 0;
        if ( cflag ) {

-           findcalls( parentp , parentp -> value , (parentp+1) -> value );
+           findcall( parentp , parentp -> value , (parentp+1) -> value );

        }
     }
        /*
        }
     }
        /*

diff --git a/usr/src/usr.bin/gprof/tahoe.c b/usr/src/usr.bin/gprof/tahoe.c
index 8db6cd3..34382bf 100644 (file)
--- a/usr/src/usr.bin/gprof/tahoe.c
+++ b/usr/src/usr.bin/gprof/tahoe.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)tahoe.c     1.1 (Berkeley) %G%";
+static char *sccsid = "@(#)tahoe.c     1.2 (Berkeley) %G%";

 #endif not lint
 
 #include       "gprof.h"
 #endif not lint
 
 #include       "gprof.h"


@@ -186,7 +186,7 @@ reladdr( modep )
     }
 }
 
     }
 }
 

-findcallf( parentp , p_lowpc , p_highpc )
+findcall( parentp , p_lowpc , p_highpc )

     nltype             *parentp;
     unsigned long      p_lowpc;
     unsigned long      p_highpc;
     nltype             *parentp;
     unsigned long      p_lowpc;
     unsigned long      p_highpc;


@@ -209,7 +209,7 @@ findcallf( parentp , p_lowpc , p_highpc )
     }
 #   ifdef DEBUG
        if ( debug & CALLDEBUG ) {
     }
 #   ifdef DEBUG
        if ( debug & CALLDEBUG ) {

-           printf( "[findcallf] %s: 0x%x to 0x%x\n" ,
+           printf( "[findcall] %s: 0x%x to 0x%x\n" ,

                    parentp -> name , p_lowpc , p_highpc );
        }
 #   endif DEBUG
                    parentp -> name , p_lowpc , p_highpc );
        }
 #   endif DEBUG


@@ -224,7 +224,7 @@ findcallf( parentp , p_lowpc , p_highpc )
                 */
 #          ifdef DEBUG
                if ( debug & CALLDEBUG ) {
                 */
 #          ifdef DEBUG
                if ( debug & CALLDEBUG ) {

-                   printf( "[findcallf]\t0x%x:callf" , instructp - textspace );
+                   printf( "[findcall]\t0x%x:callf" , instructp - textspace );

                }
 #          endif DEBUG
            firstmode = operandmode( instructp+length );
                }
 #          endif DEBUG
            firstmode = operandmode( instructp+length );


@@ -276,7 +276,7 @@ findcallf( parentp , p_lowpc , p_highpc )
                        childp = nllookup( destpc );
 #                      ifdef DEBUG
                            if ( debug & CALLDEBUG ) {
                        childp = nllookup( destpc );
 #                      ifdef DEBUG
                            if ( debug & CALLDEBUG ) {

-                               printf( "[findcallf]\tdestpc 0x%x" , destpc );
+                               printf( "[findcall]\tdestpc 0x%x" , destpc );

                                printf( " childp->name %s" , childp -> name );
                                printf( " childp->value 0x%x\n" ,
                                        childp -> value );
                                printf( " childp->name %s" , childp -> name );
                                printf( " childp->value 0x%x\n" ,
                                        childp -> value );


@@ -305,7 +305,7 @@ findcallf( parentp , p_lowpc , p_highpc )
                         */
 #                  ifdef DEBUG
                        if ( debug & CALLDEBUG ) {
                         */
 #                  ifdef DEBUG
                        if ( debug & CALLDEBUG ) {

-                           printf( "[findcallf]\tbut it's a botch\n" );
+                           printf( "[findcall]\tbut it's a botch\n" );

                        }
 #                  endif DEBUG
                    length = 1;
                        }
 #                  endif DEBUG
                    length = 1;

diff --git a/usr/src/usr.bin/gprof/vax.c b/usr/src/usr.bin/gprof/vax.c
index b7058dc..5fbf0b3 100644 (file)
--- a/usr/src/usr.bin/gprof/vax.c
+++ b/usr/src/usr.bin/gprof/vax.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)vax.c      5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)vax.c      5.3 (Berkeley) %G%";

 #endif not lint
 
 #include       "gprof.h"
 #endif not lint
 
 #include       "gprof.h"


@@ -188,7 +188,7 @@ reladdr( modep )
     }
 }
 
     }
 }
 

-findcalls( parentp , p_lowpc , p_highpc )
+findcall( parentp , p_lowpc , p_highpc )

     nltype             *parentp;
     unsigned long      p_lowpc;
     unsigned long      p_highpc;
     nltype             *parentp;
     unsigned long      p_lowpc;
     unsigned long      p_highpc;


@@ -211,7 +211,7 @@ findcalls( parentp , p_lowpc , p_highpc )
     }
 #   ifdef DEBUG
        if ( debug & CALLDEBUG ) {
     }
 #   ifdef DEBUG
        if ( debug & CALLDEBUG ) {

-           printf( "[findcalls] %s: 0x%x to 0x%x\n" ,
+           printf( "[findcall] %s: 0x%x to 0x%x\n" ,

                    parentp -> name , p_lowpc , p_highpc );
        }
 #   endif DEBUG
                    parentp -> name , p_lowpc , p_highpc );
        }
 #   endif DEBUG


@@ -226,7 +226,7 @@ findcalls( parentp , p_lowpc , p_highpc )
                 */
 #          ifdef DEBUG
                if ( debug & CALLDEBUG ) {
                 */
 #          ifdef DEBUG
                if ( debug & CALLDEBUG ) {

-                   printf( "[findcalls]\t0x%x:calls" , instructp - textspace );
+                   printf( "[findcall]\t0x%x:calls" , instructp - textspace );

                }
 #          endif DEBUG
            firstmode = operandmode( (struct modebyte *) (instructp+length) );
                }
 #          endif DEBUG
            firstmode = operandmode( (struct modebyte *) (instructp+length) );


@@ -279,7 +279,7 @@ findcalls( parentp , p_lowpc , p_highpc )
                        childp = nllookup( destpc );
 #                      ifdef DEBUG
                            if ( debug & CALLDEBUG ) {
                        childp = nllookup( destpc );
 #                      ifdef DEBUG
                            if ( debug & CALLDEBUG ) {

-                               printf( "[findcalls]\tdestpc 0x%x" , destpc );
+                               printf( "[findcall]\tdestpc 0x%x" , destpc );

                                printf( " childp->name %s" , childp -> name );
                                printf( " childp->value 0x%x\n" ,
                                        childp -> value );
                                printf( " childp->name %s" , childp -> name );
                                printf( " childp->value 0x%x\n" ,
                                        childp -> value );


@@ -309,7 +309,7 @@ findcalls( parentp , p_lowpc , p_highpc )
                         */
 #                  ifdef DEBUG
                        if ( debug & CALLDEBUG ) {
                         */
 #                  ifdef DEBUG
                        if ( debug & CALLDEBUG ) {

-                           printf( "[findcalls]\tbut it's a botch\n" );
+                           printf( "[findcall]\tbut it's a botch\n" );

                        }
 #                  endif DEBUG
                    length = 1;
                        }
 #                  endif DEBUG
                    length = 1;