/* Support for printing Fortran values for GDB, the GNU debugger.
- Copyright (C) 1993-2014 Free Software Foundation, Inc.
+ Copyright (C) 1993-2023 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.
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include <string.h>
+#include "annotate.h"
#include "symtab.h"
#include "gdbtypes.h"
#include "expression.h"
#include "command.h"
#include "block.h"
#include "dictionary.h"
-#include "gdb_assert.h"
-#include "exceptions.h"
+#include "cli/cli-style.h"
+#include "gdbarch.h"
+#include "f-array-walker.h"
-extern void _initialize_f_valprint (void);
-static void info_common_command (char *, int);
-static void f77_create_arrayprint_offset_tbl (struct type *,
- struct ui_file *);
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. */
-
-/* The following macro gives us the size of the nth dimension, Where
- n is 1 based. */
-
-#define F77_DIM_SIZE(n) (f77_array_offset_tbl[n][1])
-
-/* The following gives us the offset for row n where n is 1-based. */
-
-#define F77_DIM_OFFSET(n) (f77_array_offset_tbl[n][0])
-
-int
+LONGEST
f77_get_lowerbound (struct type *type)
{
- if (TYPE_ARRAY_LOWER_BOUND_IS_UNDEFINED (type))
+ if (type->bounds ()->low.kind () != PROP_CONST)
error (_("Lower bound may not be '*' in F77"));
- return TYPE_ARRAY_LOWER_BOUND_VALUE (type);
+ return type->bounds ()->low.const_val ();
}
-int
+LONGEST
f77_get_upperbound (struct type *type)
{
- if (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (type))
+ if (type->bounds ()->high.kind () != PROP_CONST)
{
/* We have an assumed size array on our hands. Assume that
upper_bound == lower_bound so that we show at least 1 element.
return f77_get_lowerbound (type);
}
- return TYPE_ARRAY_UPPER_BOUND_VALUE (type);
+ return type->bounds ()->high.const_val ();
}
/* Obtain F77 adjustable array dimensions. */
This function also works for strings which behave very
similarly to arrays. */
- if (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_ARRAY
- || TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_STRING)
- f77_get_dynamic_length_of_aggregate (TYPE_TARGET_TYPE (type));
+ if (type->target_type ()->code () == TYPE_CODE_ARRAY
+ || type->target_type ()->code () == TYPE_CODE_STRING)
+ f77_get_dynamic_length_of_aggregate (type->target_type ());
/* Recursion ends here, start setting up lengths. */
lower_bound = f77_get_lowerbound (type);
upper_bound = f77_get_upperbound (type);
/* Patch in a valid length value. */
-
- TYPE_LENGTH (type) =
- (upper_bound - lower_bound + 1)
- * TYPE_LENGTH (check_typedef (TYPE_TARGET_TYPE (type)));
+ type->set_length ((upper_bound - lower_bound + 1)
+ * check_typedef (type->target_type ())->length ());
}
-/* Function that sets up the array offset,size table for the array
- type "type". */
+/* Per-dimension statistics. */
-static void
-f77_create_arrayprint_offset_tbl (struct type *type, struct ui_file *stream)
+struct dimension_stats
{
- struct type *tmp_type;
- int eltlen;
- int ndimen = 1;
- int upper, lower;
+ /* The type of the index used to address elements in the dimension. */
+ struct type *index_type;
- tmp_type = type;
+ /* Total number of elements in the dimension, counted as we go. */
+ int nelts;
+};
- while (TYPE_CODE (tmp_type) == TYPE_CODE_ARRAY)
- {
- upper = f77_get_upperbound (tmp_type);
- lower = f77_get_lowerbound (tmp_type);
+/* A class used by FORTRAN_PRINT_ARRAY as a specialisation of the array
+ walking template. This specialisation prints Fortran arrays. */
- F77_DIM_SIZE (ndimen) = upper - lower + 1;
+class fortran_array_printer_impl : public fortran_array_walker_base_impl
+{
+public:
+ /* Constructor. TYPE is the array type being printed, ADDRESS is the
+ address in target memory for the object of TYPE being printed. VAL is
+ the GDB value (of TYPE) being printed. STREAM is where to print to,
+ RECOURSE is passed through (and prevents infinite recursion), and
+ OPTIONS are the printing control options. */
+ explicit fortran_array_printer_impl (struct type *type,
+ CORE_ADDR address,
+ struct value *val,
+ struct ui_file *stream,
+ int recurse,
+ const struct value_print_options *options)
+ : m_elts (0),
+ m_val (val),
+ m_stream (stream),
+ m_recurse (recurse),
+ m_options (options),
+ m_dimension (0),
+ m_nrepeats (0),
+ m_stats (0)
+ { /* Nothing. */ }
+
+ /* Called while iterating over the array bounds. When SHOULD_CONTINUE is
+ false then we must return false, as we have reached the end of the
+ array bounds for this dimension. However, we also return false if we
+ have printed too many elements (after printing '...'). In all other
+ cases, return true. */
+ bool continue_walking (bool should_continue)
+ {
+ bool cont = should_continue && (m_elts < m_options->print_max);
+ if (!cont && should_continue)
+ gdb_puts ("...", m_stream);
+ return cont;
+ }
+
+ /* Called when we start iterating over a dimension. If it's not the
+ inner most dimension then print an opening '(' character. */
+ void start_dimension (struct type *index_type, LONGEST nelts, bool inner_p)
+ {
+ size_t dim_indx = m_dimension++;
+
+ m_elt_type_prev = nullptr;
+ if (m_stats.size () < m_dimension)
+ {
+ m_stats.resize (m_dimension);
+ m_stats[dim_indx].index_type = index_type;
+ m_stats[dim_indx].nelts = nelts;
+ }
- tmp_type = TYPE_TARGET_TYPE (tmp_type);
- ndimen++;
- }
+ gdb_puts ("(", m_stream);
+ }
+
+ /* Called when we finish processing a batch of items within a dimension
+ of the array. Depending on whether this is the inner most dimension
+ or not we print different things, but this is all about adding
+ separators between elements, and dimensions of the array. */
+ void finish_dimension (bool inner_p, bool last_p)
+ {
+ gdb_puts (")", m_stream);
+ if (!last_p)
+ gdb_puts (" ", m_stream);
+
+ m_dimension--;
+ }
+
+ /* Called when processing dimensions of the array other than the
+ innermost one. WALK_1 is the walker to normally call, ELT_TYPE is
+ the type of the element being extracted, and ELT_OFF is the offset
+ of the element from the start of array being walked, INDEX_TYPE
+ and INDEX is the type and the value respectively of the element's
+ index in the dimension currently being walked and LAST_P is true
+ only when this is the last element that will be processed in this
+ dimension. */
+ void process_dimension (gdb::function_view<void (struct type *,
+ int, bool)> walk_1,
+ struct type *elt_type, LONGEST elt_off,
+ LONGEST index, bool last_p)
+ {
+ size_t dim_indx = m_dimension - 1;
+ struct type *elt_type_prev = m_elt_type_prev;
+ LONGEST elt_off_prev = m_elt_off_prev;
+ bool repeated = (m_options->repeat_count_threshold < UINT_MAX
+ && elt_type_prev != nullptr
+ && (m_elts + ((m_nrepeats + 1)
+ * m_stats[dim_indx + 1].nelts)
+ <= m_options->print_max)
+ && dimension_contents_eq (m_val, elt_type,
+ elt_off_prev, elt_off));
+
+ if (repeated)
+ m_nrepeats++;
+ if (!repeated || last_p)
+ {
+ LONGEST nrepeats = m_nrepeats;
- /* Now we multiply eltlen by all the offsets, so that later we
- can print out array elements correctly. Up till now we
- know an offset to apply to get the item but we also
- have to know how much to add to get to the next item. */
+ m_nrepeats = 0;
+ if (nrepeats >= m_options->repeat_count_threshold)
+ {
+ annotate_elt_rep (nrepeats + 1);
+ gdb_printf (m_stream, "%p[<repeats %s times>%p]",
+ metadata_style.style ().ptr (),
+ plongest (nrepeats + 1),
+ nullptr);
+ annotate_elt_rep_end ();
+ if (!repeated)
+ gdb_puts (" ", m_stream);
+ m_elts += nrepeats * m_stats[dim_indx + 1].nelts;
+ }
+ else
+ for (LONGEST i = nrepeats; i > 0; i--)
+ {
+ maybe_print_array_index (m_stats[dim_indx].index_type,
+ index - nrepeats + repeated,
+ m_stream, m_options);
+ walk_1 (elt_type_prev, elt_off_prev, repeated && i == 1);
+ }
- ndimen--;
- eltlen = TYPE_LENGTH (tmp_type);
- F77_DIM_OFFSET (ndimen) = eltlen;
- while (--ndimen > 0)
- {
- eltlen *= F77_DIM_SIZE (ndimen + 1);
- F77_DIM_OFFSET (ndimen) = eltlen;
- }
-}
+ if (!repeated)
+ {
+ /* We need to specially handle the case of hitting `print_max'
+ exactly as recursing would cause lone `(...)' to be printed.
+ And we need to print `...' by hand if the skipped element
+ would be the last one processed, because the subsequent call
+ to `continue_walking' from our caller won't do that. */
+ if (m_elts < m_options->print_max)
+ {
+ maybe_print_array_index (m_stats[dim_indx].index_type, index,
+ m_stream, m_options);
+ walk_1 (elt_type, elt_off, last_p);
+ nrepeats++;
+ }
+ else if (last_p)
+ gdb_puts ("...", m_stream);
+ }
+ }
+ m_elt_type_prev = elt_type;
+ m_elt_off_prev = elt_off;
+ }
+
+ /* Called to process an element of ELT_TYPE at offset ELT_OFF from the
+ start of the parent object, where INDEX is the value of the element's
+ index in the dimension currently being walked and LAST_P is true only
+ when this is the last element to be processed in this dimension. */
+ void process_element (struct type *elt_type, LONGEST elt_off,
+ LONGEST index, bool last_p)
+ {
+ size_t dim_indx = m_dimension - 1;
+ struct type *elt_type_prev = m_elt_type_prev;
+ LONGEST elt_off_prev = m_elt_off_prev;
+ bool repeated = (m_options->repeat_count_threshold < UINT_MAX
+ && elt_type_prev != nullptr
+ && value_contents_eq (m_val, elt_off_prev, m_val, elt_off,
+ elt_type->length ()));
+
+ if (repeated)
+ m_nrepeats++;
+ if (!repeated || last_p || m_elts + 1 == m_options->print_max)
+ {
+ LONGEST nrepeats = m_nrepeats;
+ bool printed = false;
+ if (nrepeats != 0)
+ {
+ m_nrepeats = 0;
+ if (nrepeats >= m_options->repeat_count_threshold)
+ {
+ annotate_elt_rep (nrepeats + 1);
+ gdb_printf (m_stream, "%p[<repeats %s times>%p]",
+ metadata_style.style ().ptr (),
+ plongest (nrepeats + 1),
+ nullptr);
+ annotate_elt_rep_end ();
+ }
+ else
+ {
+ /* Extract the element value from the parent value. */
+ struct value *e_val
+ = value_from_component (m_val, elt_type, elt_off_prev);
+
+ for (LONGEST i = nrepeats; i > 0; i--)
+ {
+ maybe_print_array_index (m_stats[dim_indx].index_type,
+ index - i + 1,
+ m_stream, m_options);
+ common_val_print (e_val, m_stream, m_recurse, m_options,
+ current_language);
+ if (i > 1)
+ gdb_puts (", ", m_stream);
+ }
+ }
+ printed = true;
+ }
-/* Actual function which prints out F77 arrays, Valaddr == address in
- the superior. Address == the address in the inferior. */
+ if (!repeated)
+ {
+ /* Extract the element value from the parent value. */
+ struct value *e_val
+ = value_from_component (m_val, elt_type, elt_off);
+
+ if (printed)
+ gdb_puts (", ", m_stream);
+ maybe_print_array_index (m_stats[dim_indx].index_type, index,
+ m_stream, m_options);
+ common_val_print (e_val, m_stream, m_recurse, m_options,
+ current_language);
+ }
+ if (!last_p)
+ gdb_puts (", ", m_stream);
+ }
-static void
-f77_print_array_1 (int nss, int ndimensions, struct type *type,
- const gdb_byte *valaddr,
- int embedded_offset, CORE_ADDR address,
- struct ui_file *stream, int recurse,
- const struct value *val,
- const struct value_print_options *options,
- int *elts)
-{
- int i;
+ m_elt_type_prev = elt_type;
+ m_elt_off_prev = elt_off;
+ ++m_elts;
+ }
+
+private:
+ /* Called to compare two VAL elements of ELT_TYPE at offsets OFFSET1
+ and OFFSET2 each. Handle subarrays recursively, because they may
+ have been sliced and we do not want to compare any memory contents
+ present between the slices requested. */
+ bool
+ dimension_contents_eq (const struct value *val, struct type *type,
+ LONGEST offset1, LONGEST offset2)
+ {
+ if (type->code () == TYPE_CODE_ARRAY
+ && type->target_type ()->code () != TYPE_CODE_CHAR)
+ {
+ /* Extract the range, and get lower and upper bounds. */
+ struct type *range_type = check_typedef (type)->index_type ();
+ LONGEST lowerbound, upperbound;
+ if (!get_discrete_bounds (range_type, &lowerbound, &upperbound))
+ error ("failed to get range bounds");
- if (nss != ndimensions)
- {
- for (i = 0;
- (i < F77_DIM_SIZE (nss) && (*elts) < options->print_max);
- i++)
- {
- fprintf_filtered (stream, "( ");
- f77_print_array_1 (nss + 1, ndimensions, TYPE_TARGET_TYPE (type),
- valaddr,
- embedded_offset + i * F77_DIM_OFFSET (nss),
- address,
- stream, recurse, val, options, elts);
- fprintf_filtered (stream, ") ");
- }
- if (*elts >= options->print_max && i < F77_DIM_SIZE (nss))
- fprintf_filtered (stream, "...");
- }
- else
- {
- for (i = 0; i < F77_DIM_SIZE (nss) && (*elts) < options->print_max;
- i++, (*elts)++)
- {
- val_print (TYPE_TARGET_TYPE (type),
- valaddr,
- embedded_offset + i * F77_DIM_OFFSET (ndimensions),
- address, stream, recurse,
- val, options, current_language);
-
- if (i != (F77_DIM_SIZE (nss) - 1))
- fprintf_filtered (stream, ", ");
-
- if ((*elts == options->print_max - 1)
- && (i != (F77_DIM_SIZE (nss) - 1)))
- fprintf_filtered (stream, "...");
- }
- }
-}
+ /* CALC is used to calculate the offsets for each element. */
+ fortran_array_offset_calculator calc (type);
-/* This function gets called to print an F77 array, we set up some
- stuff and then immediately call f77_print_array_1(). */
+ struct type *subarray_type = check_typedef (type->target_type ());
+ for (LONGEST i = lowerbound; i < upperbound + 1; i++)
+ {
+ /* Use the index and the stride to work out a new offset. */
+ LONGEST index_offset = calc.index_offset (i);
-static void
-f77_print_array (struct type *type, const gdb_byte *valaddr,
- int embedded_offset,
- CORE_ADDR address, struct ui_file *stream,
- int recurse,
- const struct value *val,
- const struct value_print_options *options)
-{
- int ndimensions;
- int elts = 0;
+ if (!dimension_contents_eq (val, subarray_type,
+ offset1 + index_offset,
+ offset2 + index_offset))
+ return false;
+ }
+ return true;
+ }
+ else
+ return value_contents_eq (val, offset1, val, offset2,
+ type->length ());
+ }
+
+ /* The number of elements printed so far. */
+ int m_elts;
+
+ /* The value from which we are printing elements. */
+ struct value *m_val;
+
+ /* The stream we should print too. */
+ struct ui_file *m_stream;
- ndimensions = calc_f77_array_dims (type);
+ /* The recursion counter, passed through when we print each element. */
+ int m_recurse;
- if (ndimensions > MAX_FORTRAN_DIMS || ndimensions < 0)
- error (_("\
-Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)"),
- ndimensions, MAX_FORTRAN_DIMS);
+ /* The print control options. Gives us the maximum number of elements to
+ print, and is passed through to each element that we print. */
+ const struct value_print_options *m_options = nullptr;
- /* Since F77 arrays are stored column-major, we set up an
- offset table to get at the various row's elements. The
- offset table contains entries for both offset and subarray size. */
+ /* The number of the current dimension being handled. */
+ LONGEST m_dimension;
- f77_create_arrayprint_offset_tbl (type, stream);
+ /* The number of element repetitions in the current series. */
+ LONGEST m_nrepeats;
- f77_print_array_1 (1, ndimensions, type, valaddr, embedded_offset,
- address, stream, recurse, val, options, &elts);
+ /* The type and offset from M_VAL of the element handled in the previous
+ iteration over the current dimension. */
+ struct type *m_elt_type_prev;
+ LONGEST m_elt_off_prev;
+
+ /* Per-dimension stats. */
+ std::vector<struct dimension_stats> m_stats;
+};
+
+/* This function gets called to print a Fortran array. */
+
+static void
+fortran_print_array (struct type *type, CORE_ADDR address,
+ struct ui_file *stream, int recurse,
+ const struct value *val,
+ const struct value_print_options *options)
+{
+ fortran_array_walker<fortran_array_printer_impl> p
+ (type, address, (struct value *) val, stream, recurse, options);
+ p.walk ();
}
\f
")",
".TRUE.",
".FALSE.",
- "VOID",
+ "void",
+ "{",
+ "}"
};
-/* See val_print for a description of the various parameters of this
- function; they are identical. */
+/* See f-lang.h. */
void
-f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
- CORE_ADDR address, struct ui_file *stream, int recurse,
- const struct value *original_value,
- const struct value_print_options *options)
+f_language::value_print_inner (struct value *val, struct ui_file *stream,
+ int recurse,
+ const struct value_print_options *options) const
{
- struct gdbarch *gdbarch = get_type_arch (type);
- enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
- unsigned int i = 0; /* Number of characters printed. */
+ struct type *type = check_typedef (value_type (val));
+ struct gdbarch *gdbarch = type->arch ();
+ int printed_field = 0; /* Number of fields printed. */
struct type *elttype;
CORE_ADDR addr;
int index;
+ const gdb_byte *valaddr = value_contents_for_printing (val).data ();
+ const CORE_ADDR address = value_address (val);
- CHECK_TYPEDEF (type);
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_STRING:
f77_get_dynamic_length_of_aggregate (type);
- LA_PRINT_STRING (stream, builtin_type (gdbarch)->builtin_char,
- valaddr + embedded_offset,
- TYPE_LENGTH (type), NULL, 0, options);
+ printstr (stream, builtin_type (gdbarch)->builtin_char, valaddr,
+ type->length (), NULL, 0, options);
break;
case TYPE_CODE_ARRAY:
- if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_CHAR)
- {
- fprintf_filtered (stream, "(");
- f77_print_array (type, valaddr, embedded_offset,
- address, stream, recurse, original_value, options);
- fprintf_filtered (stream, ")");
- }
+ if (type->target_type ()->code () != TYPE_CODE_CHAR)
+ fortran_print_array (type, address, stream, recurse, val, options);
else
{
- struct type *ch_type = TYPE_TARGET_TYPE (type);
+ struct type *ch_type = type->target_type ();
f77_get_dynamic_length_of_aggregate (type);
- LA_PRINT_STRING (stream, ch_type,
- valaddr + embedded_offset,
- TYPE_LENGTH (type) / TYPE_LENGTH (ch_type),
- NULL, 0, options);
+ printstr (stream, ch_type, valaddr,
+ type->length () / ch_type->length (), NULL, 0,
+ options);
}
break;
case TYPE_CODE_PTR:
if (options->format && options->format != 's')
{
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, options, 0, stream);
+ value_print_scalar_formatted (val, options, 0, stream);
break;
}
else
{
int want_space = 0;
- addr = unpack_pointer (type, valaddr + embedded_offset);
- elttype = check_typedef (TYPE_TARGET_TYPE (type));
+ addr = unpack_pointer (type, valaddr);
+ elttype = check_typedef (type->target_type ());
- if (TYPE_CODE (elttype) == TYPE_CODE_FUNC)
+ if (elttype->code () == TYPE_CODE_FUNC)
{
/* Try to print what function it points to. */
print_function_pointer_address (options, gdbarch, addr, stream);
stream, demangle);
else if (options->addressprint && options->format != 's')
{
- fputs_filtered (paddress (gdbarch, addr), stream);
+ gdb_puts (paddress (gdbarch, addr), stream);
want_space = 1;
}
/* For a pointer to char or unsigned char, also print the string
pointed to, unless pointer is null. */
- if (TYPE_LENGTH (elttype) == 1
- && TYPE_CODE (elttype) == TYPE_CODE_INT
+ if (elttype->length () == 1
+ && elttype->code () == TYPE_CODE_INT
&& (options->format == 0 || options->format == 's')
&& addr != 0)
{
if (want_space)
- fputs_filtered (" ", stream);
- i = val_print_string (TYPE_TARGET_TYPE (type), NULL, addr, -1,
- stream, options);
+ gdb_puts (" ", stream);
+ val_print_string (type->target_type (), NULL, addr, -1,
+ stream, options);
}
return;
}
break;
- case TYPE_CODE_INT:
+ case TYPE_CODE_STRUCT:
+ case TYPE_CODE_UNION:
+ case TYPE_CODE_NAMELIST:
+ /* Starting from the Fortran 90 standard, Fortran supports derived
+ types. */
+ gdb_printf (stream, "( ");
+ for (index = 0; index < type->num_fields (); index++)
+ {
+ struct type *field_type
+ = check_typedef (type->field (index).type ());
+
+ if (field_type->code () != TYPE_CODE_FUNC)
+ {
+ const char *field_name = type->field (index).name ();
+ struct value *field;
+
+ if (type->code () == TYPE_CODE_NAMELIST)
+ {
+ /* While printing namelist items, fetch the appropriate
+ value field before printing its value. */
+ struct block_symbol sym
+ = lookup_symbol (field_name, get_selected_block (nullptr),
+ VAR_DOMAIN, nullptr);
+ if (sym.symbol == nullptr)
+ error (_("failed to find symbol for name list component %s"),
+ field_name);
+ field = value_of_variable (sym.symbol, sym.block);
+ }
+ else
+ field = value_field (val, index);
+
+ if (printed_field > 0)
+ gdb_puts (", ", stream);
+
+ if (field_name != NULL)
+ {
+ fputs_styled (field_name, variable_name_style.style (),
+ stream);
+ gdb_puts (" = ", stream);
+ }
+
+ common_val_print (field, stream, recurse + 1,
+ options, current_language);
+
+ ++printed_field;
+ }
+ }
+ gdb_printf (stream, " )");
+ break;
+
+ case TYPE_CODE_BOOL:
if (options->format || options->output_format)
{
struct value_print_options opts = *options;
-
opts.format = (options->format ? options->format
: options->output_format);
- val_print_scalar_formatted (type, valaddr, embedded_offset,
- original_value, options, 0, stream);
+ value_print_scalar_formatted (val, &opts, 0, stream);
}
else
{
- val_print_type_code_int (type, valaddr + embedded_offset, stream);
- /* C and C++ has no single byte int type, char is used instead.
- Since we don't know whether the value is really intended to
- be used as an integer or a character, print the character
- equivalent as well. */
- if (TYPE_LENGTH (type) == 1)
- {
- LONGEST c;
-
- fputs_filtered (" ", stream);
- c = unpack_long (type, valaddr + embedded_offset);
- LA_PRINT_CHAR ((unsigned char) c, type, stream);
- }
+ LONGEST longval = value_as_long (val);
+ /* The Fortran standard doesn't specify how logical types are
+ represented. Different compilers use different non zero
+ values to represent logical true. */
+ if (longval == 0)
+ gdb_puts (f_decorations.false_name, stream);
+ else
+ gdb_puts (f_decorations.true_name, stream);
}
break;
- case TYPE_CODE_STRUCT:
- case TYPE_CODE_UNION:
- /* Starting from the Fortran 90 standard, Fortran supports derived
- types. */
- fprintf_filtered (stream, "( ");
- for (index = 0; index < TYPE_NFIELDS (type); index++)
- {
- int offset = TYPE_FIELD_BITPOS (type, index) / 8;
-
- val_print (TYPE_FIELD_TYPE (type, index), valaddr,
- embedded_offset + offset,
- address, stream, recurse + 1,
- original_value, options, current_language);
- if (index != TYPE_NFIELDS (type) - 1)
- fputs_filtered (", ", stream);
- }
- fprintf_filtered (stream, " )");
- break;
-
+ case TYPE_CODE_INT:
case TYPE_CODE_REF:
case TYPE_CODE_FUNC:
case TYPE_CODE_FLAGS:
case TYPE_CODE_RANGE:
case TYPE_CODE_UNDEF:
case TYPE_CODE_COMPLEX:
- case TYPE_CODE_BOOL:
case TYPE_CODE_CHAR:
default:
- generic_val_print (type, valaddr, embedded_offset, address,
- stream, recurse, original_value, options,
- &f_decorations);
+ generic_value_print (val, stream, recurse, options, &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);
ALL_BLOCK_SYMBOLS (block, iter, sym)
- if (SYMBOL_DOMAIN (sym) == COMMON_BLOCK_DOMAIN)
+ if (sym->domain () == COMMON_BLOCK_DOMAIN)
{
- const struct common_block *common = SYMBOL_VALUE_COMMON_BLOCK (sym);
+ const struct common_block *common = sym->value_common_block ();
size_t index;
- gdb_assert (SYMBOL_CLASS (sym) == LOC_COMMON_BLOCK);
+ gdb_assert (sym->aclass () == 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');
+ gdb_putc ('\n');
else
*any_printed = 1;
- if (SYMBOL_PRINT_NAME (sym))
- printf_filtered (_("Contents of F77 COMMON block '%s':\n"),
- SYMBOL_PRINT_NAME (sym));
+ if (sym->print_name ())
+ gdb_printf (_("Contents of F77 COMMON block '%s':\n"),
+ sym->print_name ());
else
- printf_filtered (_("Contents of blank COMMON block:\n"));
+ gdb_printf (_("Contents of blank COMMON block:\n"));
for (index = 0; index < common->n_entries; index++)
{
struct value *val = NULL;
- volatile struct gdb_exception except;
- printf_filtered ("%s = ",
- SYMBOL_PRINT_NAME (common->contents[index]));
+ gdb_printf ("%s = ",
+ common->contents[index]->print_name ());
- TRY_CATCH (except, RETURN_MASK_ERROR)
+ try
{
val = value_of_variable (common->contents[index], block);
value_print (val, gdb_stdout, &opts);
}
- if (except.reason < 0)
- printf_filtered ("<error reading variable: %s>", except.message);
- putchar_filtered ('\n');
+ catch (const gdb_exception_error &except)
+ {
+ fprintf_styled (gdb_stdout, metadata_style.style (),
+ "<error reading variable: %s>",
+ except.what ());
+ }
+
+ gdb_putc ('\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;
+ frame_info_ptr fi;
const struct block *block;
int values_printed = 0;
block = get_frame_block (fi, 0);
if (block == NULL)
{
- printf_filtered (_("No symbol table info available.\n"));
+ gdb_printf (_("No symbol table info available.\n"));
return;
}
{
info_common_command_for_block (block, comname, &values_printed);
/* After handling the function's top-level block, stop. Don't
- continue to its superblock, the block of per-file symbols. */
- if (BLOCK_FUNCTION (block))
+ continue to its superblock, the block of per-file symbols. */
+ if (block->function ())
break;
- block = BLOCK_SUPERBLOCK (block);
+ block = block->superblock ();
}
if (!values_printed)
{
if (comname)
- printf_filtered (_("No common block '%s'.\n"), comname);
+ gdb_printf (_("No common block '%s'.\n"), comname);
else
- printf_filtered (_("No common blocks.\n"));
+ gdb_printf (_("No common blocks.\n"));
}
}
+void _initialize_f_valprint ();
void
-_initialize_f_valprint (void)
+_initialize_f_valprint ()
{
add_info ("common", info_common_command,
_("Print out the values contained in a Fortran COMMON block."));
- if (xdb_commands)
- add_com ("lc", class_info, info_common_command,
- _("Print out the values contained in a Fortran COMMON block."));
}
projects / thirdparty / binutils-gdb.git / blobdiff