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

Factor out pointer printing code from generic_val_print

Browse source 
gdb/ChangeLog:

	* valprint.c (generic_val_print): Factor out pointer
	printing code to ...
	(generic_val_print_ptr): ... this new function.
This commit is contained in:
Simon Marchi 2015-07-27 14:11:19 -04:00
parent 557dbe8a5e
commit 81eb921ae1
2 changed files with 32 additions and 12 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 pointer
printing code to ...
(generic_val_print_ptr): ... 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 array * valprint.c (generic_val_print): Factor out array

38
gdb/valprint.c
View file

@ -425,6 +425,29 @@ generic_val_print_array (struct type *type, const gdb_byte *valaddr,
} }
/* generic_val_print helper for TYPE_CODE_PTR. */
static void
generic_val_print_ptr (struct type *type, const gdb_byte *valaddr,
int embedded_offset, struct ui_file *stream,
const struct value *original_value,
const struct value_print_options *options)
{
if (options->format && options->format != 's')
{
val_print_scalar_formatted (type, valaddr, embedded_offset,
original_value, options, 0, stream);
}
else
{
struct type *unresolved_elttype = TYPE_TARGET_TYPE(type);
struct type *elttype = check_typedef (unresolved_elttype);
CORE_ADDR addr = unpack_pointer (type, valaddr + embedded_offset);
print_unpacked_pointer (type, elttype, addr, stream, options);
}
}
/* 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
@ -447,10 +470,9 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
struct gdbarch *gdbarch = get_type_arch (type); struct gdbarch *gdbarch = get_type_arch (type);
unsigned int i = 0; /* Number of characters printed. */ unsigned int i = 0; /* Number of characters printed. */
unsigned len; unsigned len;
struct type *elttype, *unresolved_elttype; struct type *elttype;
struct type *unresolved_type = type; struct type *unresolved_type = type;
LONGEST val; LONGEST val;
CORE_ADDR addr;
type = check_typedef (type); type = check_typedef (type);
switch (TYPE_CODE (type)) switch (TYPE_CODE (type))
@ -466,16 +488,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
break; break;
case TYPE_CODE_PTR: case TYPE_CODE_PTR:
if (options->format && options->format != 's') generic_val_print_ptr (type, valaddr, embedded_offset, stream,
{ original_value, options);
val_print_scalar_formatted (type, valaddr, embedded_offset,
original_value, options, 0, stream);
break;
}
unresolved_elttype = TYPE_TARGET_TYPE (type);
elttype = check_typedef (unresolved_elttype);
addr = unpack_pointer (type, valaddr + embedded_offset);
print_unpacked_pointer (type, elttype, addr, stream, options);
break; break;
case TYPE_CODE_REF: case TYPE_CODE_REF: