From patchwork Mon Apr 6 17:26:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 6017 Received: (qmail 11908 invoked by alias); 6 Apr 2015 17:26:38 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 11896 invoked by uid 89); 6 Apr 2015 17:26:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 06 Apr 2015 17:26:36 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 564EEBBF49 for ; Mon, 6 Apr 2015 17:26:35 +0000 (UTC) Received: from host1.jankratochvil.net (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t36HQXFp000681; Mon, 6 Apr 2015 13:26:34 -0400 Subject: [PATCH v2 1/9] Code cleanup: Make parts of print_command_1 public From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Phil Muldoon Date: Mon, 06 Apr 2015 19:26:33 +0200 Message-ID: <20150406172633.31404.11844.stgit@host1.jankratochvil.net> In-Reply-To: <20150406172623.31404.58833.stgit@host1.jankratochvil.net> References: <20150406172623.31404.58833.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes 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-03-26 Jan Kratochvil * printcmd.c (print_command_parse_format, print_value): New functions from ... (print_command_1): ... here. Call them. * valprint.h (struct format_data, print_command_parse_format) (print_value): New declarations. --- gdb/printcmd.c | 89 +++++++++++++++++++++++++++++++++----------------------- gdb/valprint.h | 5 +++ 2 files changed, 58 insertions(+), 36 deletions(-) diff --git a/gdb/printcmd.c b/gdb/printcmd.c index deb501a..d89e6df 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -939,6 +939,56 @@ validate_format (struct format_data fmt, const char *cmdname) fmt.format, cmdname); } +/* Parse print command format string and update *EXPP, return it allocated, + caller has to call xfree for it. Return NULL if no format string has been + found. CMDNAME should name the current command. */ + +struct format_data * +print_command_parse_format (const char **expp, const char *cmdname) +{ + struct format_data *fmtp; + const char *exp = *expp; + struct cleanup *cleanup; + + if (exp == NULL || *exp != '/') + return NULL; + exp++; + + fmtp = xmalloc (sizeof (*fmtp)); + cleanup = make_cleanup (xfree, fmtp); + *fmtp = decode_format (&exp, last_format, 0); + validate_format (*fmtp, cmdname); + last_format = fmtp->format; + + discard_cleanups (cleanup); + *expp = exp; + return fmtp; +} + + +/* Print VAL to console, 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 == NULL ? 0 : fmtp->format)); + opts.raw = (fmtp == NULL ? 0 : fmtp->raw); + + print_formatted (val, (fmtp == NULL ? 0 : 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). */ @@ -947,25 +997,9 @@ static void 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; - } + struct format_data *fmtp = print_command_parse_format (&exp, "print"); + struct cleanup *old_chain = make_cleanup (xfree, fmtp); if (exp && *exp) { @@ -978,24 +1012,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, fmtp); do_cleanups (old_chain); } diff --git a/gdb/valprint.h b/gdb/valprint.h index e3d0137..3ab531f 100644 --- a/gdb/valprint.h +++ b/gdb/valprint.h @@ -217,4 +217,9 @@ extern void output_command_const (const char *args, int from_tty); extern int val_print_scalar_type_p (struct type *type); +struct format_data; +extern struct format_data *print_command_parse_format (const char **expp, + const char *cmdname); +extern void print_value (struct value *val, const struct format_data *fmtp); + #endif