aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@ericsson.com>2015-07-27 14:11:23 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2015-07-27 14:11:23 -0400
commite5bead4b23122be39e0bf32889fd609df6299e1c (patch)
treea527418ddf6a021428d20ae705ed990c03588275 /gdb
parent4a8c372f1f82d1be24d2575e5979690efd839e08 (diff)
downloadgdb-e5bead4b23122be39e0bf32889fd609df6299e1c.zip
gdb-e5bead4b23122be39e0bf32889fd609df6299e1c.tar.gz
gdb-e5bead4b23122be39e0bf32889fd609df6299e1c.tar.bz2
Factor out bool printing code from generic_val_print
gdb/ChangeLog: * valprint.c (generic_val_print): Factor out bool printing code to ... (generic_val_print_bool): ... this new function.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/valprint.c51
2 files changed, 39 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c5e6fe2..b30f6e6 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 bool
+ printing code to ...
+ (generic_val_print_bool): ... this new function.
+
+2015-07-27 Simon Marchi <simon.marchi@ericsson.com>
+
* valprint.c (generic_val_print): Factor out function/method
printing code to ...
(generic_val_print_func): ... this new function.
diff --git a/gdb/valprint.c b/gdb/valprint.c
index cb1a317..9551e20 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -623,6 +623,37 @@ generic_val_print_func (struct type *type, const gdb_byte *valaddr,
}
}
+/* generic_val_print helper for TYPE_CODE_BOOL. */
+
+static void
+generic_val_print_bool (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)
+{
+ 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 (val == 0)
+ fputs_filtered (decorations->false_name, stream);
+ else if (val == 1)
+ fputs_filtered (decorations->true_name, stream);
+ else
+ print_longest (stream, 'd', 0, val);
+ }
+}
+
/* 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
@@ -685,24 +716,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr,
break;
case TYPE_CODE_BOOL:
- 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 (val == 0)
- fputs_filtered (decorations->false_name, stream);
- else if (val == 1)
- fputs_filtered (decorations->true_name, stream);
- else
- print_longest (stream, 'd', 0, val);
- }
+ generic_val_print_bool (type, valaddr, embedded_offset, stream,
+ original_value, options, decorations);
break;
case TYPE_CODE_RANGE: