/* Ada Ravenscar thread support.
- Copyright 2004, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2004-2014 Free Software Foundation, Inc.
This file is part of GDB.
#include "command.h"
#include "ravenscar-thread.h"
#include "observer.h"
-#include "gdb_string.h"
+#include <string.h>
#include "gdbcmd.h"
#include "top.h"
#include "regcache.h"
/* 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;
/* Ptid of the inferior as seen by the process stratum. */
static ptid_t base_ptid;
-static const char running_thread_name[] = "running_thread";
+static const char running_thread_name[] = "__gnat_running_thread_table";
static const char known_tasks_name[] = "system__tasking__debug__known_tasks";
+static const char first_task_name[] = "system__tasking__debug__first_task";
-static const char ravenscar_runtime_initializer[] = "system__bb__threads__initialize";
+static const char ravenscar_runtime_initializer[] =
+ "system__bb__threads__initialize";
static struct observer *update_target_observer = NULL;
-/* Architecture-specific hooks. */
-static struct ravenscar_arch_ops* current_arch_ops;
-
-static CORE_ADDR read_thread_id (const char *symbol_name);
-
static void ravenscar_find_new_threads (struct target_ops *ops);
static ptid_t ravenscar_running_thread (void);
static char *ravenscar_extra_thread_info (struct thread_info *tp);
struct regcache *regcache, int regnum);
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_prepare_to_store (struct target_ops *self,
+ struct regcache *regcache);
static void ravenscar_resume (struct target_ops *ops, ptid_t ptid, int step,
- enum target_signal siggnal);
+ enum gdb_signal siggnal);
static void ravenscar_mourn_inferior (struct target_ops *ops);
static void ravenscar_update_inferior_ptid (void);
static int has_ravenscar_runtime (void);
add_thread (inferior_ptid);
}
+/* The Ravenscar Runtime exports a symbol which contains the ID of
+ the thread that is currently running. Try to locate that symbol
+ and return its associated minimal symbol.
+ Return NULL if not found. */
+
+static struct minimal_symbol *
+get_running_thread_msymbol (void)
+{
+ struct minimal_symbol *msym;
+
+ msym = lookup_minimal_symbol (running_thread_name, NULL, NULL);
+ if (!msym)
+ /* Older versions of the GNAT runtime were using a different
+ (less ideal) name for the symbol where the active thread ID
+ is stored. If we couldn't find the symbol using the latest
+ name, then try the old one. */
+ msym = lookup_minimal_symbol ("running_thread", NULL, NULL);
+
+ return msym;
+}
+
/* Return True if the Ada Ravenscar run-time can be found in the
application. */
lookup_minimal_symbol (ravenscar_runtime_initializer, NULL, NULL);
struct minimal_symbol *msym_known_tasks =
lookup_minimal_symbol (known_tasks_name, NULL, NULL);
- struct minimal_symbol *msym_running_thread =
- lookup_minimal_symbol (running_thread_name, NULL, NULL);
+ struct minimal_symbol *msym_first_task =
+ lookup_minimal_symbol (first_task_name, NULL, NULL);
+ struct minimal_symbol *msym_running_thread = get_running_thread_msymbol ();
return (msym_ravenscar_runtime_initializer
- && msym_known_tasks
+ && (msym_known_tasks || msym_first_task)
&& msym_running_thread);
}
return (!(ptid_equal (ravenscar_running_thread (), null_ptid)));
}
-/* Read the thread ID whose symbol name is SYMBOL_NAME. */
+/* Return the ID of the thread that is currently running.
+ Return 0 if the ID could not be determined. */
static CORE_ADDR
-read_thread_id (const char *symbol_name)
+get_running_thread_id (void)
{
- const struct minimal_symbol *object_msym =
- lookup_minimal_symbol (symbol_name, NULL, NULL);
+ const struct minimal_symbol *object_msym = get_running_thread_msymbol ();
int object_size;
int buf_size;
- char *buf;
+ gdb_byte *buf;
CORE_ADDR object_addr;
struct type *builtin_type_void_data_ptr =
- builtin_type (target_gdbarch)->builtin_data_ptr;
+ builtin_type (target_gdbarch ())->builtin_data_ptr;
if (!object_msym)
return 0;
return extract_typed_address (buf, builtin_type_void_data_ptr);
}
-static void
-ravenscar_close (int quitting)
-{
- ravenscar_is_open = 0;
-}
-
static void
ravenscar_resume (struct target_ops *ops, ptid_t ptid, int step,
- enum target_signal siggnal)
+ enum gdb_signal siggnal)
{
struct target_ops *beneath = find_target_beneath (ops);
inferior_ptid = base_ptid;
beneath->to_wait (beneath, base_ptid, status, 0);
- ravenscar_find_new_threads (ops);
- ravenscar_update_inferior_ptid ();
+ /* Find any new threads that might have been created, and update
+ inferior_ptid to the active thread.
+
+ Only do it if the program is still alive, though. Otherwise,
+ this causes problems when debugging through the remote protocol,
+ because we might try switching threads (and thus sending packets)
+ after the remote has disconnected. */
+ if (status->kind != TARGET_WAITKIND_EXITED
+ && status->kind != TARGET_WAITKIND_SIGNALLED)
+ {
+ ravenscar_find_new_threads (ops);
+ ravenscar_update_inferior_ptid ();
+ }
return inferior_ptid;
}
static void
ravenscar_find_new_threads (struct target_ops *ops)
{
- ada_build_task_list (0);
+ ada_build_task_list ();
/* Do not clear the thread list before adding the Ada task, to keep
the thread that the process stratum has included into it
static ptid_t
ravenscar_running_thread (void)
{
- CORE_ADDR tid = read_thread_id (running_thread_name);
+ CORE_ADDR tid = get_running_thread_id ();
if (tid == 0)
return null_ptid;
|| ptid_equal (inferior_ptid, ravenscar_running_thread ()))
beneath->to_fetch_registers (beneath, regcache, regnum);
else
- current_arch_ops->to_fetch_registers (regcache, regnum);
+ {
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct ravenscar_arch_ops *arch_ops
+ = gdbarch_ravenscar_ops (gdbarch);
+
+ arch_ops->to_fetch_registers (regcache, regnum);
+ }
}
static void
|| ptid_equal (inferior_ptid, ravenscar_running_thread ()))
beneath->to_store_registers (beneath, regcache, regnum);
else
- current_arch_ops->to_store_registers (regcache, regnum);
+ {
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct ravenscar_arch_ops *arch_ops
+ = gdbarch_ravenscar_ops (gdbarch);
+
+ arch_ops->to_store_registers (regcache, regnum);
+ }
}
static void
-ravenscar_prepare_to_store (struct regcache *regcache)
+ravenscar_prepare_to_store (struct target_ops *self,
+ struct regcache *regcache)
{
struct target_ops *beneath = find_target_beneath (&ravenscar_ops);
if (!ravenscar_runtime_initialized ()
|| ptid_equal (inferior_ptid, base_magic_null_ptid)
|| ptid_equal (inferior_ptid, ravenscar_running_thread ()))
- beneath->to_prepare_to_store (regcache);
+ beneath->to_prepare_to_store (beneath, regcache);
else
- current_arch_ops->to_prepare_to_store (regcache);
+ {
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ struct ravenscar_arch_ops *arch_ops
+ = gdbarch_ravenscar_ops (gdbarch);
+
+ arch_ops->to_prepare_to_store (regcache);
+ }
}
static void
static void
ravenscar_inferior_created (struct target_ops *target, int from_tty)
{
- if (ravenscar_task_support
- && has_ravenscar_runtime ())
- ravenscar_initialize (NULL, 0);
-}
+ struct ravenscar_arch_ops *ops;
-void
-ravenscar_register_arch_ops (struct ravenscar_arch_ops *ops)
-{
- /* FIXME: To be clean, we would need to handle a list of
- architectures, just like in remote-wtx-hw.c. However, for now the
- only Ravenscar run-time for bare board that is implemented in
- GNAT is for only one architecture: erc32-elf. So no need to care about
- that for now...*/
- current_arch_ops = ops;
-}
-
-/* Initialize Ravenscar support. */
-
-static void
-ravenscar_initialize (char *name, int from_tty)
-{
- if (ravenscar_is_open)
+ if (!ravenscar_task_support
+ || gdbarch_ravenscar_ops (current_inferior ()->gdbarch) == NULL
+ || !has_ravenscar_runtime ())
return;
base_magic_null_ptid = inferior_ptid;
ravenscar_update_inferior_ptid ();
push_target (&ravenscar_ops);
- ravenscar_is_open = 1;
}
static ptid_t
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;
{
if (ravenscar_task_support)
fprintf_filtered (file, _("\
-Support for Ravenscar task/thread switching is enabled"));
+Support for Ravenscar task/thread switching is enabled\n"));
else
fprintf_filtered (file, _("\
-Support for Ravenscar task/thread switching is disabled"));
+Support for Ravenscar task/thread switching is disabled\n"));
}
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern void _initialize_ravenscar (void);
+
/* Module startup initialization function, automagically called by
init.c. */
ravenscar ops if needed. */
observer_attach_inferior_created (ravenscar_inferior_created);
- add_target (&ravenscar_ops);
+ complete_target_initialization (&ravenscar_ops);
add_prefix_cmd ("ravenscar", no_class, set_ravenscar_command,
_("Prefix command for changing Ravenscar-specific settings"),
add_prefix_cmd ("ravenscar", no_class, show_ravenscar_command,
_("Prefix command for showing Ravenscar-specific settings"),
- &show_ravenscar_list, "set ravenscar ", 0, &showlist);
+ &show_ravenscar_list, "show ravenscar ", 0, &showlist);
add_setshow_boolean_cmd ("task-switching", class_obscure,
&ravenscar_task_support, _("\