diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2015-07-27 14:11:23 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2015-07-27 14:11:23 -0400 |
| commit | b21b63420be3857c1d0e2676e1214d63fe38ed3d (patch) | |
| tree | 4af3bd05e29ef15a2044e1e125972f44fee1fed5 | |
| parent | e5bead4b23122be39e0bf32889fd609df6299e1c (diff) | |
| download | gdb-b21b63420be3857c1d0e2676e1214d63fe38ed3d.zip gdb-b21b63420be3857c1d0e2676e1214d63fe38ed3d.tar.gz gdb-b21b63420be3857c1d0e2676e1214d63fe38ed3d.tar.bz2 | |
Factor out int printing code from generic_val_print
gdb/ChangeLog:
* valprint.c (generic_val_print): Factor out integer
printing code to ...
(generic_val_print_int): ... this new function.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/valprint.c | 34 |
2 files changed, 29 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b30f6e6..bf318c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2015-07-27 Simon Marchi <simon.marchi@ericsson.com> + * valprint.c (generic_val_print): Factor out integer + printing code to ... + (generic_val_print_int): ... this new function. + +2015-07-27 Simon Marchi <simon.marchi@ericsson.com> + * valprint.c (generic_val_print): Factor out bool printing code to ... (generic_val_print_bool): ... this new function. diff --git a/gdb/valprint.c b/gdb/valprint.c index 9551e20..887701c 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -654,6 +654,27 @@ generic_val_print_bool (struct type *type, const gdb_byte *valaddr, } } +/* generic_val_print helper for TYPE_CODE_INT. */ + +static void +generic_val_print_int (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->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, &opts, 0, stream); + } + else + val_print_type_code_int (type, valaddr + embedded_offset, stream); +} + /* 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 @@ -732,17 +753,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, /* FALLTHROUGH */ case TYPE_CODE_INT: - 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, &opts, 0, stream); - } - else - val_print_type_code_int (type, valaddr + embedded_offset, stream); + generic_val_print_int (type, valaddr, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_CHAR: |