From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 12/18] Add a default encoding to generic_emit_char and generic_printstr
Date: Thu, 17 Feb 2022 15:05:40 -0700 [thread overview]
Message-ID: <20220217220547.3874030-13-tom@tromey.com> (raw)
In-Reply-To: <20220217220547.3874030-1-tom@tromey.com>
This adds a default encoding to generic_emit_char and
generic_printstr. The default is pretty basic: use the target charset
for single-byte characters, use the wide charset for wchar_t, and
assume UTF-16/32 for the appropriately-sized other characters.
Languages for which these do not hold can be modified to do something
else if need be.
---
gdb/valprint.c | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gdb/valprint.c b/gdb/valprint.c
index ecb9b3c9871..39c75e82a71 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -2245,6 +2245,37 @@ default_emit_wchar (obstack_wide_file *stream,
}
}
+/* Helper function to get the default encoding, given a type. */
+static const char *
+get_default_encoding (struct type *chtype)
+{
+ const char *encoding;
+ if (TYPE_LENGTH (chtype) == 1)
+ encoding = target_charset (chtype->arch ());
+ else if (streq (chtype->name (), "wchar_t"))
+ encoding = target_wide_charset (chtype->arch ());
+ else if (TYPE_LENGTH (chtype) == 2)
+ {
+ if (type_byte_order (chtype) == BFD_ENDIAN_BIG)
+ encoding = "UTF-16BE";
+ else
+ encoding = "UTF-16LE";
+ }
+ else if (TYPE_LENGTH (chtype) == 4)
+ {
+ if (type_byte_order (chtype) == BFD_ENDIAN_BIG)
+ encoding = "UTF-32BE";
+ else
+ encoding = "UTF-32LE";
+ }
+ else
+ {
+ /* No idea. */
+ encoding = target_charset (chtype->arch ());
+ }
+ return encoding;
+}
+
/* Print the character C on STREAM as part of the contents of a
literal string whose delimiter is QUOTER. ENCODING names the
encoding of C. */
@@ -2254,6 +2285,8 @@ generic_emit_char (int c, struct type *type, struct ui_file *stream,
int quoter, const char *encoding,
emit_char_ftype emitter)
{
+ if (encoding == nullptr)
+ encoding = get_default_encoding (type);
enum bfd_endian byte_order
= type_byte_order (type);
gdb_byte *c_buf;
@@ -2590,6 +2623,8 @@ generic_printstr (struct ui_file *stream, struct type *type,
const struct value_print_options *options,
emit_char_ftype emitter)
{
+ if (encoding == nullptr)
+ encoding = get_default_encoding (type);
enum bfd_endian byte_order = type_byte_order (type);
unsigned int i;
int width = TYPE_LENGTH (type);
--
2.31.1
next prev parent reply other threads:[~2022-02-17 22:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 22:05 [PATCH v2 00/18] Refactor character printing Tom Tromey
2022-02-17 22:05 ` [PATCH v2 01/18] Fix latent quote char bug in generic_printstr Tom Tromey
2022-02-17 22:05 ` [PATCH v2 02/18] Boolify need_escape in generic_emit_char Tom Tromey
2022-02-17 22:05 ` [PATCH v2 03/18] Remove c_emit_char Tom Tromey
2022-02-17 22:05 ` [PATCH v2 04/18] Remove c_printstr Tom Tromey
2022-02-17 22:05 ` [PATCH v2 05/18] Don't use wchar_printable in print_wchar Tom Tromey
2022-02-22 15:36 ` Andrew Burgess
2022-10-10 16:39 ` Tom Tromey
2022-02-17 22:05 ` [PATCH v2 06/18] Fix a latent bug " Tom Tromey
2022-02-17 22:05 ` [PATCH v2 07/18] Remove language_defn::emitchar Tom Tromey
2022-02-17 22:05 ` [PATCH v2 08/18] Add gdb_iswcntrl Tom Tromey
2022-02-17 22:05 ` [PATCH v2 09/18] Include \0 in printable wide characters Tom Tromey
2022-02-23 13:49 ` Andrew Burgess
2022-02-23 22:28 ` Tom Tromey
2022-02-23 23:59 ` Tom Tromey
2022-02-17 22:05 ` [PATCH v2 10/18] Use a ui_file in print_wchar Tom Tromey
2022-02-17 22:05 ` [PATCH v2 11/18] Add an emitter callback to generic_printstr and generic_emit_char Tom Tromey
2022-02-17 22:05 ` Tom Tromey [this message]
2022-02-17 22:05 ` [PATCH v2 13/18] Change generic_emit_char to print the quotes Tom Tromey
2022-02-17 22:05 ` [PATCH v2 14/18] Use generic_emit_char in Rust Tom Tromey
2022-02-17 22:05 ` [PATCH v2 15/18] Use generic_emit_char in Ada Tom Tromey
2022-02-17 22:05 ` [PATCH v2 16/18] Use generic_emit_char in Modula-2 Tom Tromey
2022-02-23 20:17 ` Gaius Mulley
2022-03-16 12:29 ` [PATCH] Additional modula2 tests Gaius Mulley
2022-04-07 14:21 ` Tom Tromey
2022-04-09 23:16 ` Gaius Mulley
2022-04-11 19:45 ` [PATCH v1] Array access in Modula-2 Gaius Mulley
2022-02-17 22:05 ` [PATCH v2 17/18] Use generic_emit_char in Pascal Tom Tromey
2022-02-17 22:05 ` [PATCH v2 18/18] Simplify Fortran string printing Tom Tromey
2022-10-10 17:37 ` [PATCH v2 00/18] Refactor character printing Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220217220547.3874030-13-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).