This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA/commit 1/3] minor ravenscar-thread cleanup
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Joel Brobecker <brobecker at adacore dot com>
- Date: Fri, 14 Dec 2012 19:02:34 +0400
- Subject: [RFA/commit 1/3] minor ravenscar-thread cleanup
Hello,
Before attacking the gdbarch-ification of ravenscar-thread
proper, I noticed that ravenscar-thread uses a number of
global variables, which annoyed me quite a bit. There was
one that seems like an easy target, so I dealt with it now.
For the remaining ones, I will take care of them after the patch
series is in, and I have reconciled the FSF tree and AdaCore's
tree.
The use of the ravenscar_open static global is unnecessary.
This patch removes it. It also removes some routines that
were created in association with the management of this global.
gdb/ChangeLog:
* ravenscar-thread.c (ravenscar_is_open): Delete.
(ravenscar_initialize): Move most of the code from here...
(ravenscar_inferior_created): ... to there. Invert logic.
(ravenscar_close): Delete.
(init_ravenscar_thread_ops): Remove setting of
ravenscar_ops.to_close.
Tested on x86_64-linux. Also tested on sparc-elf with AdaCore's
testsuite.
---
gdb/ravenscar-thread.c | 35 ++++++-----------------------------
1 file changed, 6 insertions(+), 29 deletions(-)
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index 0f9380b..ddbaea6 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -34,10 +34,6 @@
/* If non-null, ravenscar task support is enabled. */
static int ravenscar_task_support = 1;
-/* Non-null if the ravenscar thread layer has been pushed on the target
- stack. */
-static int ravenscar_is_open = 0;
-
/* This module's target-specific operations. */
static struct target_ops ravenscar_ops;
@@ -70,7 +66,6 @@ static void ravenscar_fetch_registers (struct target_ops *ops,
static void ravenscar_store_registers (struct target_ops *ops,
struct regcache *regcache, int regnum);
static void ravenscar_prepare_to_store (struct regcache *regcache);
-static void ravenscar_initialize (char *name, int from_tty);
static void ravenscar_resume (struct target_ops *ops, ptid_t ptid, int step,
enum gdb_signal siggnal);
static void ravenscar_mourn_inferior (struct target_ops *ops);
@@ -180,12 +175,6 @@ get_running_thread_id (void)
}
static void
-ravenscar_close (int quitting)
-{
- ravenscar_is_open = 0;
-}
-
-static void
ravenscar_resume (struct target_ops *ops, ptid_t ptid, int step,
enum gdb_signal siggnal)
{
@@ -332,9 +321,12 @@ ravenscar_mourn_inferior (struct target_ops *ops)
static void
ravenscar_inferior_created (struct target_ops *target, int from_tty)
{
- if (ravenscar_task_support
- && has_ravenscar_runtime ())
- ravenscar_initialize (NULL, 0);
+ if (!ravenscar_task_support || !has_ravenscar_runtime ())
+ return;
+
+ base_magic_null_ptid = inferior_ptid;
+ ravenscar_update_inferior_ptid ();
+ push_target (&ravenscar_ops);
}
void
@@ -348,20 +340,6 @@ ravenscar_register_arch_ops (struct ravenscar_arch_ops *ops)
current_arch_ops = ops;
}
-/* Initialize Ravenscar support. */
-
-static void
-ravenscar_initialize (char *name, int from_tty)
-{
- if (ravenscar_is_open)
- return;
-
- base_magic_null_ptid = inferior_ptid;
- ravenscar_update_inferior_ptid ();
- push_target (&ravenscar_ops);
- ravenscar_is_open = 1;
-}
-
static ptid_t
ravenscar_get_ada_task_ptid (long lwp, long thread)
{
@@ -374,7 +352,6 @@ init_ravenscar_thread_ops (void)
ravenscar_ops.to_shortname = "ravenscar";
ravenscar_ops.to_longname = "Ravenscar tasks.";
ravenscar_ops.to_doc = "Ravenscar tasks support.";
- ravenscar_ops.to_close = ravenscar_close;
ravenscar_ops.to_resume = ravenscar_resume;
ravenscar_ops.to_wait = ravenscar_wait;
ravenscar_ops.to_fetch_registers = ravenscar_fetch_registers;
--
1.7.10.4