[PATCH 01/18] Some ada-lang/ada-tasks routines needed by the VxWorks target

Joel Brobecker
2011-02-24T17:49:47Z

We need to add a few routines in the following units...

- ada-lang.c:
After switching to a new partition, if there is an Ada main in there,
and the language is auto, switch the language to Ada (if not already
Ada).

- ada-tasks.c:
The remote-wtx backend needs to know which task is the environment
task (this is the initial/main task). The program dies when this
task dies...

gdb/ChangeLog:

* ada-lang.h (ada_language_auto_set, ada_get_environment_task):
Add declarations.
* ada-lang.c (ada_language_auto_set): New function.
* ada-tasks.c (ada_get_environment_task): New function.
---
gdb/ada-lang.c | 14 ++++++++++++++
gdb/ada-lang.h | 4 ++++
gdb/ada-tasks.c | 16 ++++++++++++++++
3 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 467e4df..a325e81 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -740,6 +740,20 @@ ada_update_initial_language (enum language lang)
return lang;
}

+/* If the language mode is auto, and we can find some Ada code
+ in one of the module, then automatically set the language to Ada. */
+
+void
+ada_language_auto_set (void)
+{
+ if (language_mode == language_mode_auto
+ && ada_update_initial_language (language_unknown) == language_ada)
+ {
+ set_language (language_ada);
+ expected_language = current_language;
+ }
+}
+
/* If the main procedure is written in Ada, then return its name.
The result is good until the next call. Return NULL if the main
procedure doesn't appear to be in Ada. */
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 7902124..9a0e8ed 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -215,6 +215,8 @@ extern const char *ada_decode (const char*);

extern enum language ada_update_initial_language (enum language);

+extern void ada_language_auto_set (void);
+
extern void clear_ada_sym_cache (void);

extern int ada_lookup_symbol_list (const char *, const struct block *,
@@ -377,6 +379,8 @@ extern char *ada_main_name (void);

extern int valid_task_id (int);

+extern struct ada_task_info *ada_get_environment_task (void);
+
extern int ada_get_task_number (ptid_t);

typedef void (ada_task_list_iterator_ftype) (struct ada_task_info *task);
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 216902a..d132ec7 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -212,6 +212,22 @@ ada_task_is_alive (struct ada_task_info *task_info)
return (task_info->state != Terminated);
}

+/* Return the task info associated to the Environment Task.
+ This function assumes that the inferior does in fact use tasking. */
+
+struct ada_task_info *
+ada_get_environment_task (void)
+{
+ ada_build_task_list (0);
+ gdb_assert (VEC_length (ada_task_info_s, task_list) > 0);
+
+ /* We use a little bit of insider knowledge to determine which task
+ is the Environment Task: We know that this task is created first,
+ and thus should always be task #1, which is at index 0 of the
+ TASK_LIST. */
+ return (VEC_index (ada_task_info_s, task_list, 0));
+}
+
/* Call the ITERATOR function once for each Ada task that hasn't been
terminated yet. */

--
1.7.0.4