From nobody Mon Nov 22 22:37:52 2021 X-Original-To: dev-commits-src-main@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 C139F1892E57; Mon, 22 Nov 2021 22:37:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HyhxG0HqXz4YF0; Mon, 22 Nov 2021 22:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D4472F86; Mon, 22 Nov 2021 22:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AMMbqIm047346; Mon, 22 Nov 2021 22:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMMbqbN047345; Mon, 22 Nov 2021 22:37:52 GMT (envelope-from git) Date: Mon, 22 Nov 2021 22:37:52 GMT Message-Id: <202111222237.1AMMbqbN047345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 79634eb90bff - main - makesyscalls: handle arrays of pointers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79634eb90bff52e9b651bdae6f57082741778d1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=79634eb90bff52e9b651bdae6f57082741778d1b commit 79634eb90bff52e9b651bdae6f57082741778d1b Author: Brooks Davis AuthorDate: 2021-11-22 22:36:57 +0000 Commit: Brooks Davis CommitDate: 2021-11-22 22:36:57 +0000 makesyscalls: handle arrays of pointers When the config variable abi_intptr_t is not "", transform arrays of pointers to arrays of abi_intptr_t. Reviewed by: kevans --- sys/tools/makesyscalls.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index a4250e072277..a5387463e4e2 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -66,6 +66,7 @@ local config = { abi_u_long = "u_long", abi_long = "long", abi_semid_t = "semid_t", + abi_ptr_array_t = "", ptr_intptr_t_cast = "intptr_t", } @@ -163,6 +164,7 @@ local known_abi_flags = { value = 0x00000008, exprs = { "_Contains[a-z_]*_ptr_", + "[*][*]", }, }, } @@ -420,6 +422,10 @@ local function isptrtype(type) type:find("intptr_t") or type:find(config['abi_intptr_t']) end +local function isptrarraytype(type) + return type:find("[*][*]") or type:find("[*][ ]*const[ ]*[*]") +end + local process_syscall_def -- These patterns are processed in order on any line that isn't empty. @@ -626,6 +632,12 @@ local function process_args(args) elseif argtype:find("^long$") then argtype = config["abi_long"] end + if isptrarraytype(argtype) and config["abi_ptr_array_t"] ~= "" then + -- `* const *` -> `**` + argtype = argtype:gsub("[*][ ]*const[ ]*[*]", "**") + -- e.g., `struct aiocb **` -> `uint32_t *` + argtype = argtype:gsub("[^*]*[*]", config["abi_ptr_array_t"] .. " ", 1) + end -- XX TODO: Forward declarations? See: sysstubfwd in CheriBSD if abi_change then