diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 39 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 74 | ||||
| -rw-r--r-- | gdb/gdbserver/target.h | 5 |
4 files changed, 126 insertions, 0 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 3fda37e..30d7e0f 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,11 @@ +2009-02-06 Pedro Alves <pedro@codesourcery.com> + + * server.c (handle_query): Report qXfer:siginfo:read and + qXfer:siginfo:write as supported and handle them. + * target.h (struct target_ops) <qxfer_siginfo>: New field. + * linux-low.c (linux_xfer_siginfo): New. + (linux_target_ops): Set it. + 2009-01-26 Pedro Alves <pedro@codesourcery.com> * server.c (gdbserver_usage): Mention --remote-debug. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 3fa06ec..38dd000 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -2180,6 +2180,44 @@ linux_qxfer_osdata (const char *annex, return len; } +static int +linux_xfer_siginfo (const char *annex, unsigned char *readbuf, + unsigned const char *writebuf, CORE_ADDR offset, int len) +{ + struct siginfo siginfo; + long pid = -1; + + if (current_inferior == NULL) + return -1; + + pid = pid_of (get_thread_process (current_inferior)); + + if (debug_threads) + fprintf (stderr, "%s siginfo for lwp %ld.\n", + readbuf != NULL ? "Reading" : "Writing", + pid); + + if (offset > sizeof (siginfo)) + return -1; + + if (ptrace (PTRACE_GETSIGINFO, pid, 0, &siginfo) != 0) + return -1; + + if (offset + len > sizeof (siginfo)) + len = sizeof (siginfo) - offset; + + if (readbuf != NULL) + memcpy (readbuf, (char *) &siginfo + offset, len); + else + { + memcpy ((char *) &siginfo + offset, writebuf, len); + if (ptrace (PTRACE_SETSIGINFO, pid, 0, &siginfo) != 0) + return -1; + } + + return len; +} + static struct target_ops linux_target_ops = { linux_create_inferior, linux_attach, @@ -2213,6 +2251,7 @@ static struct target_ops linux_target_ops = { NULL, hostio_last_error_from_errno, linux_qxfer_osdata, + linux_xfer_siginfo, }; static void diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index c4e1672..416ceb3 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -810,6 +810,77 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) return; } + if (the_target->qxfer_siginfo != NULL + && strncmp ("qXfer:siginfo:read:", own_buf, 19) == 0) + { + unsigned char *data; + int n; + CORE_ADDR ofs; + unsigned int len; + char *annex; + + require_running (own_buf); + + /* Reject any annex; grab the offset and length. */ + if (decode_xfer_read (own_buf + 19, &annex, &ofs, &len) < 0 + || annex[0] != '\0') + { + strcpy (own_buf, "E00"); + return; + } + + /* Read one extra byte, as an indicator of whether there is + more. */ + if (len > PBUFSIZ - 2) + len = PBUFSIZ - 2; + data = malloc (len + 1); + if (!data) + return; + n = (*the_target->qxfer_siginfo) (annex, data, NULL, ofs, len + 1); + if (n < 0) + write_enn (own_buf); + else if (n > len) + *new_packet_len_p = write_qxfer_response (own_buf, data, len, 1); + else + *new_packet_len_p = write_qxfer_response (own_buf, data, n, 0); + + free (data); + return; + } + + if (the_target->qxfer_siginfo != NULL + && strncmp ("qXfer:siginfo:write:", own_buf, 20) == 0) + { + char *annex; + int n; + unsigned int len; + CORE_ADDR ofs; + unsigned char *data; + + require_running (own_buf); + + strcpy (own_buf, "E00"); + data = malloc (packet_len - 19); + if (!data) + return; + if (decode_xfer_write (own_buf + 20, packet_len - 20, &annex, + &ofs, &len, data) < 0) + { + free (data); + return; + } + + n = (*the_target->qxfer_siginfo) + (annex, NULL, (unsigned const char *)data, ofs, len); + if (n < 0) + write_enn (own_buf); + else + sprintf (own_buf, "%x", n); + + free (data); + return; + } + /* Protocol features query. */ if (strncmp ("qSupported", own_buf, 10) == 0 && (own_buf[10] == ':' || own_buf[10] == '\0')) @@ -826,6 +897,9 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (the_target->qxfer_spu != NULL) strcat (own_buf, ";qXfer:spu:read+;qXfer:spu:write+"); + if (the_target->qxfer_siginfo != NULL) + strcat (own_buf, ";qXfer:siginfo:read+;qXfer:siginfo:write+"); + /* We always report qXfer:features:read, as targets may install XML files on a subsequent call to arch_setup. If we reported to GDB on startup that we don't support diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h index a1dfad6..7851a4c 100644 --- a/gdb/gdbserver/target.h +++ b/gdb/gdbserver/target.h @@ -193,6 +193,11 @@ struct target_ops int (*qxfer_osdata) (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, CORE_ADDR offset, int len); + + /* Read/Write extra signal info. */ + int (*qxfer_siginfo) (const char *annex, unsigned char *readbuf, + unsigned const char *writebuf, + CORE_ADDR offset, int len); }; extern struct target_ops *the_target; |