Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 01:07:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Non bit-packed packed arrays as variable-length fields

Browse Source 
In the case of non bit-packed arrays, GNAT does not generate its
traditional XP encoding; it is not needed. However, it still generates
the so-called "implementation type" with a P suffix. This
implementation type shall be skipped when looking for other
descriptive types such as XA encodings for variable-length
fields.

Note also that there may be an intermediate typedef between the
implementation type and its XA description. It shall be skipped
as well.

gdb/ChangeLog:

        Jerome Guitton  <guitton@adacore.com>
	* ada-lang.c (find_parallel_type_by_descriptive_type):
	Go through typedefs during lookup.
	(to_fixed_array_type): Add support for non-bit packed arrays
	as variable-length fields.

gdb/testsuite/ChangeLog:

        * gdb.ada/byte_packed_arr: New testcase.
This commit is contained in:
Jerome Guitton
2015-03-26 16:19:27 +01:00
committed by Joel Brobecker
parent fd8008d83c
commit 931e5bc3e1
8 changed files with 190 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gdb/ada-lang.c
View File

@@ -7762,7 +7762,7 @@ ada_type_name (struct type *type)
static struct type *
find_parallel_type_by_descriptive_type (struct type *type, const char *name)
{
struct type *result;
struct type *result, *tmp;
if (ada_ignore_descriptive_types_p)
return NULL;
@@ -7789,9 +7789,21 @@ find_parallel_type_by_descriptive_type (struct type *type, const char *name)
/* Otherwise, look at the next item on the list, if any. */
if (HAVE_GNAT_AUX_INFO (result))
result = TYPE_DESCRIPTIVE_TYPE (result);
tmp = TYPE_DESCRIPTIVE_TYPE (result);
else
result = NULL;
tmp = NULL;
/* If not found either, try after having resolved the typedef. */
if (tmp != NULL)
result = tmp;
else
{
CHECK_TYPEDEF (result);
if (HAVE_GNAT_AUX_INFO (result))
result = TYPE_DESCRIPTIVE_TYPE (result);
else
result = NULL;
}
}
/* If we didn't find a match, see whether this is a packed array. With
@@ -8509,6 +8521,7 @@ to_fixed_array_type (struct type *type0, struct value *dval,
struct type *index_type_desc;
struct type *result;
int constrained_packed_array_p;
static const char *xa_suffix = "___XA";
type0 = ada_check_typedef (type0);
if (TYPE_FIXED_INSTANCE (type0))
@@ -8518,7 +8531,30 @@ to_fixed_array_type (struct type *type0, struct value *dval,
if (constrained_packed_array_p)
type0 = decode_constrained_packed_array_type (type0);
index_type_desc = ada_find_parallel_type (type0, "___XA");
index_type_desc = ada_find_parallel_type (type0, xa_suffix);
/* As mentioned in exp_dbug.ads, for non bit-packed arrays an
encoding suffixed with 'P' may still be generated. If so,
it should be used to find the XA type. */
if (index_type_desc == NULL)
{
const char *typename = ada_type_name (type0);
if (typename != NULL)
{
const int len = strlen (typename);
char *name = (char *) alloca (len + strlen (xa_suffix));
if (typename[len - 1] == 'P')
{
strcpy (name, typename);
strcpy (name + len - 1, xa_suffix);
index_type_desc = ada_find_parallel_type_with_name (type0, name);
}
}
}
ada_fixup_array_indexes_type (index_type_desc);
if (index_type_desc != NULL
&& ada_is_redundant_index_type_desc (type0, index_type_desc))