From nobody Fri Apr 17 04:45:37 2026 X-Original-To: dev-commits-src-all@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 4fxj4L1xQYz6bLLT for ; Fri, 17 Apr 2026 04:45:38 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxj4K6tNZz45sX for ; Fri, 17 Apr 2026 04:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776401138; 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=7DG4LndzyKhPXTGhfv9VSqOBxrq1p5ZYVJ5t2+CexKQ=; b=NV97Ug/n+gJBshoLc3OExpSBdRS2DWdtNGgAQ453ay/aD1hU0PdiaPiIzpmIDvWdCgtf1a a6wcbY3G0NQQM3SLhdaHHp6ifRde9a/skD3VaWvnJGbkuaRBwXsj8rxW2bFmwPHkAxB9MK UODyjk6gGnAm6zjQo06z2eY65IU4JhpZN0R+H8TaqF1uLGDOeDGK2Gt4rbCjBebrC0FjPf k9s5p94W+HR+wKwGsergrBSHk0TNWWDXgfzr2LrMRSDJkth/5LspZ+oLVB+fCZJDWqSv1B 9hy38nhQo9cM6HLO09ipRl7eFzG+Hbyqyrfnh9lEK8WtM/zv8VShKcDrcQ5Ivg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776401138; a=rsa-sha256; cv=none; b=wmJwvGo8ntsN6cnUftYqPh8/yw8Q/TphZi1xUfVsxo40xsGfZIvSLcfGfTOfnKmTpMKHLc x1bx3khS51VwCHO3eATip7Cxzo7Wj43IxUTf/qp7OKLujOdEXthXGien0FCSCy/bAciyjW g35Iy5Mqp6gWBv11cxQR/67EuvFcSGH7fPkq9VKmiC8puQKgyq2+o6OBiD2xJaa/x9+gx2 lXrhQtc8nUcQuiQrRCx9M6oPyKekimxOOm2bZG/LQpxAIV4FdQUTJTLA5wnLLiMsV5qisV MBWQoDYnRbkBCaEQSomWp7aVwmEbfbPElJPRW0isLF0bbahXGsqeV4megXfh4g== 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=1776401138; 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=7DG4LndzyKhPXTGhfv9VSqOBxrq1p5ZYVJ5t2+CexKQ=; b=JMlERIQzWZM/+IYFeXlei36ViocWRmrbnDmhqwpAf4NfWZdO5O6PjQlRaQVVkG3TJQl/u2 Li6XXXPbkouDau2/uprbFDI0anZAJG9mVG423afl64NbJT7M8kXQqGGm+8wqGHcNzFQYms f0b3SCDSLt2rIRMg6UUn1CjebdWMLaWT2N1Lm4Ft+szHQgQsSfsLW8UmJXQDbI/0hZjj98 4GoGydDPRTS27yDCpVErO+5EzBrK9GnVqcnnBVZCWQTwKLIs0DvIObfdkK/aAfFTS5I5s7 j04+SqeWSDMSinPV9v3MPRGM69/1RnAnYZyr0gD/9MNzjypdUpPqi9Gq8HN9lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxj4K5rvJzfbH for ; Fri, 17 Apr 2026 04:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 329fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Apr 2026 04:45:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2a1745da389b - main - syscalls: Preserve the attributes of the args List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a1745da389bd3bb9fd32c25cf221fa32866debd Auto-Submitted: auto-generated Date: Fri, 17 Apr 2026 04:45:37 +0000 Message-Id: <69e1baf1.329fc.6fa77803@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a1745da389bd3bb9fd32c25cf221fa32866debd commit 2a1745da389bd3bb9fd32c25cf221fa32866debd Author: Warner Losh AuthorDate: 2026-04-17 04:42:01 +0000 Commit: Warner Losh CommitDate: 2026-04-17 04:44:19 +0000 syscalls: Preserve the attributes of the args Lightly parse and preserve the attributes of the args as attributes. Sponsored by: Netflix Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D56407 --- sys/tools/syscalls/core/scarg.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/sys/tools/syscalls/core/scarg.lua b/sys/tools/syscalls/core/scarg.lua index 7ffbf15b3a80..ac0332ce3a78 100644 --- a/sys/tools/syscalls/core/scarg.lua +++ b/sys/tools/syscalls/core/scarg.lua @@ -29,6 +29,21 @@ local function checkAbiChanges(arg) return false end +-- Extracts the Microsoft(R) SAL annotations from this argument. +local function extractArgAnnotations(arg) + local annotations = {} + for ann in arg:gmatch("_Contains_[^ ]*[_)]") do + table.insert(annotations, ann) + end + for ann in arg:gmatch("_In[^ ]*[_)]") do + table.insert(annotations, ann) + end + for ann in arg:gmatch("_Out[^ ]*[_)]") do + table.insert(annotations, ann) + end + return table.concat(annotations, " ") +end + -- Strips the Microsoft(R) SAL annotations from this argument. local function stripArgAnnotations(arg) arg = arg:gsub("_Contains_[^ ]*[_)] ?", "") @@ -46,6 +61,7 @@ function scarg:init(line) self.arg_abi_change = checkAbiChanges(self.scarg) self.changes_abi = self.arg_abi_change + self.annotation = extractArgAnnotations(self.scarg) self.scarg = stripArgAnnotations(self.scarg) self.name = self.scarg:match("([^* ]+)$") @@ -126,15 +142,18 @@ function scarg:append(tbl) table.insert(tbl, { type = "uint32_t", name = self.name .. "1", + annotation = self.annotation or "", }) table.insert(tbl, { type = "uint32_t", name = self.name .. "2", + annotation = "", }) else table.insert(tbl, { type = self.type, name = self.name, + annotation = self.annotation or "", }) end end