From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id fPtqFbfXw2ml2zgAWB0awg (envelope-from ) for ; Wed, 25 Mar 2026 08:40:23 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=DYh8d1Vx; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=nuWX/+rF; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=DYh8d1Vx; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=nuWX/+rF; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 427D41E04F; Wed, 25 Mar 2026 08:40:23 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id C9D211E04F for ; Wed, 25 Mar 2026 08:40:21 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 1F8D64B920DD for ; Wed, 25 Mar 2026 12:40:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F8D64B920DD Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=DYh8d1Vx; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=nuWX/+rF; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=DYh8d1Vx; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=nuWX/+rF Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 32B1C4BAD150 for ; Wed, 25 Mar 2026 12:39:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 32B1C4BAD150 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 32B1C4BAD150 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774442388; cv=none; b=rzQYItPCQnIQ5tasBGFXcJeenhUdUNUI7bMmXEt5510WRzY/+5LhoeiORT+T14E1C40ksgv0O1sRYX35nehCX70JfDnsMg9OsaB0acnI69NYq1HHBoGE6p5EAN5V8MY1DSHvSlCntQMN9Ndo6iZVGVvWhxtv+eT0nWs1zQHxbGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1774442388; c=relaxed/simple; bh=/q17xHwhG0M4Uodx+cuxV0c5VrKXUrO+eRpDZymwHwc=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=ZPW10Ln8SIlm9dM3le0JiyroK3sSXvfeb/7ahszrbIi7NBP8x22SRef1BEL0TgIb4i1dqn94LtUwIgQsaB30XPiGJJjKf/3Wz4gKEOVcNuXgRjSA2+inYDAcxdgCEEUz38mK35FSvDVW8ZkGz5y47Spd5p+P/GxPG8+yEr18wSc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32B1C4BAD150 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 18F144D3A7 for ; Wed, 25 Mar 2026 12:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774442387; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8IAtnHFi7+9AjC3fjf9PfwYUpaCx3iKkXF5+cn1HufY=; b=DYh8d1Vx1FxZCt2TofFcvjTilBBCBvyIlCubtkV+P01Ud0fBjAlohi4vuyjM/Uz6hgYHnO Hecm1tsvDM4vOU7Qw9SViX6Xk4e/tg2Ns9jVigocdt5myVOci3vCLq/m4P/R0UhYvQYIJz 28mC9Ego8DhM1SOtiJ0+psVF+I7aVFA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774442387; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8IAtnHFi7+9AjC3fjf9PfwYUpaCx3iKkXF5+cn1HufY=; b=nuWX/+rFlAd6lKzJn4otPgGHL3x6ihFWYYiFQW38tBq3tqOihk7qdBRtfxky6uEdjJjo9Z qYOpKWbMWjgePZAA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774442387; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8IAtnHFi7+9AjC3fjf9PfwYUpaCx3iKkXF5+cn1HufY=; b=DYh8d1Vx1FxZCt2TofFcvjTilBBCBvyIlCubtkV+P01Ud0fBjAlohi4vuyjM/Uz6hgYHnO Hecm1tsvDM4vOU7Qw9SViX6Xk4e/tg2Ns9jVigocdt5myVOci3vCLq/m4P/R0UhYvQYIJz 28mC9Ego8DhM1SOtiJ0+psVF+I7aVFA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774442387; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8IAtnHFi7+9AjC3fjf9PfwYUpaCx3iKkXF5+cn1HufY=; b=nuWX/+rFlAd6lKzJn4otPgGHL3x6ihFWYYiFQW38tBq3tqOihk7qdBRtfxky6uEdjJjo9Z qYOpKWbMWjgePZAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 05424443DB for ; Wed, 25 Mar 2026 12:39:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id nv8WAJPXw2njVAAAD6G6ig (envelope-from ) for ; Wed, 25 Mar 2026 12:39:47 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb] Add c_ctrl/c_unctrl Date: Wed, 25 Mar 2026 13:39:46 +0100 Message-ID: <20260325123946.4072546-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Readline exports macros CTRL/UNCTRL (compatible with readline macro CTRL_CHAR), such that: - CTRL_CHAR ('C') == 0 - CTRL_CHAR (0x03 /* ^C */) == 1 - CTRL ('C') == 0x03 /* ^C */ - CTRL ('c') == 0x03 /* ^C */ - UNCTRL (0x03 /* ^C */) == 'C' Add c_ctrl/c_unctrl, a variant of CTRL/UNCTRL that's compatible with gnulib's c_iscntrl. While c_iscntrl (0x7f /* ^? */) == 1, CTRL_CHAR (0x7f /* ^? */) == 0. Consequently, the current code using CTRL_CHAR also explicitly handles RUBOUT (which is readline's way of representing ^?). Use c_iscntrl/c_ctrl/c_unctrl instead of CTRL_CHAR/CTRL/UNCTRL, removing redundant RUBOUT handling code. Tested on x86_64-linux. A v1 was submitted here [2]. Changes in v2: - change $subject to use gdb instead of gdbsupport since we're adding the new functions in gdb/utils.c - change parameter and result type of c_unctrl to unsigned char - avoid using readline macros in c_unctrl implementation - rewrite c_unctrl to be compatible with c_iscntrl, making sure to handle ^?. - add c_ctrl - use c_ctrl/c_iscntrl instead of CTRL/CTRL_CHAR. Suggested-By: Tom Tromey [1] [1] https://sourceware.org/pipermail/gdb-patches/2026-March/226136.html [2] https://sourceware.org/pipermail/gdb-patches/2026-March/226171.html --- gdb/completer.c | 16 ++-------- gdb/tui/tui-io.c | 4 +-- gdb/tui/tui.c | 4 +-- gdb/utils.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ gdb/utils.h | 8 +++++ 5 files changed, 95 insertions(+), 17 deletions(-) diff --git a/gdb/completer.c b/gdb/completer.c index 8c70a61cdec..49189ac183f 100644 --- a/gdb/completer.c +++ b/gdb/completer.c @@ -3044,7 +3044,7 @@ gdb_fnwidth (const char *string) width = pos = 0; while (string[pos]) { - if (CTRL_CHAR (string[pos]) || string[pos] == RUBOUT) + if (c_iscntrl (string[pos])) { width += 2; pos++; @@ -3118,20 +3118,10 @@ gdb_fnprint (const char *to_print, int prefix_bytes, s = to_print + prefix_bytes; while (*s) { - if (CTRL_CHAR (*s)) + if (c_iscntrl (*s)) { displayer->putch (displayer, '^'); - displayer->putch (displayer, UNCTRL (*s)); - printed_len += 2; - s++; -#if defined (HANDLE_MULTIBYTE) - memset (&ps, 0, sizeof (mbstate_t)); -#endif - } - else if (*s == RUBOUT) - { - displayer->putch (displayer, '^'); - displayer->putch (displayer, '?'); + displayer->putch (displayer, c_unctrl (*s)); printed_len += 2; s++; #if defined (HANDLE_MULTIBYTE) diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 6b94fa2e8b0..e0892a40c0d 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -631,10 +631,10 @@ tui_redisplay_readline (void) break; c = (unsigned char) rl_line_buffer[in]; - if (CTRL_CHAR (c) || c == RUBOUT) + if (c_iscntrl (c)) { waddch (w, '^'); - waddch (w, CTRL_CHAR (c) ? UNCTRL (c) : '?'); + waddch (w, c_unctrl (c)); } else if (c == '\t') { diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index b6b6fb7acf5..9cf21f390c8 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -364,8 +364,8 @@ tui_ensure_readline_initialized () rl_bind_key_in_map ('a', tui_rl_switch_mode, tui_ctlx_keymap); rl_bind_key_in_map ('A', tui_rl_switch_mode, emacs_ctlx_keymap); rl_bind_key_in_map ('A', tui_rl_switch_mode, tui_ctlx_keymap); - rl_bind_key_in_map (CTRL ('A'), tui_rl_switch_mode, emacs_ctlx_keymap); - rl_bind_key_in_map (CTRL ('A'), tui_rl_switch_mode, tui_ctlx_keymap); + rl_bind_key_in_map (c_ctrl ('A'), tui_rl_switch_mode, emacs_ctlx_keymap); + rl_bind_key_in_map (c_ctrl ('A'), tui_rl_switch_mode, tui_ctlx_keymap); rl_bind_key_in_map ('1', tui_rl_delete_other_windows, emacs_ctlx_keymap); rl_bind_key_in_map ('1', tui_rl_delete_other_windows, tui_ctlx_keymap); rl_bind_key_in_map ('2', tui_rl_change_windows, emacs_ctlx_keymap); diff --git a/gdb/utils.c b/gdb/utils.c index 6908256de4d..b073bb9fdf3 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3733,6 +3733,85 @@ extract_single_filename_arg (const char *args) return filename; } +/* See utils.h. */ + +unsigned char +c_unctrl (unsigned char c) +{ + if (!c_iscntrl (c)) + return c; + + unsigned char res = c; + if (res >= 0x40) + { + /* Map 0x7f (^?) to 0x3f (?). */ + res -= 0x40; + } + else + { + /* Map 0x03 (^C) to 0x43 (C). */ + res += 0x40; + } + + return res; +} + +/* See utils.h. */ + +unsigned char +c_ctrl (unsigned char c) +{ + unsigned char res = c; + if (res < 0x40) + { + /* Map 0x3f (?) to 0x7f (^?). */ + res += 0x40; + } + else + { + res = c_toupper (res); + + /* Map 0x43 (C) to 0x03 (^C). */ + res -= 0x40; + } + + return c_iscntrl (res) ? res : c; +} + +#if GDB_SELF_TEST +static void +test_c_ctrl_unctrl () +{ + /* Basic check. */ + SELF_CHECK (c_ctrl ('C') == 0x03); + SELF_CHECK (c_ctrl ('c') == 0x03); + SELF_CHECK (c_unctrl (0x03) == 'C'); + + /* Function c_iscntrl considers ^? to be a control character, but for some + reason, readline's CTRL_CHAR doesn't, so CTRL/UNCTRL don't handle it. + Check that c_ctrl/c_unctrl do handle it. */ + SELF_CHECK (c_ctrl ('?') == 0x7f); + SELF_CHECK (c_unctrl (0x7f) == '?'); + + /* Consistency check. */ + for (unsigned int i = 0; i < 0x100; i++) + { + unsigned char ch = i; + unsigned char unctrl_ch = c_unctrl (ch); + if (!c_iscntrl (ch)) + { + SELF_CHECK (unctrl_ch == ch); + continue; + } + + SELF_CHECK (!c_iscntrl (unctrl_ch)); + SELF_CHECK (!c_islower (unctrl_ch)); + SELF_CHECK (c_ctrl (unctrl_ch) == ch); + SELF_CHECK (c_ctrl (c_tolower (unctrl_ch)) == ch); + } +} +#endif + #if GDB_SELF_TEST static void test_assign_set_return_if_changed () @@ -3834,5 +3913,6 @@ When set, debugging messages will be marked with seconds and microseconds."), selftests::register_test ("pager", test_pager); selftests::register_test ("assign_set_return_if_changed", test_assign_set_return_if_changed); + selftests::register_test ("c_ctrl_unctrl", test_c_ctrl_unctrl); #endif } diff --git a/gdb/utils.h b/gdb/utils.h index 7cab021e7a9..ecef7d13c20 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -515,4 +515,12 @@ struct deferred_warnings final : public warning_hook_handler_type std::vector m_warnings; }; +/* Re-implementation of readline's CTRL/UNCTRL (compatible with readline's + CTRL_CHAR), designed to be compatible with gnulib's c_iscntrl. + While gnulib's c-ctype.h still uses int for character parameters and + results, we use unsigned char here for maximum clarity. */ + +extern unsigned char c_ctrl (unsigned char c); +extern unsigned char c_unctrl (unsigned char c); + #endif /* GDB_UTILS_H */ base-commit: 4054f280399225fc40ac42423246ac9c5de6f857 -- 2.51.0