From nobody Thu Jul 9 06:51:44 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gwlxY1zqBz6kgrh for ; Thu, 09 Jul 2026 06:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gwlxY0M3kz3PZQ for ; Thu, 09 Jul 2026 06:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783579905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lCim75KUA1Ole+5k8SZy2wu9Ucae98AXAHC/cGQj0w=; b=SLKESo1eyuelxXDjPmSdX0ZIgNNDHjDQ3XidgpRzf2z0c6Pn6iU5dPSzjWXpRVK8ki3hsy 367EZaCKbLBjavcGairQ29jpnA93Uy9JVGwREWVjAl9/LsTAwrqz41Wy99/eENVgtT9lhd CcENF0m1TnUwXRnAj9Qxit7c3yTntr89syuvcblDE3aT9RDCVqCrYS/WJbfz/YLwQ0sdUp TIpsAB/4BaZtPeeWBUBGISqtBYmUEgsDXv4y8RhCgIWbTkk+AVcinukaU/UYBANR64/a4c 21xWUcoIERE0Fw/0BNPAMv4nqvIkJ+hfZMv1pz7Msf4I3NpK6p5jUZgXUHql0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783579905; a=rsa-sha256; cv=none; b=XakXUW04WYF7fc0JA5KHL3Sb1tQXqT5A6LGluO8s5Uos27Mqjl2JvMWLsMrKa1A8SErjf/ 7KD38v9YIrpaBnYPEG8fnrlTDuA54bwrob/QrkkMLS0tAhvQelgjXWm7jy5MDSh3HafTcF MN8x2xGdHzOEaLkAzhPwstZbgA+7HVVYliZY3C8uwceTqZrt5XNfjpGgerOUsxyxgBfCuS qofLVMoUCYuDlbPQwIyb99Wf9neooA4Zrg/979+B4Kvuo4ZHj8uICCfQti/LTBFMZAlri2 izV9SuNBaDcb2ZNADjpY03olbtkPpQzF7s7VTnvmYyZ+VWejky11nVrPIYxHPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783579905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0lCim75KUA1Ole+5k8SZy2wu9Ucae98AXAHC/cGQj0w=; b=oEqzHxTWfWHnzDx/OB3voZZ+Dn1wrntSb2VM1m3SOXcqDMK9J33pFKJpG53hnoovd04ou4 sS1aDB3WJPSyHBRZYCkZlUNMc9Mw3OhS25jFfLdIs1O9jAxbiT3HMRqrZ9h5rHuJ1t32JT w6f+KayMfYHvUTlIx8JIJun7ICuoC7WHjQNrqbFg2L0ArSr68Nm0jlWwVlIRgJoBVo8Idm 7O2jbzkyPLkxTB1y3fX3ji474TqO34wHysBOH0zPBCkJ2A2hfujqznREwxpz4oaZ2dIYmc RbZPJaxG8PMHm9ojwTDr2Yk/A2jQ5mZQoy0hvO1jIai/ABJbrdNa8D0QVRhhYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwlxX63vxzxrL for ; Thu, 09 Jul 2026 06:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44101 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Jul 2026 06:51:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: ff22dcccc089 - stable/15 - libsysdecode: Teach mktables to handle enums List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff22dcccc08985fa6ce0643bf701b9f031aa8cd5 Auto-Submitted: auto-generated Date: Thu, 09 Jul 2026 06:51:44 +0000 Message-Id: <6a4f4500.44101.3f88a0f9@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=ff22dcccc08985fa6ce0643bf701b9f031aa8cd5 commit ff22dcccc08985fa6ce0643bf701b9f031aa8cd5 Author: Dag-Erling Smørgrav AuthorDate: 2026-07-06 19:41:15 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-07-09 06:51:40 +0000 libsysdecode: Teach mktables to handle enums While here, clean up and simplify the existing code. MFC after: 1 week Reviewed by: glebius, jhb Differential Revision: https://reviews.freebsd.org/D57993 (cherry picked from commit 8b197806dcdff5673dd4f77a97bf46035d14db2a) --- lib/libsysdecode/mktables | 59 +++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index ad5d82dcdb42..2b428fc8063b 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -48,35 +48,54 @@ fi all_headers= # -# Generate a table C #definitions. The including file can define the -# TABLE_NAME(n), TABLE_ENTRY(x), and TABLE_END macros to define what -# the tables map to. +# Generate a table from C preprocessor symbol definitions. The +# including file can define the TABLE_START(n), TABLE_ENTRY(x), and +# TABLE_END macros to define what the tables map to. # gen_table() { - local name grep file excl filter - name=$1 - grep=$2 - file=$3 - excl=$4 + local name=$1 grep=$2 file=$3 excl=$4 - if [ -z "$excl" ]; then - filter="cat" - else - filter="egrep -v" + cat <<_EOF_ +TABLE_START(${name}) +_EOF_ + if [ -e "${include_dir}/${file}" ]; then + all_headers="${all_headers:+${all_headers} }${file}" + sed -nE ${excl:+-e "/${excl}/d"} \ + -e "/^#[[:space:]]*define[[:space:]]+${grep}/p" \ + "${include_dir}/${file}" | \ + sed -Ee 's/.*define[[:space:]]+([^[:space:]]+)\>.*/TABLE_ENTRY(\1)/' fi +cat <<_EOF_ +TABLE_END + +_EOF_ +} + +# +# Generate a table from C enum definitions. The including file can +# define the TABLE_START(n), TABLE_ENTRY(x), and TABLE_END macros to +# define what the tables map to. Works with most enum definitions as +# long as each constant is on a line by itself. +# +gen_table_enum() +{ + local name=$1 grep=$2 file=$3 excl=$4 + cat <<_EOF_ TABLE_START(${name}) _EOF_ if [ -e "${include_dir}/${file}" ]; then all_headers="${all_headers:+${all_headers} }${file}" - egrep "^#[[:space:]]*define[[:space:]]+"${grep}"[[:space:]]*" \ - $include_dir/$file | ${filter} ${excl} | \ - awk '{ for (i = 1; i <= NF; i++) \ - if ($i ~ /define/) \ - break; \ - ++i; \ - printf "TABLE_ENTRY(%s)\n", $i }' + # preprocess the header + ${CPP:-${CC:-cc} -E} "${include_dir}/${file}" | + # filter out directives and apply exclusion + sed -Ee '/^#/d' ${excl:+-e "/${excl}/d"} | + # extract all enum definitions + awk '/^(typedef[[:space:]]*)?enum([[:space:]].*)?\{/, + /^\}([[:space:]].*)?;/' | + # pick out the constants we want + sed -Ene 's/^[[:space:]]*('"${grep}"')\>.*/TABLE_ENTRY(\1)/p' fi cat <<_EOF_ TABLE_END @@ -127,7 +146,7 @@ gen_table "rusage" "RUSAGE_[A-Z]+[[:space:]]+[-0-9]+" "sys/ gen_table "schedpolicy" "SCHED_[A-Z]+[[:space:]]+[0-9]+" "sys/sched.h" gen_table "sendfileflags" "SF_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h" gen_table "shmatflags" "SHM_[A-Z]+[[:space:]]+[0-9]{6}" "sys/shm.h" -gen_table "shutdownhow" "SHUT_[A-Z]+[[:space:]]+SHUT_[A-Z]+" "sys/socket.h" +gen_table_enum "shutdownhow" "SHUT_[A-Z]+" "sys/socket.h" gen_table "sigbuscode" "BUS_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h" gen_table "sigchldcode" "CLD_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h" gen_table "sigfpecode" "FPE_[A-Z]+[[:space:]]+[0-9]+" "sys/signal.h"