-/* Copyright (C) 1992-2020 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2021 Free Software Foundation, Inc.
This file is part of GDB.
};
/* A short description corresponding to each possible task state. */
-static const char *task_states[] = {
+static const char * const task_states[] = {
N_("Unactivated"),
N_("Runnable"),
N_("Terminated"),
};
/* A longer description corresponding to each possible task state. */
-static const char *long_task_states[] = {
+static const char * const long_task_states[] = {
N_("Unactivated"),
N_("Runnable"),
N_("Terminated"),
/* The index of various fields in the ATCB record and sub-records. */
struct atcb_fieldnos atcb_fieldno {};
+
+ /* On some systems, gdbserver applies an offset to the CPU that is
+ reported. */
+ unsigned int cpu_id_offset = 0;
};
/* Key to our per-program-space data. */
the list of Ada tasks. The value of this field influences
the interpretation of the known_tasks_addr field below:
- ADA_TASKS_UNKNOWN: The value of known_tasks_addr hasn't
- been determined yet;
+ been determined yet;
- ADA_TASKS_NOT_FOUND: The program probably does not use tasking
- and the known_tasks_addr is irrelevant;
+ and the known_tasks_addr is irrelevant;
- ADA_TASKS_ARRAY: The known_tasks is an array;
- ADA_TASKS_LIST: The known_tasks is a list. */
enum ada_known_tasks_kind known_tasks_kind = ADA_TASKS_UNKNOWN;
for (int i = 0; i < data->task_list.size (); i++)
{
if (data->task_list[i].task_id == task_id)
- return i + 1;
+ return i + 1;
}
/* Task not found. Return 0. */
terminated yet. */
void
-iterate_over_live_ada_tasks (ada_task_list_iterator_ftype *iterator)
+iterate_over_live_ada_tasks (ada_task_list_iterator_ftype iterator)
{
struct ada_tasks_inferior_data *data;
for (ada_task_info &task : data->task_list)
{
if (!ada_task_is_alive (&task))
- continue;
+ continue;
iterator (&task);
}
}
array_fieldno = ada_get_field_index (type, "P_ARRAY", 0);
bounds_fieldno = ada_get_field_index (type, "P_BOUNDS", 0);
- bounds_type = TYPE_FIELD_TYPE (type, bounds_fieldno);
+ bounds_type = type->field (bounds_fieldno).type ();
if (bounds_type->code () == TYPE_CODE_PTR)
- bounds_type = TYPE_TARGET_TYPE (bounds_type);
+ bounds_type = TYPE_TARGET_TYPE (bounds_type);
if (bounds_type->code () != TYPE_CODE_STRUCT)
- error (_("Unknown task name format. Aborting"));
+ error (_("Unknown task name format. Aborting"));
upper_bound_fieldno = ada_get_field_index (bounds_type, "UB0", 0);
initialize_fieldnos = 0;
if (atcb_sym == NULL || atcb_sym->type == NULL)
{
/* In Ravenscar run-time libs, the ATCB does not have a dynamic
- size, so the symbol name differs. */
+ size, so the symbol name differs. */
atcb_sym = lookup_symbol_in_language (atcb_name_fixed, NULL,
STRUCT_DOMAIN, language_c,
NULL).symbol;
if (atcb_sym == NULL || atcb_sym->type == NULL)
- return _("Cannot find Ada_Task_Control_Block type");
+ return _("Cannot find Ada_Task_Control_Block type");
type = atcb_sym->type;
}
else
{
/* Get a static representation of the type record
- Ada_Task_Control_Block. */
+ Ada_Task_Control_Block. */
type = atcb_sym->type;
type = ada_template_to_fixed_record_type_1 (type, NULL, 0, NULL, 0);
}
fieldnos.image = ada_get_field_index (common_type, "task_image", 1);
fieldnos.image_len = ada_get_field_index (common_type, "task_image_len", 1);
fieldnos.activation_link = ada_get_field_index (common_type,
- "activation_link", 1);
+ "activation_link", 1);
fieldnos.call = ada_get_field_index (common_type, "call", 1);
fieldnos.ll = ada_get_field_index (common_type, "ll", 0);
fieldnos.base_cpu = ada_get_field_index (common_type, "base_cpu", 0);
if (fieldnos.ll_lwp < 0)
fieldnos.ll_lwp = ada_get_field_index (ll_type, "thread_id", 1);
+ /* Check for the CPU offset. */
+ bound_minimal_symbol first_id_sym
+ = lookup_bound_minimal_symbol ("__gnat_gdb_cpu_first_id");
+ unsigned int first_id = 0;
+ if (first_id_sym.minsym != nullptr)
+ {
+ CORE_ADDR addr = BMSYMBOL_VALUE_ADDRESS (first_id_sym);
+ /* This symbol always has type uint32_t. */
+ struct type *u32type = builtin_type (target_gdbarch ())->builtin_uint32;
+ first_id = value_as_long (value_at (u32type, addr));
+ }
+
/* Set all the out parameters all at once, now that we are certain
that there are no potential error() anymore. */
pspace_data = get_ada_tasks_pspace_data (current_program_space);
pspace_data->atcb_ll_type = ll_type;
pspace_data->atcb_call_type = call_type;
pspace_data->atcb_fieldno = fieldnos;
+ pspace_data->cpu_id_offset = first_id;
return NULL;
}
if (pspace_data->atcb_fieldno.image_len == -1)
{
if (pspace_data->atcb_fieldno.image >= 0)
- read_fat_string_value (task_info->name,
- value_field (common_value,
+ read_fat_string_value (task_info->name,
+ value_field (common_value,
pspace_data->atcb_fieldno.image),
- sizeof (task_info->name) - 1);
+ sizeof (task_info->name) - 1);
else
{
struct bound_minimal_symbol msym;
pspace_data->atcb_fieldno.image_len));
value_as_string (task_info->name,
- value_field (common_value,
+ value_field (common_value,
pspace_data->atcb_fieldno.image),
len);
}
&& pspace_data->atcb_fieldno.entry_calls > 0)
{
/* Let My_ATCB be the Ada task control block of a task calling the
- entry of another task; then the Task_Id of the called task is
- in My_ATCB.Entry_Calls (My_ATCB.ATC_Nesting_Level).Called_Task. */
+ entry of another task; then the Task_Id of the called task is
+ in My_ATCB.Entry_Calls (My_ATCB.ATC_Nesting_Level).Called_Task. */
atc_nesting_level_value =
- value_field (tcb_value, pspace_data->atcb_fieldno.atc_nesting_level);
+ value_field (tcb_value, pspace_data->atcb_fieldno.atc_nesting_level);
entry_calls_value =
- ada_coerce_to_simple_array_ptr
+ ada_coerce_to_simple_array_ptr
(value_field (tcb_value, pspace_data->atcb_fieldno.entry_calls));
entry_calls_value_element =
- value_subscript (entry_calls_value,
+ value_subscript (entry_calls_value,
value_as_long (atc_nesting_level_value));
called_task_fieldno =
- ada_get_field_index (value_type (entry_calls_value_element),
- "called_task", 0);
+ ada_get_field_index (value_type (entry_calls_value_element),
+ "called_task", 0);
task_info->called_task =
- value_as_address (value_field (entry_calls_value_element,
- called_task_fieldno));
+ value_as_address (value_field (entry_calls_value_element,
+ called_task_fieldno));
}
/* If the ATCB contains some information about RV callers, then
if (pspace_data->atcb_fieldno.call >= 0)
{
/* Get the ID of the caller task from Common_ATCB.Call.all.Self.
- If Common_ATCB.Call is null, then there is no caller. */
+ If Common_ATCB.Call is null, then there is no caller. */
const CORE_ADDR call =
- value_as_address (value_field (common_value,
+ value_as_address (value_field (common_value,
pspace_data->atcb_fieldno.call));
struct value *call_val;
if (call != 0)
- {
- call_val =
- value_from_contents_and_address (pspace_data->atcb_call_type,
+ {
+ call_val =
+ value_from_contents_and_address (pspace_data->atcb_call_type,
NULL, call);
- task_info->caller_task =
- value_as_address
+ task_info->caller_task =
+ value_as_address
(value_field (call_val, pspace_data->atcb_fieldno.call_self));
- }
+ }
}
task_info->base_cpu
- = value_as_long (value_field (common_value,
- pspace_data->atcb_fieldno.base_cpu));
+ = (pspace_data->cpu_id_offset
+ + value_as_long (value_field (common_value,
+ pspace_data->atcb_fieldno.base_cpu)));
/* And finally, compute the task ptid. Note that there is not point
in computing it if the task is no longer alive, in which case
for (i = 0; i < data->known_tasks_length; i++)
{
CORE_ADDR task_id =
- extract_typed_address (known_tasks + i * target_ptr_byte,
+ extract_typed_address (known_tasks + i * target_ptr_byte,
data->known_tasks_element);
if (task_id != 0)
- add_ada_task (task_id, current_inferior ());
+ add_ada_task (task_id, current_inferior ());
}
return true;
common_value = value_field (tcb_value, pspace_data->atcb_fieldno.common);
task_id = value_as_address
(value_field (common_value,
- pspace_data->atcb_fieldno.activation_link));
+ pspace_data->atcb_fieldno.activation_link));
}
return true;
&& eltype->code () == TYPE_CODE_PTR)
idxtype = check_typedef (type->index_type ());
if (idxtype != NULL
- && !TYPE_LOW_BOUND_UNDEFINED (idxtype)
- && !TYPE_HIGH_BOUND_UNDEFINED (idxtype))
+ && idxtype->bounds ()->low.kind () != PROP_UNDEFINED
+ && idxtype->bounds ()->high.kind () != PROP_UNDEFINED)
{
data->known_tasks_element = eltype;
data->known_tasks_length =
- TYPE_HIGH_BOUND (idxtype) - TYPE_LOW_BOUND (idxtype) + 1;
+ (idxtype->bounds ()->high.const_val ()
+ - idxtype->bounds ()->low.const_val () + 1);
return;
}
}
{
struct ada_tasks_inferior_data *data;
- if (!target_has_stack)
+ if (!target_has_stack ())
error (_("Cannot inspect Ada tasks when program is not running"));
data = get_ada_tasks_inferior_data (current_inferior ());
to one task only, and this is not the task, skip
to the next one. */
if (taskno_arg && taskno != taskno_arg)
- continue;
+ continue;
ui_out_emit_tuple tuple_emitter (uiout, NULL);
/* Print a star if this task is the current task (or the task
- currently selected). */
+ currently selected). */
if (task_info->ptid == inferior_ptid)
uiout->field_string ("current", "*");
else
/* Print the associated Thread ID. */
if (uiout->is_mi_like_p ())
- {
+ {
thread_info *thread = (ada_task_is_alive (task_info)
? find_thread_ptid (inf, task_info->ptid)
: nullptr);
/* Print the ID of the parent task. */
parent_id = get_task_number_from_id (task_info->parent, inf);
if (parent_id)
- uiout->field_signed ("parent-id", parent_id);
+ uiout->field_signed ("parent-id", parent_id);
else
- uiout->field_skip ("parent-id");
+ uiout->field_skip ("parent-id");
/* Print the base priority of the task. */
uiout->field_signed ("priority", task_info->priority);
/* Finally, print the task name, without quotes around it, as mi like
is not expecting quotes, and in non mi-like no need for quotes
- as there is a specific column for the name. */
+ as there is a specific column for the name. */
uiout->field_fmt ("name",
(task_info->name[0] != '\0'
? ui_file_style ()
if (taskno <= 0 || taskno > data->task_list.size ())
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
- "see the IDs of currently known tasks"), taskno);
+ "see the IDs of currently known tasks"), taskno);
task_info = &data->task_list[taskno - 1];
/* Print the Ada task ID. */
printf_filtered (_("Parent: %d"), parent_taskno);
if (parent->name[0] != '\0')
- printf_filtered (" (%s)", parent->name);
+ printf_filtered (" (%s)", parent->name);
printf_filtered ("\n");
}
else
if (task_info->caller_task)
{
- target_taskno = get_task_number_from_id (task_info->caller_task, inf);
- printf_filtered (_("State: Accepting rendezvous with %d"),
- target_taskno);
+ target_taskno = get_task_number_from_id (task_info->caller_task, inf);
+ printf_filtered (_("State: Accepting rendezvous with %d"),
+ target_taskno);
}
else if (task_info->called_task)
{
- target_taskno = get_task_number_from_id (task_info->called_task, inf);
- printf_filtered (_("State: Waiting on task %d's entry"),
- target_taskno);
+ target_taskno = get_task_number_from_id (task_info->called_task, inf);
+ printf_filtered (_("State: Waiting on task %d's entry"),
+ target_taskno);
}
else
printf_filtered (_("State: %s"), _(long_task_states[task_info->state]));
if (target_taskno)
{
- ada_task_info *target_task_info = &data->task_list[target_taskno - 1];
+ ada_task_info *target_task_info = &data->task_list[target_taskno - 1];
- if (target_task_info->name[0] != '\0')
- printf_filtered (" (%s)", target_task_info->name);
+ if (target_task_info->name[0] != '\0')
+ printf_filtered (" (%s)", target_task_info->name);
}
printf_filtered ("\n");
if (taskno <= 0 || taskno > data->task_list.size ())
error (_("Task ID %d not known. Use the \"info tasks\" command to\n"
- "see the IDs of currently known tasks"), taskno);
+ "see the IDs of currently known tasks"), taskno);
task_info = &data->task_list[taskno - 1];
if (!ada_task_is_alive (task_info))
thread_info *tp = find_thread_ptid (inf, task_info->ptid);
if (tp == NULL)
error (_("Unable to compute thread ID for task %s.\n"
- "Cannot switch to this task."),
- task_to_str (taskno, task_info).c_str ());
+ "Cannot switch to this task."),
+ task_to_str (taskno, task_info).c_str ());
switch_to_thread (tp);
ada_find_printable_frame (get_selected_frame (NULL));
printf_filtered (_("[Switching to task %s]\n"),
task_to_str (taskno, task_info).c_str ());
print_stack_frame (get_selected_frame (NULL),
- frame_relative_level (get_selected_frame (NULL)),
+ frame_relative_level (get_selected_frame (NULL)),
SRC_AND_LOC, 1);
}
/* All objfiles are being cleared, so we should clear all
our caches for all program spaces. */
for (struct program_space *pspace : program_spaces)
- ada_tasks_invalidate_pspace_data (pspace);
+ ada_tasks_invalidate_pspace_data (pspace);
}
else
{
_initialize_tasks ()
{
/* Attach various observers. */
- gdb::observers::normal_stop.attach (ada_tasks_normal_stop_observer);
- gdb::observers::new_objfile.attach (ada_tasks_new_objfile_observer);
+ gdb::observers::normal_stop.attach (ada_tasks_normal_stop_observer,
+ "ada-tasks");
+ gdb::observers::new_objfile.attach (ada_tasks_new_objfile_observer,
+ "ada-tasks");
/* Some new commands provided by this module. */
add_info ("tasks", info_tasks_command,
- _("Provide information about all known Ada tasks."));
+ _("Provide information about all known Ada tasks."));
add_cmd ("task", class_run, task_command,
- _("Use this command to switch between Ada tasks.\n\
+ _("Use this command to switch between Ada tasks.\n\
Without argument, this command simply prints the current task ID."),
- &cmdlist);
+ &cmdlist);
}
projects / deliverable / binutils-gdb.git / blobdiff