From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA v2 11/13] Remove unused variables from gdbserver
Date: Sat, 21 Jul 2018 18:47:00 -0000 [thread overview]
Message-ID: <20180721184720.3263-12-tom@tromey.com> (raw)
In-Reply-To: <20180721184720.3263-1-tom@tromey.com>
This removes a few unused variables from gdbserver.
The x86-tdesc.h change is a bit unusual for this series. This file
was not defining the multiple-include guard symbol, so I've added that
here. Also, it is hard to determine when i386_expedite_regs will be
needed, so this patch simply marks it ATTRIBUTE_UNUSED.
gdb/gdbserver/ChangeLog
2018-07-21 Tom Tromey <tom@tromey.com>
* win32-low.c (win32_create_inferior): Remove unused variables.
* gdbreplay.c (remote_open): Remove unused variable.
* remote-utils.c (remote_prepare): Remove unused variable.
* x86-tdesc.h (X86_TDESC_H): Define.
(amd64_expedite_regs): Define conditionally.
(i386_expedite_regs): Mark ATTRIBUTE_UNUSED.
* linux-x86-tdesc.c (i386_tdescs): Move inside #if.
* remote-utils.c (readchar): Remove unused variable.
---
gdb/gdbserver/ChangeLog | 11 +++++++++++
gdb/gdbserver/gdbreplay.c | 1 -
gdb/gdbserver/linux-x86-tdesc.c | 4 ++--
gdb/gdbserver/remote-utils.c | 2 --
gdb/gdbserver/win32-low.c | 2 --
gdb/gdbserver/x86-tdesc.h | 10 ++++++++--
6 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 026bbfccaf0..b05209c4d14 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -157,7 +157,6 @@ remote_open (char *name)
#ifdef USE_WIN32API
static int winsock_initialized;
#endif
- char *port_str;
int tmp;
int tmp_desc;
struct addrinfo hint;
diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c
index c3aa20c982c..93122bffe83 100644
--- a/gdb/gdbserver/linux-x86-tdesc.c
+++ b/gdb/gdbserver/linux-x86-tdesc.c
@@ -69,10 +69,10 @@ xcr0_to_tdesc_idx (uint64_t xcr0, bool is_x32)
return X86_TDESC_LAST;
}
-static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { };
-
#if defined __i386__ || !defined IN_PROCESS_AGENT
+static struct target_desc *i386_tdescs[X86_TDESC_LAST] = { };
+
/* Return the target description according to XCR0. */
const struct target_desc *
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 1734c54e39a..38c90324288 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -231,7 +231,6 @@ void
remote_prepare (const char *name)
{
client_state &cs = get_client_state ();
- const char *port_str;
#ifdef USE_WIN32API
static int winsock_initialized;
#endif
@@ -902,7 +901,6 @@ static unsigned char *readchar_bufp;
static int
readchar (void)
{
- client_state &cs = get_client_state ();
int ch;
if (readchar_bufcnt == 0)
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index 765391dd477..4aed58d3b8e 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -634,8 +634,6 @@ win32_create_inferior (const char *program,
#endif
BOOL ret;
DWORD flags;
- int argslen;
- int argc;
PROCESS_INFORMATION pi;
DWORD err;
std::string str_program_args = stringify_argv (program_args);
diff --git a/gdb/gdbserver/x86-tdesc.h b/gdb/gdbserver/x86-tdesc.h
index c1641b2760f..d0920b0006f 100644
--- a/gdb/gdbserver/x86-tdesc.h
+++ b/gdb/gdbserver/x86-tdesc.h
@@ -16,11 +16,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifndef X86_TDESC_H
+#define X86_TDESC_H
-/* The "expedite" registers for x86 targets. */
-static const char *i386_expedite_regs[] = {"ebp", "esp", "eip", NULL};
+/* The "expedite" registers for x86 targets. Since whether the
+ variable is used depends on host/configuration, we mark it
+ ATTRIBUTE_UNUSED to keep it simple here. */
+static const char *i386_expedite_regs[] ATTRIBUTE_UNUSED
+ = {"ebp", "esp", "eip", NULL};
+#ifdef __x86_64__
/* The "expedite" registers for x86_64 targets. */
static const char *amd64_expedite_regs[] = {"rbp", "rsp", "rip", NULL};
+#endif
#endif /* X86_TDESC_H */
--
2.13.6
next prev parent reply other threads:[~2018-07-21 18:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-21 18:47 [RFA v2 00/13] Add -Wunused-variable Tom Tromey
2018-07-21 18:47 ` [RFA v2 09/13] Pass the correct argument to the observer in reread_symbols Tom Tromey
2018-07-21 18:47 ` [RFA v2 12/13] Conditionally define xmltarget_${name} variable in regdat.sh Tom Tromey
2018-07-21 18:47 ` [RFA v2 04/13] Use a previously unused variable in bfin-tdep.c Tom Tromey
2018-07-21 18:47 ` [RFA v2 06/13] Remove dead code from m32c-tdep.c Tom Tromey
2018-07-22 2:10 ` Simon Marchi
2018-07-21 18:47 ` Tom Tromey [this message]
2018-07-21 18:47 ` [RFA v2 03/13] Unused variable fixes related to conditional compilation Tom Tromey
2018-07-21 18:47 ` [RFA v2 02/13] Remove an unused variable from spu_get_overlay_table Tom Tromey
2018-07-22 2:06 ` Simon Marchi
2018-07-22 18:59 ` Ulrich Weigand
2018-07-21 18:47 ` [RFA v2 01/13] Simple unused variable removals Tom Tromey
2018-07-22 2:04 ` Simon Marchi
2018-07-21 18:47 ` [RFA v2 10/13] Remove unused declaration from value.c Tom Tromey
2018-07-22 2:13 ` Simon Marchi
2018-07-21 18:47 ` [RFA v2 08/13] Fix ravenscar-thread.c to use arch_ops Tom Tromey
2018-07-21 18:47 ` [RFA v2 13/13] Add -Wunused-variable to warnings.m4 Tom Tromey
2018-07-21 18:47 ` [RFA v2 07/13] Call value_fetch_lazy when needed in pretty-printers Tom Tromey
2018-07-21 18:47 ` [RFA v2 05/13] Call some functions in guile/ for effect Tom Tromey
2018-07-22 2:26 ` [RFA v2 00/13] Add -Wunused-variable Simon Marchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180721184720.3263-12-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).