From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 15/18] Use generic_emit_char in Ada
Date: Thu, 17 Feb 2022 15:05:43 -0700 [thread overview]
Message-ID: <20220217220547.3874030-16-tom@tromey.com> (raw)
In-Reply-To: <20220217220547.3874030-1-tom@tromey.com>
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 <algorithm>
#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<const gdb_byte> 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<const gdb_byte> 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[<repeats %u times>%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
next prev parent reply other threads:[~2022-02-17 22:06 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 ` [PATCH v2 12/18] Add a default encoding to generic_emit_char and generic_printstr Tom Tromey
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 ` Tom Tromey [this message]
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-16-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).