darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Factor out function/method printing code from generic_val_print

Browse source 
gdb/ChangeLog:

	* valprint.c (generic_val_print): Factor out function/method
	printing code to ...
	(generic_val_print_func): ... this new function.
This commit is contained in:
Simon Marchi 2015-07-27 14:11:22 -04:00
parent d93880bd1c
commit 4a8c372f1f
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
* valprint.c (generic_val_print): Factor out function/method
printing code to ...
(generic_val_print_func): ... this new function.
2015-07-27 Simon Marchi <simon.marchi@ericsson.com> 2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
* valprint.c (generic_val_print): Factor out flags * valprint.c (generic_val_print): Factor out flags

46
gdb/valprint.c
View file

@ -594,6 +594,35 @@ generic_val_print_flags (struct type *type, const gdb_byte *valaddr,
val_print_type_code_flags (type, valaddr + embedded_offset, stream); val_print_type_code_flags (type, valaddr + embedded_offset, stream);
} }
/* generic_val_print helper for TYPE_CODE_FUNC and TYPE_CODE_METHOD. */
static void
generic_val_print_func (struct type *type, const gdb_byte *valaddr,
int embedded_offset, CORE_ADDR address,
struct ui_file *stream,
const struct value *original_value,
const struct value_print_options *options)
{
struct gdbarch *gdbarch = get_type_arch (type);
if (options->format)
{
val_print_scalar_formatted (type, valaddr, embedded_offset,
original_value, options, 0, stream);
}
else
{
/* FIXME, we should consider, at least for ANSI C language,
eliminating the distinction made between FUNCs and POINTERs
to FUNCs. */
fprintf_filtered (stream, "{");
type_print (type, "", stream, -1);
fprintf_filtered (stream, "} ");
/* Try to print what function it points to, and its address. */
print_address_demangle (options, gdbarch, address, stream, demangle);
}
}
/* A generic val_print that is suitable for use by language /* A generic val_print that is suitable for use by language
implementations of the la_val_print method. This function can implementations of the la_val_print method. This function can
handle most type codes, though not all, notably exception handle most type codes, though not all, notably exception
@ -613,7 +642,6 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
const struct value_print_options *options, const struct value_print_options *options,
const struct generic_val_print_decorations *decorations) const struct generic_val_print_decorations *decorations)
{ {
struct gdbarch *gdbarch = get_type_arch (type);
struct type *unresolved_type = type; struct type *unresolved_type = type;
LONGEST val; LONGEST val;
@ -652,20 +680,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
case TYPE_CODE_FUNC: case TYPE_CODE_FUNC:
case TYPE_CODE_METHOD: case TYPE_CODE_METHOD:
if (options->format) generic_val_print_func (type, valaddr, embedded_offset, address, stream,
{ original_value, options);
val_print_scalar_formatted (type, valaddr, embedded_offset,
original_value, options, 0, stream);
break;
}
/* FIXME, we should consider, at least for ANSI C language,
eliminating the distinction made between FUNCs and POINTERs
to FUNCs. */
fprintf_filtered (stream, "{");
type_print (type, "", stream, -1);
fprintf_filtered (stream, "} ");
/* Try to print what function it points to, and its address. */
print_address_demangle (options, gdbarch, address, stream, demangle);
break; break;
case TYPE_CODE_BOOL: case TYPE_CODE_BOOL: