From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15727 invoked by alias); 15 Jul 2015 16:47:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 15628 invoked by uid 89); 15 Jul 2015 16:47:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 15 Jul 2015 16:47:50 +0000 Received: from EUSAAHC003.ericsson.se (Unknown_Domain [147.117.188.81]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id BC.19.12958.72336A55; Wed, 15 Jul 2015 12:17:11 +0200 (CEST) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.81) with Microsoft SMTP Server (TLS) id 14.3.210.2; Wed, 15 Jul 2015 12:47:47 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 02/14] Factor out array printing code from generic_val_print Date: Wed, 15 Jul 2015 16:48:00 -0000 Message-ID: <1436978863-15125-3-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1436978863-15125-1-git-send-email-simon.marchi@ericsson.com> References: <1436978863-15125-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2015-07/txt/msg00445.txt.bz2 From: Simon Marchi gdb/ChangeLog: * valprint.c (generic_val_print): Factor out array printing code to ... (generic_val_print_array): ... this new function. --- gdb/valprint.c | 66 ++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/gdb/valprint.c b/gdb/valprint.c index eee52c5..cf4567b 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -386,6 +386,45 @@ print_unpacked_pointer (struct type *type, struct type *elttype, fputs_filtered (paddress (gdbarch, address), stream); } +/* generic_val_print helper for TYPE_CODE_ARRAY. */ + +static void +generic_val_print_array (struct type *type, const gdb_byte *valaddr, + int embedded_offset, CORE_ADDR address, + struct ui_file *stream, int recurse, + const struct value *original_value, + const struct value_print_options *options) +{ + struct type *unresolved_elttype = TYPE_TARGET_TYPE (type); + struct type *elttype = check_typedef (unresolved_elttype); + + if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0) + { + LONGEST low_bound, high_bound; + + if (!get_array_bounds (type, &low_bound, &high_bound)) + error (_("Could not determine the array high bound")); + + if (options->prettyformat_arrays) + { + print_spaces_filtered (2 + 2 * recurse, stream); + } + + fprintf_filtered (stream, "{"); + val_print_array_elements (type, valaddr, embedded_offset, + address, stream, + recurse, original_value, options, 0); + fprintf_filtered (stream, "}"); + } + else + { + /* Array of unspecified length: treat like pointer to first elt. */ + print_unpacked_pointer (type, elttype, address + embedded_offset, stream, + options); + } + +} + /* 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 @@ -417,31 +456,8 @@ generic_val_print (struct type *type, const gdb_byte *valaddr, switch (TYPE_CODE (type)) { case TYPE_CODE_ARRAY: - unresolved_elttype = TYPE_TARGET_TYPE (type); - elttype = check_typedef (unresolved_elttype); - if (TYPE_LENGTH (type) > 0 && TYPE_LENGTH (unresolved_elttype) > 0) - { - LONGEST low_bound, high_bound; - - if (!get_array_bounds (type, &low_bound, &high_bound)) - error (_("Could not determine the array high bound")); - - if (options->prettyformat_arrays) - { - print_spaces_filtered (2 + 2 * recurse, stream); - } - - fprintf_filtered (stream, "{"); - val_print_array_elements (type, valaddr, embedded_offset, - address, stream, - recurse, original_value, options, 0); - fprintf_filtered (stream, "}"); - break; - } - /* Array of unspecified length: treat like pointer to first - elt. */ - addr = address + embedded_offset; - print_unpacked_pointer (type, elttype, addr, stream, options); + generic_val_print_array (type, valaddr, embedded_offset, address, stream, + recurse, original_value, options); break; case TYPE_CODE_MEMBERPTR: -- 2.1.4