diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2015-07-27 14:11:26 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2015-07-27 14:11:26 -0400 |
| commit | 0c87c0bfdfe19d5e2b8938d1db42c43e7b19e53f (patch) | |
| tree | 82afc2a41f5bc1d517c719520b079f848c7a6447 /gdb | |
| parent | 9550ae5e548dd63599ffadedfe8d1768bfc94072 (diff) | |
| download | gdb-0c87c0bfdfe19d5e2b8938d1db42c43e7b19e53f.zip gdb-0c87c0bfdfe19d5e2b8938d1db42c43e7b19e53f.tar.gz gdb-0c87c0bfdfe19d5e2b8938d1db42c43e7b19e53f.tar.bz2 | |
Factor out complex printing code from generic_val_print
gdb/ChangeLog:
* valprint.c (generic_val_print): Factor out complex
printing code to ...
(generic_val_print_complex): ... this new function.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/valprint.c | 56 |
2 files changed, 39 insertions, 23 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index af0c32f..f0338a2 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 complex + printing code to ... + (generic_val_print_complex): ... this new function. + +2015-07-27 Simon Marchi <simon.marchi@ericsson.com> + * valprint.c (generic_val_print): Factor out decfloat printing code to ... (generic_val_print_decfloat): ... this new function. diff --git a/gdb/valprint.c b/gdb/valprint.c index 63e5046..8893830 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -741,6 +741,37 @@ generic_val_print_decfloat (struct type *type, const gdb_byte *valaddr, print_decimal_floating (valaddr + embedded_offset, type, stream); } +/* generic_val_print helper for TYPE_CODE_COMPLEX. */ + +static void +generic_val_print_complex (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, + const struct generic_val_print_decorations + *decorations) +{ + fprintf_filtered (stream, "%s", decorations->complex_prefix); + if (options->format) + val_print_scalar_formatted (TYPE_TARGET_TYPE (type), valaddr, + embedded_offset, original_value, options, 0, + stream); + else + print_floating (valaddr + embedded_offset, TYPE_TARGET_TYPE (type), + stream); + fprintf_filtered (stream, "%s", decorations->complex_infix); + if (options->format) + val_print_scalar_formatted (TYPE_TARGET_TYPE (type), valaddr, + embedded_offset + + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), + original_value, options, 0, stream); + else + print_floating (valaddr + embedded_offset + + 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 @@ -854,29 +885,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_COMPLEX: - fprintf_filtered (stream, "%s", decorations->complex_prefix); - if (options->format) - val_print_scalar_formatted (TYPE_TARGET_TYPE (type), - valaddr, embedded_offset, - original_value, options, 0, stream); - else - print_floating (valaddr + embedded_offset, - TYPE_TARGET_TYPE (type), - stream); - fprintf_filtered (stream, "%s", decorations->complex_infix); - if (options->format) - val_print_scalar_formatted (TYPE_TARGET_TYPE (type), - valaddr, - embedded_offset - + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), - original_value, - options, 0, stream); - else - print_floating (valaddr + embedded_offset - + TYPE_LENGTH (TYPE_TARGET_TYPE (type)), - TYPE_TARGET_TYPE (type), - stream); - fprintf_filtered (stream, "%s", decorations->complex_suffix); + generic_val_print_complex (type, valaddr, embedded_offset, stream, + original_value, options, decorations); break; case TYPE_CODE_UNION: |