From: Pedro Alves Date: Fri, 19 Apr 2013 15:27:06 +0000 (+0000) Subject: gdb_byte for binary buffer, char for string: remote.c, tracepoint.c. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bc20a4afc3fa41cab07aa68571b713ecef0aa675;p=binutils-gdb.git gdb_byte for binary buffer, char for string: remote.c, tracepoint.c. While the RSP is largely ASCII based (hence the packet buffer type is char *), at places we pass around 8-bit binary packets in that buffer. Functions like hex2bin or remote_escape_output conceptually are handling binary buffers, so I left them as working with gdb_byte, and added casts where necessary. Whether these are host bytes or target bytes is blurry at present, so this is largely a matter of taste. Switching some of these functions to take "char *" or "void *" would be equally good. gdb/ 2013-04-19 Pedro Alves * remote.c (remote_write_bytes_aux, compare_sections_command) (remote_read_qxfer) (remote_search_memory, remote_hostio_pwrite, remote_hostio_pread) (remote_hostio_readlink, remote_bfd_iovec_pread) (remote_set_trace_notes): Use gdb_byte when RSP buffer is used as binary buffer, and char when buffer is used as string. * tracepoint.c (encode_source_string, tfile_write_uploaded_tp) (trace_save, tfile_open, traceframe_walk_blocks) (tfile_fetch_registers): Likewise. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 49448b6c49b..8b3bfbd4929 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2013-04-19 Pedro Alves + + * remote.c (remote_write_bytes_aux, compare_sections_command) + (remote_read_qxfer) + (remote_search_memory, remote_hostio_pwrite, remote_hostio_pread) + (remote_hostio_readlink, remote_bfd_iovec_pread) + (remote_set_trace_notes): Use gdb_byte when RSP buffer is used as + binary buffer, and char when buffer is used as string. + * tracepoint.c (encode_source_string, tfile_write_uploaded_tp) + (trace_save, tfile_open, traceframe_walk_blocks) + (tfile_fetch_registers): Likewise. + 2013-04-19 Pedro Alves * ser-base.c (ser_base_write): Change prototype -- take 'void *' diff --git a/gdb/remote.c b/gdb/remote.c index 9f447ba20e9..61fc5e75773 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6744,8 +6744,8 @@ remote_write_bytes_aux (const char *header, CORE_ADDR memaddr, /* Binary mode. Send target system values byte by byte, in increasing byte addresses. Only escape certain critical characters. */ - payload_length = remote_escape_output (myaddr, todo, p, &nr_bytes, - payload_size); + payload_length = remote_escape_output (myaddr, todo, (gdb_byte *) p, + &nr_bytes, payload_size); /* If not all TODO bytes fit, then we'll need another packet. Make a second try to keep the end of the packet aligned. Don't do @@ -6758,7 +6758,7 @@ remote_write_bytes_aux (const char *header, CORE_ADDR memaddr, - memaddr); if (new_nr_bytes != nr_bytes) payload_length = remote_escape_output (myaddr, new_nr_bytes, - p, &nr_bytes, + (gdb_byte *) p, &nr_bytes, payload_size); } @@ -8575,7 +8575,7 @@ remote_write_qxfer (struct target_ops *ops, const char *object_name, /* Escape as much data as fits into rs->buf. */ buf_len = remote_escape_output - (writebuf, len, (rs->buf + i), &max_size, max_size); + (writebuf, len, (gdb_byte *) rs->buf + i, &max_size, max_size); if (putpkt_binary (rs->buf, i + buf_len) < 0 || getpkt_sane (&rs->buf, &rs->buf_size, 0) < 0 @@ -8654,7 +8654,8 @@ remote_read_qxfer (struct target_ops *ops, const char *object_name, error (_("Remote qXfer reply contained no data.")); /* Got some data. */ - i = remote_unescape_input (rs->buf + 1, packet_len - 1, readbuf, n); + i = remote_unescape_input ((gdb_byte *) rs->buf + 1, + packet_len - 1, readbuf, n); /* 'l' is an EOF marker, possibly including a final block of data, or possibly empty. If we have the final block of a non-empty @@ -8935,7 +8936,7 @@ remote_search_memory (struct target_ops* ops, /* Escape as much data as fits into rs->buf. */ escaped_pattern_len = - remote_escape_output (pattern, pattern_len, (rs->buf + i), + remote_escape_output (pattern, pattern_len, (gdb_byte *) rs->buf + i, &used_pattern_len, max_size); /* Bail if the pattern is too large. */ @@ -9709,7 +9710,7 @@ remote_hostio_pwrite (int fd, const gdb_byte *write_buf, int len, remote_buffer_add_int (&p, &left, offset); remote_buffer_add_string (&p, &left, ","); - p += remote_escape_output (write_buf, len, p, &out_len, + p += remote_escape_output (write_buf, len, (gdb_byte *) p, &out_len, get_remote_packet_size () - (p - rs->buf)); return remote_hostio_send_command (p - rs->buf, PACKET_vFile_pwrite, @@ -9748,7 +9749,7 @@ remote_hostio_pread (int fd, gdb_byte *read_buf, int len, if (ret < 0) return ret; - read_len = remote_unescape_input (attachment, attachment_len, + read_len = remote_unescape_input ((gdb_byte *) attachment, attachment_len, read_buf, len); if (read_len != ret) error (_("Read returned %d, but %d bytes."), ret, (int) read_len); @@ -9822,8 +9823,8 @@ remote_hostio_readlink (const char *filename, int *remote_errno) ret = xmalloc (len + 1); - read_len = remote_unescape_input (attachment, attachment_len, - ret, len); + read_len = remote_unescape_input ((gdb_byte *) attachment, attachment_len, + (gdb_byte *) ret, len); if (read_len != len) error (_("Readlink returned %d, but %d bytes."), len, read_len); @@ -9952,7 +9953,7 @@ remote_bfd_iovec_pread (struct bfd *abfd, void *stream, void *buf, pos = 0; while (nbytes > pos) { - bytes = remote_hostio_pread (fd, (char *)buf + pos, nbytes - pos, + bytes = remote_hostio_pread (fd, (gdb_byte *) buf + pos, nbytes - pos, offset + pos, &remote_errno); if (bytes == 0) /* Success, but no bytes, means end-of-file. */ @@ -11135,21 +11136,21 @@ remote_set_trace_notes (char *user, char *notes, char *stop_notes) if (user) { buf += xsnprintf (buf, endbuf - buf, "user:"); - nbytes = bin2hex (user, buf, 0); + nbytes = bin2hex ((gdb_byte *) user, buf, 0); buf += 2 * nbytes; *buf++ = ';'; } if (notes) { buf += xsnprintf (buf, endbuf - buf, "notes:"); - nbytes = bin2hex (notes, buf, 0); + nbytes = bin2hex ((gdb_byte *) notes, buf, 0); buf += 2 * nbytes; *buf++ = ';'; } if (stop_notes) { buf += xsnprintf (buf, endbuf - buf, "tstop:"); - nbytes = bin2hex (stop_notes, buf, 0); + nbytes = bin2hex ((gdb_byte *) stop_notes, buf, 0); buf += 2 * nbytes; *buf++ = ';'; } diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index b89ca22b4bf..212fe59ef64 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3000,7 +3000,7 @@ encode_source_string (int tpnum, ULONGEST addr, srctype, 0, (int) strlen (src)); if (strlen (buf) + strlen (src) * 2 >= buf_size) error (_("Source string too long for buffer")); - bin2hex (src, buf + strlen (buf), 0); + bin2hex ((gdb_byte *) src, buf + strlen (buf), 0); return -1; } @@ -3190,7 +3190,7 @@ tfile_write_uploaded_tp (struct trace_file_writer *self, = (struct tfile_trace_file_writer *) self; int a; char *act; - gdb_byte buf[MAX_TRACE_UPLOAD]; + char buf[MAX_TRACE_UPLOAD]; fprintf (writer->fp, "tp T%x:%s:%c:%x:%x", utp->number, phex_nz (utp->addr, sizeof (utp->addr)), @@ -3322,6 +3322,7 @@ trace_save (const char *filename, struct trace_file_writer *writer, ULONGEST offset = 0; gdb_byte buf[MAX_TRACE_UPLOAD]; +#define MAX_TRACE_UPLOAD 2000 int written; enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ()); @@ -4175,7 +4176,7 @@ tfile_open (char *filename, int from_tty) int scratch_chan; char header[TRACE_HEADER_SIZE]; char linebuf[1000]; /* Should be max remote packet size or so. */ - char byte; + gdb_byte byte; int bytes, i; struct trace_status *ts; struct uploaded_tp *uploaded_tps = NULL; @@ -4387,7 +4388,7 @@ Status line: '%s'\n"), p, line); else if (p2 != p1) { ts->stop_desc = xmalloc (strlen (line)); - end = hex2bin (p1, ts->stop_desc, (p2 - p1) / 2); + end = hex2bin (p1, (gdb_byte *) ts->stop_desc, (p2 - p1) / 2); ts->stop_desc[end] = '\0'; } else @@ -4407,7 +4408,7 @@ Status line: '%s'\n"), p, line); if (p2 != p1) { ts->stop_desc = xmalloc ((p2 - p1) / 2 + 1); - end = hex2bin (p1, ts->stop_desc, (p2 - p1) / 2); + end = hex2bin (p1, (gdb_byte *) ts->stop_desc, (p2 - p1) / 2); ts->stop_desc[end] = '\0'; } else @@ -4461,7 +4462,7 @@ Status line: '%s'\n"), p, line); { ++p1; ts->user_name = xmalloc (strlen (p) / 2); - end = hex2bin (p1, ts->user_name, (p3 - p1) / 2); + end = hex2bin (p1, (gdb_byte *) ts->user_name, (p3 - p1) / 2); ts->user_name[end] = '\0'; p = p3; } @@ -4469,7 +4470,7 @@ Status line: '%s'\n"), p, line); { ++p1; ts->notes = xmalloc (strlen (p) / 2); - end = hex2bin (p1, ts->notes, (p3 - p1) / 2); + end = hex2bin (p1, (gdb_byte *) ts->notes, (p3 - p1) / 2); ts->notes[end] = '\0'; p = p3; } @@ -4865,7 +4866,7 @@ traceframe_walk_blocks (walk_blocks_callback_func callback, unsigned short mlen; char block_type; - tfile_read (&block_type, 1); + tfile_read ((gdb_byte *) &block_type, 1); ++pos;