summaryrefslogtreecommitdiffstats
path: root/usr.bin/truss/amd64-fbsd32.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/truss/amd64-fbsd32.c')
-rw-r--r--usr.bin/truss/amd64-fbsd32.c153
1 files changed, 80 insertions, 73 deletions
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index 5cf9f84..72f4295 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -62,8 +62,6 @@ static const char rcsid[] =
#include "syscall.h"
#include "extern.h"
-static int cpid = -1;
-
#include "freebsd32_syscalls.h"
static int nsyscalls = sizeof(freebsd32_syscallnames) /
@@ -78,7 +76,7 @@ static int nsyscalls = sizeof(freebsd32_syscallnames) /
* 'struct syscall' describes the system call; it may be NULL, however,
* if we don't know about this particular system call yet.
*/
-static struct freebsd32_syscall {
+struct freebsd32_syscall {
struct syscall *sc;
const char *name;
int number;
@@ -86,25 +84,29 @@ static struct freebsd32_syscall {
unsigned int *args32;
int nargs; /* number of arguments -- *not* number of words! */
char **s_args; /* the printable arguments */
-} fsc;
+};
+
+static struct freebsd32_syscall *
+alloc_fsc(void)
+{
+
+ return (malloc(sizeof(struct freebsd32_syscall)));
+}
/* Clear up and free parts of the fsc structure. */
-static __inline void
-clear_fsc(void)
+static void
+free_fsc(struct freebsd32_syscall *fsc)
{
int i;
- if (fsc.args)
- free(fsc.args);
- if (fsc.args32)
- free(fsc.args32);
- if (fsc.s_args) {
- for (i = 0; i < fsc.nargs; i++)
- if (fsc.s_args[i])
- free(fsc.s_args[i]);
- free(fsc.s_args);
+ free(fsc->args);
+ free(fsc->args32);
+ if (fsc->s_args) {
+ for (i = 0; i < fsc->nargs; i++)
+ free(fsc->s_args[i]);
+ free(fsc->s_args);
}
- memset(&fsc, 0, sizeof(fsc));
+ free(fsc);
}
/*
@@ -119,15 +121,15 @@ amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs)
{
struct ptrace_io_desc iorequest;
struct reg regs;
+ struct freebsd32_syscall *fsc;
struct syscall *sc;
+ lwpid_t tid;
unsigned long parm_offset;
int i, syscall_num;
- clear_fsc();
-
- cpid = trussinfo->curthread->tid;
+ tid = trussinfo->curthread->tid;
- if (ptrace(PT_GETREGS, cpid, (caddr_t)&regs, 0) < 0) {
+ if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
return;
}
@@ -141,60 +143,63 @@ amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs)
syscall_num = regs.r_rax;
switch (syscall_num) {
case SYS_syscall:
- syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0);
+ syscall_num = ptrace(PT_READ_D, tid, (caddr_t)parm_offset, 0);
parm_offset += sizeof(int);
break;
case SYS___syscall:
- syscall_num = ptrace(PT_READ_D, cpid, (caddr_t)parm_offset, 0);
+ syscall_num = ptrace(PT_READ_D, tid, (caddr_t)parm_offset, 0);
parm_offset += sizeof(quad_t);
break;
}
- fsc.number = syscall_num;
- fsc.name = (syscall_num < 0 || syscall_num >= nsyscalls) ?
+ fsc = alloc_fsc();
+ if (fsc == NULL)
+ return;
+ fsc->number = syscall_num;
+ fsc->name = (syscall_num < 0 || syscall_num >= nsyscalls) ?
NULL : freebsd32_syscallnames[syscall_num];
- if (!fsc.name) {
+ 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))
+ 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.args32 = malloc((1 + nargs) * sizeof(unsigned int));
+ fsc->args32 = malloc((1 + nargs) * sizeof(unsigned int));
iorequest.piod_op = PIOD_READ_D;
iorequest.piod_offs = (void *)parm_offset;
- iorequest.piod_addr = fsc.args32;
+ iorequest.piod_addr = fsc->args32;
iorequest.piod_len = (1 + nargs) * sizeof(unsigned int);
- ptrace(PT_IO, cpid, (caddr_t)&iorequest, 0);
+ ptrace(PT_IO, tid, (caddr_t)&iorequest, 0);
if (iorequest.piod_len == 0)
return;
- fsc.args = malloc((1 + nargs) * sizeof(unsigned long));
+ fsc->args = malloc((1 + nargs) * sizeof(unsigned long));
for (i = 0; i < nargs + 1; i++)
- fsc.args[i] = fsc.args32[i];
+ fsc->args[i] = fsc->args32[i];
sc = NULL;
- if (fsc.name)
- sc = get_syscall(fsc.name);
+ if (fsc->name)
+ sc = get_syscall(fsc->name);
if (sc)
- fsc.nargs = sc->nargs;
+ fsc->nargs = sc->nargs;
else {
#if DEBUG
fprintf(trussinfo->outfile, "unknown syscall %s -- setting "
- "args to %d\n", fsc.name, nargs);
+ "args to %d\n", fsc->name, nargs);
#endif
- fsc.nargs = nargs;
+ fsc->nargs = nargs;
}
- fsc.s_args = calloc(1, (1 + fsc.nargs) * sizeof(char *));
- fsc.sc = sc;
+ fsc->s_args = calloc(1, (1 + fsc->nargs) * sizeof(char *));
+ fsc->sc = sc;
/*
* At this point, we set up the system call arguments.
@@ -204,19 +209,19 @@ amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs)
* passed in *and* out, however.
*/
- if (fsc.name) {
+ 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) ? "," : "");
+ 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);
+ fsc->s_args[i] = print_arg(&sc->args[i],
+ fsc->args, 0, trussinfo);
}
}
#if DEBUG
@@ -228,30 +233,29 @@ amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs)
fprintf(trussinfo->outfile, "\n");
#endif
- if (fsc.name != NULL && (strcmp(fsc.name, "freebsd32_execve") == 0||
- strcmp(fsc.name, "exit") == 0)) {
+ if (fsc->name != NULL && (strcmp(fsc->name, "freebsd32_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, "freebsd32_execve") == 0) {
+ if (strcmp(fsc->name, "freebsd32_execve") == 0) {
if ((trussinfo->flags & EXECVEARGS) == 0) {
- if (fsc.s_args[1]) {
- free(fsc.s_args[1]);
- fsc.s_args[1] = NULL;
+ 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;
+ if (fsc->s_args[2]) {
+ free(fsc->s_args[2]);
+ fsc->s_args[2] = NULL;
}
}
}
}
-
- return;
+ trussinfo->curthread->fsc = fsc;
}
/*
@@ -265,16 +269,18 @@ long
amd64_fbsd32_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
{
struct reg regs;
+ struct freebsd32_syscall *fsc;
struct syscall *sc;
+ lwpid_t tid;
long retval;
int errorp, i;
- if (fsc.name == NULL)
+ if (trussinfo->curthread->fsc == NULL)
return (-1);
- cpid = trussinfo->curthread->tid;
+ tid = trussinfo->curthread->tid;
- if (ptrace(PT_GETREGS, cpid, (caddr_t)&regs, 0) < 0) {
+ if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
return (-1);
}
@@ -287,10 +293,11 @@ amd64_fbsd32_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
* stand some significant cleaning.
*/
- sc = fsc.sc;
+ 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]);
+ 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 --
@@ -305,18 +312,18 @@ amd64_fbsd32_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
*/
if (errorp) {
asprintf(&temp, "0x%lx",
- fsc.args[sc->args[i].offset]);
+ fsc->args[sc->args[i].offset]);
} else {
temp = print_arg(&sc->args[i],
- fsc.args, retval, trussinfo);
+ fsc->args, retval, trussinfo);
}
- fsc.s_args[i] = temp;
+ fsc->s_args[i] = temp;
}
}
}
- if (fsc.name != NULL && (strcmp(fsc.name, "freebsd32_execve") == 0 ||
- strcmp(fsc.name, "exit") == 0))
+ if (fsc->name != NULL && (strcmp(fsc->name, "freebsd32_execve") == 0 ||
+ strcmp(fsc->name, "exit") == 0))
trussinfo->curthread->in_syscall = 1;
/*
@@ -324,9 +331,9 @@ amd64_fbsd32_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
* but that complicates things considerably.
*/
- print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp,
- retval, fsc.sc);
- clear_fsc();
+ print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp,
+ retval, fsc->sc);
+ free_fsc(fsc);
return (retval);
}
OpenPOWER on IntegriCloud