From 909c2cdaa78f5c33ce61a3b47e86f831025d0a02 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 15 Jun 2015 17:08:49 +0200 Subject: [PATCH] Merge multiple hex conversions gdb/ChangeLog 2015-06-15 Aleksandar Ristovski Merge multiple hex conversions. * monitor.c: Include rsp-low.h. (fromhex): Remove definition. gdb/gdbserver/ChangeLog 2015-06-15 Aleksandar Ristovski Merge multiple hex conversions. * gdbreplay.c (tohex): Rename to 'fromhex'. (logchar): Use fromhex. --- gdb/ChangeLog | 7 +++++++ gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/gdbreplay.c | 6 +++--- gdb/monitor.c | 16 +--------------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f7e1167280..eeded49e65 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-06-15 Aleksandar Ristovski + + Merge multiple hex conversions. + * monitor.c: Include rsp-low.h. + (fromhex): Remove definition. + 2015-06-15 Aleksandar Ristovski diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 5d5f0a435a..c1d589ac3b 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2015-06-15 Aleksandar Ristovski + + Merge multiple hex conversions. + * gdbreplay.c (tohex): Rename to 'fromhex'. + (logchar): Use fromhex. + 2015-06-10 Jan Kratochvil * server.c (handle_qxfer_libraries): Set `version' attribute for diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c index a02a824072..79aa8aa8a8 100644 --- a/gdb/gdbserver/gdbreplay.c +++ b/gdb/gdbserver/gdbreplay.c @@ -259,7 +259,7 @@ remote_open (char *name) } static int -tohex (int ch) +fromhex (int ch) { if (ch >= '0' && ch <= '9') { @@ -322,11 +322,11 @@ logchar (FILE *fp) ch2 = fgetc (fp); fputc (ch2, stdout); fflush (stdout); - ch = tohex (ch2) << 4; + ch = fromhex (ch2) << 4; ch2 = fgetc (fp); fputc (ch2, stdout); fflush (stdout); - ch |= tohex (ch2); + ch |= fromhex (ch2); break; default: /* Treat any other char as just itself */ diff --git a/gdb/monitor.c b/gdb/monitor.c index 548dae3d5b..c7f5fc70ce 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -54,6 +54,7 @@ #include "regcache.h" #include "gdbthread.h" #include "readline/readline.h" +#include "rsp-low.h" static char *dev_name; static struct target_ops *targ_ops; @@ -225,21 +226,6 @@ monitor_error (char *function, char *message, message, safe_string); } -/* Convert hex digit A to a number. */ - -static int -fromhex (int a) -{ - if (a >= '0' && a <= '9') - return a - '0'; - else if (a >= 'a' && a <= 'f') - return a - 'a' + 10; - else if (a >= 'A' && a <= 'F') - return a - 'A' + 10; - else - error (_("Invalid hex digit %d"), a); -} - /* monitor_vsprintf - similar to vsprintf but handles 64-bit addresses This function exists to get around the problem that many host platforms -- 2.34.1