From 79a45b7d67b37d45cdb44d3ee2761a768474dd73 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 28 Oct 2008 17:19:58 +0000 Subject: gdb * varobj.c (value_get_print_value): Include valprint.h. (value_get_print_value): Use get_formatted_print_options. * value.h (struct value_print_options): Declare. (value_print, val_print, common_val_print, val_print_string): Update. * value.c: Include valprint.h. (show_values): Use get_user_print_options. (show_convenience): Likewise. * valprint.h (prettyprint_arrays, prettyprint_structs): Don't declare. (struct value_print_options): New type. (vtblprint, unionprint, addressprint, objectprint, print_max, inspect_it, repeat_count_threshold, output_format, stop_print_at_null): Don't declare. (user_print_options, get_user_print_options, get_raw_print_options, get_formatted_print_options): Declare. (print_array_indexes_p): Don't declare. (maybe_print_array_index, val_print_array_elements): Update. * valprint.c (print_max): Remove. (user_print_options): New global. (get_user_print_options, get_raw_print_options, get_formatted_print_options): New functions. (print_array_indexes, repeat_count_threshold, stop_print_at_null, prettyprint_structs, prettyprint_arrays, unionprint, addressprint): Remove. (val_print): Remove format, deref_ref, pretty arguments; add options. Update. (common_val_print): Likewise. (print_array_indexes_p): Remove. (maybe_print_array_index): Remove format, pretty arguments; add options. Update. (val_print_array_elements): Remove format, deref_ref, pretty arguments; add options. Update. (val_print_string): Add options argument. Update. (_initialize_valprint): Use user_print_options. (output_format): Remove. (set_output_radix_1): Use user_print_options. * typeprint.c: Include valprint.h. (objectprint): Don't declare. (whatis_exp): Use get_user_print_options. * tui/tui-regs.c: Include valprint.h. (tui_register_format): Use get_formatted_print_options. * tracepoint.c: Include valprint.h. (addressprint): Don't declare. (trace_mention): Use get_user_print_options. (tracepoints_info): Likewise. * stack.c (print_frame_args): Use get_raw_print_options. (print_frame_info): Use get_user_print_options. (print_frame): Likewise. * sh64-tdep.c: Include valprint.h (sh64_do_register): Use get_formatted_print_options. * scm-valprint.c (scm_inferior_print): Remove format, deref_ref, pretty arguments; add options. (scm_scmlist_print): Likewise. Update. (scm_scmval_print): Likewise. (scm_val_print): Likewise. (scm_value_print): Remove format, pretty arguments; add options. Update. * scm-lang.h (scm_value_print, scm_val_print, scm_scmval_print): Update. * scm-lang.c (scm_printstr): Add options argument. * python/python-value.c: Include valprint.h. (valpy_str): Use get_user_print_options. * printcmd.c: Include valprint.h. (addressprint): Don't declare. (inspect_it): Remove. (print_formatted): Remove format option; add options. Update. (print_scalar_formatted): Likewise. (print_address_demangle): Use get_user_print_options. (do_examine): Use get_formatted_print_options. (print_command_1): Likewise. (output_command): Use get_formatted_print_options. (do_one_display): Likewise. (print_variable_value): Use get_user_print_options. * p-valprint.c (pascal_val_print): Remove format, deref_ref, pretty arguments; add options. Update. (pascal_value_print): Remove format, pretty arguments; add options. Update. (vtblprint, objectprint): Don't declare. (pascal_static_field_print): Remove. (pascal_object_print_value_fields): Remove format, pretty arguments; add options. Update. (pascal_object_print_static_field): Likewise. (_initialize_pascal_valprint): Use user_print_options. Update. * p-lang.h (pascal_val_print, pascal_value_print, pascal_printstr, pascal_object_print_value_fields): Update. (vtblprint, static_field_print): Don't declare. * p-lang.c (pascal_printstr): Add options argument. Update. * objc-lang.c (objc_printstr): Add options argument. Update. * mt-tdep.c: Include valprint.h. (mt_registers_info): Use get_raw_print_options. * mips-tdep.c: Include valprint.h. (mips_print_fp_register): Use get_formatted_print_options. (mips_print_register): Likewise. * mi/mi-main.c: Include valprint.h. (get_register): Use get_user_print_options. (mi_cmd_data_evaluate_expression): Likewise. (mi_cmd_data_read_memory): Use get_formatted_print_options. * mi/mi-cmd-stack.c: Include valprint.h. (list_args_or_locals): Use get_raw_print_options. * m2-valprint.c (print_function_pointer_address): Add addressprint argument. (m2_print_long_set): Remove format, pretty arguments. (m2_print_unbounded_array): Remove format, deref_ref, pretty arguments; add options. Update. (print_unpacked_pointer): Remove format argument; add options. Now static. Update. (print_variable_at_address): Remove format, deref_ref, pretty arguments; add options. Update. (m2_print_array_contents): Likewise. (m2_val_print): Likewise. * m2-lang.h (m2_val_print): Update. * m2-lang.c (m2_printstr): Add options argument. Update. * language.h (struct value_print_options): Declare. (struct language_defn) : Add options argument. : Remove format, deref_ref, pretty argument; add options. : Remove format, pretty arguments; add options. : Likewise. (LA_VAL_PRINT, LA_VALUE_PRINT, LA_PRINT_STRING, LA_PRINT_ARRAY_INDEX): Update. (default_print_array_index): Update. * language.c (default_print_array_index): Remove format, pretty arguments; add options. Update. (unk_lang_printstr): Add options argument. (unk_lang_val_print): Remove format, deref_ref, pretty arguments; add options. (unk_lang_value_print): Remove format, pretty arguments; add options. * jv-valprint.c (java_value_print): Remove format, pretty arguments; add options. Update. (java_print_value_fields): Likewise. (java_val_print): Remove format, deref_ref, pretty arguments; add options. Update. * jv-lang.h (java_val_print, java_value_print): Declare. * infcmd.c: Include valprint.h. (print_return_value): Use get_raw_print_options. (default_print_registers_info): Use get_user_print_options, get_formatted_print_options. (registers_info): Use get_formatted_print_options. * gdbtypes.h (struct value_print_options): Declare. (print_scalar_formatted): Update. * f-valprint.c (f77_print_array_1): Remove format, deref_ref, pretty arguments; add options. Update. (f77_print_array): Likewise. (f_val_print): Likewise. * f-lang.h (f_val_print): Update. * f-lang.c (f_printstr): Add options argument. Update. (c_value_print): Update declaration. * expprint.c: Include valprint.h. (print_subexp_standard): Use get_raw_print_options, get_user_print_options. * eval.c: Include valprint.h. (objectprint): Don't declare. (evaluate_subexp_standard): Use get_user_print_options. * cp-valprint.c (vtblprint, objectprint, static_field_print): Remove. (cp_print_value_fields): Remove format, pretty arguments; add options. Update. (cp_print_value): Likewise. (cp_print_static_field): Likewise. (_initialize_cp_valprint): Use user_print_options. Update. * c-valprint.c (print_function_pointer_address): Add addressprint argument. (c_val_print): Remove format, deref_ref, pretty arguments; add options. Update. (c_value_print): Add options argument. Update. * c-lang.h (c_val_print, c_value_print, c_printstr): Update. (vtblprint, static_field_print): Don't declare. (cp_print_value_fields): Update. * c-lang.c (c_printstr): Add options argument. Update. * breakpoint.c: Include valprint.h. (addressprint): Don't declare. (watchpoint_value_print): Use get_user_print_options. (print_one_breakpoint_location): Likewise. (breakpoint_1, print_it_catch_fork, print_it_catch_vfork, mention, print_exception_catchpoint): Likewise. * auxv.c (fprint_target_auxv): Don't declare addressprint. Use get_user_print_options. * ada-valprint.c (struct ada_val_print_args): Remove format, deref_ref, and pretty; add options. (print_optional_low_bound): Add options argument. (val_print_packed_array_elements): Remove format and pretty arguments; add options. Update. (printstr): Add options argument. Update. (ada_printstr): Likewise. (ada_val_print): Remove format, deref_ref, pretty arguments; add options argument. Update. (ada_val_print_stub): Update. (ada_val_print_array): Remove format, deref_ref, pretty arguments; add options. Update. (ada_val_print_1): Likewise. (print_variant_part): Likewise. (ada_value_print): Remove format, pretty arguments; add options. Update. (print_record): Likewise. (print_field_values): Likewise. * ada-lang.h (ada_val_print, ada_value_print, ada_printstr): Update. * ada-lang.c (ada_print_array_index): Add options argument; remove format and pretty arguments. (print_one_exception): Use get_user_print_options. gdb/testsuite * gdb.base/exprs.exp (test_expr): Add enum formatting tests. --- gdb/p-valprint.c | 203 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 105 insertions(+), 98 deletions(-) (limited to 'gdb/p-valprint.c') diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index bc4fbe1..65ab8a1 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -44,23 +44,17 @@ /* Print data of type TYPE located at VALADDR (within GDB), which came from the inferior at address ADDRESS, onto stdio stream STREAM according to - FORMAT (a letter or 0 for natural format). The data at VALADDR is in - target byte order. + OPTIONS. The data at VALADDR is in target byte order. If the data are a string pointer, returns the number of string characters - printed. - - If DEREF_REF is nonzero, then dereference references, otherwise just print - them like pointers. - - The PRETTY parameter controls prettyprinting. */ + printed. */ int pascal_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset, CORE_ADDR address, - struct ui_file *stream, int format, int deref_ref, - int recurse, enum val_prettyprint pretty) + struct ui_file *stream, int recurse, + const struct value_print_options *options) { unsigned int i = 0; /* Number of characters printed */ unsigned len; @@ -80,7 +74,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, elttype = check_typedef (TYPE_TARGET_TYPE (type)); eltlen = TYPE_LENGTH (elttype); len = TYPE_LENGTH (type) / eltlen; - if (prettyprint_arrays) + if (options->prettyprint_arrays) { print_spaces_filtered (2 + 2 * recurse, stream); } @@ -89,23 +83,24 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, && ((TYPE_CODE (elttype) == TYPE_CODE_INT) || ((current_language->la_language == language_pascal) && (TYPE_CODE (elttype) == TYPE_CODE_CHAR))) - && (format == 0 || format == 's')) + && (options->format == 0 || options->format == 's')) { /* If requested, look for the first null char and only print elements up to it. */ - if (stop_print_at_null) + if (options->stop_print_at_null) { unsigned int temp_len; /* Look for a NULL char. */ for (temp_len = 0; (valaddr + embedded_offset)[temp_len] - && temp_len < len && temp_len < print_max; + && temp_len < len && temp_len < options->print_max; temp_len++); len = temp_len; } - LA_PRINT_STRING (stream, valaddr + embedded_offset, len, 1, 0); + LA_PRINT_STRING (stream, valaddr + embedded_offset, len, 1, 0, + options); i = len; } else @@ -123,7 +118,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, i = 0; } val_print_array_elements (type, valaddr + embedded_offset, address, stream, - format, deref_ref, recurse, pretty, i); + recurse, options, i); fprintf_filtered (stream, "}"); } break; @@ -133,12 +128,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, goto print_unpacked_pointer; case TYPE_CODE_PTR: - if (format && format != 's') + if (options->format && options->format != 's') { - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + print_scalar_formatted (valaddr + embedded_offset, type, + options, 0, stream); break; } - if (vtblprint && pascal_object_is_vtbl_ptr_type (type)) + if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type)) { /* Print the unmangled name if desired. */ /* Print vtable entry - we only get here if we ARE using @@ -162,7 +158,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, return (0); } - if (addressprint && format != 's') + if (options->addressprint && options->format != 's') { fputs_filtered (paddress (addr), stream); } @@ -172,11 +168,11 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, if (TYPE_LENGTH (elttype) == 1 && (TYPE_CODE (elttype) == TYPE_CODE_INT || TYPE_CODE(elttype) == TYPE_CODE_CHAR) - && (format == 0 || format == 's') + && (options->format == 0 || options->format == 's') && addr != 0) { /* no wide string yet */ - i = val_print_string (addr, -1, 1, stream); + i = val_print_string (addr, -1, 1, stream, options); } /* also for pointers to pascal strings */ /* Note: this is Free Pascal specific: @@ -193,7 +189,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, read_memory (addr + length_pos, buffer, length_size); string_length = extract_unsigned_integer (buffer, length_size); xfree (buffer); - i = val_print_string (addr + string_pos, string_length, char_size, stream); + i = val_print_string (addr + string_pos, string_length, char_size, stream, options); } else if (pascal_object_is_vtbl_member (type)) { @@ -209,7 +205,7 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, fputs_filtered (SYMBOL_PRINT_NAME (msymbol), stream); fputs_filtered (">", stream); } - if (vt_address && vtblprint) + if (vt_address && options->vtblprint) { struct value *vt_val; struct symbol *wsym = (struct symbol *) NULL; @@ -230,9 +226,9 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, wtype = TYPE_TARGET_TYPE (type); } vt_val = value_at (wtype, vt_address); - common_val_print (vt_val, stream, format, deref_ref, - recurse + 1, pretty, current_language); - if (pretty) + common_val_print (vt_val, stream, recurse + 1, options, + current_language); + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -249,18 +245,18 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, case TYPE_CODE_REF: elttype = check_typedef (TYPE_TARGET_TYPE (type)); - if (addressprint) + if (options->addressprint) { fprintf_filtered (stream, "@"); /* Extract the address, assume that it is unsigned. */ fputs_filtered (paddress ( extract_unsigned_integer (valaddr + embedded_offset, gdbarch_ptr_bit (current_gdbarch) / HOST_CHAR_BIT)), stream); - if (deref_ref) + if (options->deref_ref) fputs_filtered (": ", stream); } /* De-reference the reference. */ - if (deref_ref) + if (options->deref_ref) { if (TYPE_CODE (elttype) != TYPE_CODE_UNDEF) { @@ -268,8 +264,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, value_at (TYPE_TARGET_TYPE (type), unpack_pointer (type, valaddr + embedded_offset)); - common_val_print (deref_val, stream, format, deref_ref, - recurse + 1, pretty, current_language); + common_val_print (deref_val, stream, recurse + 1, options, + current_language); } else fputs_filtered ("???", stream); @@ -277,14 +273,14 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_UNION: - if (recurse && !unionprint) + if (recurse && !options->unionprint) { fprintf_filtered (stream, "{...}"); break; } /* Fall through. */ case TYPE_CODE_STRUCT: - if (vtblprint && pascal_object_is_vtbl_ptr_type (type)) + if (options->vtblprint && pascal_object_is_vtbl_ptr_type (type)) { /* Print the unmangled name if desired. */ /* Print vtable entry - we only get here if NOT using @@ -301,18 +297,19 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, &string_pos, &char_size, NULL)) { len = extract_unsigned_integer (valaddr + embedded_offset + length_pos, length_size); - LA_PRINT_STRING (stream, valaddr + embedded_offset + string_pos, len, char_size, 0); + LA_PRINT_STRING (stream, valaddr + embedded_offset + string_pos, len, char_size, 0, options); } else - pascal_object_print_value_fields (type, valaddr + embedded_offset, address, stream, format, - recurse, pretty, NULL, 0); + pascal_object_print_value_fields (type, valaddr + embedded_offset, address, stream, + recurse, options, NULL, 0); } break; case TYPE_CODE_ENUM: - if (format) + if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + print_scalar_formatted (valaddr + embedded_offset, type, + options, 0, stream); break; } len = TYPE_NFIELDS (type); @@ -336,16 +333,18 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_FLAGS: - if (format) - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + if (options->format) + print_scalar_formatted (valaddr + embedded_offset, type, + options, 0, stream); else val_print_type_code_flags (type, valaddr + embedded_offset, stream); break; case TYPE_CODE_FUNC: - if (format) + if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + print_scalar_formatted (valaddr + embedded_offset, type, + options, 0, stream); break; } /* FIXME, we should consider, at least for ANSI C language, eliminating @@ -358,9 +357,14 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_BOOL: - format = format ? format : output_format; - if (format) - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + if (options->format || options->output_format) + { + struct value_print_options opts = *options; + opts.format = (options->format ? options->format + : options->output_format); + print_scalar_formatted (valaddr + embedded_offset, type, + &opts, 0, stream); + } else { val = unpack_long (type, valaddr + embedded_offset); @@ -387,10 +391,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, /* FALLTHROUGH */ case TYPE_CODE_INT: - format = format ? format : output_format; - if (format) + if (options->format || options->output_format) { - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + struct value_print_options opts = *options; + opts.format = (options->format ? options->format + : options->output_format); + print_scalar_formatted (valaddr + embedded_offset, type, + &opts, 0, stream); } else { @@ -399,10 +406,13 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_CHAR: - format = format ? format : output_format; - if (format) + if (options->format || options->output_format) { - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + struct value_print_options opts = *options; + opts.format = (options->format ? options->format + : options->output_format); + print_scalar_formatted (valaddr + embedded_offset, type, + &opts, 0, stream); } else { @@ -417,9 +427,10 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_FLT: - if (format) + if (options->format) { - print_scalar_formatted (valaddr + embedded_offset, type, format, 0, stream); + print_scalar_formatted (valaddr + embedded_offset, type, + options, 0, stream); } else { @@ -517,8 +528,8 @@ pascal_val_print (struct type *type, const gdb_byte *valaddr, } int -pascal_value_print (struct value *val, struct ui_file *stream, int format, - enum val_prettyprint pretty) +pascal_value_print (struct value *val, struct ui_file *stream, + const struct value_print_options *options) { struct type *type = value_type (val); @@ -547,19 +558,10 @@ pascal_value_print (struct value *val, struct ui_file *stream, int format, fprintf_filtered (stream, ") "); } } - return common_val_print (val, stream, format, 1, 0, pretty, - current_language); + return common_val_print (val, stream, 0, options, current_language); } -/****************************************************************************** - Inserted from cp-valprint -******************************************************************************/ - -extern int vtblprint; /* Controls printing of vtbl's */ -extern int objectprint; /* Controls looking up an object's derived type - using what we find in its vtables. */ -static int pascal_static_field_print; /* Controls printing of static fields. */ static void show_pascal_static_field_print (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -572,12 +574,12 @@ static struct obstack dont_print_vb_obstack; static struct obstack dont_print_statmem_obstack; static void pascal_object_print_static_field (struct value *, - struct ui_file *, int, int, - enum val_prettyprint); + struct ui_file *, int, + const struct value_print_options *); static void pascal_object_print_value (struct type *, const gdb_byte *, - CORE_ADDR, struct ui_file *, - int, int, enum val_prettyprint, + CORE_ADDR, struct ui_file *, int, + const struct value_print_options *, struct type **); /* It was changed to this after 2.4.5. */ @@ -624,7 +626,7 @@ pascal_object_is_vtbl_member (struct type *type) c_val_print to print out a structure's fields: pascal_object_print_value_fields and pascal_object_print_value. - TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and PRETTY have the + TYPE, VALADDR, ADDRESS, STREAM, RECURSE, and OPTIONS have the same meanings as in pascal_object_print_value and c_val_print. DONT_PRINT is an array of baseclass types that we @@ -633,8 +635,8 @@ pascal_object_is_vtbl_member (struct type *type) void pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, CORE_ADDR address, struct ui_file *stream, - int format, int recurse, - enum val_prettyprint pretty, + int recurse, + const struct value_print_options *options, struct type **dont_print_vb, int dont_print_statmem) { @@ -651,7 +653,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, duplicates of virtual baseclasses. */ if (n_baseclasses > 0) pascal_object_print_value (type, valaddr, address, stream, - format, recurse + 1, pretty, dont_print_vb); + recurse + 1, options, dont_print_vb); if (!len && n_baseclasses == 1) fprintf_filtered (stream, ""); @@ -671,14 +673,14 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, for (i = n_baseclasses; i < len; i++) { /* If requested, skip printing of static fields. */ - if (!pascal_static_field_print + if (!options->pascal_static_field_print && field_is_static (&TYPE_FIELD (type, i))) continue; if (fields_seen) fprintf_filtered (stream, ", "); else if (n_baseclasses > 0) { - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -689,7 +691,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, } fields_seen = 1; - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 + 2 * recurse, stream); @@ -698,7 +700,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, { wrap_here (n_spaces (2 + 2 * recurse)); } - if (inspect_it) + if (options->inspect_it) { if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_PTR) fputs_filtered ("\"( ptr \"", stream); @@ -742,11 +744,13 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, } else { + struct value_print_options opts = *options; v = value_from_longest (TYPE_FIELD_TYPE (type, i), unpack_field_as_long (type, valaddr, i)); - common_val_print (v, stream, format, 0, recurse + 1, - pretty, current_language); + opts.deref_ref = 0; + common_val_print (v, stream, recurse + 1, &opts, + current_language); } } else @@ -765,11 +769,13 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, if (v == NULL) fputs_filtered ("", stream); else - pascal_object_print_static_field (v, stream, format, - recurse + 1, pretty); + pascal_object_print_static_field (v, stream, recurse + 1, + options); } else { + struct value_print_options opts = *options; + opts.deref_ref = 0; /* val_print (TYPE_FIELD_TYPE (type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / 8, address + TYPE_FIELD_BITPOS (type, i) / 8, 0, @@ -777,7 +783,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, val_print (TYPE_FIELD_TYPE (type, i), valaddr, TYPE_FIELD_BITPOS (type, i) / 8, address + TYPE_FIELD_BITPOS (type, i) / 8, - stream, format, 0, recurse + 1, pretty, + stream, recurse + 1, &opts, current_language); } } @@ -792,7 +798,7 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, dont_print_statmem_obstack = tmp_obstack; } - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -807,8 +813,8 @@ pascal_object_print_value_fields (struct type *type, const gdb_byte *valaddr, static void pascal_object_print_value (struct type *type, const gdb_byte *valaddr, CORE_ADDR address, struct ui_file *stream, - int format, int recurse, - enum val_prettyprint pretty, + int recurse, + const struct value_print_options *options, struct type **dont_print_vb) { struct type **last_dont_print @@ -849,7 +855,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, boffset = baseclass_offset (type, i, valaddr, address); - if (pretty) + if (options->pretty) { fprintf_filtered (stream, "\n"); print_spaces_filtered (2 * recurse, stream); @@ -881,7 +887,7 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, fprintf_filtered (stream, ""); else pascal_object_print_value_fields (baseclass, base_valaddr, address + boffset, - stream, format, recurse, pretty, + stream, recurse, options, (struct type **) obstack_base (&dont_print_vb_obstack), 0); fputs_filtered (", ", stream); @@ -907,15 +913,17 @@ pascal_object_print_value (struct type *type, const gdb_byte *valaddr, static member classes in an obstack and refuse to print them more than once. - VAL contains the value to print, STREAM, RECURSE, and PRETTY + VAL contains the value to print, STREAM, RECURSE, and OPTIONS have the same meanings as in c_val_print. */ static void pascal_object_print_static_field (struct value *val, - struct ui_file *stream, int format, - int recurse, enum val_prettyprint pretty) + struct ui_file *stream, + int recurse, + const struct value_print_options *options) { struct type *type = value_type (val); + struct value_print_options opts; if (TYPE_CODE (type) == TYPE_CODE_STRUCT) { @@ -942,11 +950,13 @@ pascal_object_print_static_field (struct value *val, CHECK_TYPEDEF (type); pascal_object_print_value_fields (type, value_contents (val), VALUE_ADDRESS (val), - stream, format, recurse, pretty, NULL, 1); + stream, recurse, options, NULL, 1); return; } - common_val_print (val, stream, format, 0, recurse, pretty, - current_language); + + opts = *options; + opts.deref_ref = 0; + common_val_print (val, stream, recurse, &opts, current_language); } extern initialize_file_ftype _initialize_pascal_valprint; /* -Wmissing-prototypes */ @@ -955,13 +965,10 @@ void _initialize_pascal_valprint (void) { add_setshow_boolean_cmd ("pascal_static-members", class_support, - &pascal_static_field_print, _("\ + &user_print_options.pascal_static_field_print, _("\ Set printing of pascal static members."), _("\ Show printing of pascal static members."), NULL, NULL, show_pascal_static_field_print, &setprintlist, &showprintlist); - /* Turn on printing of static fields. */ - pascal_static_field_print = 1; - } -- cgit v1.1