X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fproc-api.c;h=3b807c4af1df2ef98a7398eec6d984601fb26a84;hb=264b62058b585d4bee3ef4ffa804fce7400df80e;hp=cf12d424d6559db0716bc5542c1bd6fb13d359df;hpb=27e232885db363fb545fd2f450e72d929e59b8f6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/proc-api.c b/gdb/proc-api.c index cf12d424d6..3b807c4af1 100644 --- a/gdb/proc-api.c +++ b/gdb/proc-api.c @@ -1,5 +1,8 @@ /* Machine independent support for SVR4 /proc (process file system) for GDB. - Copyright 1999 Free Software Foundation, Inc. + + Copyright (C) 1999, 2000, 2001, 2003, 2005, 2007 + Free Software Foundation, Inc. + Written by Michael Snyder at Cygnus Solutions. Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others. @@ -17,7 +20,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, -Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* * Pretty-print trace of api calls to the /proc api @@ -27,6 +31,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "defs.h" #include "gdbcmd.h" +#include "completer.h" #if defined (NEW_PROC_API) #define _STRUCTURED_PROC 1 @@ -35,12 +40,14 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include #include +#ifdef HAVE_SYS_PROC_H #include /* for struct proc */ +#endif #ifdef HAVE_SYS_USER_H #include /* for struct user */ #endif #include /* for O_RDWR etc. */ -#include +#include "gdb_wait.h" #include "proc-utils.h" @@ -69,10 +76,7 @@ prepare_to_trace (void) } static void -set_procfs_trace_cmd (args, from_tty, c) - char *args; - int from_tty; - struct cmd_list_element *c; +set_procfs_trace_cmd (char *args, int from_tty, struct cmd_list_element *c) { #if 0 /* not sure what I might actually need to do here, if anything */ if (procfs_file) @@ -81,10 +85,7 @@ set_procfs_trace_cmd (args, from_tty, c) } static void -set_procfs_file_cmd (args, from_tty, c) - char *args; - int from_tty; - struct cmd_list_element *c; +set_procfs_file_cmd (char *args, int from_tty, struct cmd_list_element *c) { /* Just changed the filename for procfs tracing. If a file was already open, close it. */ @@ -223,14 +224,11 @@ static struct trans ioctl_table[] = { }; int -ioctl_with_trace (fd, opcode, ptr, file, line) - int fd; - long opcode; - void *ptr; - char *file; - int line; +ioctl_with_trace (int fd, long opcode, void *ptr, char *file, int line) { - int i, ret, arg1; + int i = 0; + int ret; + int arg1; prepare_to_trace (); @@ -403,9 +401,13 @@ static struct trans rw_table[] = { #ifdef PCCSIG /* solaris */ { PCCSIG, "PCCSIG", "clear current signal" }, #endif +#ifdef PCDSTOP /* solaris */ { PCDSTOP, "PCDSTOP", "post stop request" }, +#endif { PCKILL, "PCKILL", "post a signal" }, +#ifdef PCNICE /* solaris */ { PCNICE, "PCNICE", "set nice priority" }, +#endif #ifdef PCREAD /* solaris */ { PCREAD, "PCREAD", "read from the address space" }, { PCWRITE, "PCWRITE", "write to the address space" }, @@ -425,7 +427,9 @@ static struct trans rw_table[] = { { PCSEXIT, "PCSEXIT", "set traced syscall exit set" }, { PCSFAULT, "PCSFAULT", "set traced fault set" }, { PCSFPREG, "PCSFPREG", "set floating point registers" }, +#ifdef PCSHOLD /* solaris */ { PCSHOLD, "PCSHOLD", "set signal mask" }, +#endif { PCSREG, "PCSREG", "set general registers" }, { PCSSIG, "PCSSIG", "set current signal" }, { PCSTOP, "PCSTOP", "post stop request and wait" }, @@ -439,7 +443,9 @@ static struct trans rw_table[] = { #ifdef PCTWSTOP /* solaris */ { PCTWSTOP, "PCTWSTOP", "wait for stop, with timeout arg" }, #endif +#ifdef PCUNKILL /* solaris */ { PCUNKILL, "PCUNKILL", "delete a pending signal" }, +#endif #ifdef PCUNSET /* solaris */ { PCUNSET, "PCUNSET", "unset modes" }, #endif @@ -453,21 +459,16 @@ static struct trans rw_table[] = { static off_t lseek_offset; int -write_with_trace (fd, varg, len, file, line) - int fd; - void *varg; - size_t len; - char *file; - int line; +write_with_trace (int fd, void *varg, size_t len, char *file, int line) { - int i; + int i = ARRAY_SIZE (rw_table) - 1; int ret; - long *arg = (long *) varg; + procfs_ctl_t *arg = (procfs_ctl_t *) varg; prepare_to_trace (); if (procfs_trace) { - long opcode = arg[0]; + procfs_ctl_t opcode = arg[0]; for (i = 0; rw_table[i].name != NULL; i++) if (rw_table[i].value == opcode) break; @@ -491,7 +492,9 @@ write_with_trace (fd, varg, len, file, line) case PCUNSET: #endif #ifdef PCRESET +#if PCRESET != PCUNSET case PCRESET: +#endif #endif fprintf (procfs_file ? procfs_file : stdout, "write (PCRESET, %s) %s\n", @@ -527,12 +530,14 @@ write_with_trace (fd, varg, len, file, line) proc_prettyfprint_syscalls (procfs_file ? procfs_file : stdout, (sysset_t *) &arg[1], 0); break; +#ifdef PCSHOLD case PCSHOLD: fprintf (procfs_file ? procfs_file : stdout, "write (PCSHOLD) "); proc_prettyfprint_signalset (procfs_file ? procfs_file : stdout, (sigset_t *) &arg[1], 0); break; +#endif case PCSSIG: fprintf (procfs_file ? procfs_file : stdout, "write (PCSSIG) "); @@ -551,10 +556,14 @@ write_with_trace (fd, varg, len, file, line) fprintf (procfs_file ? procfs_file : stdout, "clearFlt "); if (arg[1] & PRSTEP) fprintf (procfs_file ? procfs_file : stdout, "step "); +#ifdef PRSABORT if (arg[1] & PRSABORT) fprintf (procfs_file ? procfs_file : stdout, "syscallAbort "); +#endif +#ifdef PRSTOP if (arg[1] & PRSTOP) fprintf (procfs_file ? procfs_file : stdout, "stopReq "); +#endif fprintf (procfs_file ? procfs_file : stdout, "\n"); break; @@ -567,14 +576,7 @@ write_with_trace (fd, varg, len, file, line) break; default: { - static unsigned char break_insn[] = BREAKPOINT; - - if (len == sizeof (break_insn) && - memcmp (arg, &break_insn, len) == 0) - fprintf (procfs_file ? procfs_file : stdout, - "write () \n", - (unsigned long) lseek_offset); - else if (rw_table[i].name) + if (rw_table[i].name) fprintf (procfs_file ? procfs_file : stdout, "write (%s) %s\n", rw_table[i].name, @@ -614,12 +616,7 @@ write_with_trace (fd, varg, len, file, line) } off_t -lseek_with_trace (fd, offset, whence, file, line) - int fd; - off_t offset; - int whence; - char *file; - int line; +lseek_with_trace (int fd, off_t offset, int whence, char *file, int line) { off_t ret; @@ -642,11 +639,7 @@ lseek_with_trace (fd, offset, whence, file, line) #endif /* NEW_PROC_API */ int -open_with_trace (filename, mode, file, line) - char *filename; - int mode; - char *file; - int line; +open_with_trace (char *filename, int mode, char *file, int line) { int ret; @@ -687,10 +680,7 @@ open_with_trace (filename, mode, file, line) } int -close_with_trace (fd, file, line) - int fd; - char *file; - int line; +close_with_trace (int fd, char *file, int line) { int ret; @@ -716,10 +706,7 @@ close_with_trace (fd, file, line) } pid_t -wait_with_trace (wstat, file, line) - int *wstat; - char *file; - int line; +wait_with_trace (int *wstat, char *file, int line) { int ret, lstat = 0; @@ -754,10 +741,7 @@ wait_with_trace (wstat, file, line) } void -procfs_note (msg, file, line) - char *msg; - char *file; - int line; +procfs_note (char *msg, char *file, int line) { prepare_to_trace (); if (procfs_trace) @@ -765,18 +749,14 @@ procfs_note (msg, file, line) if (info_verbose) fprintf (procfs_file ? procfs_file : stdout, "%s:%d -- ", file, line); - fprintf (procfs_file ? procfs_file : stdout, msg); + fprintf (procfs_file ? procfs_file : stdout, "%s", msg); if (procfs_file) fflush (procfs_file); } } void -proc_prettyfprint_status (flags, why, what, thread) - long flags; - int why; - int what; - int thread; +proc_prettyfprint_status (long flags, int why, int what, int thread) { prepare_to_trace (); if (procfs_trace) @@ -798,21 +778,21 @@ proc_prettyfprint_status (flags, why, what, thread) void -_initialize_proc_api () +_initialize_proc_api (void) { struct cmd_list_element *c; - c = add_set_cmd ("procfs-trace", no_class, - var_boolean, (char *) &procfs_trace, - "Set tracing for /proc api calls.\n", &setlist); - - add_show_from_set (c, &showlist); - c->function.sfunc = set_procfs_trace_cmd; - - c = add_set_cmd ("procfs-file", no_class, var_filename, - (char *) &procfs_filename, - "Set filename for /proc tracefile.\n", &setlist); - - add_show_from_set (c, &showlist); - c->function.sfunc = set_procfs_file_cmd; + add_setshow_boolean_cmd ("procfs-trace", no_class, &procfs_trace, _("\ +Set tracing for /proc api calls."), _("\ +Show tracing for /proc api calls."), NULL, + set_procfs_trace_cmd, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_filename_cmd ("procfs-file", no_class, &procfs_filename, _("\ +Set filename for /proc tracefile."), _("\ +Show filename for /proc tracefile."), NULL, + set_procfs_file_cmd, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); }