OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2003-09-15 David Lecomber <dsl@sources.redhat.com> 

* f-valprint.c: Apply array element printing limits to multi-dimensional arrays
This commit is contained in:
David Lecomber 2003-09-15 15:14:12 +00:00
parent 739fea7ba8
commit b3cacbee3f
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2003-09-15 David Lecomber <dsl@sources.redhat.com>
* f-valprint.c: Apply array element printing limits to multi-dimensional arrays
2003-09-14 Michael Chastain <mec@shout.net>
* config/m68k/nm-apollo68v.h: Delete.

23
gdb/f-valprint.c
View File

@ -47,7 +47,8 @@ static void f77_print_array (struct type *, char *, CORE_ADDR,
enum val_prettyprint);
static void f77_print_array_1 (int, int, struct type *, char *,
CORE_ADDR, struct ui_file *, int, int, int,
enum val_prettyprint);
enum val_prettyprint,
int *elts);
static void f77_create_arrayprint_offset_tbl (struct type *,
struct ui_file *);
static void f77_get_dynamic_length_of_aggregate (struct type *);
@ -271,31 +272,36 @@ f77_create_arrayprint_offset_tbl (struct type *type, struct ui_file *stream)
}
}
/* Actual function which prints out F77 arrays, Valaddr == address in
the superior. Address == the address in the inferior. */
static void
f77_print_array_1 (int nss, int ndimensions, struct type *type, char *valaddr,
CORE_ADDR address, struct ui_file *stream, int format,
int deref_ref, int recurse, enum val_prettyprint pretty)
int deref_ref, int recurse, enum val_prettyprint pretty,
int *elts)
{
int i;
if (nss != ndimensions)
{
for (i = 0; i < F77_DIM_SIZE (nss); i++)
for (i = 0; (i < F77_DIM_SIZE (nss) && (*elts) < print_max); i++)
{
fprintf_filtered (stream, "( ");
f77_print_array_1 (nss + 1, ndimensions, TYPE_TARGET_TYPE (type),
valaddr + i * F77_DIM_OFFSET (nss),
address + i * F77_DIM_OFFSET (nss),
stream, format, deref_ref, recurse, pretty);
stream, format, deref_ref, recurse, pretty, elts);
fprintf_filtered (stream, ") ");
}
if (*elts >= print_max && i < F77_DIM_SIZE (nss)) {
fprintf_filtered (stream, "...");
}
}
else
{
for (i = 0; (i < F77_DIM_SIZE (nss) && i < print_max); i++)
for (i = 0; (i < F77_DIM_SIZE (nss) && (*elts) < print_max); i++, (*elts)++)
{
val_print (TYPE_TARGET_TYPE (type),
valaddr + i * F77_DIM_OFFSET (ndimensions),
@ -306,7 +312,7 @@ f77_print_array_1 (int nss, int ndimensions, struct type *type, char *valaddr,
if (i != (F77_DIM_SIZE (nss) - 1))
fprintf_filtered (stream, ", ");
if (i == print_max - 1)
if ((( *elts) == print_max - 1) && (i != (F77_DIM_SIZE (nss) - 1)))
fprintf_filtered (stream, "...");
}
}
@ -321,6 +327,7 @@ f77_print_array (struct type *type, char *valaddr, CORE_ADDR address,
enum val_prettyprint pretty)
{
int ndimensions;
int elts = 0;
ndimensions = calc_f77_array_dims (type);
@ -335,7 +342,7 @@ f77_print_array (struct type *type, char *valaddr, CORE_ADDR address,
f77_create_arrayprint_offset_tbl (type, stream);
f77_print_array_1 (1, ndimensions, type, valaddr, address, stream, format,
deref_ref, recurse, pretty);
deref_ref, recurse, pretty, &elts);
}