From: Doug Evans <dje@google.com>
To: gdb-patches@sourceware.org, jan.kratochvil@redhat.com
Subject: [PATCH] Delete struct inferior_suspend_state
Date: Thu, 31 Jul 2014 19:30:00 -0000 [thread overview]
Message-ID: <yjt2silh73aa.fsf@ruffy.mtv.corp.google.com> (raw)
Hi.
I happened across some #if 0's in the code and thought that odd.
I found the relevant thread here:
https://sourceware.org/ml/gdb-patches/2012-06/msg00370.html
Any desire to continue to keep this, or can we delete it?
[I don't have a strong preference, but it feels like it's time.]
2014-07-31 Doug Evans <dje@google.com>
* inferior.h (struct inferior_suspend_state): Delete, unused.
All references deleted.
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 522b674..623977b 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -129,9 +129,7 @@ struct thread_control_state
struct interp *command_interp;
};
-/* Inferior thread specific part of `struct infcall_suspend_state'.
-
- Inferior process counterpart is `struct inferior_suspend_state'. */
+/* Inferior thread specific part of `struct infcall_suspend_state'. */
struct thread_suspend_state
{
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 668c888..3929d16 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -272,16 +272,6 @@ struct inferior_control_state
enum stop_kind stop_soon;
};
-/* Inferior process specific part of `struct infcall_suspend_state'.
-
- Inferior thread counterpart is `struct thread_suspend_state'. */
-
-#if 0 /* Currently unused and empty structures are not valid C. */
-struct inferior_suspend_state
-{
-};
-#endif
-
/* GDB represents the state of each program execution with an object
called an inferior. An inferior typically corresponds to a process
but is more general and applies also to targets that do not have a
@@ -310,12 +300,6 @@ struct inferior
See `struct inferior_control_state'. */
struct inferior_control_state control;
- /* State of inferior process to restore after GDB is done with an inferior
- call. See `struct inferior_suspend_state'. */
-#if 0 /* Currently unused and empty structures are not valid C. */
- struct inferior_suspend_state suspend;
-#endif
-
/* True if this was an auto-created inferior, e.g. created from
following a fork; false, if this inferior was manually added by
the user, and we should not attempt to prune it
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 33aa674..08b5556 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6819,9 +6819,6 @@ siginfo_make_value (struct gdbarch *gdbarch, struct internalvar *var,
struct infcall_suspend_state
{
struct thread_suspend_state thread_suspend;
-#if 0 /* Currently unused and empty structures are not valid C. */
- struct inferior_suspend_state inferior_suspend;
-#endif
/* Other fields: */
CORE_ADDR stop_pc;
@@ -6841,9 +6838,6 @@ save_infcall_suspend_state (void)
{
struct infcall_suspend_state *inf_state;
struct thread_info *tp = inferior_thread ();
-#if 0
- struct inferior *inf = current_inferior ();
-#endif
struct regcache *regcache = get_current_regcache ();
struct gdbarch *gdbarch = get_regcache_arch (regcache);
gdb_byte *siginfo_data = NULL;
@@ -6877,9 +6871,6 @@ save_infcall_suspend_state (void)
}
inf_state->thread_suspend = tp->suspend;
-#if 0 /* Currently unused and empty structures are not valid C. */
- inf_state->inferior_suspend = inf->suspend;
-#endif
/* run_inferior_call will not use the signal due to its `proceed' call with
GDB_SIGNAL_0 anyway. */
@@ -6898,16 +6889,10 @@ void
restore_infcall_suspend_state (struct infcall_suspend_state *inf_state)
{
struct thread_info *tp = inferior_thread ();
-#if 0
- struct inferior *inf = current_inferior ();
-#endif
struct regcache *regcache = get_current_regcache ();
struct gdbarch *gdbarch = get_regcache_arch (regcache);
tp->suspend = inf_state->thread_suspend;
-#if 0 /* Currently unused and empty structures are not valid C. */
- inf->suspend = inf_state->inferior_suspend;
-#endif
stop_pc = inf_state->stop_pc;
next reply other threads:[~2014-07-31 19:10 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-31 19:30 Doug Evans [this message]
2014-07-31 19:46 ` Jan Kratochvil
2014-07-31 19:54 ` Doug Evans
2014-07-31 20:33 ` Joel Brobecker
2014-07-31 20:42 ` Doug Evans
2014-07-31 20:58 ` Joel Brobecker
2014-07-31 21:11 ` Doug Evans
2014-07-31 21:53 ` Joel Brobecker
2014-08-01 2:04 ` Doug Evans
2014-08-08 23:25 ` Stan Shebs
2014-08-09 20:53 ` Doug Evans
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=yjt2silh73aa.fsf@ruffy.mtv.corp.google.com \
--to=dje@google.com \
--cc=gdb-patches@sourceware.org \
--cc=jan.kratochvil@redhat.com \
/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