1 files changed, 207 insertions, 199 deletions

diff --git a/usr.bin/truss/powerpc64-fbsd.c b/usr.bin/truss/powerpc64-fbsd.c
index 145c330..7147f81 100644
--- a/usr.bin/truss/powerpc64-fbsd.c
+++ b/usr.bin/truss/powerpc64-fbsd.c
@@ -61,8 +61,6 @@ static const char rcsid[] =
 #include "syscall.h"
 #include "extern.h"
 
-static int cpid = -1;
-
 #include "syscalls.h"
 
 static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]);
@@ -76,29 +74,35 @@ static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]);
  * 'struct syscall' describes the system call; it may be NULL, however,
  * if we don't know about this particular system call yet.
  */
-static struct freebsd_syscall {
+struct freebsd_syscall {
 	struct syscall *sc;
 	const char *name;
 	int number;
 	unsigned long *args;
 	int nargs;	/* number of arguments -- *not* number of words! */
 	char **s_args;	/* the printable arguments */
-} fsc;
+};
+
+static struct freebsd_syscall *
+alloc_fsc(void)
+{
+
+	return (malloc(sizeof(struct freebsd_syscall)));
+}
 
 /* Clear up and free parts of the fsc structure. */
-static __inline void
-clear_fsc(void) {
-  if (fsc.args) {
-    free(fsc.args);
-  }
-  if (fsc.s_args) {
-    int i;
-    for (i = 0; i < fsc.nargs; i++)
-      if (fsc.s_args[i])
-	free(fsc.s_args[i]);
-    free(fsc.s_args);
-  }
-  memset(&fsc, 0, sizeof(fsc));
+static void
+free_fsc(struct freebsd_syscall *fsc)
+{
+	int i;
+
+	free(fsc->args);
+	if (fsc->s_args) {
+		for (i = 0; i < fsc->nargs; i++)
+			free(fsc->s_args[i]);
+		free(fsc->s_args);
+	}
+	free(fsc);
 }
 
 /*
@@ -109,141 +113,141 @@ clear_fsc(void) {
  */
 
 void
-powerpc64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
-  char buf[32];
-  struct reg regs;
-  void *args;
-  int syscall_num;
-  int i;
-  unsigned int regargs;
-  struct syscall *sc;
-
-  cpid = trussinfo->curthread->tid;
-
-  clear_fsc();
-  if (ptrace(PT_GETREGS, cpid, (caddr_t)&regs, 0) < 0) {
-    fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
-    return;
-  }
-
-  /*
-   * FreeBSD has two special kinds of system call redirctions --
-   * SYS_syscall, and SYS___syscall.  The former is the old syscall()
-   * routine, basically; the latter is for quad-aligned arguments.
-   */
-  regargs = NARGREG;
-  syscall_num = regs.fixreg[0];
-  args = &regs.fixreg[3];
-  if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) {
-    args = &regs.fixreg[4];
-    regargs -= 1;
-    syscall_num = regs.fixreg[3];
-  }
-
-  fsc.number = syscall_num;
-  fsc.name =
-    (syscall_num < 0 || syscall_num >= nsyscalls) ? NULL : syscallnames[syscall_num];
-  if (!fsc.name) {
-    fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n", syscall_num);
-  }
-
-  if (fsc.name && (trussinfo->flags & FOLLOWFORKS)
-   && ((!strcmp(fsc.name, "fork")
-    || !strcmp(fsc.name, "rfork")
-    || !strcmp(fsc.name, "vfork"))))
-  {
-    trussinfo->curthread->in_fork = 1;
-  }
-
-  if (nargs == 0)
-    return;
-
-  fsc.args = malloc((1+nargs) * sizeof(unsigned long));
-
-  if (nargs > regargs) {
-    struct ptrace_io_desc iorequest;
-    memmove(&fsc.args[0], args, regargs * sizeof(fsc.args[0]));
-
-    iorequest.piod_op = PIOD_READ_D;
-    iorequest.piod_offs = (void *)(regs.fixreg[1] + 48);
-    iorequest.piod_addr = &fsc.args[regargs];
-    iorequest.piod_len = (nargs - regargs) * sizeof(fsc.args[0]);
-    ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0);
-    if (iorequest.piod_len == 0)
-       return;
-  } else {
-    memmove(&fsc.args[0], args, nargs * sizeof(fsc.args[0]));
-  }
-
-  sc = get_syscall(fsc.name);
-  if (sc) {
-    fsc.nargs = sc->nargs;
-  } else {
+powerpc64_syscall_entry(struct trussinfo *trussinfo, int nargs)
+{
+	struct ptrace_io_desc iorequest;
+	struct reg regs;
+	struct freebsd_syscall *fsc;
+	struct syscall *sc;
+	void *args;
+	lwpid_t tid;
+	int i, regargs, syscall_num;
+
+	tid = trussinfo->curthread->tid;
+
+	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
+		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
+		return;
+	}
+
+	/*
+	 * FreeBSD has two special kinds of system call redirctions --
+	 * SYS_syscall, and SYS___syscall.  The former is the old syscall()
+	 * routine, basically; the latter is for quad-aligned arguments.
+	 */
+	regargs = NARGREG;
+	syscall_num = regs.fixreg[0];
+	args = &regs.fixreg[3];
+	if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) {
+		args = &regs.fixreg[4];
+		regargs -= 1;
+		syscall_num = regs.fixreg[3];
+	}
+
+	fsc = alloc_fsc();
+	if (fsc == NULL)
+		return;
+	fsc->number = syscall_num;
+	fsc->name = (syscall_num < 0 || syscall_num >= nsyscalls) ?
+	    NULL : syscallnames[syscall_num];
+	if (!fsc->name) {
+		fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n",
+		    syscall_num);
+	}
+
+	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
+	    (strcmp(fsc->name, "fork") == 0 ||
+	    strcmp(fsc->name, "rfork") == 0 ||
+	    strcmp(fsc->name, "vfork") == 0))
+		trussinfo->curthread->in_fork = 1;
+
+	if (nargs == 0)
+		return;
+
+	fsc->args = malloc((1 + nargs) * sizeof(unsigned long));
+
+	if (nargs > regargs) {
+		memmove(&fsc->args[0], args, regargs * sizeof(fsc->args[0]));
+
+		iorequest.piod_op = PIOD_READ_D;
+		iorequest.piod_offs = (void *)(regs.fixreg[1] + 48);
+		iorequest.piod_addr = &fsc->args[regargs];
+		iorequest.piod_len = (nargs - regargs) * sizeof(fsc->args[0]);
+		ptrace(PT_IO, tid, (caddr_t)&iorequest, 0);
+		if (iorequest.piod_len == 0)
+			return;
+	} else
+		memmove(&fsc->args[0], args, nargs * sizeof(fsc->args[0]));
+
+	sc = get_syscall(fsc->name);
+	if (sc)
+		fsc->nargs = sc->nargs;
+	else {
 #if DEBUG
-    fprintf(trussinfo->outfile, "unknown syscall %s -- setting args to %d\n",
-	   fsc.name, nargs);
+		fprintf(trussinfo->outfile, "unknown syscall %s -- setting "
+		    "args to %d\n", fsc->name, nargs);
 #endif
-    fsc.nargs = nargs;
-  }
-
-  fsc.s_args = calloc(1, (1+fsc.nargs) * sizeof(char*));
-  fsc.sc = sc;
+		fsc->nargs = nargs;
+	}
 
-  /*
-   * At this point, we set up the system call arguments.
-   * We ignore any OUT ones, however -- those are arguments that
-   * are set by the system call, and so are probably meaningless
-   * now.  This doesn't currently support arguments that are
-   * passed in *and* out, however.
-   */
+	fsc->s_args = calloc(1, (1 + fsc->nargs) * sizeof(char *));
+	fsc->sc = sc;
 
-  if (fsc.name) {
+	/*
+	 * At this point, we set up the system call arguments.
+	 * We ignore any OUT ones, however -- those are arguments that
+	 * are set by the system call, and so are probably meaningless
+	 * now.	This doesn't currently support arguments that are
+	 * passed in *and* out, however.
+	 */
 
+	if (fsc->name) {
 #if DEBUG
-    fprintf(stderr, "syscall %s(", fsc.name);
+		fprintf(stderr, "syscall %s(", fsc->name);
 #endif
-    for (i = 0; i < fsc.nargs; i++) {
+		for (i = 0; i < fsc->nargs; i++) {
 #if DEBUG
-      fprintf(stderr, "0x%x%s",
-	      sc
-	      ? fsc.args[sc->args[i].offset]
-	      : fsc.args[i],
-	      i < (fsc.nargs - 1) ? "," : "");
+			fprintf(stderr, "0x%x%s", sc ?
+			    fsc->args[sc->args[i].offset] : fsc->args[i],
+			    i < (fsc->nargs - 1) ? "," : "");
 #endif
-      if (sc && !(sc->args[i].type & OUT)) {
-	fsc.s_args[i] = print_arg(&sc->args[i], fsc.args, 0, trussinfo);
-      }
-    }
+			if (sc && !(sc->args[i].type & OUT)) {
+				fsc->s_args[i] = print_arg(&sc->args[i],
+				    fsc->args, 0, trussinfo);
+			}
+		}
 #if DEBUG
-    fprintf(stderr, ")\n");
+		fprintf(stderr, ")\n");
 #endif
-  }
+	}
 
 #if DEBUG
-  fprintf(trussinfo->outfile, "\n");
+	fprintf(trussinfo->outfile, "\n");
 #endif
 
-  if (fsc.name && (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit"))) {
-
-    /* XXX
-     * This could be done in a more general
-     * manner but it still wouldn't be very pretty.
-     */
-    if (!strcmp(fsc.name, "execve")) {
-        if ((trussinfo->flags & EXECVEARGS) == 0)
-          if (fsc.s_args[1]) {
-            free(fsc.s_args[1]);
-            fsc.s_args[1] = NULL;
-          }
-        if ((trussinfo->flags & EXECVEENVS) == 0)
-          if (fsc.s_args[2]) {
-            free(fsc.s_args[2]);
-            fsc.s_args[2] = NULL;
-          }
-    }
-  }
-
-  return;
+	if (fsc->name && (strcmp(fsc->name, "execve") == 0 ||
+	    strcmp(fsc->name, "exit") == 0)) {
+		/*
+		 * XXX
+		 * This could be done in a more general
+		 * manner but it still wouldn't be very pretty.
+		 */
+		if (strcmp(fsc->name, "execve") == 0) {
+			if ((trussinfo->flags & EXECVEARGS) == 0) {
+				if (fsc->s_args[1]) {
+					free(fsc->s_args[1]);
+					fsc->s_args[1] = NULL;
+				}
+			}
+			if ((trussinfo->flags & EXECVEENVS) == 0) {
+				if (fsc->s_args[2]) {
+					free(fsc->s_args[2]);
+					fsc->s_args[2] = NULL;
+				}
+			}
+		}
+	}
+	trussinfo->curthread->fsc = fsc;
 }
 
 /*
@@ -256,68 +260,72 @@ powerpc64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
 long
 powerpc64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
 {
-  struct reg regs;
-  long retval;
-  int i;
-  int errorp;
-  struct syscall *sc;
-
-  if (fsc.name == NULL)
-	return (-1);
-
-  cpid = trussinfo->curthread->tid;
-
-  if (ptrace(PT_GETREGS, cpid, (caddr_t)&regs, 0) < 0) {
-    fprintf(trussinfo->outfile, "\n");
-    return (-1);
-  }
-  retval = regs.fixreg[3];
-  errorp = !!(regs.cr & 0x10000000);
-
-  /*
-   * This code, while simpler than the initial versions I used, could
-   * stand some significant cleaning.
-   */
-
-  sc = fsc.sc;
-  if (!sc) {
-    for (i = 0; i < fsc.nargs; i++)
-      asprintf(&fsc.s_args[i], "0x%lx", fsc.args[i]);
-  } else {
-    /*
-     * Here, we only look for arguments that have OUT masked in --
-     * otherwise, they were handled in the syscall_entry function.
-     */
-    for (i = 0; i < sc->nargs; i++) {
-      char *temp;
-      if (sc->args[i].type & OUT) {
+	struct reg regs;
+	struct freebsd_syscall *fsc;
+	struct syscall *sc;
+	lwpid_t tid;
+	long retval;
+	int errorp, i;
+
+	if (trussinfo->curthread->fsc == NULL)
+		return (-1);
+
+	tid = trussinfo->curthread->tid;
+
+	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
+		fprintf(trussinfo->outfile, "\n");
+		return (-1);
+	}
+
+	retval = regs.fixreg[3];
+	errorp = !!(regs.cr & 0x10000000);
+
 	/*
-	 * If an error occurred, than don't bothe getting the data;
-	 * it may not be valid.
+	 * This code, while simpler than the initial versions I used, could
+	 * stand some significant cleaning.
 	 */
-	if (errorp)
-	  asprintf(&temp, "0x%lx", fsc.args[sc->args[i].offset]);
-	else
-	  temp = print_arg(&sc->args[i], fsc.args, retval, trussinfo);
-	fsc.s_args[i] = temp;
-      }
-    }
-  }
-
-  if (fsc.name != NULL &&
-      (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit"))) {
-	trussinfo->curthread->in_syscall = 1;
-  }
-
-
-  /*
-   * It would probably be a good idea to merge the error handling,
-   * but that complicates things considerably.
-   */
-
-  print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp,
-		    retval, fsc.sc);
-  clear_fsc();
-
-  return (retval);
+
+	fsc = trussinfo->curthread->fsc;
+	sc = fsc->sc;
+	if (!sc) {
+		for (i = 0; i < fsc->nargs; i++)
+			asprintf(&fsc->s_args[i], "0x%lx", fsc->args[i]);
+	} else {
+		/*
+		 * Here, we only look for arguments that have OUT masked in --
+		 * otherwise, they were handled in the syscall_entry function.
+		 */
+		for (i = 0; i < sc->nargs; i++) {
+			char *temp;
+			if (sc->args[i].type & OUT) {
+				/*
+				 * If an error occurred, then don't bother
+				 * getting the data; it may not be valid.
+				 */
+				if (errorp) {
+					asprintf(&temp, "0x%lx",
+					    fsc->args[sc->args[i].offset]);
+				} else {
+					temp = print_arg(&sc->args[i],
+					    fsc->args, retval, trussinfo);
+				}
+				fsc->s_args[i] = temp;
+			}
+		}
+	}
+
+	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
+	    strcmp(fsc->name, "exit") == 0))
+		trussinfo->curthread->in_syscall = 1;
+
+	/*
+	 * It would probably be a good idea to merge the error handling,
+	 * but that complicates things considerably.
+	 */
+
+	print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp,
+	    retval, fsc->sc);
+	free_fsc(fsc);
+
+	return (retval);
 }