This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFC 8/9] replace convert_ascii_to_int with hex2bin
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tromey at redhat dot com>
- Date: Mon, 20 Jan 2014 12:18:20 -0700
- Subject: [RFC 8/9] replace convert_ascii_to_int with hex2bin
- Authentication-results: sourceware.org; auth=none
- References: <1390245501-1186-1-git-send-email-tromey at redhat dot com>
convert_ascii_to_int is identical to hex2bin.
This removes the former.
2014-01-20 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-01-20 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.
---
gdb/ChangeLog | 5 +++++
gdb/common/rsp-low.c | 12 ------------
gdb/common/rsp-low.h | 2 --
gdb/gdbserver/ChangeLog | 8 ++++++++
gdb/gdbserver/ax.c | 2 +-
gdb/gdbserver/regcache.c | 2 +-
gdb/gdbserver/remote-utils.c | 2 +-
gdb/gdbserver/server.c | 4 ++--
8 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c
index 9c1a56f..d7a1280 100644
--- a/gdb/common/rsp-low.c
+++ b/gdb/common/rsp-low.c
@@ -127,18 +127,6 @@ hex2bin (const char *hex, gdb_byte *bin, int count)
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
bin2hex (const gdb_byte *bin, char *hex, int count)
{
diff --git a/gdb/common/rsp-low.h b/gdb/common/rsp-low.h
index 229b909..611dba3 100644
--- a/gdb/common/rsp-low.h
+++ b/gdb/common/rsp-low.h
@@ -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 void convert_ascii_to_int (const char *from, unsigned char *to, int n);
-
extern int bin2hex (const gdb_byte *bin, char *hex, int count);
/* Convert BUFFER, binary data at least LEN bytes long, into escaped
diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c
index 1eefaf3..ef659dc 100644
--- a/gdb/gdbserver/ax.c
+++ b/gdb/gdbserver/ax.c
@@ -105,7 +105,7 @@ gdb_parse_agent_expr (char **actparm)
aexpr = xmalloc (sizeof (struct agent_expr));
aexpr->length = xlen;
aexpr->bytes = xmalloc (xlen);
- convert_ascii_to_int (act, aexpr->bytes, xlen);
+ hex2bin (act, aexpr->bytes, xlen);
*actparm = act + (xlen * 2);
return aexpr;
}
diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
index 6e5aa08..bed10b48 100644
--- a/gdb/gdbserver/regcache.c
+++ b/gdb/gdbserver/regcache.c
@@ -234,7 +234,7 @@ registers_from_string (struct regcache *regcache, char *buf)
if (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 *
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index a10af64..22253d4 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -1270,7 +1270,7 @@ decode_M_packet (char *from, CORE_ADDR *mem_addr_ptr, unsigned int *len_ptr,
if (*to_p == NULL)
*to_p = xmalloc (*len_ptr);
- convert_ascii_to_int (&from[i++], *to_p, *len_ptr);
+ hex2bin (&from[i++], *to_p, *len_ptr);
}
int
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 255a048..5b4d202 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -3509,7 +3509,7 @@ process_serial_event (void)
break;
case 'C':
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))
signal = gdb_signal_to_host (sig);
else
@@ -3518,7 +3518,7 @@ process_serial_event (void)
break;
case 'S':
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))
signal = gdb_signal_to_host (sig);
else
--
1.8.1.4