/* Support for printing Fortran values for GDB, the GNU debugger.
- Copyright (C) 1993-2017 Free Software Foundation, Inc.
+ Copyright (C) 1993-2019 Free Software Foundation, Inc.
Contributed by Motorola. Adapted from the C definitions by Farooq Butt
(fmbutt@engage.sps.mot.com), additionally worked over by Stan Shebs.
#include "command.h"
#include "block.h"
#include "dictionary.h"
+#include "cli/cli-style.h"
+#include "gdbarch.h"
-extern void _initialize_f_valprint (void);
-static void info_common_command (char *, int);
static void f77_get_dynamic_length_of_aggregate (struct type *);
int f77_array_offset_tbl[MAX_FORTRAN_DIMS + 1][2];
/* Array which holds offsets to be applied to get a row's elements
for a given array. Array also holds the size of each subarray. */
-int
+LONGEST
f77_get_lowerbound (struct type *type)
{
if (TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED (type))
return TYPE_ARRAY_LOWER_BOUND_VALUE (type);
}
-int
+LONGEST
f77_get_upperbound (struct type *type)
{
if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
if (nss != ndimensions)
{
- size_t dim_size = TYPE_LENGTH (TYPE_TARGET_TYPE (type));
+ struct gdbarch *gdbarch = get_type_arch (type);
+ size_t dim_size = type_length_units (TYPE_TARGET_TYPE (type));
+ int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
+ size_t byte_stride = TYPE_ARRAY_BIT_STRIDE (type) / (unit_size * 8);
+ if (byte_stride == 0)
+ byte_stride = dim_size;
size_t offs = 0;
for (i = lowerbound;
value_embedded_offset (subarray),
value_address (subarray),
stream, recurse, subarray, options, elts);
- offs += dim_size;
+ offs += byte_stride;
fprintf_filtered (stream, ") ");
}
if (*elts >= options->print_max && i < upperbound)
")",
".TRUE.",
".FALSE.",
- "VOID",
+ "void",
"{",
"}"
};
const struct value_print_options *options)
{
struct gdbarch *gdbarch = get_type_arch (type);
- enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int printed_field = 0; /* Number of fields printed. */
struct type *elttype;
CORE_ADDR addr;
&f_decorations);
break;
}
- gdb_flush (stream);
}
static void
{
struct block_iterator iter;
struct symbol *sym;
- const char *name;
struct value_print_options opts;
get_user_print_options (&opts);
gdb_assert (SYMBOL_CLASS (sym) == LOC_COMMON_BLOCK);
- if (comname && (!SYMBOL_LINKAGE_NAME (sym)
- || strcmp (comname, SYMBOL_LINKAGE_NAME (sym)) != 0))
+ if (comname && (!sym->linkage_name ()
+ || strcmp (comname, sym->linkage_name ()) != 0))
continue;
if (*any_printed)
putchar_filtered ('\n');
else
*any_printed = 1;
- if (SYMBOL_PRINT_NAME (sym))
+ if (sym->print_name ())
printf_filtered (_("Contents of F77 COMMON block '%s':\n"),
- SYMBOL_PRINT_NAME (sym));
+ sym->print_name ());
else
printf_filtered (_("Contents of blank COMMON block:\n"));
struct value *val = NULL;
printf_filtered ("%s = ",
- SYMBOL_PRINT_NAME (common->contents[index]));
+ common->contents[index]->print_name ());
- TRY
+ try
{
val = value_of_variable (common->contents[index], block);
value_print (val, gdb_stdout, &opts);
}
- CATCH (except, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &except)
{
- printf_filtered ("<error reading variable: %s>", except.message);
+ fprintf_styled (gdb_stdout, metadata_style.style (),
+ "<error reading variable: %s>",
+ except.what ());
}
- END_CATCH
putchar_filtered ('\n');
}
given name. */
static void
-info_common_command (char *comname, int from_tty)
+info_common_command (const char *comname, int from_tty)
{
struct frame_info *fi;
const struct block *block;