diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/common/rsp-low.c | 14 | ||||
| -rw-r--r-- | gdb/common/rsp-low.h | 2 | ||||
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/remote-utils.c | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/tracepoint.c | 6 |
6 files changed, 17 insertions, 21 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e8521c9..a0d6bc1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2014-02-12 Tom Tromey <tromey@redhat.com> + * common/rsp-low.h (hexify): Don't declare. + * common/rsp-low.c (hexify): Remove. + +2014-02-12 Tom Tromey <tromey@redhat.com> + * common/rsp-low.c (hexify): Never take strlen of argument. 2014-02-12 Tom Tromey <tromey@redhat.com> diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c index fd6f563..a7b0014 100644 --- a/gdb/common/rsp-low.c +++ b/gdb/common/rsp-low.c @@ -172,20 +172,6 @@ bin2hex (const gdb_byte *bin, char *hex, int count) return i; } -int -hexify (char *hex, const char *bin, int count) -{ - int i; - - for (i = 0; i < count; i++) - { - *hex++ = tohex ((*bin >> 4) & 0xf); - *hex++ = tohex (*bin++ & 0xf); - } - *hex = 0; - return i; -} - void convert_int_to_ascii (const unsigned char *from, char *to, int n) { diff --git a/gdb/common/rsp-low.h b/gdb/common/rsp-low.h index 161c4a2..2ef5e6d 100644 --- a/gdb/common/rsp-low.h +++ b/gdb/common/rsp-low.h @@ -42,8 +42,6 @@ extern void convert_ascii_to_int (const char *from, unsigned char *to, int n); extern int bin2hex (const gdb_byte *bin, char *hex, int count); -extern int hexify (char *hex, const char *bin, int count); - extern void convert_int_to_ascii (const unsigned char *from, char *to, int n); /* Convert BUFFER, binary data at least LEN bytes long, into escaped diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 35303df..dc2c078 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,11 @@ 2014-02-12 Tom Tromey <tromey@redhat.com> + * remote-utils.c (look_up_one_symbol, monitor_output): Use + bin2hex, not hexify. + * tracepoint.c (cmd_qtstatus): Likewise. + +2014-02-12 Tom Tromey <tromey@redhat.com> + * remote-utils.c (monitor_output): Pass explicit length to hexify. diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 8fd7c4a..a81a739 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -1399,7 +1399,8 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb) /* Send the request. */ strcpy (own_buf, "qSymbol:"); - hexify (own_buf + strlen ("qSymbol:"), name, strlen (name)); + bin2hex ((const gdb_byte *) name, own_buf + strlen ("qSymbol:"), + strlen (name)); if (putpkt (own_buf) < 0) return -1; @@ -1562,7 +1563,7 @@ monitor_output (const char *msg) char *buf = xmalloc (len * 2 + 2); buf[0] = 'O'; - hexify (buf + 1, msg, len); + bin2hex ((const gdb_byte *) msg, buf + 1, len); putpkt (buf); free (buf); diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index c61f1d5..3ae3bdd 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -3623,17 +3623,17 @@ cmd_qtstatus (char *packet) str = (tracing_user_name ? tracing_user_name : ""); slen = strlen (str); buf1 = (char *) alloca (slen * 2 + 1); - hexify (buf1, str, slen); + bin2hex ((gdb_byte *) str, buf1, slen); str = (tracing_notes ? tracing_notes : ""); slen = strlen (str); buf2 = (char *) alloca (slen * 2 + 1); - hexify (buf2, str, slen); + bin2hex ((gdb_byte *) str, buf2, slen); str = (tracing_stop_note ? tracing_stop_note : ""); slen = strlen (str); buf3 = (char *) alloca (slen * 2 + 1); - hexify (buf3, str, slen); + bin2hex ((gdb_byte *) str, buf3, slen); trace_debug ("Returning trace status as %d, stop reason %s", tracing, tracing_stop_reason); |