Alpha support for truss. I tested this on both bento and beast (thanks,

Jordan, for pointing me at beast!).  There should be no change for the
i386 version.

3 files changed, 351 insertions, 3 deletions

diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 63172a8..8db1458 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,6 +1,11 @@
 PROG=	truss
-SRCS=	main.c setup.c i386-fbsd.c i386-linux.c \
-	syscalls.c linux_syscalls.h syscalls.h ioctl.c
+SRCS=	main.c setup.c syscalls.c syscalls.h ioctl.c
+.if (${MACHINE} == "alpha")
+SRCS+=	alpha-fbsd.c
+.elif (${MACHINE} == "i386")
+SRCS+=	i386-fbsd.c i386-linux.c linux_syscalls.h
+.endif
+
 CFLAGS+= -I${.CURDIR} -I.
 CLEANFILES+=i386l-syscalls.master syscalls.master linux_syscalls.h \
 	syscalls.h ioctl.c
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
new file mode 100644
index 0000000..ca573ff
--- /dev/null
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -0,0 +1,332 @@
+/*
+ * Copryight 1998 Sean Eric Fagan
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Sean Eric Fagan
+ * 4. Neither the name of the author may be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+/*
+ * FreeBSD/alpha-specific system call handling.  This is probably the most
+ * complex part of the entire truss program, although I've got lots of
+ * it handled relatively cleanly now.  The system call names are generated
+ * automatically, thanks to /usr/src/sys/kern/syscalls.master.  The
+ * names used for the various structures are confusing, I sadly admit.
+ *
+ * This file is almost nothing more than a slightly-edited i386-fbsd.c.
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <sys/pioctl.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
+#include <sys/syscall.h>
+
+#include "syscall.h"
+
+static int fd = -1;
+static int cpid = -1;
+extern int Procfd;
+
+extern FILE *outfile;
+#include "syscalls.h"
+
+static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]);
+
+/*
+ * This is what this particular file uses to keep track of a system call.
+ * It is probably not quite sufficient -- I can probably use the same
+ * structure for the various syscall personalities, and I also probably
+ * need to nest system calls (for signal handlers).
+ *
+ * '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 syscall *sc;
+	char *name;
+	int number;
+	unsigned long *args;
+	int nargs;	/* number of arguments -- *not* number of words! */
+	char **s_args;	/* the printable arguments */
+} fsc;
+
+/* Clear up and free parts of the fsc structure. */
+static inline void
+clear_fsc() {
+  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));
+}
+
+/*
+ * Called when a process has entered a system call.  nargs is the
+ * number of words, not number of arguments (a necessary distinction
+ * in some cases).  Note that if the STOPEVENT() code in alpha/alpha/trap.c
+ * is ever changed these functions need to keep up.
+ */
+
+void
+alpha_syscall_entry(int pid, int nargs) {
+  char buf[32];
+  struct reg regs = { 0 };
+  int syscall;
+  int i;
+  unsigned int parm_offset;
+  struct syscall *sc;
+  int indir = 0;	/* indirect system call */
+
+  if (fd == -1 || pid != cpid) {
+    sprintf(buf, "/proc/%d/regs", pid);
+    fd = open(buf, O_RDWR);
+    if (fd == -1) {
+      fprintf(outfile, "-- CANNOT READ REGISTERS --\n");
+      return;
+    }
+    cpid = pid;
+  }
+
+  clear_fsc();
+  lseek(fd, 0L, 0);
+  i = read(fd, &regs, sizeof(regs));
+  parm_offset = regs.r_regs[R_SP] + sizeof(int);
+
+  /*
+   * FreeBSD has two special kinds of system call redirctions --
+   * SYS_syscall, and SYS___syscall.  The former is the old syscall()
+   * routine, basicly; the latter is for quad-aligned arguments.
+   */
+  syscall = regs.r_regs[R_V0];
+  if (syscall == SYS_syscall || syscall == SYS___syscall) {
+    indir = 1;
+    syscall = regs.r_regs[R_A0];
+  }
+
+  fsc.number = syscall;
+  fsc.name =
+    (syscall < 0 || syscall > nsyscalls) ? NULL : syscallnames[syscall];
+  if (!fsc.name) {
+    fprintf(outfile, "-- UNKNOWN SYSCALL %d --\n", syscall);
+  }
+
+  if (nargs == 0)
+    return;
+
+  fsc.args = malloc((1+nargs) * sizeof(unsigned long));
+  switch (nargs) {
+  default:
+	/*
+	 * The OS doesn't seem to allow more than 10 words of
+	 * parameters (yay!).  So we shouldn't be here.
+	 */
+	warn("More than 10 words (%d) of arguments!\n", nargs);
+	break;
+  case 10: case 9: case 8: case 7:
+	/*
+	 * If there are 7-10 words of arguments, they are placed
+	 * on the stack, as is normal for other processors.
+	 * The fall-through for all of these is deliberate!!!
+	 */
+	lseek(Procfd, regs.r_regs[R_SP], SEEK_SET);
+	read(fd, &fsc.args[6], (nargs - 6) * sizeof(fsc.args[0]));
+  case 6:	fsc.args[5] = regs.r_regs[R_A5];
+  case 5:	fsc.args[4] = regs.r_regs[R_A4];
+  case 4:	fsc.args[3] = regs.r_regs[R_A3];
+  case 3:	fsc.args[2] = regs.r_regs[R_A2];
+  case 2:	fsc.args[1] = regs.r_regs[R_A1];
+  case 1:	fsc.args[0] = regs.r_regs[R_A0];
+  case 0:
+	break;
+  }
+
+  if (indir) {
+    memmove(&fsc.args[0], &fsc.args[1], (nargs-1) * sizeof(fsc.args[0]));
+  }
+
+  sc = get_syscall(fsc.name);
+  if (sc) {
+    fsc.nargs = sc->nargs;
+  } else {
+#if DEBUG
+    fprintf(outfile, "unknown syscall %s -- setting args to %d\n",
+	   fsc.name, nargs);
+#endif
+    fsc.nargs = nargs;
+  }
+
+  fsc.s_args = malloc((1+fsc.nargs) * sizeof(char*));
+  memset(fsc.s_args, 0, fsc.nargs * sizeof(char*));
+  fsc.sc = sc;
+
+  /*
+   * 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);
+#endif
+    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) ? "," : "");
+#endif
+      if (sc && !(sc->args[i].type & OUT)) {
+	fsc.s_args[i] = print_arg(Procfd, &sc->args[i], fsc.args);
+      }
+    }
+#if DEBUG
+    fprintf(stderr, ")\n");
+#endif
+  }
+
+#if DEBUG
+  fprintf(outfile, "\n");
+#endif
+
+  /*
+   * Some system calls should be printed out before they are done --
+   * execve() and exit(), for example, never return.  Possibly change
+   * this to work for any system call that doesn't have an OUT
+   * parameter?
+   */
+
+  if (!strcmp(fsc.name, "execve") || !strcmp(fsc.name, "exit")) {
+    print_syscall(outfile, fsc.name, fsc.nargs, fsc.s_args);
+  }
+
+  return;
+}
+
+/*
+ * And when the system call is done, we handle it here.
+ * Currently, no attempt is made to ensure that the system calls
+ * match -- this needs to be fixed (and is, in fact, why S_SCX includes
+ * the sytem call number instead of, say, an error status).
+ */
+
+void
+alpha_syscall_exit(int pid, int syscall) {
+  char buf[32];
+  struct reg regs;
+  int retval;
+  int i;
+  int errorp;
+  struct syscall *sc;
+
+  if (fd == -1 || pid != cpid) {
+    sprintf(buf, "/proc/%d/regs", pid);
+    fd = open(buf, O_RDONLY);
+    if (fd == -1) {
+      fprintf(outfile, "-- CANNOT READ REGISTERS --\n");
+      return;
+    }
+    cpid = pid;
+  }
+
+  lseek(fd, 0L, 0);
+  if (read(fd, &regs, sizeof(regs)) != sizeof(regs))
+    return;
+  retval = regs.r_regs[R_V0];
+  errorp = !!(regs.r_regs[R_A3]);
+
+  /*
+   * 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++) {
+      fsc.s_args[i] = malloc(12);
+      sprintf(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, than don't bothe getting the data;
+	 * it may not be valid.
+	 */
+	if (errorp) {
+	  temp = malloc(12);
+	  sprintf(temp, "0x%lx", fsc.args[sc->args[i].offset]);
+	} else {
+	  temp = print_arg(Procfd, &sc->args[i], fsc.args);
+	}
+	fsc.s_args[i] = temp;
+      }
+    }
+  }
+
+  /*
+   * It would probably be a good idea to merge the error handling,
+   * but that complicates things considerably.
+   */
+
+  print_syscall(outfile, fsc.name, fsc.nargs, fsc.s_args);
+  if (errorp) {
+    fprintf(outfile, "errno %d '%s'\n", retval, strerror(retval));
+  } else {
+    fprintf(outfile, "returns %d (0x%x)\n", retval, retval);
+  }
+  clear_fsc();
+
+  return;
+}
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index 0cc2aed..427130c 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.10 1998/08/24 10:17:20 cracauer Exp $";
+	"$Id: main.c,v 1.11 1998/09/07 05:49:43 sef Exp $";
 #endif /* not lint */
 
 /*
@@ -53,10 +53,16 @@ static const char rcsid[] =
 
 extern int setup_and_wait(char **);
 extern int start_tracing(int, int);
+#ifdef __alpha__
+extern void alpha_syscall_entry(int, int);
+extern void alpha_syscall_exit(int, int);
+#endif
+#ifdef __i386__
 extern void i386_syscall_entry(int, int);
 extern void i386_syscall_exit(int, int);
 extern void i386_linux_syscall_entry(int, int);
 extern void i386_linux_syscall_exit(int, int);
+#endif
 
 /*
  * These should really be parameterized -- I don't like having globals,
@@ -87,9 +93,14 @@ struct ex_types {
   void (*enter_syscall)(int, int);
   void (*exit_syscall)(int, int);
 } ex_types[] = {
+#ifdef __alpha__
+  { "FreeBSD ELF", alpha_syscall_entry, alpha_syscall_exit },
+#endif
+#ifdef __i386__
   { "FreeBSD a.out", i386_syscall_entry, i386_syscall_exit },
   { "FreeBSD ELF", i386_syscall_entry, i386_syscall_exit },
   { "Linux ELF", i386_linux_syscall_entry, i386_linux_syscall_exit },
+#endif
   { 0, 0, 0 },
 };