+ }
+}
+
+/* generic_val_print helper for TYPE_CODE_BOOL. */
+
+static void
+generic_val_print_bool (struct type *type,
+ int embedded_offset, struct ui_file *stream,
+ struct value *original_value,
+ const struct value_print_options *options,
+ const struct generic_val_print_decorations *decorations)
+{
+ LONGEST val;
+ struct gdbarch *gdbarch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
+
+ 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, embedded_offset,
+ original_value, &opts, 0, stream);
+ }
+ else
+ {
+ const gdb_byte *valaddr = value_contents_for_printing (original_value);
+
+ val = unpack_long (type, valaddr + embedded_offset * unit_size);
+ if (val == 0)
+ fputs_filtered (decorations->false_name, stream);
+ else if (val == 1)
+ fputs_filtered (decorations->true_name, stream);
+ else
+ print_longest (stream, 'd', 0, val);
+ }
+}
+
+/* generic_val_print helper for TYPE_CODE_INT. */
+
+static void
+generic_val_print_int (struct type *type,
+ int embedded_offset, struct ui_file *stream,
+ struct value *original_value,
+ const struct value_print_options *options)
+{
+ struct value_print_options opts = *options;
+
+ opts.format = (options->format ? options->format
+ : options->output_format);
+ val_print_scalar_formatted (type, embedded_offset,
+ original_value, &opts, 0, stream);
+}
+
+/* generic_val_print helper for TYPE_CODE_CHAR. */
+
+static void
+generic_val_print_char (struct type *type, struct type *unresolved_type,
+ int embedded_offset,
+ struct ui_file *stream,
+ struct value *original_value,
+ const struct value_print_options *options)
+{
+ LONGEST val;
+ struct gdbarch *gdbarch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
+
+ 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, embedded_offset,
+ original_value, &opts, 0, stream);
+ }
+ else
+ {
+ const gdb_byte *valaddr = value_contents_for_printing (original_value);
+
+ val = unpack_long (type, valaddr + embedded_offset * unit_size);
+ if (TYPE_UNSIGNED (type))
+ fprintf_filtered (stream, "%u", (unsigned int) val);
+ else
+ fprintf_filtered (stream, "%d", (int) val);
+ fputs_filtered (" ", stream);
+ LA_PRINT_CHAR (val, unresolved_type, stream);
+ }
+}
+
+/* generic_val_print helper for TYPE_CODE_FLT and TYPE_CODE_DECFLOAT. */
+
+static void
+generic_val_print_float (struct type *type,
+ int embedded_offset, struct ui_file *stream,
+ struct value *original_value,
+ const struct value_print_options *options)
+{
+ struct gdbarch *gdbarch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
+
+ if (options->format)
+ {
+ val_print_scalar_formatted (type, embedded_offset,
+ original_value, options, 0, stream);
+ }
+ else
+ {
+ const gdb_byte *valaddr = value_contents_for_printing (original_value);
+
+ print_floating (valaddr + embedded_offset * unit_size, type, stream);
+ }
+}
+
+/* generic_val_print helper for TYPE_CODE_COMPLEX. */
+
+static void
+generic_val_print_complex (struct type *type,
+ int embedded_offset, struct ui_file *stream,
+ struct value *original_value,
+ const struct value_print_options *options,
+ const struct generic_val_print_decorations
+ *decorations)
+{
+ struct gdbarch *gdbarch = get_type_arch (type);
+ int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
+ const gdb_byte *valaddr = value_contents_for_printing (original_value);
+
+ fprintf_filtered (stream, "%s", decorations->complex_prefix);
+ if (options->format)
+ val_print_scalar_formatted (TYPE_TARGET_TYPE (type),
+ embedded_offset, original_value, options, 0,
+ stream);
+ else
+ print_floating (valaddr + embedded_offset * unit_size,
+ TYPE_TARGET_TYPE (type), stream);
+ fprintf_filtered (stream, "%s", decorations->complex_infix);
+ if (options->format)
+ val_print_scalar_formatted (TYPE_TARGET_TYPE (type),
+ embedded_offset
+ + type_length_units (TYPE_TARGET_TYPE (type)),
+ original_value, options, 0, stream);
+ else
+ print_floating (valaddr + embedded_offset * unit_size
+ + TYPE_LENGTH (TYPE_TARGET_TYPE (type)),
+ TYPE_TARGET_TYPE (type), stream);
+ fprintf_filtered (stream, "%s", decorations->complex_suffix);
+}
+
+/* A generic val_print that is suitable for use by language
+ implementations of the la_val_print method. This function can
+ handle most type codes, though not all, notably exception
+ TYPE_CODE_UNION and TYPE_CODE_STRUCT, which must be implemented by
+ the caller.
+
+ Most arguments are as to val_print.
+
+ The additional DECORATIONS argument can be used to customize the
+ output in some small, language-specific ways. */
+
+void
+generic_val_print (struct type *type,
+ int embedded_offset, CORE_ADDR address,
+ struct ui_file *stream, int recurse,
+ struct value *original_value,
+ const struct value_print_options *options,
+ const struct generic_val_print_decorations *decorations)
+{
+ struct type *unresolved_type = type;
+
+ type = check_typedef (type);
+ switch (TYPE_CODE (type))
+ {
+ case TYPE_CODE_ARRAY:
+ generic_val_print_array (type, embedded_offset, address, stream,
+ recurse, original_value, options, decorations);
+ break;
+
+ case TYPE_CODE_MEMBERPTR:
+ generic_val_print_memberptr (type, embedded_offset, stream,
+ original_value, options);
+ break;
+
+ case TYPE_CODE_PTR:
+ generic_val_print_ptr (type, embedded_offset, stream,
+ original_value, options);
+ break;
+
+ case TYPE_CODE_REF:
+ case TYPE_CODE_RVALUE_REF:
+ generic_val_print_ref (type, embedded_offset, stream, recurse,
+ original_value, options);
+ break;
+
+ case TYPE_CODE_ENUM:
+ generic_val_print_enum (type, embedded_offset, stream,
+ original_value, options);
+ break;
+
+ case TYPE_CODE_FLAGS:
+ generic_val_print_flags (type, embedded_offset, stream,
+ original_value, options);
+ break;
+
+ case TYPE_CODE_FUNC:
+ case TYPE_CODE_METHOD:
+ generic_val_print_func (type, embedded_offset, address, stream,
+ original_value, options);