Re: [PATCH 11/14] Factor out char printing code from generic_val_print

Simon Marchi
2015-07-27T18:17:51Z

On 15-07-23 05:45 PM, Pedro Alves wrote:
> On 07/15/2015 05:47 PM, Simon Marchi wrote:
>> +/* generic_val_print helper for TYPE_CODE_INT. */
>
> TYPE_CODE_CHAR. Otherwise looks good.
>
>> +
>> +static void
>> +generic_val_print_char (struct type *type, struct type *unresolved_type,
>> + const gdb_byte *valaddr, int embedded_offset,
>> + struct ui_file *stream,
>> + const struct value *original_value,
>> + const struct value_print_options *options)
>
>
> Thanks,
> Pedro Alves

Here is what I pushed:

From 385f5affc00e88ad6ff0f8287bb3c1c43d59351c 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 char printing code from generic_val_print

gdb/ChangeLog:

* valprint.c (generic_val_print): Factor out char
printing code to ...
(generic_val_print_char): ... this new function.
---
gdb/ChangeLog | 6 ++++++
gdb/valprint.c | 54 ++++++++++++++++++++++++++++++++++--------------------
2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bf318c3..782a893 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 char
+ printing code to ...
+ (generic_val_print_char): ... this new function.
+
+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.
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 887701c..c8f1e0a 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -675,6 +675,38 @@ generic_val_print_int (struct type *type, const gdb_byte *valaddr,
val_print_type_code_int (type, valaddr + embedded_offset, stream);
}

+/* generic_val_print helper for TYPE_CODE_CHAR. */
+
+static void
+generic_val_print_char (struct type *type, struct type *unresolved_type,
+ const gdb_byte *valaddr, int embedded_offset,
+ struct ui_file *stream,
+ const struct value *original_value,
+ const struct value_print_options *options)
+{
+ LONGEST val;
+
+ 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 = unpack_long (type, valaddr + embedded_offset);
+ if (TYPE_UNSIGNED (type))
+ fprintf_filtered (stream, "%u", (unsigned int) val);
+ else
+ fprintf_filtered (stream, "%d", (int) val);
+ fputs_filtered (" ", stream);
+ LA_PRINT_CHAR (val, unresolved_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
@@ -695,7 +727,6 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
const struct generic_val_print_decorations *decorations)
{
struct type *unresolved_type = type;
- LONGEST val;

type = check_typedef (type);
switch (TYPE_CODE (type))
@@ -758,25 +789,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
break;

case TYPE_CODE_CHAR:
- 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 = unpack_long (type, valaddr + embedded_offset);
- if (TYPE_UNSIGNED (type))
- fprintf_filtered (stream, "%u", (unsigned int) val);
- else
- fprintf_filtered (stream, "%d", (int) val);
- fputs_filtered (" ", stream);
- LA_PRINT_CHAR (val, unresolved_type, stream);
- }
+ generic_val_print_char (type, unresolved_type, valaddr, embedded_offset,
+ stream, original_value, options);
break;

case TYPE_CODE_FLT:
--
2.1.4