From 7784724bb1b8a5732239e27935cd76813b9df35c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 27 Jul 2015 14:11:24 -0400 Subject: [PATCH] Factor out float printing code from generic_val_print gdb/ChangeLog: * valprint.c (generic_val_print): Factor out float printing code to ... (generic_val_print_float): ... this new function. --- gdb/ChangeLog | 6 ++++++ gdb/valprint.c | 30 +++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 782a893090b..135e7897af6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2015-07-27 Simon Marchi + + * valprint.c (generic_val_print): Factor out float + printing code to ... + (generic_val_print_float): ... this new function. + 2015-07-27 Simon Marchi * valprint.c (generic_val_print): Factor out char diff --git a/gdb/valprint.c b/gdb/valprint.c index c8f1e0abab4..0bce438264c 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -707,6 +707,25 @@ generic_val_print_char (struct type *type, struct type *unresolved_type, } } +/* generic_val_print helper for TYPE_CODE_FLT. */ + +static void +generic_val_print_float (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) + { + val_print_scalar_formatted (type, valaddr, embedded_offset, + original_value, options, 0, stream); + } + else + { + print_floating (valaddr + embedded_offset, type, 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 @@ -794,15 +813,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, break; case TYPE_CODE_FLT: - if (options->format) - { - val_print_scalar_formatted (type, valaddr, embedded_offset, - original_value, options, 0, stream); - } - else - { - print_floating (valaddr + embedded_offset, type, stream); - } + generic_val_print_float (type, valaddr, embedded_offset, stream, + original_value, options); break; case TYPE_CODE_DECFLOAT: -- 2.30.2