diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-05-16 14:26:06 +0200 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-05-16 14:26:06 +0200 |
commit | 1c88ceb1bedc81dbfd1d076e4a49bbf533b4e238 (patch) | |
tree | 536661170661d5de5ca7a65457d1be3aaa8dd6e1 /gdb/printcmd.c | |
parent | 0b738f2744178ad33eeb60bcd9bdfb77adb5605b (diff) |
Code cleanup: Make parts of print_command_1 public
The later 'compile print' command should share its behavior with the existing
'print' command. Make the needed existing parts of print_command_1 public.
gdb/ChangeLog
2015-05-16 Jan Kratochvil <jan.kratochvil@redhat.com>
* printcmd.c (struct format_data): Move it to valprint.h.
(print_command_parse_format, print_value): New functions from ...
(print_command_1): ... here. Call them.
* valprint.h (struct format_data): Move it here from printcmd.c.
(print_command_parse_format, print_value): New declarations.
Diffstat (limited to 'gdb/printcmd.c')
-rw-r--r-- | gdb/printcmd.c | 97 |
1 files changed, 53 insertions, 44 deletions
diff --git a/gdb/printcmd.c b/gdb/printcmd.c index deb501ae7c..0ae402fc0a 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -52,17 +52,6 @@ #include "tui/tui.h" /* For tui_active et al. */ #endif -struct format_data - { - int count; - char format; - char size; - - /* True if the value should be printed raw -- that is, bypassing - python-based formatters. */ - unsigned char raw; - }; - /* Last specified output format. */ static char last_format = 0; @@ -939,6 +928,57 @@ validate_format (struct format_data fmt, const char *cmdname) fmt.format, cmdname); } +/* Parse print command format string into *FMTP and update *EXPP. + CMDNAME should name the current command. */ + +void +print_command_parse_format (const char **expp, const char *cmdname, + struct format_data *fmtp) +{ + const char *exp = *expp; + + if (exp && *exp == '/') + { + exp++; + *fmtp = decode_format (&exp, last_format, 0); + validate_format (*fmtp, cmdname); + last_format = fmtp->format; + } + else + { + fmtp->count = 1; + fmtp->format = 0; + fmtp->size = 0; + fmtp->raw = 0; + } + + *expp = exp; +} + +/* Print VAL to console according to *FMTP, including recording it to + the history. */ + +void +print_value (struct value *val, const struct format_data *fmtp) +{ + struct value_print_options opts; + int histindex = record_latest_value (val); + + annotate_value_history_begin (histindex, value_type (val)); + + printf_filtered ("$%d = ", histindex); + + annotate_value_history_value (); + + get_formatted_print_options (&opts, fmtp->format); + opts.raw = fmtp->raw; + + print_formatted (val, fmtp->size, &opts, gdb_stdout); + printf_filtered ("\n"); + + annotate_value_history_end (); +} + /* Evaluate string EXP as an expression in the current language and print the resulting value. EXP may contain a format specifier as the first argument ("/x myvar" for example, to print myvar in hex). */ @@ -948,24 +988,10 @@ print_command_1 (const char *exp, int voidprint) { struct expression *expr; struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); - char format = 0; struct value *val; struct format_data fmt; - if (exp && *exp == '/') - { - exp++; - fmt = decode_format (&exp, last_format, 0); - validate_format (fmt, "print"); - last_format = format = fmt.format; - } - else - { - fmt.count = 1; - fmt.format = 0; - fmt.size = 0; - fmt.raw = 0; - } + print_command_parse_format (&exp, "print", &fmt); if (exp && *exp) { @@ -978,24 +1004,7 @@ print_command_1 (const char *exp, int voidprint) if (voidprint || (val && value_type (val) && TYPE_CODE (value_type (val)) != TYPE_CODE_VOID)) - { - struct value_print_options opts; - int histindex = record_latest_value (val); - - annotate_value_history_begin (histindex, value_type (val)); - - printf_filtered ("$%d = ", histindex); - - annotate_value_history_value (); - - get_formatted_print_options (&opts, format); - opts.raw = fmt.raw; - - print_formatted (val, fmt.size, &opts, gdb_stdout); - printf_filtered ("\n"); - - annotate_value_history_end (); - } + print_value (val, &fmt); do_cleanups (old_chain); } |