From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id EnlpBYCXkWpzuQsAWB0awg (envelope-from ) for ; Fri, 28 Aug 2026 10:13:20 -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=PZBYFev+; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XmH1ph7r; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=izxdkxAP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Azi57wOK; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id D278A1E166; Fri, 28 Aug 2026 10:13:19 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 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 778B11E033 for ; Fri, 28 Aug 2026 10:13:18 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3A33E4BA23C0 for ; Fri, 28 Aug 2026 14:13:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3A33E4BA23C0 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=PZBYFev+; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XmH1ph7r; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=izxdkxAP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Azi57wOK 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 7E7634BA2E05 for ; Fri, 28 Aug 2026 14:12:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7E7634BA2E05 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 7E7634BA2E05 Authentication-Results: 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=1787926371; cv=none; b=M1ySCFwSOiQR8VAjantIT9OlIww7VmZnkSqYl+HzKMq6EKieFSjLqVt1wG7OFk8fS1lh/Jvau1m2VhrDGJaPsAPAeR4yGZK4WR87IVIOAD28vR2pgSxDWMmU0Yw069Ng+4IGstLjimjfCwlnqINuOJksazifFpb0s1eWK0Vi6Uk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1787926371; c=relaxed/simple; bh=B4wf768Xpuct3kUMOtpELI2a/Vj2zwyL3Br5kgkOmPw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=LivHJiJIrGhUnA1lIaRvmNvqXOLTP+k2/PLre5uc4B4nEdDdpshKkf4eDROPOH2pVWICMWttxXxCGCRk2k81HtzRIDHS1bSyAZThFv0iUY9PSvTU7IUm7qhzem9Oj/T2dszOEIH5dza4A7Sjg2LN7lernqD9uqrn5tvwSWiYbn4= ARC-Authentication-Results: i=1; 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=PZBYFev+; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XmH1ph7r; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=izxdkxAP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Azi57wOK DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E7634BA2E05 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 CA34521A8D for ; Fri, 28 Aug 2026 14:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787926366; 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=qT9gfqxwcmOxuMJYimE54PoWdE+IVhR3Pr2TTOGMXVs=; b=PZBYFev+JZjCt/E6TeeXkJIHEG8mqZOd7hfsz5kvCVsgBOPpdivyZ+Q5ZbmG9NdUsX2et7 sfQRVvnmCTsm3gelpQLxAz/bR+KZXWbbCEdW0RVatVs3vLZG5En9VVQTpgiJwg77Xnsaao EAHpAAyPxXETP3MMGmbHy1iGme6tpAw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787926366; 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=qT9gfqxwcmOxuMJYimE54PoWdE+IVhR3Pr2TTOGMXVs=; b=XmH1ph7rWcKlr1TsiwJOJdoOX426MGg13+OLDumOX3rVrMKoSyPR0VJsOGzCivCmAJq7Z/ NJXcsQUq8EcxwQAw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1787926361; 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=qT9gfqxwcmOxuMJYimE54PoWdE+IVhR3Pr2TTOGMXVs=; b=izxdkxAPC88DGuSe+Bj4SZx2nuVcHI601Zbn2n4QRRIpDWWSoFOAAynCdAYo1m6vsmmVpq gNwBk9Q4pUtlNfuoCgcXuZL7+3W+T8A5coFW0im59Uqp2XndgEglgnfp80KxkQJ6gKum9M wzjNWOSslJXQ2p9VCuf7z4tfhOULz0E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1787926361; 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=qT9gfqxwcmOxuMJYimE54PoWdE+IVhR3Pr2TTOGMXVs=; b=Azi57wOK91GBDbsuXCY7wrYu2TTRy1jlmbX5uK7kcpVqcz55gF4VB6lZm4cC4Kbqb5PCS8 g0GHhewTTA2kWbCw== 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 9B5EF13515 for ; Fri, 28 Aug 2026 14:12:41 +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 o+eBJFmXkWpGHAAAD6G6ig (envelope-from ) for ; Fri, 28 Aug 2026 14:12:41 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb] Use shfmt on regformats/regdat.sh Date: Fri, 28 Aug 2026 16:12:41 +0200 Message-ID: <20260828141241.3921145-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%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.995]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,sourceware.org:url,imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; 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 Run shfmt [1] on gdb/regformats/regdat.sh: ... $ shfmt \ --language-dialect=posix \ --indent=4 \ --func-next-line \ --space-redirects \ --write \ gdb/regformats/regdat.sh ... followed by emacs whitespace-cleanup (because shfmt doesn't know about mixed tab/spaces indentation). Normalizes things like: ... if true then ... to: ... if true; then ... as suggested by Simon [2]. Also: - fixes up inconsistent indentation - makes sure statements are on their own line - removes double empty line - minor whitespace changes: - do_read () -> do_read() - cat < cat << EOF [1] https://github.com/mvdan/sh [2] https://sourceware.org/pipermail/gdb-patches/2026-August/229818.html --- gdb/regformats/regdat.sh | 149 +++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 78 deletions(-) diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh index f93270ba0ca..0df4d07c44b 100755 --- a/gdb/regformats/regdat.sh +++ b/gdb/regformats/regdat.sh @@ -23,17 +23,14 @@ set -u # Format of the input files read="type entry" -do_read () +do_read() { type="" entry="" - while read -r line - do - if test "${line}" = "" - then + while read -r line; do + if test "${line}" = ""; then continue - elif expr "${line}" : "#" > /dev/null - then + elif expr "${line}" : "#" > /dev/null; then continue else @@ -42,21 +39,20 @@ do_read () # Work around this by eliminating ``::'' .... line="$(echo "${line}" | sed -e 's/::/: :/g' -e 's/::/: :/g')" - OFS="${IFS}" ; IFS="[:]" + OFS="${IFS}" + IFS="[:]" # Word-splitting on read variable is required. # shellcheck disable=SC2086 - eval read ${read} <&2 - exit 1 + echo "$0: Could not open $1." 1>&2 + exit 1 fi -copyright () +copyright() { -cat < new-"$3" copyright "$1" echo '#include "regdef.h"' @@ -121,51 +115,50 @@ expedite=x feature=x osabi=unknown exec < "$1" -while do_read -do - if test "${type}" = "name"; then - name="${entry}" - - echo "const_target_desc_up tdesc_${name};" - echo "" - - # This is necessary for -Wmissing-declarations. - echo "void init_registers_${name} (void);" - - echo "void" - echo "init_registers_${name} (void)" - echo "{" - echo " target_desc_up result = allocate_target_description ();" - echo " struct tdesc_feature *feature = tdesc_create_feature (result.get (), \"${name}\");" - continue - elif test "${type}" = "xmltarget"; then - xmltarget="${entry}" - continue - elif test "${type}" = "xmlarch"; then - xmlarch="${entry}" - continue - elif test "${type}" = "xmlosabi"; then - xmlosabi="${entry}" - continue - elif test "${type}" = "expedite"; then - expedite="${entry}" - continue - elif test "${type}" = "feature"; then - feature="${entry}" - continue - elif test "${type}" = "osabi"; then - osabi="${entry}" - continue - elif test "${name}" = x; then - echo "$0: $1 does not specify \`\`name''." 1>&2 - exit 1 - else - echo " tdesc_create_reg (feature, \"${entry}\"," - echo " 0, 0, NULL, ${type}, NULL);" +while do_read; do + if test "${type}" = "name"; then + name="${entry}" + + echo "const_target_desc_up tdesc_${name};" + echo "" + + # This is necessary for -Wmissing-declarations. + echo "void init_registers_${name} (void);" + + echo "void" + echo "init_registers_${name} (void)" + echo "{" + echo " target_desc_up result = allocate_target_description ();" + echo " struct tdesc_feature *feature = tdesc_create_feature (result.get (), \"${name}\");" + continue + elif test "${type}" = "xmltarget"; then + xmltarget="${entry}" + continue + elif test "${type}" = "xmlarch"; then + xmlarch="${entry}" + continue + elif test "${type}" = "xmlosabi"; then + xmlosabi="${entry}" + continue + elif test "${type}" = "expedite"; then + expedite="${entry}" + continue + elif test "${type}" = "feature"; then + feature="${entry}" + continue + elif test "${type}" = "osabi"; then + osabi="${entry}" + continue + elif test "${name}" = x; then + echo "$0: $1 does not specify \`\`name''." 1>&2 + exit 1 + else + echo " tdesc_create_reg (feature, \"${entry}\"," + echo " 0, 0, NULL, ${type}, NULL);" - offset=$((offset + type)) - i=$((i + 1)) - fi + offset=$((offset + type)) + i=$((i + 1)) + fi done echo @@ -173,28 +166,28 @@ echo "static const char *expedite_regs_${name}[] = { \"$(echo "${expedite}" | se echo "#ifndef IN_PROCESS_AGENT" if test "${feature}" != x; then - echo "static const char *xmltarget_${name} = 0;" -elif test "${xmltarget}" = x; then - if test "${xmlarch}" = x && test "${xmlosabi}" = x; then echo "static const char *xmltarget_${name} = 0;" - else - echo "static const char *xmltarget_${name} = \"@\\" - if test "${xmlarch}" != x; then - echo "${xmlarch}\\" - fi - if test "${xmlosabi}" != x; then - echo "${xmlosabi}\\" +elif test "${xmltarget}" = x; then + if test "${xmlarch}" = x && test "${xmlosabi}" = x; then + echo "static const char *xmltarget_${name} = 0;" + else + echo "static const char *xmltarget_${name} = \"@\\" + if test "${xmlarch}" != x; then + echo "${xmlarch}\\" + fi + if test "${xmlosabi}" != x; then + echo "${xmlosabi}\\" + fi + echo "\";" fi - echo "\";" - fi else - echo "static const char *xmltarget_${name} = \"${xmltarget}\";" + echo "static const char *xmltarget_${name} = \"${xmltarget}\";" fi echo osabi_enum=$(grep "${osabi}" "$2" | sed 's/.*(\([^,]\+\),.*/GDB_OSABI_\1/') -cat <xmltarget = xmltarget_${name}; #endif base-commit: 5d09165a3e9c8d32742fc764e98e927950f7b2f5 -- 2.51.0