From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from qproxy1-pub.mail.unifiedlayer.com (qproxy1-pub.mail.unifiedlayer.com [173.254.64.10]) by sourceware.org (Postfix) with ESMTPS id 297BD385BF92 for ; Thu, 17 Feb 2022 22:06:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 297BD385BF92 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by qproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id 89D158031D71 for ; Thu, 17 Feb 2022 22:06:24 +0000 (UTC) Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id 61853100462B2 for ; Thu, 17 Feb 2022 22:05:54 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KouPnYhYH8lmIKouQnx94O; Thu, 17 Feb 2022 22:05:54 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=HvGzp2fS c=1 sm=1 tr=0 ts=620ec6c2 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=oGFeUVbbRNcA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=qUsEGaXBuV6lJt32JHgA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=RdCqwL65dz30B3nCcvbQf4VjeMb7kFPBDOTr5745rlE=; b=R7HRrSkAKWPq3Iydj3EptERmz+ 8EGkRIhN7DQyrj+hh6/P2TXqxOIp7htT0kfiOqLT9QGxDK46kdq/YiBIoKfDl0fDQ81/Sbg6PiCzT xwZ8Agt7IukKeYWHzoFG6Buf+; Received: from 75-166-146-214.hlrn.qwest.net ([75.166.146.214]:41038 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nKouP-002ABb-Ea; Thu, 17 Feb 2022 15:05:53 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 15/18] Use generic_emit_char in Ada Date: Thu, 17 Feb 2022 15:05:43 -0700 Message-Id: <20220217220547.3874030-16-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220217220547.3874030-1-tom@tromey.com> References: <20220217220547.3874030-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.146.214 X-Source-L: No X-Exim-ID: 1nKouP-002ABb-Ea X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-146-214.hlrn.qwest.net (prentzel.Home) [75.166.146.214]:41038 X-Source-Auth: tom+tromey.com X-Email-Count: 21 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Feb 2022 22:06:29 -0000 This changes the Ada code to use generic_emit_char and generic_printstr. This simplifies gdb somewhat. --- gdb/ada-lang.c | 7 +- gdb/ada-lang.h | 14 ++-- gdb/ada-valprint.c | 159 ++++++++++----------------------------------- 3 files changed, 44 insertions(+), 136 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index e3bd1fa7c17..35474909f20 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -59,6 +59,7 @@ #include "gdbsupport/byte-vector.h" #include #include "ada-exp.h" +#include "charset.h" /* Define whether or not the C operator '/' truncates towards zero for differently signed operands (truncation direction is undefined in C). @@ -13320,7 +13321,7 @@ class ada_language : public language_defn void printchar (int ch, struct type *chtype, struct ui_file *stream) const override { - ada_printchar (ch, chtype, stream); + generic_emit_char (ch, chtype, stream, '\'', nullptr, ada_emit_char); } /* See language.h. */ @@ -13330,8 +13331,8 @@ class ada_language : public language_defn const char *encoding, int force_ellipses, const struct value_print_options *options) const override { - ada_printstr (stream, elttype, string, length, encoding, - force_ellipses, options); + generic_printstr (stream, elttype, string, length, encoding, + force_ellipses, '"', 0, options, ada_emit_char); } /* See language.h. */ diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index a6caf35b826..a593a44daa7 100644 --- a/gdb/ada-lang.h +++ b/gdb/ada-lang.h @@ -28,6 +28,7 @@ struct parser_state; #include "value.h" #include "gdbtypes.h" #include "breakpoint.h" +#include "valprint.h" /* Names of specific files known to be part of the runtime system and that might consider (confusing) debugging information. @@ -172,13 +173,12 @@ extern void ada_value_print (struct value *, struct ui_file *, /* Defined in ada-lang.c */ -extern void ada_emit_char (int, struct type *, struct ui_file *, int, int); - -extern void ada_printchar (int, struct type *, struct ui_file *); - -extern void ada_printstr (struct ui_file *, struct type *, const gdb_byte *, - unsigned int, const char *, int, - const struct value_print_options *); +extern void ada_emit_char (obstack_wide_file *stream, gdb_wint_t w, + gdb::array_view orig, + int width, + enum bfd_endian byte_order, + int quoter, + bool *need_escapep); struct value *ada_convert_actual (struct value *actual, struct type *formal_type0); diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c index a59c392bef4..cf3145fcc40 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -255,29 +255,41 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr, value_free_to_mark (mark); } -/* Print the character C on STREAM as part of the contents of a literal - string whose delimiter is QUOTER. TYPE_LEN is the length in bytes - of the character. */ +/* A callback for generic_emit_char and generic_printstr that escapes + characters Ada-style. */ void -ada_emit_char (int c, struct type *type, struct ui_file *stream, - int quoter, int type_len) +ada_emit_char (obstack_wide_file *stream, gdb_wint_t w, + gdb::array_view orig, + int width, + enum bfd_endian byte_order, + int quoter, + bool *need_escapep) { - /* If this character fits in the normal ASCII range, and is - a printable character, then print the character as if it was - an ASCII character, even if this is a wide character. - The UCHAR_MAX check is necessary because the isascii function - requires that its argument have a value of an unsigned char, - or EOF (EOF is obviously not printable). */ - if (c <= UCHAR_MAX && isascii (c) && isprint (c)) + if (quoter == '"' && w == LCST ('"')) + fprintf_filtered (stream, "\"\""); + else if (gdb_iswprint (w) && !gdb_iswcntrl (w)) + default_emit_wchar (stream, w, orig, width, byte_order, quoter, + need_escapep); + else { - if (c == quoter && c == '"') - fprintf_filtered (stream, "\"\""); - else - fprintf_filtered (stream, "%c", c); + int i; + + for (i = 0; i + width <= orig.size (); i += width) + { + ULONGEST value = extract_unsigned_integer (&orig[i], width, + byte_order); + fprintf_filtered (stream, "[\"%0*lx\"]", width * 2, + (unsigned long) value); + } + + /* If we somehow have extra bytes, print them now. */ + while (i < orig.size ()) + { + fprintf_filtered (stream, "[\"%02x\"]", orig[i] & 0xff); + ++i; + } } - else - fprintf_filtered (stream, "[\"%0*x\"]", type_len * 2, c); } /* Character #I of STRING, given that TYPE_LEN is the size in bytes @@ -348,14 +360,6 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type, fprintf_filtered (stream, "%s", &s[skip_count]); } -void -ada_printchar (int c, struct type *type, struct ui_file *stream) -{ - fputs_filtered ("'", stream); - ada_emit_char (c, type, stream, '\'', TYPE_LENGTH (type)); - fputs_filtered ("'", stream); -} - /* [From print_type_scalar in typeprint.c]. Print VAL on STREAM in a form appropriate for TYPE, if non-NULL. If TYPE is NULL, print VAL like a default signed integer. */ @@ -436,103 +440,6 @@ ada_print_scalar (struct type *type, LONGEST val, struct ui_file *stream) } } -/* Print the character string STRING, printing at most LENGTH characters. - Printing stops early if the number hits print_max; repeat counts - are printed as appropriate. Print ellipses at the end if we - had to stop before printing LENGTH characters, or if FORCE_ELLIPSES. - TYPE_LEN is the length (1 or 2) of the character type. */ - -static void -printstr (struct ui_file *stream, struct type *elttype, const gdb_byte *string, - unsigned int length, int force_ellipses, int type_len, - const struct value_print_options *options) -{ - enum bfd_endian byte_order = type_byte_order (elttype); - unsigned int i; - unsigned int things_printed = 0; - int in_quotes = 0; - int need_comma = 0; - - if (length == 0) - { - fputs_filtered ("\"\"", stream); - return; - } - - for (i = 0; i < length && things_printed < options->print_max; i += 1) - { - /* Position of the character we are examining - to see whether it is repeated. */ - unsigned int rep1; - /* Number of repetitions we have detected so far. */ - unsigned int reps; - - QUIT; - - if (need_comma) - { - fputs_filtered (", ", stream); - need_comma = 0; - } - - rep1 = i + 1; - reps = 1; - while (rep1 < length - && char_at (string, rep1, type_len, byte_order) - == char_at (string, i, type_len, byte_order)) - { - rep1 += 1; - reps += 1; - } - - if (reps > options->repeat_count_threshold) - { - if (in_quotes) - { - fputs_filtered ("\", ", stream); - in_quotes = 0; - } - fputs_filtered ("'", stream); - ada_emit_char (char_at (string, i, type_len, byte_order), - elttype, stream, '\'', type_len); - fputs_filtered ("'", stream); - fprintf_filtered (stream, _(" %p[%p]"), - metadata_style.style ().ptr (), reps, nullptr); - i = rep1 - 1; - things_printed += options->repeat_count_threshold; - need_comma = 1; - } - else - { - if (!in_quotes) - { - fputs_filtered ("\"", stream); - in_quotes = 1; - } - ada_emit_char (char_at (string, i, type_len, byte_order), - elttype, stream, '"', type_len); - things_printed += 1; - } - } - - /* Terminate the quotes if necessary. */ - if (in_quotes) - fputs_filtered ("\"", stream); - - if (force_ellipses || i < length) - fputs_filtered ("...", stream); -} - -void -ada_printstr (struct ui_file *stream, struct type *type, - const gdb_byte *string, unsigned int length, - const char *encoding, int force_ellipses, - const struct value_print_options *options) -{ - printstr (stream, type, string, length, force_ellipses, TYPE_LENGTH (type), - options); -} - static int print_variant_part (struct value *value, int field_num, struct value *outer_value, @@ -707,8 +614,8 @@ ada_val_print_string (struct type *type, const gdb_byte *valaddr, len = temp_len; } - printstr (stream, elttype, valaddr + offset_aligned, len, 0, - eltlen, options); + current_language->printstr (stream, elttype, valaddr + offset_aligned, + len, nullptr, 0, options); } /* Implement Ada value_print'ing for the case where TYPE is a @@ -802,7 +709,7 @@ ada_value_print_num (struct value *val, struct ui_file *stream, int recurse, fputs_filtered (" ", stream); c = unpack_long (type, valaddr); - ada_printchar (c, type, stream); + current_language->printchar (c, type, stream); } } return; -- 2.31.1