X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=process.c;h=2c619e7fe9abed81199097b42fa6c75c42f99d05;hb=7a0fb3838629aa53fa4c6b21a1cc11f67a1090df;hp=23e44f6df7a8d86ae614f52c8aa043f0e9942b1a;hpb=59432dbb333959618b5afdb9a7513d1ab0289a14;p=strace diff --git a/process.c b/process.c index 23e44f6d..2c619e7f 100644 --- a/process.c +++ b/process.c @@ -8,7 +8,6 @@ * * Copyright (c) 2000 PocketPenguins Inc. Linux for Hitachi SuperH * port by Greg Banks - * * All rights reserved. * @@ -33,116 +32,81 @@ * 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. - * - * $Id$ */ #include "defs.h" - #include #include -#include #include #include #include #include -#include -#include -#ifdef SUNOS4 -#include -#endif /* SUNOS4 */ - -#ifdef FREEBSD -#include -#endif - -#if HAVE_ASM_REG_H -#if defined (SPARC) || defined (SPARC64) -# define fpq kernel_fpq -# define fq kernel_fq -# define fpu kernel_fpu -#endif /* SPARC || SPARC64 */ -#include -#if defined (SPARC) || defined (SPARC64) -# undef fpq -# undef fq -# undef fpu -#endif /* SPARC || SPARC64 */ -#endif /* HAVE_ASM_REG_H */ +#ifdef HAVE_ELF_H +# include +#endif #ifdef HAVE_SYS_REG_H # include -#ifndef PTRACE_PEEKUSR -# define PTRACE_PEEKUSR PTRACE_PEEKUSER -#endif -#ifndef PTRACE_POKEUSR -# define PTRACE_POKEUSR PTRACE_POKEUSER -#endif +# ifndef PTRACE_PEEKUSR +# define PTRACE_PEEKUSR PTRACE_PEEKUSER +# endif +# ifndef PTRACE_POKEUSR +# define PTRACE_POKEUSR PTRACE_POKEUSER +# endif #endif #ifdef HAVE_LINUX_PTRACE_H -#undef PTRACE_SYSCALL +# undef PTRACE_SYSCALL # ifdef HAVE_STRUCT_IA64_FPREG # define ia64_fpreg XXX_ia64_fpreg # endif # ifdef HAVE_STRUCT_PT_ALL_USER_REGS # define pt_all_user_regs XXX_pt_all_user_regs # endif -#include +# include # undef ia64_fpreg # undef pt_all_user_regs #endif -#if defined (LINUX) && defined (SPARC64) +#if defined(SPARC64) # define r_pc r_tpc # undef PTRACE_GETREGS # define PTRACE_GETREGS PTRACE_GETREGS64 # undef PTRACE_SETREGS # define PTRACE_SETREGS PTRACE_SETREGS64 -#endif /* LINUX && SPARC64 */ +#endif #ifdef HAVE_LINUX_FUTEX_H -#include +# include #endif -#if defined LINUX -# ifndef FUTEX_WAIT -# define FUTEX_WAIT 0 -# endif -# ifndef FUTEX_WAKE -# define FUTEX_WAKE 1 -# endif -# ifndef FUTEX_FD -# define FUTEX_FD 2 -# endif -# ifndef FUTEX_REQUEUE -# define FUTEX_REQUEUE 3 -# endif +#ifndef FUTEX_WAIT +# define FUTEX_WAIT 0 +#endif +#ifndef FUTEX_WAKE +# define FUTEX_WAKE 1 +#endif +#ifndef FUTEX_FD +# define FUTEX_FD 2 +#endif +#ifndef FUTEX_REQUEUE +# define FUTEX_REQUEUE 3 #endif -#ifdef LINUX #include #include #undef GETGROUPS_T #define GETGROUPS_T __kernel_gid_t #undef GETGROUPS32_T #define GETGROUPS32_T __kernel_gid32_t -#endif /* LINUX */ -#if defined(LINUX) && defined(IA64) +#if defined(IA64) # include # include #endif #ifdef HAVE_PRCTL -#include -#endif - -#ifndef WCOREDUMP -#define WCOREDUMP(status) ((status) & 0200) -#endif +# include -/* WTA: this was `&& !defined(LINUXSPARC)', this seems unneeded though? */ -#if defined(HAVE_PRCTL) static const struct xlat prctl_options[] = { #ifdef PR_MAXPROCS { PR_MAXPROCS, "PR_MAXPROCS" }, @@ -195,6 +159,7 @@ static const struct xlat prctl_options[] = { #ifdef PR_PTHREADEXIT { PR_PTHREADEXIT, "PR_PTHREADEXIT" }, #endif + #ifdef PR_SET_PDEATHSIG { PR_SET_PDEATHSIG, "PR_SET_PDEATHSIG" }, #endif @@ -255,6 +220,12 @@ static const struct xlat prctl_options[] = { #ifdef PR_SET_SECCOMP { PR_SET_SECCOMP, "PR_SET_SECCOMP" }, #endif +#ifdef PR_CAPBSET_READ + { PR_CAPBSET_READ, "PR_CAPBSET_READ" }, +#endif +#ifdef PR_CAPBSET_DROP + { PR_CAPBSET_DROP, "PR_CAPBSET_DROP" }, +#endif #ifdef PR_GET_TSC { PR_GET_TSC, "PR_GET_TSC" }, #endif @@ -266,36 +237,72 @@ static const struct xlat prctl_options[] = { #endif #ifdef PR_SET_SECUREBITS { PR_SET_SECUREBITS, "PR_SET_SECUREBITS" }, +#endif +#ifdef PR_SET_TIMERSLACK + { PR_SET_TIMERSLACK, "PR_SET_TIMERSLACK" }, +#endif +#ifdef PR_GET_TIMERSLACK + { PR_GET_TIMERSLACK, "PR_GET_TIMERSLACK" }, +#endif +#ifdef PR_TASK_PERF_EVENTS_DISABLE + { PR_TASK_PERF_EVENTS_DISABLE, "PR_TASK_PERF_EVENTS_DISABLE" }, +#endif +#ifdef PR_TASK_PERF_EVENTS_ENABLE + { PR_TASK_PERF_EVENTS_ENABLE, "PR_TASK_PERF_EVENTS_ENABLE" }, +#endif +#ifdef PR_MCE_KILL + { PR_MCE_KILL, "PR_MCE_KILL" }, +#endif +#ifdef PR_MCE_KILL_GET + { PR_MCE_KILL_GET, "PR_MCE_KILL_GET" }, +#endif +#ifdef PR_SET_MM + { PR_SET_MM, "PR_SET_MM" }, +#endif +#ifdef PR_SET_PTRACER + { PR_SET_PTRACER, "PR_SET_PTRACER" }, +#endif +#ifdef PR_SET_CHILD_SUBREAPER + { PR_SET_CHILD_SUBREAPER, "PR_SET_CHILD_SUBREAPER" }, +#endif +#ifdef PR_GET_CHILD_SUBREAPER + { PR_GET_CHILD_SUBREAPER, "PR_GET_CHILD_SUBREAPER" }, +#endif +#ifdef PR_SET_NO_NEW_PRIVS + { PR_SET_NO_NEW_PRIVS, "PR_SET_NO_NEW_PRIVS" }, +#endif +#ifdef PR_GET_NO_NEW_PRIVS + { PR_GET_NO_NEW_PRIVS, "PR_GET_NO_NEW_PRIVS" }, +#endif +#ifdef PR_GET_TID_ADDRESS + { PR_GET_TID_ADDRESS, "PR_GET_TID_ADDRESS" }, #endif { 0, NULL }, }; - static const char * -unalignctl_string (unsigned int ctl) +unalignctl_string(unsigned int ctl) { - static char buf[16]; + static char buf[sizeof(int)*2 + 2]; switch (ctl) { #ifdef PR_UNALIGN_NOPRINT - case PR_UNALIGN_NOPRINT: - return "NOPRINT"; + case PR_UNALIGN_NOPRINT: + return "NOPRINT"; #endif #ifdef PR_UNALIGN_SIGBUS - case PR_UNALIGN_SIGBUS: - return "SIGBUS"; + case PR_UNALIGN_SIGBUS: + return "SIGBUS"; #endif - default: - break; + default: + break; } sprintf(buf, "%x", ctl); return buf; } - int -sys_prctl(tcp) -struct tcb *tcp; +sys_prctl(struct tcb *tcp) { int i; @@ -344,7 +351,7 @@ struct tcb *tcp; break; #endif default: - for (i = 1; i < tcp->u_nargs; i++) + for (i = 1; i < tcp->s_ent->nargs; i++) tprintf(", %#lx", tcp->u_arg[i]); break; } @@ -379,23 +386,10 @@ struct tcb *tcp; } return 0; } - #endif /* HAVE_PRCTL */ -#if defined(FREEBSD) || defined(SUNOS4) || defined(SVR4) -int -sys_gethostid(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) - return RVAL_HEX; - return 0; -} -#endif /* FREEBSD || SUNOS4 || SVR4 */ - int -sys_sethostname(tcp) -struct tcb *tcp; +sys_sethostname(struct tcb *tcp) { if (entering(tcp)) { printpathn(tcp, tcp->u_arg[0], tcp->u_arg[1]); @@ -404,10 +398,9 @@ struct tcb *tcp; return 0; } -#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4) || defined(SVR4) +#if defined(ALPHA) int -sys_gethostname(tcp) -struct tcb *tcp; +sys_gethostname(struct tcb *tcp) { if (exiting(tcp)) { if (syserror(tcp)) @@ -418,11 +411,10 @@ struct tcb *tcp; } return 0; } -#endif /* ALPHA || FREEBSD || SUNOS4 || SVR4 */ +#endif int -sys_setdomainname(tcp) -struct tcb *tcp; +sys_setdomainname(struct tcb *tcp) { if (entering(tcp)) { printpathn(tcp, tcp->u_arg[0], tcp->u_arg[1]); @@ -431,26 +423,8 @@ struct tcb *tcp; return 0; } -#if !defined(LINUX) - -int -sys_getdomainname(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) { - if (syserror(tcp)) - tprintf("%#lx", tcp->u_arg[0]); - else - printpath(tcp, tcp->u_arg[0]); - tprintf(", %lu", tcp->u_arg[1]); - } - return 0; -} -#endif /* !LINUX */ - int -sys_exit(tcp) -struct tcb *tcp; +sys_exit(struct tcb *tcp) { if (exiting(tcp)) { fprintf(stderr, "_exit returned!\n"); @@ -458,107 +432,12 @@ struct tcb *tcp; } /* special case: we stop tracing this process, finish line now */ tprintf("%ld) ", tcp->u_arg[0]); - tabto(acolumn); - tprintf("= ?"); - printtrailer(); - return 0; -} - -int -internal_exit(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tcp->flags |= TCB_EXITING; -#ifdef __NR_exit_group -# ifdef IA64 - if (ia32) { - if (tcp->scno == 252) - tcp->flags |= TCB_GROUP_EXITING; - } else -# endif - if (known_scno(tcp) == __NR_exit_group) - tcp->flags |= TCB_GROUP_EXITING; -#endif - } - return 0; -} - -/* TCP is creating a child we want to follow. - If there will be space in tcbtab for it, set TCB_FOLLOWFORK and return 0. - If not, clear TCB_FOLLOWFORK, print an error, and return 1. */ -static void -fork_tcb(struct tcb *tcp) -{ - if (nprocs == tcbtabsize) - expand_tcbtab(); - - tcp->flags |= TCB_FOLLOWFORK; -} - -#ifdef USE_PROCFS - -int -sys_fork(struct tcb *tcp) -{ - if (exiting(tcp) && !syserror(tcp)) { - if (getrval2(tcp)) { - tcp->auxstr = "child process"; - return RVAL_UDECIMAL | RVAL_STR; - } - } - return 0; -} - -#if UNIXWARE > 2 - -int -sys_rfork(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tprintf ("%ld", tcp->u_arg[0]); - } - else if (!syserror(tcp)) { - if (getrval2(tcp)) { - tcp->auxstr = "child process"; - return RVAL_UDECIMAL | RVAL_STR; - } - } - return 0; -} - -#endif - -int -internal_fork(tcp) -struct tcb *tcp; -{ - struct tcb *tcpchild; - - if (exiting(tcp)) { -#ifdef SYS_rfork - if (known_scno(tcp) == SYS_rfork && !(tcp->u_arg[0]&RFPROC)) - return 0; -#endif - if (getrval2(tcp)) - return 0; - if (!followfork) - return 0; - fork_tcb(tcp); - if (syserror(tcp)) - return 0; - tcpchild = alloctcb(tcp->u_rval); - if (proc_open(tcpchild, 2) < 0) - droptcb(tcpchild); - } + tabto(); + tprints("= ?\n"); + line_ended(); return 0; } -#else /* !USE_PROCFS */ - -#ifdef LINUX - /* defines copied from linux/sched.h since we can't include that * ourselves (it conflicts with *lots* of libc includes) */ @@ -577,100 +456,114 @@ struct tcb *tcp; #define CLONE_SETTLS 0x00080000 /* create a new TLS for the child */ #define CLONE_PARENT_SETTID 0x00100000 /* set the TID in the parent */ #define CLONE_CHILD_CLEARTID 0x00200000 /* clear the TID in the child */ -#define CLONE_DETACHED 0x00400000 /* parent wants no child-exit signal */ #define CLONE_UNTRACED 0x00800000 /* set if the tracing process can't force CLONE_PTRACE on this clone */ #define CLONE_CHILD_SETTID 0x01000000 /* set the TID in the child */ +#define CLONE_STOPPED 0x02000000 /* Start in stopped state */ +#define CLONE_NEWUTS 0x04000000 /* New utsname group? */ +#define CLONE_NEWIPC 0x08000000 /* New ipcs */ +#define CLONE_NEWUSER 0x10000000 /* New user namespace */ +#define CLONE_NEWPID 0x20000000 /* New pid namespace */ +#define CLONE_NEWNET 0x40000000 /* New network namespace */ +#define CLONE_IO 0x80000000 /* Clone io context */ static const struct xlat clone_flags[] = { - { CLONE_VM, "CLONE_VM" }, - { CLONE_FS, "CLONE_FS" }, - { CLONE_FILES, "CLONE_FILES" }, - { CLONE_SIGHAND, "CLONE_SIGHAND" }, - { CLONE_IDLETASK, "CLONE_IDLETASK"}, - { CLONE_PTRACE, "CLONE_PTRACE" }, - { CLONE_VFORK, "CLONE_VFORK" }, - { CLONE_PARENT, "CLONE_PARENT" }, - { CLONE_THREAD, "CLONE_THREAD" }, - { CLONE_NEWNS, "CLONE_NEWNS" }, - { CLONE_SYSVSEM, "CLONE_SYSVSEM" }, - { CLONE_SETTLS, "CLONE_SETTLS" }, - { CLONE_PARENT_SETTID,"CLONE_PARENT_SETTID" }, - { CLONE_CHILD_CLEARTID,"CLONE_CHILD_CLEARTID" }, - { CLONE_DETACHED, "CLONE_DETACHED" }, - { CLONE_UNTRACED, "CLONE_UNTRACED" }, - { CLONE_CHILD_SETTID,"CLONE_CHILD_SETTID" }, - { 0, NULL }, + { CLONE_VM, "CLONE_VM" }, + { CLONE_FS, "CLONE_FS" }, + { CLONE_FILES, "CLONE_FILES" }, + { CLONE_SIGHAND, "CLONE_SIGHAND" }, + { CLONE_IDLETASK, "CLONE_IDLETASK" }, + { CLONE_PTRACE, "CLONE_PTRACE" }, + { CLONE_VFORK, "CLONE_VFORK" }, + { CLONE_PARENT, "CLONE_PARENT" }, + { CLONE_THREAD, "CLONE_THREAD" }, + { CLONE_NEWNS, "CLONE_NEWNS" }, + { CLONE_SYSVSEM, "CLONE_SYSVSEM" }, + { CLONE_SETTLS, "CLONE_SETTLS" }, + { CLONE_PARENT_SETTID, "CLONE_PARENT_SETTID" }, + { CLONE_CHILD_CLEARTID, "CLONE_CHILD_CLEARTID" }, + { CLONE_UNTRACED, "CLONE_UNTRACED" }, + { CLONE_CHILD_SETTID, "CLONE_CHILD_SETTID" }, + { CLONE_STOPPED, "CLONE_STOPPED" }, + { CLONE_NEWUTS, "CLONE_NEWUTS" }, + { CLONE_NEWIPC, "CLONE_NEWIPC" }, + { CLONE_NEWUSER, "CLONE_NEWUSER" }, + { CLONE_NEWPID, "CLONE_NEWPID" }, + { CLONE_NEWNET, "CLONE_NEWNET" }, + { CLONE_IO, "CLONE_IO" }, + { 0, NULL }, }; -# ifdef I386 -# include -# ifdef HAVE_STRUCT_USER_DESC -# define modify_ldt_ldt_s user_desc -# endif +#ifdef I386 +# include +# ifdef HAVE_STRUCT_USER_DESC +# define modify_ldt_ldt_s user_desc +# endif extern void print_ldt_entry(); -# endif +#endif -# if defined IA64 -# define ARG_FLAGS 0 -# define ARG_STACK 1 -# define ARG_STACKSIZE (known_scno(tcp) == SYS_clone2 ? 2 : -1) -# define ARG_PTID (known_scno(tcp) == SYS_clone2 ? 3 : 2) -# define ARG_CTID (known_scno(tcp) == SYS_clone2 ? 4 : 3) -# define ARG_TLS (known_scno(tcp) == SYS_clone2 ? 5 : 4) -# elif defined S390 || defined S390X -# define ARG_STACK 0 -# define ARG_FLAGS 1 -# define ARG_PTID 2 -# define ARG_CTID 3 -# define ARG_TLS 4 -# elif defined X86_64 || defined ALPHA -# define ARG_FLAGS 0 -# define ARG_STACK 1 -# define ARG_PTID 2 -# define ARG_CTID 3 -# define ARG_TLS 4 -# else -# define ARG_FLAGS 0 -# define ARG_STACK 1 -# define ARG_PTID 2 -# define ARG_TLS 3 -# define ARG_CTID 4 -# endif +#if defined IA64 +# define ARG_FLAGS 0 +# define ARG_STACK 1 +# define ARG_STACKSIZE (tcp->scno == SYS_clone2 ? 2 : -1) +# define ARG_PTID (tcp->scno == SYS_clone2 ? 3 : 2) +# define ARG_CTID (tcp->scno == SYS_clone2 ? 4 : 3) +# define ARG_TLS (tcp->scno == SYS_clone2 ? 5 : 4) +#elif defined S390 || defined S390X || defined CRISV10 || defined CRISV32 +# define ARG_STACK 0 +# define ARG_FLAGS 1 +# define ARG_PTID 2 +# define ARG_CTID 3 +# define ARG_TLS 4 +#elif defined X86_64 || defined X32 || defined ALPHA || defined TILE \ + || defined OR1K +# define ARG_FLAGS 0 +# define ARG_STACK 1 +# define ARG_PTID 2 +# define ARG_CTID 3 +# define ARG_TLS 4 +#else +# define ARG_FLAGS 0 +# define ARG_STACK 1 +# define ARG_PTID 2 +# define ARG_TLS 3 +# define ARG_CTID 4 +#endif int -sys_clone(tcp) -struct tcb *tcp; +sys_clone(struct tcb *tcp) { if (exiting(tcp)) { + const char *sep = "|"; unsigned long flags = tcp->u_arg[ARG_FLAGS]; tprintf("child_stack=%#lx, ", tcp->u_arg[ARG_STACK]); -# ifdef ARG_STACKSIZE +#ifdef ARG_STACKSIZE if (ARG_STACKSIZE != -1) tprintf("stack_size=%#lx, ", tcp->u_arg[ARG_STACKSIZE]); -# endif - tprintf("flags="); - printflags(clone_flags, flags &~ CSIGNAL, NULL); +#endif + tprints("flags="); + if (!printflags(clone_flags, flags &~ CSIGNAL, NULL)) + sep = ""; if ((flags & CSIGNAL) != 0) - tprintf("|%s", signame(flags & CSIGNAL)); + tprintf("%s%s", sep, signame(flags & CSIGNAL)); if ((flags & (CLONE_PARENT_SETTID|CLONE_CHILD_SETTID |CLONE_CHILD_CLEARTID|CLONE_SETTLS)) == 0) return 0; if (flags & CLONE_PARENT_SETTID) tprintf(", parent_tidptr=%#lx", tcp->u_arg[ARG_PTID]); if (flags & CLONE_SETTLS) { -# ifdef I386 +#ifdef I386 struct modify_ldt_ldt_s copy; if (umove(tcp, tcp->u_arg[ARG_TLS], ©) != -1) { tprintf(", {entry_number:%d, ", copy.entry_number); if (!verbose(tcp)) - tprintf("...}"); + tprints("...}"); else print_ldt_entry(©); } else -# endif +#endif tprintf(", tls=%#lx", tcp->u_arg[ARG_TLS]); } if (flags & (CLONE_CHILD_SETTID|CLONE_CHILD_CLEARTID)) @@ -686,11 +579,9 @@ sys_unshare(struct tcb *tcp) printflags(clone_flags, tcp->u_arg[0], "CLONE_???"); return 0; } -#endif int -sys_fork(tcp) -struct tcb *tcp; +sys_fork(struct tcb *tcp) { if (exiting(tcp)) return RVAL_UDECIMAL; @@ -698,640 +589,109 @@ struct tcb *tcp; } int -change_syscall(struct tcb *tcp, int new) +sys_vfork(struct tcb *tcp) { -#if defined(LINUX) -#if defined(I386) - /* Attempt to make vfork into fork, which we can follow. */ - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(ORIG_EAX * 4), new) < 0) - return -1; - return 0; -#elif defined(X86_64) - /* Attempt to make vfork into fork, which we can follow. */ - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(ORIG_RAX * 8), new) < 0) - return -1; - return 0; -#elif defined(POWERPC) - if (ptrace(PTRACE_POKEUSER, tcp->pid, - (char*)(sizeof(unsigned long)*PT_R0), new) < 0) - return -1; - return 0; -#elif defined(S390) || defined(S390X) - /* s390 linux after 2.4.7 has a hook in entry.S to allow this */ - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_GPR2), new)<0) - return -1; - return 0; -#elif defined(M68K) - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*PT_ORIG_D0), new)<0) - return -1; - return 0; -#elif defined(SPARC) || defined(SPARC64) - struct regs regs; - if (ptrace(PTRACE_GETREGS, tcp->pid, (char*)®s, 0)<0) - return -1; - regs.r_g1=new; - if (ptrace(PTRACE_SETREGS, tcp->pid, (char*)®s, 0)<0) - return -1; - return 0; -#elif defined(MIPS) - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_V0), new)<0) - return -1; - return 0; -#elif defined(ALPHA) - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_A3), new)<0) - return -1; - return 0; -#elif defined(BFIN) - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_P0), new)<0) - return -1; - return 0; -#elif defined(IA64) - if (ia32) { - switch (new) { - case 2: - break; /* x86 SYS_fork */ - case SYS_clone: - new = 120; - break; - default: - fprintf(stderr, "%s: unexpected syscall %d\n", - __FUNCTION__, new); - return -1; - } - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_R1), new)<0) - return -1; - } else if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_R15), new)<0) - return -1; - return 0; -#elif defined(HPPA) - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(PT_GR20), new)<0) - return -1; - return 0; -#elif defined(SH) - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*(REG_REG0+3)), new)<0) - return -1; - return 0; -#elif defined(SH64) - /* Top half of reg encodes the no. of args n as 0x1n. - Assume 0 args as kernel never actually checks... */ - if (ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(REG_SYSCALL), - 0x100000 | new) < 0) - return -1; + if (exiting(tcp)) + return RVAL_UDECIMAL; return 0; -#elif defined(ARM) - /* Some kernels support this, some (pre-2.6.16 or so) don't. */ -# ifndef PTRACE_SET_SYSCALL -# define PTRACE_SET_SYSCALL 23 -# endif +} - if (ptrace (PTRACE_SET_SYSCALL, tcp->pid, 0, new) != 0) - return -1; +int sys_getuid(struct tcb *tcp) +{ + if (exiting(tcp)) + tcp->u_rval = (uid_t) tcp->u_rval; + return RVAL_UDECIMAL; +} - return 0; -#else -#warning Do not know how to handle change_syscall for this architecture -#endif /* architecture */ -#endif /* LINUX */ - return -1; +int sys_setfsuid(struct tcb *tcp) +{ + if (entering(tcp)) + tprintf("%u", (uid_t) tcp->u_arg[0]); + else + tcp->u_rval = (uid_t) tcp->u_rval; + return RVAL_UDECIMAL; } -#if 0 int -setarg(tcp, argnum) - struct tcb *tcp; - int argnum; +sys_setuid(struct tcb *tcp) { -#if defined (IA64) - { - unsigned long *bsp, *ap; - - if (upeek(tcp, PT_AR_BSP, (long *) &bsp) , 0) - return -1; - - ap = ia64_rse_skip_regs(bsp, argnum); - errno = 0; - ptrace(PTRACE_POKEDATA, tcp->pid, (char *) ap, tcp->u_arg[argnum]); - if (errno) - return -1; - - } -#elif defined(I386) - { - ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(4*argnum), tcp->u_arg[argnum]); - if (errno) - return -1; - } -#elif defined(X86_64) - { - ptrace(PTRACE_POKEUSER, tcp->pid, (char*)(8*(long)argnum), tcp->u_arg[argnum]); - if (errno) - return -1; - } -#elif defined(POWERPC) -#ifndef PT_ORIG_R3 -#define PT_ORIG_R3 34 -#endif - { - ptrace(PTRACE_POKEUSER, tcp->pid, - (char*)((argnum==0 ? PT_ORIG_R3 : argnum+PT_R3)*sizeof(unsigned long)), - tcp->u_arg[argnum]); - if (errno) - return -1; + if (entering(tcp)) { + tprintf("%u", (uid_t) tcp->u_arg[0]); } -#elif defined(MIPS) - { - errno = 0; - if (argnum < 4) - ptrace(PTRACE_POKEUSER, tcp->pid, - (char*)(REG_A0 + argnum), tcp->u_arg[argnum]); - else { - unsigned long *sp; - - if (upeek(tcp, REG_SP, (long *) &sp) , 0) - return -1; + return 0; +} - ptrace(PTRACE_POKEDATA, tcp->pid, - (char*)(sp + argnum - 4), tcp->u_arg[argnum]); +int +sys_getresuid(struct tcb *tcp) +{ + if (exiting(tcp)) { + __kernel_uid_t uid; + if (syserror(tcp)) + tprintf("%#lx, %#lx, %#lx", tcp->u_arg[0], + tcp->u_arg[1], tcp->u_arg[2]); + else { + if (umove(tcp, tcp->u_arg[0], &uid) < 0) + tprintf("%#lx, ", tcp->u_arg[0]); + else + tprintf("[%lu], ", (unsigned long) uid); + if (umove(tcp, tcp->u_arg[1], &uid) < 0) + tprintf("%#lx, ", tcp->u_arg[1]); + else + tprintf("[%lu], ", (unsigned long) uid); + if (umove(tcp, tcp->u_arg[2], &uid) < 0) + tprintf("%#lx", tcp->u_arg[2]); + else + tprintf("[%lu]", (unsigned long) uid); } - if (errno) - return -1; } -#elif defined(S390) || defined(S390X) - { - if(argnum <= 5) - ptrace(PTRACE_POKEUSER, tcp->pid, - (char *) (argnum==0 ? PT_ORIGGPR2 : - PT_GPR2 + argnum*sizeof(long)), - tcp->u_arg[argnum]); - else - return -E2BIG; - if (errno) - return -1; + return 0; +} + +int +sys_setreuid(struct tcb *tcp) +{ + if (entering(tcp)) { + printuid("", tcp->u_arg[0]); + printuid(", ", tcp->u_arg[1]); } -#else -# warning Sorry, setargs not implemented for this architecture. -#endif return 0; } -#endif -#if defined SYS_clone || defined SYS_clone2 int -internal_clone(tcp) -struct tcb *tcp; +sys_setresuid(struct tcb *tcp) { - struct tcb *tcpchild; - int pid; if (entering(tcp)) { - if (!followfork) - return 0; - fork_tcb(tcp); - if (setbpt(tcp) < 0) - return 0; - } else { - int bpt = tcp->flags & TCB_BPTSET; + printuid("", tcp->u_arg[0]); + printuid(", ", tcp->u_arg[1]); + printuid(", ", tcp->u_arg[2]); + } + return 0; +} - if (!(tcp->flags & TCB_FOLLOWFORK)) - return 0; +int +sys_setgroups(struct tcb *tcp) +{ + if (entering(tcp)) { + unsigned long len, size, start, cur, end, abbrev_end; + GETGROUPS_T gid; + int failed = 0; - if (syserror(tcp)) { - if (bpt) - clearbpt(tcp); + len = tcp->u_arg[0]; + tprintf("%lu, ", len); + if (len == 0) { + tprints("[]"); return 0; } - - pid = tcp->u_rval; - -#ifdef CLONE_PTRACE /* See new setbpt code. */ - tcpchild = pid2tcb(pid); - if (tcpchild != NULL) { - /* The child already reported its startup trap - before the parent reported its syscall return. */ - if ((tcpchild->flags - & (TCB_STARTUP|TCB_ATTACHED|TCB_SUSPENDED)) - != (TCB_STARTUP|TCB_ATTACHED|TCB_SUSPENDED)) - fprintf(stderr, "\ -[preattached child %d of %d in weird state!]\n", - pid, tcp->pid); - } - else -#endif - { - fork_tcb(tcp); - tcpchild = alloctcb(pid); - } - -#ifndef CLONE_PTRACE - /* Attach to the new child */ - if (ptrace(PTRACE_ATTACH, pid, (char *) 1, 0) < 0) { - if (bpt) - clearbpt(tcp); - perror("PTRACE_ATTACH"); - fprintf(stderr, "Too late?\n"); - droptcb(tcpchild); + start = tcp->u_arg[1]; + if (start == 0) { + tprints("NULL"); return 0; } -#endif - - if (bpt) - clearbpt(tcp); - - tcpchild->flags |= TCB_ATTACHED; - /* Child has BPT too, must be removed on first occasion. */ - if (bpt) { - tcpchild->flags |= TCB_BPTSET; - tcpchild->baddr = tcp->baddr; - memcpy(tcpchild->inst, tcp->inst, - sizeof tcpchild->inst); - } - tcpchild->parent = tcp; - tcp->nchildren++; - if (tcpchild->flags & TCB_SUSPENDED) { - /* The child was born suspended, due to our having - forced CLONE_PTRACE. */ - if (bpt) - clearbpt(tcpchild); - - tcpchild->flags &= ~(TCB_SUSPENDED|TCB_STARTUP); - /* TCB_SUSPENDED tasks are not collected by waitpid - * loop, and left stopped. Restart it: - */ - if (ptrace_restart(PTRACE_SYSCALL, tcpchild, 0) < 0) - return -1; - - if (!qflag) - fprintf(stderr, "\ -Process %u resumed (parent %d ready)\n", - pid, tcp->pid); - } - else { - if (!qflag) - fprintf(stderr, "Process %d attached\n", pid); - } - -#ifdef TCB_CLONE_THREAD - { - /* - * Save the flags used in this call, - * in case we point TCP to our parent below. - */ - int call_flags = tcp->u_arg[ARG_FLAGS]; - if ((tcp->flags & TCB_CLONE_THREAD) && - tcp->parent != NULL) { - /* The parent in this clone is itself a - thread belonging to another process. - There is no meaning to the parentage - relationship of the new child with the - thread, only with the process. We - associate the new thread with our - parent. Since this is done for every - new thread, there will never be a - TCB_CLONE_THREAD process that has - children. */ - --tcp->nchildren; - tcp = tcp->parent; - tcpchild->parent = tcp; - ++tcp->nchildren; - } - if (call_flags & CLONE_THREAD) { - tcpchild->flags |= TCB_CLONE_THREAD; - ++tcp->nclone_threads; - } - if (call_flags & CLONE_DETACHED) { - tcpchild->flags |= TCB_CLONE_DETACHED; - ++tcp->nclone_detached; - } - } -#endif - - } - return 0; -} -#endif - -int -internal_fork(tcp) -struct tcb *tcp; -{ -#ifdef LINUX - /* We do special magic with clone for any clone or fork. */ - return internal_clone(tcp); -#else - - struct tcb *tcpchild; - int pid; - int dont_follow = 0; - -#ifdef SYS_vfork - if (known_scno(tcp) == SYS_vfork) { - /* Attempt to make vfork into fork, which we can follow. */ - if (change_syscall(tcp, SYS_fork) < 0) - dont_follow = 1; - } -#endif - if (entering(tcp)) { - if (!followfork || dont_follow) - return 0; - fork_tcb(tcp); - if (setbpt(tcp) < 0) - return 0; - } - else { - int bpt = tcp->flags & TCB_BPTSET; - - if (!(tcp->flags & TCB_FOLLOWFORK)) - return 0; - if (bpt) - clearbpt(tcp); - - if (syserror(tcp)) - return 0; - - pid = tcp->u_rval; - fork_tcb(tcp); - tcpchild = alloctcb(pid); -#ifdef LINUX -#ifdef HPPA - /* The child must have run before it can be attached. */ - /* This must be a bug in the parisc kernel, but I havn't - * identified it yet. Seems to be an issue associated - * with attaching to a process (which sends it a signal) - * before that process has ever been scheduled. When - * debugging, I started seeing crashes in - * arch/parisc/kernel/signal.c:do_signal(), apparently - * caused by r8 getting corrupt over the dequeue_signal() - * call. Didn't make much sense though... - */ - { - struct timeval tv; - tv.tv_sec = 0; - tv.tv_usec = 10000; - select(0, NULL, NULL, NULL, &tv); - } -#endif - if (ptrace(PTRACE_ATTACH, pid, (char *) 1, 0) < 0) { - perror("PTRACE_ATTACH"); - fprintf(stderr, "Too late?\n"); - droptcb(tcpchild); - return 0; - } -#endif /* LINUX */ -#ifdef SUNOS4 -#ifdef oldway - /* The child must have run before it can be attached. */ - { - struct timeval tv; - tv.tv_sec = 0; - tv.tv_usec = 10000; - select(0, NULL, NULL, NULL, &tv); - } - if (ptrace(PTRACE_ATTACH, pid, (char *)1, 0) < 0) { - perror("PTRACE_ATTACH"); - fprintf(stderr, "Too late?\n"); - droptcb(tcpchild); - return 0; - } -#else /* !oldway */ - /* Try to catch the new process as soon as possible. */ - { - int i; - for (i = 0; i < 1024; i++) - if (ptrace(PTRACE_ATTACH, pid, (char *) 1, 0) >= 0) - break; - if (i == 1024) { - perror("PTRACE_ATTACH"); - fprintf(stderr, "Too late?\n"); - droptcb(tcpchild); - return 0; - } - } -#endif /* !oldway */ -#endif /* SUNOS4 */ - tcpchild->flags |= TCB_ATTACHED; - /* Child has BPT too, must be removed on first occasion */ - if (bpt) { - tcpchild->flags |= TCB_BPTSET; - tcpchild->baddr = tcp->baddr; - memcpy(tcpchild->inst, tcp->inst, - sizeof tcpchild->inst); - } - tcpchild->parent = tcp; - tcp->nchildren++; - if (!qflag) - fprintf(stderr, "Process %d attached\n", pid); - } - return 0; -#endif -} - -#endif /* !USE_PROCFS */ - -#if defined(SUNOS4) || defined(LINUX) || defined(FREEBSD) - -int -sys_vfork(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) - return RVAL_UDECIMAL; - return 0; -} - -#endif /* SUNOS4 || LINUX || FREEBSD */ - -#ifndef LINUX - -static char idstr[16]; - -int -sys_getpid(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) { - sprintf(idstr, "ppid %lu", getrval2(tcp)); - tcp->auxstr = idstr; - return RVAL_STR; - } - return 0; -} - -int -sys_getuid(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) { - sprintf(idstr, "euid %lu", getrval2(tcp)); - tcp->auxstr = idstr; - return RVAL_STR; - } - return 0; -} - -int -sys_getgid(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) { - sprintf(idstr, "egid %lu", getrval2(tcp)); - tcp->auxstr = idstr; - return RVAL_STR; - } - return 0; -} - -#endif /* !LINUX */ - -#ifdef LINUX - -int -sys_setuid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tprintf("%u", (uid_t) tcp->u_arg[0]); - } - return 0; -} - -int -sys_setgid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tprintf("%u", (gid_t) tcp->u_arg[0]); - } - return 0; -} - -int -sys_getresuid(tcp) - struct tcb *tcp; -{ - if (exiting(tcp)) { - __kernel_uid_t uid; - if (syserror(tcp)) - tprintf("%#lx, %#lx, %#lx", tcp->u_arg[0], - tcp->u_arg[1], tcp->u_arg[2]); - else { - if (umove(tcp, tcp->u_arg[0], &uid) < 0) - tprintf("%#lx, ", tcp->u_arg[0]); - else - tprintf("[%lu], ", (unsigned long) uid); - if (umove(tcp, tcp->u_arg[1], &uid) < 0) - tprintf("%#lx, ", tcp->u_arg[1]); - else - tprintf("[%lu], ", (unsigned long) uid); - if (umove(tcp, tcp->u_arg[2], &uid) < 0) - tprintf("%#lx", tcp->u_arg[2]); - else - tprintf("[%lu]", (unsigned long) uid); - } - } - return 0; -} - -int -sys_getresgid(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) { - __kernel_gid_t gid; - if (syserror(tcp)) - tprintf("%#lx, %#lx, %#lx", tcp->u_arg[0], - tcp->u_arg[1], tcp->u_arg[2]); - else { - if (umove(tcp, tcp->u_arg[0], &gid) < 0) - tprintf("%#lx, ", tcp->u_arg[0]); - else - tprintf("[%lu], ", (unsigned long) gid); - if (umove(tcp, tcp->u_arg[1], &gid) < 0) - tprintf("%#lx, ", tcp->u_arg[1]); - else - tprintf("[%lu], ", (unsigned long) gid); - if (umove(tcp, tcp->u_arg[2], &gid) < 0) - tprintf("%#lx", tcp->u_arg[2]); - else - tprintf("[%lu]", (unsigned long) gid); - } - } - return 0; -} - -#endif /* LINUX */ - -int -sys_setreuid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - printuid("", tcp->u_arg[0]); - printuid(", ", tcp->u_arg[1]); - } - return 0; -} - -int -sys_setregid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - printuid("", tcp->u_arg[0]); - printuid(", ", tcp->u_arg[1]); - } - return 0; -} - -#if defined(LINUX) || defined(FREEBSD) -int -sys_setresuid(tcp) - struct tcb *tcp; -{ - if (entering(tcp)) { - printuid("", tcp->u_arg[0]); - printuid(", ", tcp->u_arg[1]); - printuid(", ", tcp->u_arg[2]); - } - return 0; -} -int -sys_setresgid(tcp) - struct tcb *tcp; -{ - if (entering(tcp)) { - printuid("", tcp->u_arg[0]); - printuid(", ", tcp->u_arg[1]); - printuid(", ", tcp->u_arg[2]); - } - return 0; -} - -#endif /* LINUX || FREEBSD */ - -int -sys_setgroups(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - unsigned long len, size, start, cur, end, abbrev_end; - GETGROUPS_T gid; - int failed = 0; - - len = tcp->u_arg[0]; - tprintf("%lu, ", len); - if (len == 0) { - tprintf("[]"); - return 0; - } - start = tcp->u_arg[1]; - if (start == 0) { - tprintf("NULL"); - return 0; - } - size = len * sizeof(gid); - end = start + size; - if (!verbose(tcp) || size / sizeof(gid) != len || end < start) { - tprintf("%#lx", start); - return 0; + size = len * sizeof(gid); + end = start + size; + if (!verbose(tcp) || size / sizeof(gid) != len || end < start) { + tprintf("%#lx", start); + return 0; } if (abbrev(tcp)) { abbrev_end = start + max_strlen * sizeof(gid); @@ -1340,22 +700,22 @@ struct tcb *tcp; } else { abbrev_end = end; } - tprintf("["); + tprints("["); for (cur = start; cur < end; cur += sizeof(gid)) { if (cur > start) - tprintf(", "); + tprints(", "); if (cur >= abbrev_end) { - tprintf("..."); + tprints("..."); break; } if (umoven(tcp, cur, sizeof(gid), (char *) &gid) < 0) { - tprintf("?"); + tprints("?"); failed = 1; break; } tprintf("%lu", (unsigned long) gid); } - tprintf("]"); + tprints("]"); if (failed) tprintf(" %#lx", tcp->u_arg[1]); } @@ -1363,8 +723,7 @@ struct tcb *tcp; } int -sys_getgroups(tcp) -struct tcb *tcp; +sys_getgroups(struct tcb *tcp) { unsigned long len; @@ -1378,12 +737,12 @@ struct tcb *tcp; len = tcp->u_rval; if (len == 0) { - tprintf("[]"); + tprints("[]"); return 0; } start = tcp->u_arg[1]; if (start == 0) { - tprintf("NULL"); + tprints("NULL"); return 0; } if (tcp->u_arg[0] == 0) { @@ -1404,32 +763,30 @@ struct tcb *tcp; } else { abbrev_end = end; } - tprintf("["); + tprints("["); for (cur = start; cur < end; cur += sizeof(gid)) { if (cur > start) - tprintf(", "); + tprints(", "); if (cur >= abbrev_end) { - tprintf("..."); + tprints("..."); break; } if (umoven(tcp, cur, sizeof(gid), (char *) &gid) < 0) { - tprintf("?"); + tprints("?"); failed = 1; break; } tprintf("%lu", (unsigned long) gid); } - tprintf("]"); + tprints("]"); if (failed) tprintf(" %#lx", tcp->u_arg[1]); } return 0; } -#ifdef LINUX int -sys_setgroups32(tcp) -struct tcb *tcp; +sys_setgroups32(struct tcb *tcp) { if (entering(tcp)) { unsigned long len, size, start, cur, end, abbrev_end; @@ -1439,12 +796,12 @@ struct tcb *tcp; len = tcp->u_arg[0]; tprintf("%lu, ", len); if (len == 0) { - tprintf("[]"); + tprints("[]"); return 0; } start = tcp->u_arg[1]; if (start == 0) { - tprintf("NULL"); + tprints("NULL"); return 0; } size = len * sizeof(gid); @@ -1460,22 +817,22 @@ struct tcb *tcp; } else { abbrev_end = end; } - tprintf("["); + tprints("["); for (cur = start; cur < end; cur += sizeof(gid)) { if (cur > start) - tprintf(", "); + tprints(", "); if (cur >= abbrev_end) { - tprintf("..."); + tprints("..."); break; } if (umoven(tcp, cur, sizeof(gid), (char *) &gid) < 0) { - tprintf("?"); + tprints("?"); failed = 1; break; } tprintf("%lu", (unsigned long) gid); } - tprintf("]"); + tprints("]"); if (failed) tprintf(" %#lx", tcp->u_arg[1]); } @@ -1483,8 +840,7 @@ struct tcb *tcp; } int -sys_getgroups32(tcp) -struct tcb *tcp; +sys_getgroups32(struct tcb *tcp) { unsigned long len; @@ -1498,12 +854,12 @@ struct tcb *tcp; len = tcp->u_rval; if (len == 0) { - tprintf("[]"); + tprints("[]"); return 0; } start = tcp->u_arg[1]; if (start == 0) { - tprintf("NULL"); + tprints("NULL"); return 0; } size = len * sizeof(gid); @@ -1520,263 +876,60 @@ struct tcb *tcp; } else { abbrev_end = end; } - tprintf("["); + tprints("["); for (cur = start; cur < end; cur += sizeof(gid)) { if (cur > start) - tprintf(", "); + tprints(", "); if (cur >= abbrev_end) { - tprintf("..."); + tprints("..."); break; } if (umoven(tcp, cur, sizeof(gid), (char *) &gid) < 0) { - tprintf("?"); + tprints("?"); failed = 1; break; } tprintf("%lu", (unsigned long) gid); } - tprintf("]"); + tprints("]"); if (failed) tprintf(" %#lx", tcp->u_arg[1]); } return 0; } -#endif /* LINUX */ - -#if defined(ALPHA) || defined(SUNOS4) || defined(SVR4) -int -sys_setpgrp(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { -#ifndef SVR4 - tprintf("%lu, %lu", tcp->u_arg[0], tcp->u_arg[1]); -#endif /* !SVR4 */ - } - return 0; -} -#endif /* ALPHA || SUNOS4 || SVR4 */ - -int -sys_getpgrp(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { -#ifndef SVR4 - tprintf("%lu", tcp->u_arg[0]); -#endif /* !SVR4 */ - } - return 0; -} - -int -sys_getsid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tprintf("%lu", tcp->u_arg[0]); - } - return 0; -} - -int -sys_setsid(tcp) -struct tcb *tcp; -{ - return 0; -} - -int -sys_getpgid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tprintf("%lu", tcp->u_arg[0]); - } - return 0; -} - -int -sys_setpgid(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - tprintf("%lu, %lu", tcp->u_arg[0], tcp->u_arg[1]); - } - return 0; -} - -#if UNIXWARE >= 2 - -#include - - -static const struct xlat procpriv_cmds [] = { - { SETPRV, "SETPRV" }, - { CLRPRV, "CLRPRV" }, - { PUTPRV, "PUTPRV" }, - { GETPRV, "GETPRV" }, - { CNTPRV, "CNTPRV" }, - { 0, NULL }, -}; - - -static const struct xlat procpriv_priv [] = { - { P_OWNER, "P_OWNER" }, - { P_AUDIT, "P_AUDIT" }, - { P_COMPAT, "P_COMPAT" }, - { P_DACREAD, "P_DACREAD" }, - { P_DACWRITE, "P_DACWRITE" }, - { P_DEV, "P_DEV" }, - { P_FILESYS, "P_FILESYS" }, - { P_MACREAD, "P_MACREAD" }, - { P_MACWRITE, "P_MACWRITE" }, - { P_MOUNT, "P_MOUNT" }, - { P_MULTIDIR, "P_MULTIDIR" }, - { P_SETPLEVEL, "P_SETPLEVEL" }, - { P_SETSPRIV, "P_SETSPRIV" }, - { P_SETUID, "P_SETUID" }, - { P_SYSOPS, "P_SYSOPS" }, - { P_SETUPRIV, "P_SETUPRIV" }, - { P_DRIVER, "P_DRIVER" }, - { P_RTIME, "P_RTIME" }, - { P_MACUPGRADE, "P_MACUPGRADE" }, - { P_FSYSRANGE, "P_FSYSRANGE" }, - { P_SETFLEVEL, "P_SETFLEVEL" }, - { P_AUDITWR, "P_AUDITWR" }, - { P_TSHAR, "P_TSHAR" }, - { P_PLOCK, "P_PLOCK" }, - { P_CORE, "P_CORE" }, - { P_LOADMOD, "P_LOADMOD" }, - { P_BIND, "P_BIND" }, - { P_ALLPRIVS, "P_ALLPRIVS" }, - { 0, NULL }, -}; - - -static const struct xlat procpriv_type [] = { - { PS_FIX, "PS_FIX" }, - { PS_INH, "PS_INH" }, - { PS_MAX, "PS_MAX" }, - { PS_WKG, "PS_WKG" }, - { 0, NULL }, -}; - - -static void -printpriv(struct tcb *tcp, long addr, int len, const struct xlat *opt) -{ - priv_t buf [128]; - int max = verbose (tcp) ? sizeof buf / sizeof buf [0] : 10; - int dots = len > max; - int i; - - if (len > max) len = max; - - if (len <= 0 || - umoven (tcp, addr, len * sizeof buf[0], (char *) buf) < 0) - { - tprintf ("%#lx", addr); - return; - } - - tprintf ("["); - - for (i = 0; i < len; ++i) { - const char *t, *p; - - if (i) tprintf (", "); - - if ((t = xlookup (procpriv_type, buf [i] & PS_TYPE)) && - (p = xlookup (procpriv_priv, buf [i] & ~PS_TYPE))) - { - tprintf ("%s|%s", t, p); - } - else { - tprintf ("%#lx", buf [i]); - } - } - - if (dots) tprintf (" ..."); - - tprintf ("]"); -} - - -int -sys_procpriv(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) { - printxval(procpriv_cmds, tcp->u_arg[0], "???PRV"); - switch (tcp->u_arg[0]) { - case CNTPRV: - tprintf(", %#lx, %ld", tcp->u_arg[1], tcp->u_arg[2]); - break; - - case GETPRV: - break; - - default: - tprintf (", "); - printpriv (tcp, tcp->u_arg[1], tcp->u_arg[2]); - tprintf (", %ld", tcp->u_arg[2]); - } - } - else if (tcp->u_arg[0] == GETPRV) { - if (syserror (tcp)) { - tprintf(", %#lx, %ld", tcp->u_arg[1], tcp->u_arg[2]); - } - else { - tprintf (", "); - printpriv (tcp, tcp->u_arg[1], tcp->u_rval); - tprintf (", %ld", tcp->u_arg[2]); - } - } - - return 0; -} - -#endif - static void -printargv(tcp, addr) -struct tcb *tcp; -long addr; +printargv(struct tcb *tcp, long addr) { union { - int p32; - long p64; + unsigned int p32; + unsigned long p64; char data[sizeof(long)]; } cp; - char *sep; + const char *sep; int n = 0; + unsigned wordsize = current_wordsize; cp.p64 = 1; for (sep = ""; !abbrev(tcp) || n < max_strlen / 2; sep = ", ", ++n) { - if (umoven(tcp, addr, personality_wordsize[current_personality], - cp.data) < 0) { + if (umoven(tcp, addr, wordsize, cp.data) < 0) { tprintf("%#lx", addr); return; } - if (personality_wordsize[current_personality] == 4) + if (wordsize == 4) cp.p64 = cp.p32; if (cp.p64 == 0) break; - tprintf(sep); + tprints(sep); printstr(tcp, cp.p64, -1); - addr += personality_wordsize[current_personality]; + addr += wordsize; } if (cp.p64) tprintf("%s...", sep); } static void -printargc(fmt, tcp, addr) -char *fmt; -struct tcb *tcp; -long addr; +printargc(const char *fmt, struct tcb *tcp, long addr) { int count; char *cp; @@ -1787,91 +940,49 @@ long addr; tprintf(fmt, count, count == 1 ? "" : "s"); } -#if defined(SPARC) || defined(SPARC64) || defined(SUNOS4) +#if defined(SPARC) || defined(SPARC64) int -sys_execv(tcp) -struct tcb *tcp; +sys_execv(struct tcb *tcp) { if (entering(tcp)) { printpath(tcp, tcp->u_arg[0]); if (!verbose(tcp)) tprintf(", %#lx", tcp->u_arg[1]); -#if 0 - else if (abbrev(tcp)) - printargc(", [/* %d arg%s */]", tcp, tcp->u_arg[1]); -#endif else { - tprintf(", ["); + tprints(", ["); printargv(tcp, tcp->u_arg[1]); - tprintf("]"); + tprints("]"); } } return 0; } -#endif /* SPARC || SPARC64 || SUNOS4 */ +#endif int -sys_execve(tcp) -struct tcb *tcp; +sys_execve(struct tcb *tcp) { if (entering(tcp)) { printpath(tcp, tcp->u_arg[0]); if (!verbose(tcp)) tprintf(", %#lx", tcp->u_arg[1]); -#if 0 - else if (abbrev(tcp)) - printargc(", [/* %d arg%s */]", tcp, tcp->u_arg[1]); -#endif else { - tprintf(", ["); + tprints(", ["); printargv(tcp, tcp->u_arg[1]); - tprintf("]"); + tprints("]"); } if (!verbose(tcp)) tprintf(", %#lx", tcp->u_arg[2]); else if (abbrev(tcp)) printargc(", [/* %d var%s */]", tcp, tcp->u_arg[2]); else { - tprintf(", ["); + tprints(", ["); printargv(tcp, tcp->u_arg[2]); - tprintf("]"); + tprints("]"); } } return 0; } -#if UNIXWARE > 2 - -int sys_rexecve(tcp) -struct tcb *tcp; -{ - if (entering (tcp)) { - sys_execve (tcp); - tprintf (", %ld", tcp->u_arg[3]); - } - return 0; -} - -#endif - -int -internal_exec(tcp) -struct tcb *tcp; -{ -#ifdef SUNOS4 - if (exiting(tcp) && !syserror(tcp) && followfork) - fixvfork(tcp); -#endif /* SUNOS4 */ -#if defined LINUX && defined TCB_WAITEXECVE - if (exiting(tcp) && syserror(tcp)) - tcp->flags &= ~TCB_WAITEXECVE; - else - tcp->flags |= TCB_WAITEXECVE; -#endif /* LINUX && TCB_WAITEXECVE */ - return 0; -} - -#ifdef LINUX #ifndef __WNOTHREAD #define __WNOTHREAD 0x20000000 #endif @@ -1881,7 +992,6 @@ struct tcb *tcp; #ifndef __WCLONE #define __WCLONE 0x80000000 #endif -#endif /* LINUX */ static const struct xlat wait4_options[] = { { WNOHANG, "WNOHANG" }, @@ -1919,19 +1029,20 @@ static const struct xlat wait4_options[] = { # define WCOREFLAG WCOREFLG #endif #ifndef WCOREFLAG -#define WCOREFLAG 0x80 +# define WCOREFLAG 0x80 +#endif +#ifndef WCOREDUMP +# define WCOREDUMP(status) ((status) & 0200) #endif - #ifndef W_STOPCODE -#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) +# define W_STOPCODE(sig) ((sig) << 8 | 0x7f) #endif #ifndef W_EXITCODE -#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +# define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) #endif static int -printstatus(status) -int status; +printstatus(int status) { int exited = 0; @@ -1963,7 +1074,7 @@ int status; } if (status == 0) - tprintf("]"); + tprints("]"); else tprintf(" | %#x]", status); @@ -1974,43 +1085,34 @@ static int printwaitn(struct tcb *tcp, int n, int bitness) { int status; - int exited = 0; if (entering(tcp)) { - /* - * Sign-extend a 32-bit value when that's what it is. - * - * NB: On Linux, kernel-side pid_t is typedef'ed to int - * on all arches; also, glibc-2.8 truncates wait3 and wait4 + /* On Linux, kernel-side pid_t is typedef'ed to int + * on all arches. Also, glibc-2.8 truncates wait3 and wait4 * pid argument to int on 64bit arches, producing, * for example, wait4(4294967295, ...) instead of -1 - * in strace. - * Therefore, maybe it makes sense to *unconditionally* - * widen int to long here... + * in strace. We have to use int here, not long. */ - long pid = tcp->u_arg[0]; - if (personality_wordsize[current_personality] < sizeof pid) - pid = (long) (int) pid; - tprintf("%ld, ", pid); + int pid = tcp->u_arg[0]; + tprintf("%d, ", pid); } else { /* status */ if (!tcp->u_arg[1]) - tprintf("NULL"); + tprints("NULL"); else if (syserror(tcp) || tcp->u_rval == 0) tprintf("%#lx", tcp->u_arg[1]); else if (umove(tcp, tcp->u_arg[1], &status) < 0) - tprintf("[?]"); + tprints("[?]"); else - exited = printstatus(status); + printstatus(status); /* options */ - tprintf(", "); + tprints(", "); printflags(wait4_options, tcp->u_arg[2], "W???"); if (n == 4) { - tprintf(", "); + tprints(", "); /* usage */ if (!tcp->u_arg[3]) - tprintf("NULL"); -#ifdef LINUX + tprints("NULL"); else if (tcp->u_rval > 0) { #ifdef ALPHA if (bitness) @@ -2019,11 +1121,6 @@ printwaitn(struct tcb *tcp, int n, int bitness) #endif printrusage(tcp, tcp->u_arg[3]); } -#endif /* LINUX */ -#ifdef SUNOS4 - else if (tcp->u_rval > 0 && exited) - printrusage(tcp, tcp->u_arg[3]); -#endif /* SUNOS4 */ else tprintf("%#lx", tcp->u_arg[3]); } @@ -2032,154 +1129,25 @@ printwaitn(struct tcb *tcp, int n, int bitness) } int -internal_wait(tcp, flagarg) -struct tcb *tcp; -int flagarg; -{ - int got_kids; - -#ifdef TCB_CLONE_THREAD - if (tcp->flags & TCB_CLONE_THREAD) - /* The children we wait for are our parent's children. */ - got_kids = (tcp->parent->nchildren - > tcp->parent->nclone_detached); - else - got_kids = (tcp->nchildren > tcp->nclone_detached); -#else - got_kids = tcp->nchildren > 0; -#endif - - if (entering(tcp) && got_kids) { - /* There are children that this parent should block for. - But ptrace made us the parent of the traced children - and the real parent will get ECHILD from the wait call. - - XXX If we attached with strace -f -p PID, then there - may be untraced dead children the parent could be reaping - now, but we make him block. */ - - /* ??? WTA: fix bug with hanging children */ - - if (!(tcp->u_arg[flagarg] & WNOHANG)) { - /* - * There are traced children. We'll make the parent - * block to avoid a false ECHILD error due to our - * ptrace having stolen the children. However, - * we shouldn't block if there are zombies to reap. - * XXX doesn't handle pgrp matches (u_arg[0]==0,<-1) - */ - struct tcb *child = NULL; - if (tcp->nzombies > 0 && - (tcp->u_arg[0] == -1 || - (child = pid2tcb(tcp->u_arg[0])) == NULL)) - return 0; - if (tcp->u_arg[0] > 0) { - /* - * If the parent waits for a specified child - * PID, then it must get ECHILD right away - * if that PID is not one of its children. - * Make sure that the requested PID matches - * one of the parent's children that we are - * tracing, and don't suspend it otherwise. - */ - if (child == NULL) - child = pid2tcb(tcp->u_arg[0]); - if (child == NULL || child->parent != ( -#ifdef TCB_CLONE_THREAD - (tcp->flags & TCB_CLONE_THREAD) - ? tcp->parent : -#endif - tcp) || - (child->flags & TCB_EXITING)) - return 0; - } - tcp->flags |= TCB_SUSPENDED; - tcp->waitpid = tcp->u_arg[0]; -#ifdef TCB_CLONE_THREAD - if (tcp->flags & TCB_CLONE_THREAD) - tcp->parent->nclone_waiting++; -#endif - } - } - if (exiting(tcp) && tcp->u_error == ECHILD && got_kids) { - if (tcp->u_arg[flagarg] & WNOHANG) { - /* We must force a fake result of 0 instead of - the ECHILD error. */ - extern int force_result(); - return force_result(tcp, 0, 0); - } - } - else if (exiting(tcp) && tcp->u_error == 0 && tcp->u_rval > 0 && - tcp->nzombies > 0 && pid2tcb(tcp->u_rval) == NULL) { - /* - * We just reaped a child we don't know about, - * presumably a zombie we already droptcb'd. - */ - tcp->nzombies--; - } - return 0; -} - -#ifdef SVR4 - -int -sys_wait(tcp) -struct tcb *tcp; -{ - if (exiting(tcp)) { - /* The library wrapper stuffs this into the user variable. */ - if (!syserror(tcp)) - printstatus(getrval2(tcp)); - } - return 0; -} - -#endif /* SVR4 */ - -#ifdef FREEBSD -int -sys_wait(tcp) -struct tcb *tcp; -{ - int status; - - if (exiting(tcp)) { - if (!syserror(tcp)) { - if (umove(tcp, tcp->u_arg[0], &status) < 0) - tprintf("%#lx", tcp->u_arg[0]); - else - printstatus(status); - } - } - return 0; -} -#endif - -int -sys_waitpid(tcp) -struct tcb *tcp; +sys_waitpid(struct tcb *tcp) { return printwaitn(tcp, 3, 0); } int -sys_wait4(tcp) -struct tcb *tcp; +sys_wait4(struct tcb *tcp) { return printwaitn(tcp, 4, 0); } #ifdef ALPHA int -sys_osf_wait4(tcp) -struct tcb *tcp; +sys_osf_wait4(struct tcb *tcp) { return printwaitn(tcp, 4, 1); } #endif -#if defined SVR4 || defined LINUX - static const struct xlat waitid_types[] = { { P_PID, "P_PID" }, #ifdef P_PPID @@ -2206,35 +1174,23 @@ static const struct xlat waitid_types[] = { }; int -sys_waitid(tcp) -struct tcb *tcp; +sys_waitid(struct tcb *tcp) { - siginfo_t si; - int exited; - if (entering(tcp)) { printxval(waitid_types, tcp->u_arg[0], "P_???"); tprintf(", %ld, ", tcp->u_arg[1]); } else { /* siginfo */ - exited = 0; - if (!tcp->u_arg[2]) - tprintf("NULL"); - else if (syserror(tcp)) - tprintf("%#lx", tcp->u_arg[2]); - else if (umove(tcp, tcp->u_arg[2], &si) < 0) - tprintf("{???}"); - else - printsiginfo(&si, verbose(tcp)); + printsiginfo_at(tcp, tcp->u_arg[2]); /* options */ - tprintf(", "); + tprints(", "); printflags(wait4_options, tcp->u_arg[3], "W???"); - if (tcp->u_nargs > 4) { + if (tcp->s_ent->nargs > 4) { /* usage */ - tprintf(", "); + tprints(", "); if (!tcp->u_arg[4]) - tprintf("NULL"); + tprints("NULL"); else if (tcp->u_error) tprintf("%#lx", tcp->u_arg[4]); else @@ -2244,20 +1200,8 @@ struct tcb *tcp; return 0; } -#endif /* SVR4 or LINUX */ - -int -sys_alarm(tcp) -struct tcb *tcp; -{ - if (entering(tcp)) - tprintf("%lu", tcp->u_arg[0]); - return 0; -} - int -sys_uname(tcp) -struct tcb *tcp; +sys_uname(struct tcb *tcp) { struct utsname uname; @@ -2265,20 +1209,17 @@ struct tcb *tcp; if (syserror(tcp) || !verbose(tcp)) tprintf("%#lx", tcp->u_arg[0]); else if (umove(tcp, tcp->u_arg[0], &uname) < 0) - tprintf("{...}"); + tprints("{...}"); else if (!abbrev(tcp)) { - tprintf("{sysname=\"%s\", nodename=\"%s\", ", uname.sysname, uname.nodename); tprintf("release=\"%s\", version=\"%s\", ", uname.release, uname.version); tprintf("machine=\"%s\"", uname.machine); -#ifdef LINUX -#ifndef __GLIBC__ +#ifdef HAVE_STRUCT_UTSNAME_DOMAINNAME tprintf(", domainname=\"%s\"", uname.domainname); -#endif /* __GLIBC__ */ -#endif /* LINUX */ - tprintf("}"); +#endif + tprints("}"); } else tprintf("{sys=\"%s\", node=\"%s\", ...}", @@ -2287,17 +1228,14 @@ struct tcb *tcp; return 0; } -#ifndef SVR4 - static const struct xlat ptrace_cmds[] = { -#ifndef FREEBSD { PTRACE_TRACEME, "PTRACE_TRACEME" }, - { PTRACE_PEEKTEXT, "PTRACE_PEEKTEXT", }, - { PTRACE_PEEKDATA, "PTRACE_PEEKDATA", }, - { PTRACE_PEEKUSER, "PTRACE_PEEKUSER", }, - { PTRACE_POKETEXT, "PTRACE_POKETEXT", }, - { PTRACE_POKEDATA, "PTRACE_POKEDATA", }, - { PTRACE_POKEUSER, "PTRACE_POKEUSER", }, + { PTRACE_PEEKTEXT, "PTRACE_PEEKTEXT" }, + { PTRACE_PEEKDATA, "PTRACE_PEEKDATA" }, + { PTRACE_PEEKUSER, "PTRACE_PEEKUSER" }, + { PTRACE_POKETEXT, "PTRACE_POKETEXT" }, + { PTRACE_POKEDATA, "PTRACE_POKEDATA" }, + { PTRACE_POKEUSER, "PTRACE_POKEUSER" }, { PTRACE_CONT, "PTRACE_CONT" }, { PTRACE_KILL, "PTRACE_KILL" }, { PTRACE_SINGLESTEP, "PTRACE_SINGLESTEP" }, @@ -2310,122 +1248,161 @@ static const struct xlat ptrace_cmds[] = { { PTRACE_SETREGS, "PTRACE_SETREGS" }, #endif #ifdef PTRACE_GETFPREGS - { PTRACE_GETFPREGS, "PTRACE_GETFPREGS", }, + { PTRACE_GETFPREGS, "PTRACE_GETFPREGS" }, #endif #ifdef PTRACE_SETFPREGS - { PTRACE_SETFPREGS, "PTRACE_SETFPREGS", }, + { PTRACE_SETFPREGS, "PTRACE_SETFPREGS" }, #endif #ifdef PTRACE_GETFPXREGS - { PTRACE_GETFPXREGS, "PTRACE_GETFPXREGS", }, + { PTRACE_GETFPXREGS, "PTRACE_GETFPXREGS" }, #endif #ifdef PTRACE_SETFPXREGS - { PTRACE_SETFPXREGS, "PTRACE_SETFPXREGS", }, + { PTRACE_SETFPXREGS, "PTRACE_SETFPXREGS" }, #endif #ifdef PTRACE_GETVRREGS - { PTRACE_GETVRREGS, "PTRACE_GETVRREGS", }, + { PTRACE_GETVRREGS, "PTRACE_GETVRREGS" }, #endif #ifdef PTRACE_SETVRREGS - { PTRACE_SETVRREGS, "PTRACE_SETVRREGS", }, + { PTRACE_SETVRREGS, "PTRACE_SETVRREGS" }, #endif #ifdef PTRACE_SETOPTIONS - { PTRACE_SETOPTIONS, "PTRACE_SETOPTIONS", }, + { PTRACE_SETOPTIONS, "PTRACE_SETOPTIONS" }, #endif #ifdef PTRACE_GETEVENTMSG - { PTRACE_GETEVENTMSG, "PTRACE_GETEVENTMSG", }, + { PTRACE_GETEVENTMSG, "PTRACE_GETEVENTMSG" }, #endif #ifdef PTRACE_GETSIGINFO - { PTRACE_GETSIGINFO, "PTRACE_GETSIGINFO", }, + { PTRACE_GETSIGINFO, "PTRACE_GETSIGINFO" }, #endif #ifdef PTRACE_SETSIGINFO - { PTRACE_SETSIGINFO, "PTRACE_SETSIGINFO", }, -#endif -#ifdef SUNOS4 - { PTRACE_READDATA, "PTRACE_READDATA" }, - { PTRACE_WRITEDATA, "PTRACE_WRITEDATA" }, - { PTRACE_READTEXT, "PTRACE_READTEXT" }, - { PTRACE_WRITETEXT, "PTRACE_WRITETEXT" }, - { PTRACE_GETFPAREGS, "PTRACE_GETFPAREGS" }, - { PTRACE_SETFPAREGS, "PTRACE_SETFPAREGS" }, -#ifdef SPARC - { PTRACE_GETWINDOW, "PTRACE_GETWINDOW" }, - { PTRACE_SETWINDOW, "PTRACE_SETWINDOW" }, -#else /* !SPARC */ - { PTRACE_22, "PTRACE_PTRACE_22" }, - { PTRACE_23, "PTRACE_PTRACE_23" }, -#endif /* !SPARC */ -#endif /* SUNOS4 */ + { PTRACE_SETSIGINFO, "PTRACE_SETSIGINFO" }, +#endif +#ifdef PTRACE_GETREGSET + { PTRACE_GETREGSET, "PTRACE_GETREGSET" }, +#endif +#ifdef PTRACE_SETREGSET + { PTRACE_SETREGSET, "PTRACE_SETREGSET" }, +#endif +#ifdef PTRACE_SET_SYSCALL + { PTRACE_SET_SYSCALL, "PTRACE_SET_SYSCALL" }, +#endif +#ifdef PTRACE_SEIZE + { PTRACE_SEIZE, "PTRACE_SEIZE" }, +#endif +#ifdef PTRACE_INTERRUPT + { PTRACE_INTERRUPT, "PTRACE_INTERRUPT" }, +#endif +#ifdef PTRACE_LISTEN + { PTRACE_LISTEN, "PTRACE_LISTEN" }, +#endif { PTRACE_SYSCALL, "PTRACE_SYSCALL" }, -#ifdef SUNOS4 - { PTRACE_DUMPCORE, "PTRACE_DUMPCORE" }, -#ifdef I386 - { PTRACE_SETWRBKPT, "PTRACE_SETWRBKPT" }, - { PTRACE_SETACBKPT, "PTRACE_SETACBKPT" }, - { PTRACE_CLRDR7, "PTRACE_CLRDR7" }, -#else /* !I386 */ - { PTRACE_26, "PTRACE_26" }, - { PTRACE_27, "PTRACE_27" }, - { PTRACE_28, "PTRACE_28" }, -#endif /* !I386 */ - { PTRACE_GETUCODE, "PTRACE_GETUCODE" }, -#endif /* SUNOS4 */ - -#else /* FREEBSD */ - - { PT_TRACE_ME, "PT_TRACE_ME" }, - { PT_READ_I, "PT_READ_I" }, - { PT_READ_D, "PT_READ_D" }, - { PT_WRITE_I, "PT_WRITE_I" }, - { PT_WRITE_D, "PT_WRITE_D" }, -#ifdef PT_READ_U - { PT_READ_U, "PT_READ_U" }, -#endif - { PT_CONTINUE, "PT_CONTINUE" }, - { PT_KILL, "PT_KILL" }, - { PT_STEP, "PT_STEP" }, - { PT_ATTACH, "PT_ATTACH" }, - { PT_DETACH, "PT_DETACH" }, - { PT_GETREGS, "PT_GETREGS" }, - { PT_SETREGS, "PT_SETREGS" }, - { PT_GETFPREGS, "PT_GETFPREGS" }, - { PT_SETFPREGS, "PT_SETFPREGS" }, - { PT_GETDBREGS, "PT_GETDBREGS" }, - { PT_SETDBREGS, "PT_SETDBREGS" }, -#endif /* FREEBSD */ + { 0, NULL }, }; -#ifndef FREEBSD #ifdef PTRACE_SETOPTIONS static const struct xlat ptrace_setoptions_flags[] = { -#ifdef PTRACE_O_TRACESYSGOOD +# ifdef PTRACE_O_TRACESYSGOOD { PTRACE_O_TRACESYSGOOD,"PTRACE_O_TRACESYSGOOD" }, -#endif -#ifdef PTRACE_O_TRACEFORK +# endif +# ifdef PTRACE_O_TRACEFORK { PTRACE_O_TRACEFORK, "PTRACE_O_TRACEFORK" }, -#endif -#ifdef PTRACE_O_TRACEVFORK +# endif +# ifdef PTRACE_O_TRACEVFORK { PTRACE_O_TRACEVFORK, "PTRACE_O_TRACEVFORK" }, -#endif -#ifdef PTRACE_O_TRACECLONE +# endif +# ifdef PTRACE_O_TRACECLONE { PTRACE_O_TRACECLONE, "PTRACE_O_TRACECLONE" }, -#endif -#ifdef PTRACE_O_TRACEEXEC +# endif +# ifdef PTRACE_O_TRACEEXEC { PTRACE_O_TRACEEXEC, "PTRACE_O_TRACEEXEC" }, -#endif -#ifdef PTRACE_O_TRACEVFORKDONE +# endif +# ifdef PTRACE_O_TRACEVFORKDONE { PTRACE_O_TRACEVFORKDONE,"PTRACE_O_TRACEVFORKDONE"}, -#endif -#ifdef PTRACE_O_TRACEEXIT +# endif +# ifdef PTRACE_O_TRACEEXIT { PTRACE_O_TRACEEXIT, "PTRACE_O_TRACEEXIT" }, -#endif +# endif { 0, NULL }, }; +#endif /* PTRACE_SETOPTIONS */ + +static const struct xlat nt_descriptor_types[] = { +#ifdef NT_PRSTATUS + { NT_PRSTATUS, "NT_PRSTATUS" }, +#endif +#ifdef NT_FPREGSET + { NT_FPREGSET, "NT_FPREGSET" }, +#endif +#ifdef NT_PRPSINFO + { NT_PRPSINFO, "NT_PRPSINFO" }, +#endif +#ifdef NT_PRXREG + { NT_PRXREG, "NT_PRXREG" }, +#endif +#ifdef NT_TASKSTRUCT + { NT_TASKSTRUCT, "NT_TASKSTRUCT" }, +#endif +#ifdef NT_PLATFORM + { NT_PLATFORM, "NT_PLATFORM" }, +#endif +#ifdef NT_AUXV + { NT_AUXV, "NT_AUXV" }, +#endif +#ifdef NT_GWINDOWS + { NT_GWINDOWS, "NT_GWINDOWS" }, +#endif +#ifdef NT_ASRS + { NT_ASRS, "NT_ASRS" }, +#endif +#ifdef NT_PSTATUS + { NT_PSTATUS, "NT_PSTATUS" }, +#endif +#ifdef NT_PSINFO + { NT_PSINFO, "NT_PSINFO" }, +#endif +#ifdef NT_PRCRED + { NT_PRCRED, "NT_PRCRED" }, +#endif +#ifdef NT_UTSNAME + { NT_UTSNAME, "NT_UTSNAME" }, #endif +#ifdef NT_LWPSTATUS + { NT_LWPSTATUS, "NT_LWPSTATUS" }, #endif +#ifdef NT_LWPSINFO + { NT_LWPSINFO, "NT_LWPSINFO" }, +#endif +#ifdef NT_PRFPXREG + { NT_PRFPXREG, "NT_PRFPXREG" }, +#endif +#ifdef NT_PRXFPREG + { NT_PRXFPREG, "NT_PRXFPREG" }, +#endif +#ifdef NT_PPC_VMX + { NT_PPC_VMX, "NT_PPC_VMX" }, +#endif +#ifdef NT_PPC_SPE + { NT_PPC_SPE, "NT_PPC_SPE" }, +#endif +#ifdef NT_PPC_VSX + { NT_PPC_VSX, "NT_PPC_VSX" }, +#endif +#ifdef NT_386_TLS + { NT_386_TLS, "NT_386_TLS" }, +#endif +#ifdef NT_386_IOPERM + { NT_386_IOPERM, "NT_386_IOPERM" }, +#endif +#ifdef NT_X86_XSTATE + { NT_X86_XSTATE, "NT_X86_XSTATE" }, +#endif + { 0, NULL }, +}; + +#define uoff(member) offsetof(struct user, member) -#ifndef FREEBSD const struct xlat struct_user_offsets[] = { -#ifdef LINUX #if defined(S390) || defined(S390X) { PT_PSWMASK, "psw_mask" }, { PT_PSWADDR, "psw_addr" }, @@ -2518,17 +1495,16 @@ const struct xlat struct_user_offsets[] = { { PT_CR_9, "cr9" }, { PT_CR_10, "cr10" }, { PT_CR_11, "cr11" }, - { PT_IEEE_IP, "ieee_exception_ip" }, -#endif -#if defined(SPARC) + { PT_IEEE_IP, "ieee_exception_ip" }, +#elif defined(SPARC) /* XXX No support for these offsets yet. */ #elif defined(HPPA) /* XXX No support for these offsets yet. */ #elif defined(POWERPC) -#ifndef PT_ORIG_R3 -#define PT_ORIG_R3 34 -#endif -#define REGSIZE (sizeof(unsigned long)) +# ifndef PT_ORIG_R3 +# define PT_ORIG_R3 34 +# endif +# define REGSIZE (sizeof(unsigned long)) { REGSIZE*PT_R0, "r0" }, { REGSIZE*PT_R1, "r1" }, { REGSIZE*PT_R2, "r2" }, @@ -2569,9 +1545,8 @@ const struct xlat struct_user_offsets[] = { { REGSIZE*PT_XER, "XER" }, { REGSIZE*PT_CCR, "CCR" }, { REGSIZE*PT_FPR0, "FPR0" }, -#undef REGSIZE -#else -#ifdef ALPHA +# undef REGSIZE +#elif defined(ALPHA) { 0, "r0" }, { 1, "r1" }, { 2, "r2" }, @@ -2637,8 +1612,7 @@ const struct xlat struct_user_offsets[] = { { 62, "fp30" }, { 63, "fp31" }, { 64, "pc" }, -#else /* !ALPHA */ -#ifdef IA64 +#elif defined(IA64) { PT_F32, "f32" }, { PT_F33, "f33" }, { PT_F34, "f34" }, { PT_F35, "f35" }, { PT_F36, "f36" }, { PT_F37, "f37" }, { PT_F38, "f38" }, { PT_F39, "f39" }, { PT_F40, "f40" }, @@ -2710,8 +1684,7 @@ const struct xlat struct_user_offsets[] = { { PT_AR_SSD, "ar.ssd" }, # endif { PT_DBR, "dbr" }, { PT_IBR, "ibr" }, { PT_PMD, "pmd" }, -#else /* !IA64 */ -#ifdef I386 +#elif defined(I386) { 4*EBX, "4*EBX" }, { 4*ECX, "4*ECX" }, { 4*EDX, "4*EDX" }, @@ -2729,12 +1702,11 @@ const struct xlat struct_user_offsets[] = { { 4*EFL, "4*EFL" }, { 4*UESP, "4*UESP" }, { 4*SS, "4*SS" }, -#else /* !I386 */ -#ifdef X86_64 - { 8*R15, "8*R15" }, - { 8*R14, "8*R14" }, - { 8*R13, "8*R13" }, - { 8*R12, "8*R12" }, +#elif defined(X86_64) || defined(X32) + { 8*R15, "8*R15" }, + { 8*R14, "8*R14" }, + { 8*R13, "8*R13" }, + { 8*R12, "8*R12" }, { 8*RBP, "8*RBP" }, { 8*RBX, "8*RBX" }, { 8*R11, "8*R11" }, @@ -2746,20 +1718,13 @@ const struct xlat struct_user_offsets[] = { { 8*RDX, "8*RDX" }, { 8*RSI, "8*RSI" }, { 8*RDI, "8*RDI" }, -#if 0 - { DS, "DS" }, - { ES, "ES" }, - { FS, "FS" }, - { GS, "GS" }, -#endif { 8*ORIG_RAX, "8*ORIG_RAX" }, { 8*RIP, "8*RIP" }, { 8*CS, "8*CS" }, { 8*EFLAGS, "8*EFL" }, { 8*RSP, "8*RSP" }, { 8*SS, "8*SS" }, -#endif -#ifdef M68K +#elif defined(M68K) { 4*PT_D1, "4*PT_D1" }, { 4*PT_D2, "4*PT_D2" }, { 4*PT_D3, "4*PT_D3" }, @@ -2779,216 +1744,212 @@ const struct xlat struct_user_offsets[] = { { 4*PT_ORIG_D0, "4*PT_ORIG_D0" }, { 4*PT_SR, "4*PT_SR" }, { 4*PT_PC, "4*PT_PC" }, -#endif /* M68K */ -#endif /* !I386 */ -#ifdef SH - { 4*REG_REG0, "4*REG_REG0" }, - { 4*(REG_REG0+1), "4*REG_REG1" }, - { 4*(REG_REG0+2), "4*REG_REG2" }, - { 4*(REG_REG0+3), "4*REG_REG3" }, - { 4*(REG_REG0+4), "4*REG_REG4" }, - { 4*(REG_REG0+5), "4*REG_REG5" }, - { 4*(REG_REG0+6), "4*REG_REG6" }, - { 4*(REG_REG0+7), "4*REG_REG7" }, - { 4*(REG_REG0+8), "4*REG_REG8" }, - { 4*(REG_REG0+9), "4*REG_REG9" }, - { 4*(REG_REG0+10), "4*REG_REG10" }, - { 4*(REG_REG0+11), "4*REG_REG11" }, - { 4*(REG_REG0+12), "4*REG_REG12" }, - { 4*(REG_REG0+13), "4*REG_REG13" }, - { 4*(REG_REG0+14), "4*REG_REG14" }, - { 4*REG_REG15, "4*REG_REG15" }, - { 4*REG_PC, "4*REG_PC" }, - { 4*REG_PR, "4*REG_PR" }, - { 4*REG_SR, "4*REG_SR" }, - { 4*REG_GBR, "4*REG_GBR" }, - { 4*REG_MACH, "4*REG_MACH" }, - { 4*REG_MACL, "4*REG_MACL" }, - { 4*REG_SYSCALL, "4*REG_SYSCALL" }, - { 4*REG_FPUL, "4*REG_FPUL" }, - { 4*REG_FPREG0, "4*REG_FPREG0" }, - { 4*(REG_FPREG0+1), "4*REG_FPREG1" }, - { 4*(REG_FPREG0+2), "4*REG_FPREG2" }, - { 4*(REG_FPREG0+3), "4*REG_FPREG3" }, - { 4*(REG_FPREG0+4), "4*REG_FPREG4" }, - { 4*(REG_FPREG0+5), "4*REG_FPREG5" }, - { 4*(REG_FPREG0+6), "4*REG_FPREG6" }, - { 4*(REG_FPREG0+7), "4*REG_FPREG7" }, - { 4*(REG_FPREG0+8), "4*REG_FPREG8" }, - { 4*(REG_FPREG0+9), "4*REG_FPREG9" }, - { 4*(REG_FPREG0+10), "4*REG_FPREG10" }, - { 4*(REG_FPREG0+11), "4*REG_FPREG11" }, - { 4*(REG_FPREG0+12), "4*REG_FPREG12" }, - { 4*(REG_FPREG0+13), "4*REG_FPREG13" }, - { 4*(REG_FPREG0+14), "4*REG_FPREG14" }, - { 4*REG_FPREG15, "4*REG_FPREG15" }, -#ifdef REG_XDREG0 - { 4*REG_XDREG0, "4*REG_XDREG0" }, - { 4*(REG_XDREG0+2), "4*REG_XDREG2" }, - { 4*(REG_XDREG0+4), "4*REG_XDREG4" }, - { 4*(REG_XDREG0+6), "4*REG_XDREG6" }, - { 4*(REG_XDREG0+8), "4*REG_XDREG8" }, - { 4*(REG_XDREG0+10), "4*REG_XDREG10" }, - { 4*(REG_XDREG0+12), "4*REG_XDREG12" }, - { 4*REG_XDREG14, "4*REG_XDREG14" }, -#endif - { 4*REG_FPSCR, "4*REG_FPSCR" }, -#endif /* SH */ -#ifdef SH64 - { 0, "PC(L)" }, - { 4, "PC(U)" }, - { 8, "SR(L)" }, - { 12, "SR(U)" }, - { 16, "syscall no.(L)" }, - { 20, "syscall_no.(U)" }, - { 24, "R0(L)" }, - { 28, "R0(U)" }, - { 32, "R1(L)" }, - { 36, "R1(U)" }, - { 40, "R2(L)" }, - { 44, "R2(U)" }, - { 48, "R3(L)" }, - { 52, "R3(U)" }, - { 56, "R4(L)" }, - { 60, "R4(U)" }, - { 64, "R5(L)" }, - { 68, "R5(U)" }, - { 72, "R6(L)" }, - { 76, "R6(U)" }, - { 80, "R7(L)" }, - { 84, "R7(U)" }, - { 88, "R8(L)" }, - { 92, "R8(U)" }, - { 96, "R9(L)" }, - { 100, "R9(U)" }, - { 104, "R10(L)" }, - { 108, "R10(U)" }, - { 112, "R11(L)" }, - { 116, "R11(U)" }, - { 120, "R12(L)" }, - { 124, "R12(U)" }, - { 128, "R13(L)" }, - { 132, "R13(U)" }, - { 136, "R14(L)" }, - { 140, "R14(U)" }, - { 144, "R15(L)" }, - { 148, "R15(U)" }, - { 152, "R16(L)" }, - { 156, "R16(U)" }, - { 160, "R17(L)" }, - { 164, "R17(U)" }, - { 168, "R18(L)" }, - { 172, "R18(U)" }, - { 176, "R19(L)" }, - { 180, "R19(U)" }, - { 184, "R20(L)" }, - { 188, "R20(U)" }, - { 192, "R21(L)" }, - { 196, "R21(U)" }, - { 200, "R22(L)" }, - { 204, "R22(U)" }, - { 208, "R23(L)" }, - { 212, "R23(U)" }, - { 216, "R24(L)" }, - { 220, "R24(U)" }, - { 224, "R25(L)" }, - { 228, "R25(U)" }, - { 232, "R26(L)" }, - { 236, "R26(U)" }, - { 240, "R27(L)" }, - { 244, "R27(U)" }, - { 248, "R28(L)" }, - { 252, "R28(U)" }, - { 256, "R29(L)" }, - { 260, "R29(U)" }, - { 264, "R30(L)" }, - { 268, "R30(U)" }, - { 272, "R31(L)" }, - { 276, "R31(U)" }, - { 280, "R32(L)" }, - { 284, "R32(U)" }, - { 288, "R33(L)" }, - { 292, "R33(U)" }, - { 296, "R34(L)" }, - { 300, "R34(U)" }, - { 304, "R35(L)" }, - { 308, "R35(U)" }, - { 312, "R36(L)" }, - { 316, "R36(U)" }, - { 320, "R37(L)" }, - { 324, "R37(U)" }, - { 328, "R38(L)" }, - { 332, "R38(U)" }, - { 336, "R39(L)" }, - { 340, "R39(U)" }, - { 344, "R40(L)" }, - { 348, "R40(U)" }, - { 352, "R41(L)" }, - { 356, "R41(U)" }, - { 360, "R42(L)" }, - { 364, "R42(U)" }, - { 368, "R43(L)" }, - { 372, "R43(U)" }, - { 376, "R44(L)" }, - { 380, "R44(U)" }, - { 384, "R45(L)" }, - { 388, "R45(U)" }, - { 392, "R46(L)" }, - { 396, "R46(U)" }, - { 400, "R47(L)" }, - { 404, "R47(U)" }, - { 408, "R48(L)" }, - { 412, "R48(U)" }, - { 416, "R49(L)" }, - { 420, "R49(U)" }, - { 424, "R50(L)" }, - { 428, "R50(U)" }, - { 432, "R51(L)" }, - { 436, "R51(U)" }, - { 440, "R52(L)" }, - { 444, "R52(U)" }, - { 448, "R53(L)" }, - { 452, "R53(U)" }, - { 456, "R54(L)" }, - { 460, "R54(U)" }, - { 464, "R55(L)" }, - { 468, "R55(U)" }, - { 472, "R56(L)" }, - { 476, "R56(U)" }, - { 480, "R57(L)" }, - { 484, "R57(U)" }, - { 488, "R58(L)" }, - { 492, "R58(U)" }, - { 496, "R59(L)" }, - { 500, "R59(U)" }, - { 504, "R60(L)" }, - { 508, "R60(U)" }, - { 512, "R61(L)" }, - { 516, "R61(U)" }, - { 520, "R62(L)" }, - { 524, "R62(U)" }, - { 528, "TR0(L)" }, - { 532, "TR0(U)" }, - { 536, "TR1(L)" }, - { 540, "TR1(U)" }, - { 544, "TR2(L)" }, - { 548, "TR2(U)" }, - { 552, "TR3(L)" }, - { 556, "TR3(U)" }, - { 560, "TR4(L)" }, - { 564, "TR4(U)" }, - { 568, "TR5(L)" }, - { 572, "TR5(U)" }, - { 576, "TR6(L)" }, - { 580, "TR6(U)" }, - { 584, "TR7(L)" }, - { 588, "TR7(U)" }, +#elif defined(SH) + { 4*REG_REG0, "4*REG_REG0" }, + { 4*(REG_REG0+1), "4*REG_REG1" }, + { 4*(REG_REG0+2), "4*REG_REG2" }, + { 4*(REG_REG0+3), "4*REG_REG3" }, + { 4*(REG_REG0+4), "4*REG_REG4" }, + { 4*(REG_REG0+5), "4*REG_REG5" }, + { 4*(REG_REG0+6), "4*REG_REG6" }, + { 4*(REG_REG0+7), "4*REG_REG7" }, + { 4*(REG_REG0+8), "4*REG_REG8" }, + { 4*(REG_REG0+9), "4*REG_REG9" }, + { 4*(REG_REG0+10), "4*REG_REG10" }, + { 4*(REG_REG0+11), "4*REG_REG11" }, + { 4*(REG_REG0+12), "4*REG_REG12" }, + { 4*(REG_REG0+13), "4*REG_REG13" }, + { 4*(REG_REG0+14), "4*REG_REG14" }, + { 4*REG_REG15, "4*REG_REG15" }, + { 4*REG_PC, "4*REG_PC" }, + { 4*REG_PR, "4*REG_PR" }, + { 4*REG_SR, "4*REG_SR" }, + { 4*REG_GBR, "4*REG_GBR" }, + { 4*REG_MACH, "4*REG_MACH" }, + { 4*REG_MACL, "4*REG_MACL" }, + { 4*REG_SYSCALL, "4*REG_SYSCALL" }, + { 4*REG_FPUL, "4*REG_FPUL" }, + { 4*REG_FPREG0, "4*REG_FPREG0" }, + { 4*(REG_FPREG0+1), "4*REG_FPREG1" }, + { 4*(REG_FPREG0+2), "4*REG_FPREG2" }, + { 4*(REG_FPREG0+3), "4*REG_FPREG3" }, + { 4*(REG_FPREG0+4), "4*REG_FPREG4" }, + { 4*(REG_FPREG0+5), "4*REG_FPREG5" }, + { 4*(REG_FPREG0+6), "4*REG_FPREG6" }, + { 4*(REG_FPREG0+7), "4*REG_FPREG7" }, + { 4*(REG_FPREG0+8), "4*REG_FPREG8" }, + { 4*(REG_FPREG0+9), "4*REG_FPREG9" }, + { 4*(REG_FPREG0+10), "4*REG_FPREG10" }, + { 4*(REG_FPREG0+11), "4*REG_FPREG11" }, + { 4*(REG_FPREG0+12), "4*REG_FPREG12" }, + { 4*(REG_FPREG0+13), "4*REG_FPREG13" }, + { 4*(REG_FPREG0+14), "4*REG_FPREG14" }, + { 4*REG_FPREG15, "4*REG_FPREG15" }, +# ifdef REG_XDREG0 + { 4*REG_XDREG0, "4*REG_XDREG0" }, + { 4*(REG_XDREG0+2), "4*REG_XDREG2" }, + { 4*(REG_XDREG0+4), "4*REG_XDREG4" }, + { 4*(REG_XDREG0+6), "4*REG_XDREG6" }, + { 4*(REG_XDREG0+8), "4*REG_XDREG8" }, + { 4*(REG_XDREG0+10), "4*REG_XDREG10" }, + { 4*(REG_XDREG0+12), "4*REG_XDREG12" }, + { 4*REG_XDREG14, "4*REG_XDREG14" }, +# endif + { 4*REG_FPSCR, "4*REG_FPSCR" }, +#elif defined(SH64) + { 0, "PC(L)" }, + { 4, "PC(U)" }, + { 8, "SR(L)" }, + { 12, "SR(U)" }, + { 16, "syscall no.(L)" }, + { 20, "syscall_no.(U)" }, + { 24, "R0(L)" }, + { 28, "R0(U)" }, + { 32, "R1(L)" }, + { 36, "R1(U)" }, + { 40, "R2(L)" }, + { 44, "R2(U)" }, + { 48, "R3(L)" }, + { 52, "R3(U)" }, + { 56, "R4(L)" }, + { 60, "R4(U)" }, + { 64, "R5(L)" }, + { 68, "R5(U)" }, + { 72, "R6(L)" }, + { 76, "R6(U)" }, + { 80, "R7(L)" }, + { 84, "R7(U)" }, + { 88, "R8(L)" }, + { 92, "R8(U)" }, + { 96, "R9(L)" }, + { 100, "R9(U)" }, + { 104, "R10(L)" }, + { 108, "R10(U)" }, + { 112, "R11(L)" }, + { 116, "R11(U)" }, + { 120, "R12(L)" }, + { 124, "R12(U)" }, + { 128, "R13(L)" }, + { 132, "R13(U)" }, + { 136, "R14(L)" }, + { 140, "R14(U)" }, + { 144, "R15(L)" }, + { 148, "R15(U)" }, + { 152, "R16(L)" }, + { 156, "R16(U)" }, + { 160, "R17(L)" }, + { 164, "R17(U)" }, + { 168, "R18(L)" }, + { 172, "R18(U)" }, + { 176, "R19(L)" }, + { 180, "R19(U)" }, + { 184, "R20(L)" }, + { 188, "R20(U)" }, + { 192, "R21(L)" }, + { 196, "R21(U)" }, + { 200, "R22(L)" }, + { 204, "R22(U)" }, + { 208, "R23(L)" }, + { 212, "R23(U)" }, + { 216, "R24(L)" }, + { 220, "R24(U)" }, + { 224, "R25(L)" }, + { 228, "R25(U)" }, + { 232, "R26(L)" }, + { 236, "R26(U)" }, + { 240, "R27(L)" }, + { 244, "R27(U)" }, + { 248, "R28(L)" }, + { 252, "R28(U)" }, + { 256, "R29(L)" }, + { 260, "R29(U)" }, + { 264, "R30(L)" }, + { 268, "R30(U)" }, + { 272, "R31(L)" }, + { 276, "R31(U)" }, + { 280, "R32(L)" }, + { 284, "R32(U)" }, + { 288, "R33(L)" }, + { 292, "R33(U)" }, + { 296, "R34(L)" }, + { 300, "R34(U)" }, + { 304, "R35(L)" }, + { 308, "R35(U)" }, + { 312, "R36(L)" }, + { 316, "R36(U)" }, + { 320, "R37(L)" }, + { 324, "R37(U)" }, + { 328, "R38(L)" }, + { 332, "R38(U)" }, + { 336, "R39(L)" }, + { 340, "R39(U)" }, + { 344, "R40(L)" }, + { 348, "R40(U)" }, + { 352, "R41(L)" }, + { 356, "R41(U)" }, + { 360, "R42(L)" }, + { 364, "R42(U)" }, + { 368, "R43(L)" }, + { 372, "R43(U)" }, + { 376, "R44(L)" }, + { 380, "R44(U)" }, + { 384, "R45(L)" }, + { 388, "R45(U)" }, + { 392, "R46(L)" }, + { 396, "R46(U)" }, + { 400, "R47(L)" }, + { 404, "R47(U)" }, + { 408, "R48(L)" }, + { 412, "R48(U)" }, + { 416, "R49(L)" }, + { 420, "R49(U)" }, + { 424, "R50(L)" }, + { 428, "R50(U)" }, + { 432, "R51(L)" }, + { 436, "R51(U)" }, + { 440, "R52(L)" }, + { 444, "R52(U)" }, + { 448, "R53(L)" }, + { 452, "R53(U)" }, + { 456, "R54(L)" }, + { 460, "R54(U)" }, + { 464, "R55(L)" }, + { 468, "R55(U)" }, + { 472, "R56(L)" }, + { 476, "R56(U)" }, + { 480, "R57(L)" }, + { 484, "R57(U)" }, + { 488, "R58(L)" }, + { 492, "R58(U)" }, + { 496, "R59(L)" }, + { 500, "R59(U)" }, + { 504, "R60(L)" }, + { 508, "R60(U)" }, + { 512, "R61(L)" }, + { 516, "R61(U)" }, + { 520, "R62(L)" }, + { 524, "R62(U)" }, + { 528, "TR0(L)" }, + { 532, "TR0(U)" }, + { 536, "TR1(L)" }, + { 540, "TR1(U)" }, + { 544, "TR2(L)" }, + { 548, "TR2(U)" }, + { 552, "TR3(L)" }, + { 556, "TR3(U)" }, + { 560, "TR4(L)" }, + { 564, "TR4(U)" }, + { 568, "TR5(L)" }, + { 572, "TR5(U)" }, + { 576, "TR6(L)" }, + { 580, "TR6(U)" }, + { 584, "TR7(L)" }, + { 588, "TR7(U)" }, /* This entry is in case pt_regs contains dregs (depends on the kernel build options). */ - { uoff(regs), "offsetof(struct user, regs)" }, - { uoff(fpu), "offsetof(struct user, fpu)" }, -#endif -#ifdef ARM + { uoff(regs), "offsetof(struct user, regs)" }, + { uoff(fpu), "offsetof(struct user, fpu)" }, +#elif defined(ARM) { uoff(regs.ARM_r0), "r0" }, { uoff(regs.ARM_r1), "r1" }, { uoff(regs.ARM_r2), "r2" }, @@ -3006,9 +1967,26 @@ const struct xlat struct_user_offsets[] = { { uoff(regs.ARM_lr), "lr" }, { uoff(regs.ARM_pc), "pc" }, { uoff(regs.ARM_cpsr), "cpsr" }, -#endif - -#ifdef MIPS +#elif defined(AVR32) + { uoff(regs.sr), "sr" }, + { uoff(regs.pc), "pc" }, + { uoff(regs.lr), "lr" }, + { uoff(regs.sp), "sp" }, + { uoff(regs.r12), "r12" }, + { uoff(regs.r11), "r11" }, + { uoff(regs.r10), "r10" }, + { uoff(regs.r9), "r9" }, + { uoff(regs.r8), "r8" }, + { uoff(regs.r7), "r7" }, + { uoff(regs.r6), "r6" }, + { uoff(regs.r5), "r5" }, + { uoff(regs.r4), "r4" }, + { uoff(regs.r3), "r3" }, + { uoff(regs.r2), "r2" }, + { uoff(regs.r1), "r1" }, + { uoff(regs.r0), "r0" }, + { uoff(regs.r12_orig), "orig_r12" }, +#elif defined(MIPS) { 0, "r0" }, { 1, "r1" }, { 2, "r2" }, @@ -3080,123 +2058,461 @@ const struct xlat struct_user_offsets[] = { { 68, "mmlo" }, { 69, "fpcsr" }, { 70, "fpeir" }, -#endif - -#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SPARC64) && !defined(BFIN) +#elif defined(TILE) + { PTREGS_OFFSET_REG(0), "r0" }, + { PTREGS_OFFSET_REG(1), "r1" }, + { PTREGS_OFFSET_REG(2), "r2" }, + { PTREGS_OFFSET_REG(3), "r3" }, + { PTREGS_OFFSET_REG(4), "r4" }, + { PTREGS_OFFSET_REG(5), "r5" }, + { PTREGS_OFFSET_REG(6), "r6" }, + { PTREGS_OFFSET_REG(7), "r7" }, + { PTREGS_OFFSET_REG(8), "r8" }, + { PTREGS_OFFSET_REG(9), "r9" }, + { PTREGS_OFFSET_REG(10), "r10" }, + { PTREGS_OFFSET_REG(11), "r11" }, + { PTREGS_OFFSET_REG(12), "r12" }, + { PTREGS_OFFSET_REG(13), "r13" }, + { PTREGS_OFFSET_REG(14), "r14" }, + { PTREGS_OFFSET_REG(15), "r15" }, + { PTREGS_OFFSET_REG(16), "r16" }, + { PTREGS_OFFSET_REG(17), "r17" }, + { PTREGS_OFFSET_REG(18), "r18" }, + { PTREGS_OFFSET_REG(19), "r19" }, + { PTREGS_OFFSET_REG(20), "r20" }, + { PTREGS_OFFSET_REG(21), "r21" }, + { PTREGS_OFFSET_REG(22), "r22" }, + { PTREGS_OFFSET_REG(23), "r23" }, + { PTREGS_OFFSET_REG(24), "r24" }, + { PTREGS_OFFSET_REG(25), "r25" }, + { PTREGS_OFFSET_REG(26), "r26" }, + { PTREGS_OFFSET_REG(27), "r27" }, + { PTREGS_OFFSET_REG(28), "r28" }, + { PTREGS_OFFSET_REG(29), "r29" }, + { PTREGS_OFFSET_REG(30), "r30" }, + { PTREGS_OFFSET_REG(31), "r31" }, + { PTREGS_OFFSET_REG(32), "r32" }, + { PTREGS_OFFSET_REG(33), "r33" }, + { PTREGS_OFFSET_REG(34), "r34" }, + { PTREGS_OFFSET_REG(35), "r35" }, + { PTREGS_OFFSET_REG(36), "r36" }, + { PTREGS_OFFSET_REG(37), "r37" }, + { PTREGS_OFFSET_REG(38), "r38" }, + { PTREGS_OFFSET_REG(39), "r39" }, + { PTREGS_OFFSET_REG(40), "r40" }, + { PTREGS_OFFSET_REG(41), "r41" }, + { PTREGS_OFFSET_REG(42), "r42" }, + { PTREGS_OFFSET_REG(43), "r43" }, + { PTREGS_OFFSET_REG(44), "r44" }, + { PTREGS_OFFSET_REG(45), "r45" }, + { PTREGS_OFFSET_REG(46), "r46" }, + { PTREGS_OFFSET_REG(47), "r47" }, + { PTREGS_OFFSET_REG(48), "r48" }, + { PTREGS_OFFSET_REG(49), "r49" }, + { PTREGS_OFFSET_REG(50), "r50" }, + { PTREGS_OFFSET_REG(51), "r51" }, + { PTREGS_OFFSET_REG(52), "r52" }, + { PTREGS_OFFSET_TP, "tp" }, + { PTREGS_OFFSET_SP, "sp" }, + { PTREGS_OFFSET_LR, "lr" }, + { PTREGS_OFFSET_PC, "pc" }, + { PTREGS_OFFSET_EX1, "ex1" }, + { PTREGS_OFFSET_FAULTNUM, "faultnum" }, + { PTREGS_OFFSET_ORIG_R0, "orig_r0" }, + { PTREGS_OFFSET_FLAGS, "flags" }, +#endif +#ifdef CRISV10 + { 4*PT_FRAMETYPE, "4*PT_FRAMETYPE" }, + { 4*PT_ORIG_R10, "4*PT_ORIG_R10" }, + { 4*PT_R13, "4*PT_R13" }, + { 4*PT_R12, "4*PT_R12" }, + { 4*PT_R11, "4*PT_R11" }, + { 4*PT_R10, "4*PT_R10" }, + { 4*PT_R9, "4*PT_R9" }, + { 4*PT_R8, "4*PT_R8" }, + { 4*PT_R7, "4*PT_R7" }, + { 4*PT_R6, "4*PT_R6" }, + { 4*PT_R5, "4*PT_R5" }, + { 4*PT_R4, "4*PT_R4" }, + { 4*PT_R3, "4*PT_R3" }, + { 4*PT_R2, "4*PT_R2" }, + { 4*PT_R1, "4*PT_R1" }, + { 4*PT_R0, "4*PT_R0" }, + { 4*PT_MOF, "4*PT_MOF" }, + { 4*PT_DCCR, "4*PT_DCCR" }, + { 4*PT_SRP, "4*PT_SRP" }, + { 4*PT_IRP, "4*PT_IRP" }, + { 4*PT_CSRINSTR, "4*PT_CSRINSTR" }, + { 4*PT_CSRADDR, "4*PT_CSRADDR" }, + { 4*PT_CSRDATA, "4*PT_CSRDATA" }, + { 4*PT_USP, "4*PT_USP" }, +#endif +#ifdef CRISV32 + { 4*PT_ORIG_R10, "4*PT_ORIG_R10" }, + { 4*PT_R0, "4*PT_R0" }, + { 4*PT_R1, "4*PT_R1" }, + { 4*PT_R2, "4*PT_R2" }, + { 4*PT_R3, "4*PT_R3" }, + { 4*PT_R4, "4*PT_R4" }, + { 4*PT_R5, "4*PT_R5" }, + { 4*PT_R6, "4*PT_R6" }, + { 4*PT_R7, "4*PT_R7" }, + { 4*PT_R8, "4*PT_R8" }, + { 4*PT_R9, "4*PT_R9" }, + { 4*PT_R10, "4*PT_R10" }, + { 4*PT_R11, "4*PT_R11" }, + { 4*PT_R12, "4*PT_R12" }, + { 4*PT_R13, "4*PT_R13" }, + { 4*PT_ACR, "4*PT_ACR" }, + { 4*PT_SRS, "4*PT_SRS" }, + { 4*PT_MOF, "4*PT_MOF" }, + { 4*PT_SPC, "4*PT_SPC" }, + { 4*PT_CCS, "4*PT_CCS" }, + { 4*PT_SRP, "4*PT_SRP" }, + { 4*PT_ERP, "4*PT_ERP" }, + { 4*PT_EXS, "4*PT_EXS" }, + { 4*PT_EDA, "4*PT_EDA" }, + { 4*PT_USP, "4*PT_USP" }, + { 4*PT_PPC, "4*PT_PPC" }, + { 4*PT_BP_CTRL, "4*PT_BP_CTRL" }, + { 4*PT_BP+4, "4*PT_BP+4" }, + { 4*PT_BP+8, "4*PT_BP+8" }, + { 4*PT_BP+12, "4*PT_BP+12" }, + { 4*PT_BP+16, "4*PT_BP+16" }, + { 4*PT_BP+20, "4*PT_BP+20" }, + { 4*PT_BP+24, "4*PT_BP+24" }, + { 4*PT_BP+28, "4*PT_BP+28" }, + { 4*PT_BP+32, "4*PT_BP+32" }, + { 4*PT_BP+36, "4*PT_BP+36" }, + { 4*PT_BP+40, "4*PT_BP+40" }, + { 4*PT_BP+44, "4*PT_BP+44" }, + { 4*PT_BP+48, "4*PT_BP+48" }, + { 4*PT_BP+52, "4*PT_BP+52" }, + { 4*PT_BP+56, "4*PT_BP+56" }, +#endif +#ifdef MICROBLAZE + { PT_GPR(0), "r0" }, + { PT_GPR(1), "r1" }, + { PT_GPR(2), "r2" }, + { PT_GPR(3), "r3" }, + { PT_GPR(4), "r4" }, + { PT_GPR(5), "r5" }, + { PT_GPR(6), "r6" }, + { PT_GPR(7), "r7" }, + { PT_GPR(8), "r8" }, + { PT_GPR(9), "r9" }, + { PT_GPR(10), "r10" }, + { PT_GPR(11), "r11" }, + { PT_GPR(12), "r12" }, + { PT_GPR(13), "r13" }, + { PT_GPR(14), "r14" }, + { PT_GPR(15), "r15" }, + { PT_GPR(16), "r16" }, + { PT_GPR(17), "r17" }, + { PT_GPR(18), "r18" }, + { PT_GPR(19), "r19" }, + { PT_GPR(20), "r20" }, + { PT_GPR(21), "r21" }, + { PT_GPR(22), "r22" }, + { PT_GPR(23), "r23" }, + { PT_GPR(24), "r24" }, + { PT_GPR(25), "r25" }, + { PT_GPR(26), "r26" }, + { PT_GPR(27), "r27" }, + { PT_GPR(28), "r28" }, + { PT_GPR(29), "r29" }, + { PT_GPR(30), "r30" }, + { PT_GPR(31), "r31" }, + { PT_PC, "rpc", }, + { PT_MSR, "rmsr", }, + { PT_EAR, "rear", }, + { PT_ESR, "resr", }, + { PT_FSR, "rfsr", }, + { PT_KERNEL_MODE, "kernel_mode", }, +#endif +#ifdef OR1K + { 4*0, "r0" }, + { 4*1, "r1" }, + { 4*2, "r2" }, + { 4*3, "r3" }, + { 4*4, "r4" }, + { 4*5, "r5" }, + { 4*6, "r6" }, + { 4*7, "r7" }, + { 4*8, "r8" }, + { 4*9, "r9" }, + { 4*10, "r10" }, + { 4*11, "r11" }, + { 4*12, "r12" }, + { 4*13, "r13" }, + { 4*14, "r14" }, + { 4*15, "r15" }, + { 4*16, "r16" }, + { 4*17, "r17" }, + { 4*18, "r18" }, + { 4*19, "r19" }, + { 4*20, "r20" }, + { 4*21, "r21" }, + { 4*22, "r22" }, + { 4*23, "r23" }, + { 4*24, "r24" }, + { 4*25, "r25" }, + { 4*26, "r26" }, + { 4*27, "r27" }, + { 4*28, "r28" }, + { 4*29, "r29" }, + { 4*30, "r30" }, + { 4*31, "r31" }, + { 4*32, "pc" }, + { 4*33, "sr" }, +#endif +#ifdef XTENSA + { SYSCALL_NR, "syscall_nr" }, + { REG_AR_BASE, "ar0" }, + { REG_AR_BASE+1, "ar1" }, + { REG_AR_BASE+2, "ar2" }, + { REG_AR_BASE+3, "ar3" }, + { REG_AR_BASE+4, "ar4" }, + { REG_AR_BASE+5, "ar5" }, + { REG_AR_BASE+6, "ar6" }, + { REG_AR_BASE+7, "ar7" }, + { REG_AR_BASE+8, "ar8" }, + { REG_AR_BASE+9, "ar9" }, + { REG_AR_BASE+10, "ar10" }, + { REG_AR_BASE+11, "ar11" }, + { REG_AR_BASE+12, "ar12" }, + { REG_AR_BASE+13, "ar13" }, + { REG_AR_BASE+14, "ar14" }, + { REG_AR_BASE+15, "ar15" }, + { REG_AR_BASE+16, "ar16" }, + { REG_AR_BASE+17, "ar17" }, + { REG_AR_BASE+18, "ar18" }, + { REG_AR_BASE+19, "ar19" }, + { REG_AR_BASE+20, "ar20" }, + { REG_AR_BASE+21, "ar21" }, + { REG_AR_BASE+22, "ar22" }, + { REG_AR_BASE+23, "ar23" }, + { REG_AR_BASE+24, "ar24" }, + { REG_AR_BASE+25, "ar25" }, + { REG_AR_BASE+26, "ar26" }, + { REG_AR_BASE+27, "ar27" }, + { REG_AR_BASE+28, "ar28" }, + { REG_AR_BASE+29, "ar29" }, + { REG_AR_BASE+30, "ar30" }, + { REG_AR_BASE+31, "ar31" }, + { REG_AR_BASE+32, "ar32" }, + { REG_AR_BASE+33, "ar33" }, + { REG_AR_BASE+34, "ar34" }, + { REG_AR_BASE+35, "ar35" }, + { REG_AR_BASE+36, "ar36" }, + { REG_AR_BASE+37, "ar37" }, + { REG_AR_BASE+38, "ar38" }, + { REG_AR_BASE+39, "ar39" }, + { REG_AR_BASE+40, "ar40" }, + { REG_AR_BASE+41, "ar41" }, + { REG_AR_BASE+42, "ar42" }, + { REG_AR_BASE+43, "ar43" }, + { REG_AR_BASE+44, "ar44" }, + { REG_AR_BASE+45, "ar45" }, + { REG_AR_BASE+46, "ar46" }, + { REG_AR_BASE+47, "ar47" }, + { REG_AR_BASE+48, "ar48" }, + { REG_AR_BASE+49, "ar49" }, + { REG_AR_BASE+50, "ar50" }, + { REG_AR_BASE+51, "ar51" }, + { REG_AR_BASE+52, "ar52" }, + { REG_AR_BASE+53, "ar53" }, + { REG_AR_BASE+54, "ar54" }, + { REG_AR_BASE+55, "ar55" }, + { REG_AR_BASE+56, "ar56" }, + { REG_AR_BASE+57, "ar57" }, + { REG_AR_BASE+58, "ar58" }, + { REG_AR_BASE+59, "ar59" }, + { REG_AR_BASE+60, "ar60" }, + { REG_AR_BASE+61, "ar61" }, + { REG_AR_BASE+62, "ar62" }, + { REG_AR_BASE+63, "ar63" }, + { REG_LBEG, "lbeg" }, + { REG_LEND, "lend" }, + { REG_LCOUNT, "lcount" }, + { REG_SAR, "sar" }, + { REG_WB, "wb" }, + { REG_WS, "ws" }, + { REG_PS, "ps" }, + { REG_PC, "pc" }, + { REG_A_BASE, "a0" }, + { REG_A_BASE+1, "a1" }, + { REG_A_BASE+2, "a2" }, + { REG_A_BASE+3, "a3" }, + { REG_A_BASE+4, "a4" }, + { REG_A_BASE+5, "a5" }, + { REG_A_BASE+6, "a6" }, + { REG_A_BASE+7, "a7" }, + { REG_A_BASE+8, "a8" }, + { REG_A_BASE+9, "a9" }, + { REG_A_BASE+10, "a10" }, + { REG_A_BASE+11, "a11" }, + { REG_A_BASE+12, "a12" }, + { REG_A_BASE+13, "a13" }, + { REG_A_BASE+14, "a14" }, + { REG_A_BASE+15, "a15" }, +#endif + + /* Other fields in "struct user" */ +#if defined(S390) || defined(S390X) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + /* S390[X] has no start_data */ + { uoff(start_stack), "offsetof(struct user, start_stack)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(POWERPC) + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(I386) || defined(X86_64) || defined(X32) { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, -#endif -#if defined(I386) || defined(X86_64) { uoff(i387), "offsetof(struct user, i387)" }, -#else /* !I386 */ -#ifdef M68K - { uoff(m68kfp), "offsetof(struct user, m68kfp)" }, -#endif /* M68K */ -#endif /* !I386 */ { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, -#if !defined(SPARC64) { uoff(start_code), "offsetof(struct user, start_code)" }, -#endif -#ifdef SH64 - { uoff(start_data), "offsetof(struct user, start_data)" }, -#endif -#if !defined(SPARC64) { uoff(start_stack), "offsetof(struct user, start_stack)" }, -#endif { uoff(signal), "offsetof(struct user, signal)" }, -#if !defined(S390) && !defined(S390X) && !defined(MIPS) && !defined(SH) && !defined(SH64) && !defined(SPARC64) { uoff(reserved), "offsetof(struct user, reserved)" }, -#endif -#if !defined(SPARC64) { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, -#endif -#if !defined(ARM) && !defined(MIPS) && !defined(S390) && !defined(S390X) && !defined(SPARC64) && !defined(BFIN) { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" }, -#endif { uoff(magic), "offsetof(struct user, magic)" }, { uoff(u_comm), "offsetof(struct user, u_comm)" }, -#if defined(I386) || defined(X86_64) { uoff(u_debugreg), "offsetof(struct user, u_debugreg)" }, -#endif /* I386 */ -#endif /* !IA64 */ -#endif /* !ALPHA */ -#endif /* !POWERPC/!SPARC */ -#endif /* LINUX */ -#ifdef SUNOS4 - { uoff(u_pcb), "offsetof(struct user, u_pcb)" }, - { uoff(u_procp), "offsetof(struct user, u_procp)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(IA64) + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(ARM) + { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + { uoff(start_stack), "offsetof(struct user, start_stack)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(reserved), "offsetof(struct user, reserved)" }, + { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(AARCH64) + /* nothing */ +#elif defined(M68K) + { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, + { uoff(m68kfp), "offsetof(struct user, m68kfp)" }, + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + { uoff(start_stack), "offsetof(struct user, start_stack)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(reserved), "offsetof(struct user, reserved)" }, + { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, + { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(MIPS) || defined(LINUX_MIPSN32) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + { uoff(start_data), "offsetof(struct user, start_data)" }, + { uoff(start_stack), "offsetof(struct user, start_stack)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(ALPHA) + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(SPARC) + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(SPARC64) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(HPPA) + /* nothing */ +#elif defined(SH) || defined(SH64) + { uoff(u_fpvalid), "offsetof(struct user, u_fpvalid)" }, + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + { uoff(start_data), "offsetof(struct user, start_data)" }, + { uoff(start_stack), "offsetof(struct user, start_stack)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, + { uoff(u_fpstate), "offsetof(struct user, u_fpstate)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(CRISV10) || defined(CRISV32) + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(TILE) + /* nothing */ +#elif defined(MICROBLAZE) + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(AVR32) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + { uoff(start_data), "offsetof(struct user, start_data)" }, + { uoff(start_stack), "offsetof(struct user, start_stack)" }, + { uoff(signal), "offsetof(struct user, signal)" }, + { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, + { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(BFIN) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, + { uoff(u_ssize), "offsetof(struct user, u_ssize)" }, + { uoff(start_code), "offsetof(struct user, start_code)" }, + { uoff(signal), "offsetof(struct user, signal)" }, { uoff(u_ar0), "offsetof(struct user, u_ar0)" }, - { uoff(u_comm[0]), "offsetof(struct user, u_comm[0])" }, - { uoff(u_arg[0]), "offsetof(struct user, u_arg[0])" }, - { uoff(u_ap), "offsetof(struct user, u_ap)" }, - { uoff(u_qsave), "offsetof(struct user, u_qsave)" }, - { uoff(u_rval1), "offsetof(struct user, u_rval1)" }, - { uoff(u_rval2), "offsetof(struct user, u_rval2)" }, - { uoff(u_error), "offsetof(struct user, u_error)" }, - { uoff(u_eosys), "offsetof(struct user, u_eosys)" }, - { uoff(u_ssave), "offsetof(struct user, u_ssave)" }, - { uoff(u_signal[0]), "offsetof(struct user, u_signal)" }, - { uoff(u_sigmask[0]), "offsetof(struct user, u_sigmask)" }, - { uoff(u_sigonstack), "offsetof(struct user, u_sigonstack)" }, - { uoff(u_sigintr), "offsetof(struct user, u_sigintr)" }, - { uoff(u_sigreset), "offsetof(struct user, u_sigreset)" }, - { uoff(u_oldmask), "offsetof(struct user, u_oldmask)" }, - { uoff(u_code), "offsetof(struct user, u_code)" }, - { uoff(u_addr), "offsetof(struct user, u_addr)" }, - { uoff(u_sigstack), "offsetof(struct user, u_sigstack)" }, - { uoff(u_ofile), "offsetof(struct user, u_ofile)" }, - { uoff(u_pofile), "offsetof(struct user, u_pofile)" }, - { uoff(u_ofile_arr[0]), "offsetof(struct user, u_ofile_arr[0])" }, - { uoff(u_pofile_arr[0]),"offsetof(struct user, u_pofile_arr[0])"}, - { uoff(u_lastfile), "offsetof(struct user, u_lastfile)" }, - { uoff(u_cwd), "offsetof(struct user, u_cwd)" }, - { uoff(u_cdir), "offsetof(struct user, u_cdir)" }, - { uoff(u_rdir), "offsetof(struct user, u_rdir)" }, - { uoff(u_cmask), "offsetof(struct user, u_cmask)" }, - { uoff(u_ru), "offsetof(struct user, u_ru)" }, - { uoff(u_cru), "offsetof(struct user, u_cru)" }, - { uoff(u_timer[0]), "offsetof(struct user, u_timer[0])" }, - { uoff(u_XXX[0]), "offsetof(struct user, u_XXX[0])" }, - { uoff(u_ioch), "offsetof(struct user, u_ioch)" }, - { uoff(u_start), "offsetof(struct user, u_start)" }, - { uoff(u_acflag), "offsetof(struct user, u_acflag)" }, - { uoff(u_prof.pr_base), "offsetof(struct user, u_prof.pr_base)" }, - { uoff(u_prof.pr_size), "offsetof(struct user, u_prof.pr_size)" }, - { uoff(u_prof.pr_off), "offsetof(struct user, u_prof.pr_off)" }, - { uoff(u_prof.pr_scale),"offsetof(struct user, u_prof.pr_scale)"}, - { uoff(u_rlimit[0]), "offsetof(struct user, u_rlimit)" }, - { uoff(u_exdata.Ux_A), "offsetof(struct user, u_exdata.Ux_A)" }, - { uoff(u_exdata.ux_shell[0]),"offsetof(struct user, u_exdata.ux_shell[0])"}, - { uoff(u_lofault), "offsetof(struct user, u_lofault)" }, -#endif /* SUNOS4 */ -#ifndef HPPA + { uoff(magic), "offsetof(struct user, magic)" }, + { uoff(u_comm), "offsetof(struct user, u_comm)" }, { sizeof(struct user), "sizeof(struct user)" }, +#elif defined(OR1K) + /* nothing */ +#elif defined(METAG) + /* nothing */ +#elif defined(XTENSA) + /* nothing */ #endif { 0, NULL }, }; -#endif int -sys_ptrace(tcp) -struct tcb *tcp; +sys_ptrace(struct tcb *tcp) { const struct xlat *x; long addr; if (entering(tcp)) { - printxval(ptrace_cmds, tcp->u_arg[0], -#ifndef FREEBSD - "PTRACE_???" -#else - "PT_???" -#endif - ); + printxval(ptrace_cmds, tcp->u_arg[0], "PTRACE_???"); tprintf(", %lu, ", tcp->u_arg[1]); + addr = tcp->u_arg[2]; -#ifndef FREEBSD if (tcp->u_arg[0] == PTRACE_PEEKUSER - || tcp->u_arg[0] == PTRACE_POKEUSER) { + || tcp->u_arg[0] == PTRACE_POKEUSER + ) { for (x = struct_user_offsets; x->str; x++) { if (x->val >= addr) break; @@ -3209,11 +2525,18 @@ struct tcb *tcp; } else tprintf("%s, ", x->str); - } - else + } else +#ifdef PTRACE_GETREGSET + if (tcp->u_arg[0] == PTRACE_GETREGSET + || tcp->u_arg[0] == PTRACE_SETREGSET + ) { + printxval(nt_descriptor_types, tcp->u_arg[2], "NT_???"); + tprints(", "); + } else #endif - tprintf("%#lx, ", tcp->u_arg[2]); -#ifdef LINUX + tprintf("%#lx, ", addr); + + switch (tcp->u_arg[0]) { #ifndef IA64 case PTRACE_PEEKDATA: @@ -3234,15 +2557,7 @@ struct tcb *tcp; #endif #ifdef PTRACE_SETSIGINFO case PTRACE_SETSIGINFO: { - siginfo_t si; - if (!tcp->u_arg[3]) - tprintf("NULL"); - else if (syserror(tcp)) - tprintf("%#lx", tcp->u_arg[3]); - else if (umove(tcp, tcp->u_arg[3], &si) < 0) - tprintf("{???}"); - else - printsiginfo(&si, verbose(tcp)); + printsiginfo_at(tcp, tcp->u_arg[3]); break; } #endif @@ -3250,6 +2565,13 @@ struct tcb *tcp; case PTRACE_GETSIGINFO: /* Don't print anything, do it at syscall return. */ break; +#endif +#ifdef PTRACE_GETREGSET + case PTRACE_GETREGSET: + break; + case PTRACE_SETREGSET: + tprint_iov(tcp, /*len:*/ 1, tcp->u_arg[3], /*as string:*/ 0); + break; #endif default: tprintf("%#lx", tcp->u_arg[3]); @@ -3268,68 +2590,49 @@ struct tcb *tcp; #endif #ifdef PTRACE_GETSIGINFO case PTRACE_GETSIGINFO: { - siginfo_t si; - if (!tcp->u_arg[3]) - tprintf("NULL"); - else if (syserror(tcp)) - tprintf("%#lx", tcp->u_arg[3]); - else if (umove(tcp, tcp->u_arg[3], &si) < 0) - tprintf("{???}"); - else - printsiginfo(&si, verbose(tcp)); + printsiginfo_at(tcp, tcp->u_arg[3]); break; } +#endif +#ifdef PTRACE_GETREGSET + case PTRACE_GETREGSET: + tprint_iov(tcp, /*len:*/ 1, tcp->u_arg[3], /*as string:*/ 0); + break; #endif } } -#endif /* LINUX */ -#ifdef SUNOS4 - if (tcp->u_arg[0] == PTRACE_WRITEDATA || - tcp->u_arg[0] == PTRACE_WRITETEXT) { - tprintf("%lu, ", tcp->u_arg[3]); - printstr(tcp, tcp->u_arg[4], tcp->u_arg[3]); - } else if (tcp->u_arg[0] != PTRACE_READDATA && - tcp->u_arg[0] != PTRACE_READTEXT) { - tprintf("%#lx", tcp->u_arg[3]); - } - } else { - if (tcp->u_arg[0] == PTRACE_READDATA || - tcp->u_arg[0] == PTRACE_READTEXT) { - tprintf("%lu, ", tcp->u_arg[3]); - printstr(tcp, tcp->u_arg[4], tcp->u_arg[3]); - } - } -#endif /* SUNOS4 */ -#ifdef FREEBSD - tprintf("%lu", tcp->u_arg[3]); - } -#endif /* FREEBSD */ return 0; } -#endif /* !SVR4 */ - -#ifdef LINUX -# ifndef FUTEX_CMP_REQUEUE -# define FUTEX_CMP_REQUEUE 4 -# endif -# ifndef FUTEX_WAKE_OP -# define FUTEX_WAKE_OP 5 -# endif -# ifndef FUTEX_LOCK_PI -# define FUTEX_LOCK_PI 6 -# define FUTEX_UNLOCK_PI 7 -# define FUTEX_TRYLOCK_PI 8 -# endif -# ifndef FUTEX_WAIT_BITSET -# define FUTEX_WAIT_BITSET 9 -# endif -# ifndef FUTEX_WAKE_BITSET -# define FUTEX_WAKE_BITSET 10 -# endif -# ifndef FUTEX_PRIVATE_FLAG -# define FUTEX_PRIVATE_FLAG 128 -# endif +#ifndef FUTEX_CMP_REQUEUE +# define FUTEX_CMP_REQUEUE 4 +#endif +#ifndef FUTEX_WAKE_OP +# define FUTEX_WAKE_OP 5 +#endif +#ifndef FUTEX_LOCK_PI +# define FUTEX_LOCK_PI 6 +# define FUTEX_UNLOCK_PI 7 +# define FUTEX_TRYLOCK_PI 8 +#endif +#ifndef FUTEX_WAIT_BITSET +# define FUTEX_WAIT_BITSET 9 +#endif +#ifndef FUTEX_WAKE_BITSET +# define FUTEX_WAKE_BITSET 10 +#endif +#ifndef FUTEX_WAIT_REQUEUE_PI +# define FUTEX_WAIT_REQUEUE_PI 11 +#endif +#ifndef FUTEX_CMP_REQUEUE_PI +# define FUTEX_CMP_REQUEUE_PI 12 +#endif +#ifndef FUTEX_PRIVATE_FLAG +# define FUTEX_PRIVATE_FLAG 128 +#endif +#ifndef FUTEX_CLOCK_REALTIME +# define FUTEX_CLOCK_REALTIME 256 +#endif static const struct xlat futexops[] = { { FUTEX_WAIT, "FUTEX_WAIT" }, { FUTEX_WAKE, "FUTEX_WAKE" }, @@ -3342,6 +2645,8 @@ static const struct xlat futexops[] = { { FUTEX_TRYLOCK_PI, "FUTEX_TRYLOCK_PI" }, { FUTEX_WAIT_BITSET, "FUTEX_WAIT_BITSET" }, { FUTEX_WAKE_BITSET, "FUTEX_WAKE_BITSET" }, + { FUTEX_WAIT_REQUEUE_PI, "FUTEX_WAIT_REQUEUE_PI" }, + { FUTEX_CMP_REQUEUE_PI, "FUTEX_CMP_REQUEUE_PI" }, { FUTEX_WAIT|FUTEX_PRIVATE_FLAG, "FUTEX_WAIT_PRIVATE" }, { FUTEX_WAKE|FUTEX_PRIVATE_FLAG, "FUTEX_WAKE_PRIVATE" }, { FUTEX_FD|FUTEX_PRIVATE_FLAG, "FUTEX_FD_PRIVATE" }, @@ -3353,6 +2658,12 @@ static const struct xlat futexops[] = { { FUTEX_TRYLOCK_PI|FUTEX_PRIVATE_FLAG, "FUTEX_TRYLOCK_PI_PRIVATE" }, { FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG, "FUTEX_WAIT_BITSET_PRIVATE" }, { FUTEX_WAKE_BITSET|FUTEX_PRIVATE_FLAG, "FUTEX_WAKE_BITSET_PRIVATE" }, + { FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG, "FUTEX_WAIT_REQUEUE_PI_PRIVATE" }, + { FUTEX_CMP_REQUEUE_PI|FUTEX_PRIVATE_FLAG, "FUTEX_CMP_REQUEUE_PI_PRIVATE" }, + { FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME, "FUTEX_WAIT_BITSET|FUTEX_CLOCK_REALTIME" }, + { FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG|FUTEX_CLOCK_REALTIME, "FUTEX_WAIT_BITSET_PRIVATE|FUTEX_CLOCK_REALTIME" }, + { FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME, "FUTEX_WAIT_REQUEUE_PI|FUTEX_CLOCK_REALTIME" }, + { FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG|FUTEX_CLOCK_REALTIME, "FUTEX_WAIT_REQUEUE_PI_PRIVATE|FUTEX_CLOCK_REALTIME" }, { 0, NULL } }; #ifndef FUTEX_OP_SET @@ -3387,85 +2698,127 @@ static const struct xlat futexwakecmps[] = { }; int -sys_futex(tcp) -struct tcb *tcp; +sys_futex(struct tcb *tcp) { - if (entering(tcp)) { - long int cmd = tcp->u_arg[1] & 127; - tprintf("%p, ", (void *) tcp->u_arg[0]); - printxval(futexops, tcp->u_arg[1], "FUTEX_???"); - tprintf(", %ld", tcp->u_arg[2]); - if (cmd == FUTEX_WAKE_BITSET) - tprintf(", %lx", tcp->u_arg[5]); - else if (cmd == FUTEX_WAIT) { - tprintf(", "); - printtv(tcp, tcp->u_arg[3]); - } else if (cmd == FUTEX_WAIT_BITSET) { - tprintf(", "); - printtv(tcp, tcp->u_arg[3]); - tprintf(", %lx", tcp->u_arg[5]); - } else if (cmd == FUTEX_REQUEUE) - tprintf(", %ld, %p", tcp->u_arg[3], (void *) tcp->u_arg[4]); - else if (cmd == FUTEX_CMP_REQUEUE) - tprintf(", %ld, %p, %ld", tcp->u_arg[3], (void *) tcp->u_arg[4], tcp->u_arg[5]); - else if (cmd == FUTEX_WAKE_OP) { - tprintf(", %ld, %p, {", tcp->u_arg[3], (void *) tcp->u_arg[4]); - if ((tcp->u_arg[5] >> 28) & 8) - tprintf("FUTEX_OP_OPARG_SHIFT|"); - printxval(futexwakeops, (tcp->u_arg[5] >> 28) & 0x7, "FUTEX_OP_???"); - tprintf(", %ld, ", (tcp->u_arg[5] >> 12) & 0xfff); - if ((tcp->u_arg[5] >> 24) & 8) - tprintf("FUTEX_OP_OPARG_SHIFT|"); - printxval(futexwakecmps, (tcp->u_arg[5] >> 24) & 0x7, "FUTEX_OP_CMP_???"); - tprintf(", %ld}", tcp->u_arg[5] & 0xfff); + if (entering(tcp)) { + long int cmd = tcp->u_arg[1] & 127; + tprintf("%p, ", (void *) tcp->u_arg[0]); + printxval(futexops, tcp->u_arg[1], "FUTEX_???"); + tprintf(", %ld", tcp->u_arg[2]); + if (cmd == FUTEX_WAKE_BITSET) + tprintf(", %lx", tcp->u_arg[5]); + else if (cmd == FUTEX_WAIT) { + tprints(", "); + printtv(tcp, tcp->u_arg[3]); + } else if (cmd == FUTEX_WAIT_BITSET) { + tprints(", "); + printtv(tcp, tcp->u_arg[3]); + tprintf(", %lx", tcp->u_arg[5]); + } else if (cmd == FUTEX_REQUEUE) + tprintf(", %ld, %p", tcp->u_arg[3], (void *) tcp->u_arg[4]); + else if (cmd == FUTEX_CMP_REQUEUE || cmd == FUTEX_CMP_REQUEUE_PI) + tprintf(", %ld, %p, %ld", tcp->u_arg[3], (void *) tcp->u_arg[4], tcp->u_arg[5]); + else if (cmd == FUTEX_WAKE_OP) { + tprintf(", %ld, %p, {", tcp->u_arg[3], (void *) tcp->u_arg[4]); + if ((tcp->u_arg[5] >> 28) & 8) + tprints("FUTEX_OP_OPARG_SHIFT|"); + printxval(futexwakeops, (tcp->u_arg[5] >> 28) & 0x7, "FUTEX_OP_???"); + tprintf(", %ld, ", (tcp->u_arg[5] >> 12) & 0xfff); + if ((tcp->u_arg[5] >> 24) & 8) + tprints("FUTEX_OP_OPARG_SHIFT|"); + printxval(futexwakecmps, (tcp->u_arg[5] >> 24) & 0x7, "FUTEX_OP_CMP_???"); + tprintf(", %ld}", tcp->u_arg[5] & 0xfff); + } else if (cmd == FUTEX_WAIT_REQUEUE_PI) { + tprints(", "); + printtv(tcp, tcp->u_arg[3]); + tprintf(", %p", (void *) tcp->u_arg[4]); + } } - } - return 0; + return 0; } static void -print_affinitylist(tcp, list, len) -struct tcb *tcp; -long list; -unsigned int len; +print_affinitylist(struct tcb *tcp, long list, unsigned int len) { - int first = 1; - tprintf(" {"); - while (len >= sizeof (unsigned long)) { - unsigned long w; - umove(tcp, list, &w); - tprintf("%s %lx", first ? "" : ",", w); - first = 0; - len -= sizeof (unsigned long); - list += sizeof(unsigned long); - } - tprintf(" }"); + int first = 1; + unsigned long w, min_len; + + if (abbrev(tcp) && len / sizeof(w) > max_strlen) + min_len = len - max_strlen * sizeof(w); + else + min_len = 0; + for (; len >= sizeof(w) && len > min_len; + len -= sizeof(w), list += sizeof(w)) { + if (umove(tcp, list, &w) < 0) + break; + if (first) + tprints("{"); + else + tprints(", "); + first = 0; + tprintf("%lx", w); + } + if (len) { + if (first) + tprintf("%#lx", list); + else + tprintf(", %s}", (len >= sizeof(w) && len > min_len ? + "???" : "...")); + } else { + tprints(first ? "{}" : "}"); + } } int -sys_sched_setaffinity(tcp) -struct tcb *tcp; +sys_sched_setaffinity(struct tcb *tcp) { - if (entering(tcp)) { - tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]); - print_affinitylist(tcp, tcp->u_arg[2], tcp->u_arg[1]); - } - return 0; + if (entering(tcp)) { + tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]); + print_affinitylist(tcp, tcp->u_arg[2], tcp->u_arg[1]); + } + return 0; } int -sys_sched_getaffinity(tcp) -struct tcb *tcp; +sys_sched_getaffinity(struct tcb *tcp) { - if (entering(tcp)) { - tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]); - } else { - if (tcp->u_rval == -1) - tprintf("%#lx", tcp->u_arg[2]); - else - print_affinitylist(tcp, tcp->u_arg[2], tcp->u_rval); - } - return 0; + if (entering(tcp)) { + tprintf("%ld, %lu, ", tcp->u_arg[0], tcp->u_arg[1]); + } else { + if (tcp->u_rval == -1) + tprintf("%#lx", tcp->u_arg[2]); + else + print_affinitylist(tcp, tcp->u_arg[2], tcp->u_rval); + } + return 0; +} + +int +sys_get_robust_list(struct tcb *tcp) +{ + if (entering(tcp)) { + tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]); + } else { + void *addr; + size_t len; + + if (syserror(tcp) || + !tcp->u_arg[1] || + umove(tcp, tcp->u_arg[1], &addr) < 0) { + tprintf("%#lx, ", tcp->u_arg[1]); + } else { + tprintf("[%p], ", addr); + } + + if (syserror(tcp) || + !tcp->u_arg[2] || + umove(tcp, tcp->u_arg[2], &len) < 0) { + tprintf("%#lx", tcp->u_arg[2]); + } else { + tprintf("[%lu]", (unsigned long) len); + } + } + return 0; } static const struct xlat schedulers[] = { @@ -3476,77 +2829,86 @@ static const struct xlat schedulers[] = { }; int -sys_sched_getscheduler(tcp) -struct tcb *tcp; +sys_sched_getscheduler(struct tcb *tcp) { - if (entering(tcp)) { - tprintf("%d", (int) tcp->u_arg[0]); - } else if (! syserror(tcp)) { - tcp->auxstr = xlookup (schedulers, tcp->u_rval); - if (tcp->auxstr != NULL) - return RVAL_STR; - } - return 0; + if (entering(tcp)) { + tprintf("%d", (int) tcp->u_arg[0]); + } else if (!syserror(tcp)) { + tcp->auxstr = xlookup(schedulers, tcp->u_rval); + if (tcp->auxstr != NULL) + return RVAL_STR; + } + return 0; } int -sys_sched_setscheduler(tcp) -struct tcb *tcp; +sys_sched_setscheduler(struct tcb *tcp) { - if (entering(tcp)) { - struct sched_param p; - tprintf("%d, ", (int) tcp->u_arg[0]); - printxval(schedulers, tcp->u_arg[1], "SCHED_???"); - if (umove(tcp, tcp->u_arg[2], &p) < 0) - tprintf(", %#lx", tcp->u_arg[2]); - else - tprintf(", { %d }", p.__sched_priority); - } - return 0; + if (entering(tcp)) { + struct sched_param p; + tprintf("%d, ", (int) tcp->u_arg[0]); + printxval(schedulers, tcp->u_arg[1], "SCHED_???"); + if (umove(tcp, tcp->u_arg[2], &p) < 0) + tprintf(", %#lx", tcp->u_arg[2]); + else + tprintf(", { %d }", p.__sched_priority); + } + return 0; } int -sys_sched_getparam(tcp) -struct tcb *tcp; +sys_sched_getparam(struct tcb *tcp) { - if (entering(tcp)) { - tprintf("%d, ", (int) tcp->u_arg[0]); - } else { - struct sched_param p; - if (umove(tcp, tcp->u_arg[1], &p) < 0) - tprintf("%#lx", tcp->u_arg[1]); - else - tprintf("{ %d }", p.__sched_priority); - } - return 0; + if (entering(tcp)) { + tprintf("%d, ", (int) tcp->u_arg[0]); + } else { + struct sched_param p; + if (umove(tcp, tcp->u_arg[1], &p) < 0) + tprintf("%#lx", tcp->u_arg[1]); + else + tprintf("{ %d }", p.__sched_priority); + } + return 0; } int -sys_sched_setparam(tcp) -struct tcb *tcp; +sys_sched_setparam(struct tcb *tcp) { - if (entering(tcp)) { - struct sched_param p; - if (umove(tcp, tcp->u_arg[1], &p) < 0) - tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); - else - tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority); - } - return 0; + if (entering(tcp)) { + struct sched_param p; + if (umove(tcp, tcp->u_arg[1], &p) < 0) + tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); + else + tprintf("%d, { %d }", (int) tcp->u_arg[0], p.__sched_priority); + } + return 0; +} + +int +sys_sched_get_priority_min(struct tcb *tcp) +{ + if (entering(tcp)) { + printxval(schedulers, tcp->u_arg[0], "SCHED_???"); + } + return 0; } int -sys_sched_get_priority_min(tcp) -struct tcb *tcp; +sys_sched_rr_get_interval(struct tcb *tcp) { - if (entering(tcp)) { - printxval(schedulers, tcp->u_arg[0], "SCHED_???"); - } - return 0; + if (entering(tcp)) { + tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]); + } else { + if (syserror(tcp)) + tprintf("%#lx", tcp->u_arg[1]); + else + print_timespec(tcp, tcp->u_arg[1]); + } + return 0; } -#ifdef X86_64 -#include +#if defined X86_64 || defined X32 +# include static const struct xlat archvals[] = { { ARCH_SET_GS, "ARCH_SET_GS" }, @@ -3557,43 +2919,43 @@ static const struct xlat archvals[] = { }; int -sys_arch_prctl(tcp) -struct tcb *tcp; +sys_arch_prctl(struct tcb *tcp) { - if (entering(tcp)) { - printxval(archvals, tcp->u_arg[0], "ARCH_???"); - if (tcp->u_arg[0] == ARCH_SET_GS - || tcp->u_arg[0] == ARCH_SET_FS) - tprintf(", %#lx", tcp->u_arg[1]); - } else { - if (tcp->u_arg[0] == ARCH_GET_GS - || tcp->u_arg[0] == ARCH_GET_FS) { - long int v; - if (!syserror(tcp) && umove(tcp, tcp->u_arg[1], &v) != -1) - tprintf(", [%#lx]", v); - else - tprintf(", %#lx", tcp->u_arg[1]); + if (entering(tcp)) { + printxval(archvals, tcp->u_arg[0], "ARCH_???"); + if (tcp->u_arg[0] == ARCH_SET_GS + || tcp->u_arg[0] == ARCH_SET_FS + ) { + tprintf(", %#lx", tcp->u_arg[1]); + } + } else { + if (tcp->u_arg[0] == ARCH_GET_GS + || tcp->u_arg[0] == ARCH_GET_FS + ) { + long int v; + if (!syserror(tcp) && umove(tcp, tcp->u_arg[1], &v) != -1) + tprintf(", [%#lx]", v); + else + tprintf(", %#lx", tcp->u_arg[1]); + } } - } - return 0; + return 0; } -#endif - +#endif /* X86_64 || X32 */ int -sys_getcpu(tcp) -struct tcb *tcp; +sys_getcpu(struct tcb *tcp) { if (exiting(tcp)) { unsigned u; if (tcp->u_arg[0] == 0) - tprintf("NULL, "); + tprints("NULL, "); else if (umove(tcp, tcp->u_arg[0], &u) < 0) tprintf("%#lx, ", tcp->u_arg[0]); else tprintf("[%u], ", u); if (tcp->u_arg[1] == 0) - tprintf("NULL, "); + tprints("NULL, "); else if (umove(tcp, tcp->u_arg[1], &u) < 0) tprintf("%#lx, ", tcp->u_arg[1]); else @@ -3603,4 +2965,55 @@ struct tcb *tcp; return 0; } -#endif +int +sys_process_vm_readv(struct tcb *tcp) +{ + if (entering(tcp)) { + /* arg 1: pid */ + tprintf("%ld, ", tcp->u_arg[0]); + } else { + /* arg 2: local iov */ + if (syserror(tcp)) { + tprintf("%#lx", tcp->u_arg[1]); + } else { + tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1); + } + /* arg 3: local iovcnt */ + tprintf(", %lu, ", tcp->u_arg[2]); + /* arg 4: remote iov */ + if (syserror(tcp)) { + tprintf("%#lx", tcp->u_arg[3]); + } else { + tprint_iov(tcp, tcp->u_arg[4], tcp->u_arg[3], 0); + } + /* arg 5: remote iovcnt */ + /* arg 6: flags */ + tprintf(", %lu, %lu", tcp->u_arg[4], tcp->u_arg[5]); + } + return 0; +} + +int +sys_process_vm_writev(struct tcb *tcp) +{ + if (entering(tcp)) { + /* arg 1: pid */ + tprintf("%ld, ", tcp->u_arg[0]); + /* arg 2: local iov */ + if (syserror(tcp)) + tprintf("%#lx", tcp->u_arg[1]); + else + tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1); + /* arg 3: local iovcnt */ + tprintf(", %lu, ", tcp->u_arg[2]); + /* arg 4: remote iov */ + if (syserror(tcp)) + tprintf("%#lx", tcp->u_arg[3]); + else + tprint_iov(tcp, tcp->u_arg[4], tcp->u_arg[3], 0); + /* arg 5: remote iovcnt */ + /* arg 6: flags */ + tprintf(", %lu, %lu", tcp->u_arg[4], tcp->u_arg[5]); + } + return 0; +}