Re: [PATCH 12/14] Factor out float printing code from generic_val_print

Simon Marchi
2015-07-27T18:18:29Z

On 15-07-23 05:46 PM, Pedro Alves wrote:
> On 07/15/2015 05:47 PM, Simon Marchi wrote:
>> +/* 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);
>> + }
>
> Wrong indentation, it seem. Otherwise OK.
>
>> +}
>
>
> Thanks,
> Pedro Alves

Here is what I pushed:

From 7784724bb1b8a5732239e27935cd76813b9df35c Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
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 782a893..135e789 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 float
+ printing code to ...
+ (generic_val_print_float): ... this new function.
+
+2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
+
* valprint.c (generic_val_print): Factor out char
printing code to ...
(generic_val_print_char): ... this new function.
diff --git a/gdb/valprint.c b/gdb/valprint.c
index c8f1e0a..0bce438 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.1.4