summaryrefslogtreecommitdiffstats
path: root/usr.bin/truss/amd64-linux32.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/truss/amd64-linux32.c')
-rw-r--r--usr.bin/truss/amd64-linux32.c139
1 files changed, 74 insertions, 65 deletions
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index e041b60..2c025a3 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -59,8 +59,6 @@ static const char rcsid[] =
#include "syscall.h"
#include "extern.h"
-static int cpid = -1;
-
#include "linux32_syscalls.h"
static int nsyscalls =
@@ -75,28 +73,34 @@ static int nsyscalls =
* 'struct syscall' describes the system call; it may be NULL, however,
* if we don't know about this particular system call yet.
*/
-static struct linux_syscall {
+struct linux_syscall {
struct syscall *sc;
const char *name;
int number;
unsigned long args[5];
int nargs; /* number of arguments -- *not* number of words! */
char **s_args; /* the printable arguments */
-} fsc;
+};
+
+static struct linux_syscall *
+alloc_fsc(void)
+{
+
+ return (malloc(sizeof(struct linux_syscall)));
+}
/* Clear up and free parts of the fsc structure. */
-static __inline void
-clear_fsc(void)
+static void
+free_fsc(struct linux_syscall *fsc)
{
int i;
- 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);
+ 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);
}
/*
@@ -110,31 +114,34 @@ void
amd64_linux32_syscall_entry(struct trussinfo *trussinfo, int nargs)
{
struct reg regs;
+ struct linux_syscall *fsc;
struct syscall *sc;
+ lwpid_t tid;
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;
}
syscall_num = regs.r_rax;
- 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 : linux32_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, "linux_fork") == 0||
- strcmp(fsc.name, "linux_vfork") == 0))
+ if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
+ (strcmp(fsc->name, "linux_fork") == 0 ||
+ strcmp(fsc->name, "linux_vfork") == 0))
trussinfo->curthread->in_fork = 1;
if (nargs == 0)
@@ -148,25 +155,25 @@ amd64_linux32_syscall_entry(struct trussinfo *trussinfo, int nargs)
* that have more than five arguments?
*/
- fsc.args[0] = regs.r_rbx;
- fsc.args[1] = regs.r_rcx;
- fsc.args[2] = regs.r_rdx;
- fsc.args[3] = regs.r_rsi;
- fsc.args[4] = regs.r_rdi;
+ fsc->args[0] = regs.r_rbx;
+ fsc->args[1] = regs.r_rcx;
+ fsc->args[2] = regs.r_rdx;
+ fsc->args[3] = regs.r_rsi;
+ fsc->args[4] = regs.r_rdi;
- sc = get_syscall(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.
@@ -176,19 +183,19 @@ amd64_linux32_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
@@ -200,30 +207,29 @@ amd64_linux32_syscall_entry(struct trussinfo *trussinfo, int nargs)
fprintf(trussinfo->outfile, "\n");
#endif
- if (fsc.name != NULL && (strcmp(fsc.name, "linux_execve") == 0 ||
- strcmp(fsc.name, "exit") == 0)) {
+ if (fsc->name != NULL && (strcmp(fsc->name, "linux_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, "linux_execve") == 0) {
+ if (strcmp(fsc->name, "linux_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;
}
/*
@@ -246,16 +252,18 @@ amd64_linux32_syscall_exit(struct trussinfo *trussinfo,
int syscall_num __unused)
{
struct reg regs;
+ struct linux_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);
}
@@ -268,10 +276,11 @@ amd64_linux32_syscall_exit(struct trussinfo *trussinfo,
* 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 --
@@ -286,12 +295,12 @@ amd64_linux32_syscall_exit(struct trussinfo *trussinfo,
*/
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;
}
}
}
@@ -308,13 +317,13 @@ amd64_linux32_syscall_exit(struct trussinfo *trussinfo,
}
}
- if (fsc.name != NULL && (strcmp(fsc.name, "linux_execve") == 0 ||
- strcmp(fsc.name, "exit") == 0))
+ if (fsc->name != NULL && (strcmp(fsc->name, "linux_execve") == 0 ||
+ strcmp(fsc->name, "exit") == 0))
trussinfo->curthread->in_syscall = 1;
- print_syscall_ret(trussinfo, fsc.name, fsc.nargs, fsc.s_args, errorp,
- errorp ? i : retval, fsc.sc);
- clear_fsc();
+ print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp,
+ errorp ? i : retval, fsc->sc);
+ free_fsc(fsc);
return (retval);
}
OpenPOWER on IntegriCloud