replace convert_ascii_to_int with hex2bin
convert_ascii_to_int is identical to hex2bin. This removes the former. 2014-02-12 Tom Tromey <tromey@redhat.com> * common/rsp-low.c (convert_ascii_to_int): Remove. * common/rsp-low.h (convert_ascii_to_int): Don't declare. 2014-02-12 Tom Tromey <tromey@redhat.com> * ax.c (gdb_parse_agent_expr): Use hex2bin, not convert_ascii_to_int. * regcache.c (registers_to_string): Likewise. * remote-utils.c (decode_M_packet): Likewise. * server.c (process_serial_event): Likewise.
This commit is contained in:
parent
ff0e980e6f
commit
a7191e8bd7
8 changed files with 18 additions and 19 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
|
* common/rsp-low.c (convert_ascii_to_int): Remove.
|
||||||
|
* common/rsp-low.h (convert_ascii_to_int): Don't declare.
|
||||||
|
|
||||||
2014-02-12 Tom Tromey <tromey@redhat.com>
|
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
* common/rsp-low.h (unhexify): Don't declare.
|
* common/rsp-low.h (unhexify): Don't declare.
|
||||||
|
|
|
@ -127,18 +127,6 @@ hex2bin (const char *hex, gdb_byte *bin, int count)
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
convert_ascii_to_int (const char *from, unsigned char *to, int n)
|
|
||||||
{
|
|
||||||
int nib1, nib2;
|
|
||||||
while (n--)
|
|
||||||
{
|
|
||||||
nib1 = fromhex (*from++);
|
|
||||||
nib2 = fromhex (*from++);
|
|
||||||
*to++ = (((nib1 & 0x0f) << 4) & 0xf0) | (nib2 & 0x0f);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
bin2hex (const gdb_byte *bin, char *hex, int count)
|
bin2hex (const gdb_byte *bin, char *hex, int count)
|
||||||
{
|
{
|
||||||
|
|
|
@ -36,8 +36,6 @@ extern char *unpack_varlen_hex (char *buff, ULONGEST *result);
|
||||||
|
|
||||||
extern int hex2bin (const char *hex, gdb_byte *bin, int count);
|
extern int hex2bin (const char *hex, gdb_byte *bin, int count);
|
||||||
|
|
||||||
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 bin2hex (const gdb_byte *bin, char *hex, int count);
|
||||||
|
|
||||||
/* Convert BUFFER, binary data at least LEN bytes long, into escaped
|
/* Convert BUFFER, binary data at least LEN bytes long, into escaped
|
||||||
|
|
|
@ -1,3 +1,11 @@
|
||||||
|
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
|
* ax.c (gdb_parse_agent_expr): Use hex2bin, not
|
||||||
|
convert_ascii_to_int.
|
||||||
|
* regcache.c (registers_to_string): Likewise.
|
||||||
|
* remote-utils.c (decode_M_packet): Likewise.
|
||||||
|
* server.c (process_serial_event): Likewise.
|
||||||
|
|
||||||
2014-02-12 Tom Tromey <tromey@redhat.com>
|
2014-02-12 Tom Tromey <tromey@redhat.com>
|
||||||
|
|
||||||
* server.c (handle_query, handle_v_run): Use hex2bin, not
|
* server.c (handle_query, handle_v_run): Use hex2bin, not
|
||||||
|
|
|
@ -105,7 +105,7 @@ gdb_parse_agent_expr (char **actparm)
|
||||||
aexpr = xmalloc (sizeof (struct agent_expr));
|
aexpr = xmalloc (sizeof (struct agent_expr));
|
||||||
aexpr->length = xlen;
|
aexpr->length = xlen;
|
||||||
aexpr->bytes = xmalloc (xlen);
|
aexpr->bytes = xmalloc (xlen);
|
||||||
convert_ascii_to_int (act, aexpr->bytes, xlen);
|
hex2bin (act, aexpr->bytes, xlen);
|
||||||
*actparm = act + (xlen * 2);
|
*actparm = act + (xlen * 2);
|
||||||
return aexpr;
|
return aexpr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -234,7 +234,7 @@ registers_from_string (struct regcache *regcache, char *buf)
|
||||||
if (len > tdesc->registers_size * 2)
|
if (len > tdesc->registers_size * 2)
|
||||||
len = tdesc->registers_size * 2;
|
len = tdesc->registers_size * 2;
|
||||||
}
|
}
|
||||||
convert_ascii_to_int (buf, registers, len / 2);
|
hex2bin (buf, registers, len / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct reg *
|
struct reg *
|
||||||
|
|
|
@ -1270,7 +1270,7 @@ decode_M_packet (char *from, CORE_ADDR *mem_addr_ptr, unsigned int *len_ptr,
|
||||||
if (*to_p == NULL)
|
if (*to_p == NULL)
|
||||||
*to_p = xmalloc (*len_ptr);
|
*to_p = xmalloc (*len_ptr);
|
||||||
|
|
||||||
convert_ascii_to_int (&from[i++], *to_p, *len_ptr);
|
hex2bin (&from[i++], *to_p, *len_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
|
@ -3624,7 +3624,7 @@ process_serial_event (void)
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
require_running (own_buf);
|
require_running (own_buf);
|
||||||
convert_ascii_to_int (own_buf + 1, &sig, 1);
|
hex2bin (own_buf + 1, &sig, 1);
|
||||||
if (gdb_signal_to_host_p (sig))
|
if (gdb_signal_to_host_p (sig))
|
||||||
signal = gdb_signal_to_host (sig);
|
signal = gdb_signal_to_host (sig);
|
||||||
else
|
else
|
||||||
|
@ -3633,7 +3633,7 @@ process_serial_event (void)
|
||||||
break;
|
break;
|
||||||
case 'S':
|
case 'S':
|
||||||
require_running (own_buf);
|
require_running (own_buf);
|
||||||
convert_ascii_to_int (own_buf + 1, &sig, 1);
|
hex2bin (own_buf + 1, &sig, 1);
|
||||||
if (gdb_signal_to_host_p (sig))
|
if (gdb_signal_to_host_p (sig))
|
||||||
signal = gdb_signal_to_host (sig);
|
signal = gdb_signal_to_host (sig);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue