From nobody Thu Nov 27 14:56:07 2025 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 4dHKHq6HBpz6HMhZ for ; Thu, 27 Nov 2025 14:56:07 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dHKHq4blvz3nSy for ; Thu, 27 Nov 2025 14:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764255367; 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=xiK7QL2zGLhfnHCAehnPLHL609RvNF3AsDxnbXuFWNI=; b=eeMjJydinFj5QfZ63SRfdUlTZgE7p3mbze2dJxMshbaye9NyZ/5VIttHFzZO526Y6iNDia yB42iWG2BbvhNMsGLMGa0XocUkb4+L6KTzz7WbreWtCfc1sVvRYqobz3bEnqlMUQEOwOGH q8zT//WWA07EpeMTIGPASyN8ecYdalmWcv/LrKpNdaoiuKiMR/ueWF4K6aOXoYTGzSeIHQ gNiy9WSvweUdWZRFC45WAkj+Tnc+fmzJGrrggV3BJ13bRyjQQTOrMtGna/6GIhHIf2lk6J RYvufL8nQaeoCy3eEwoJ47PZcnO7JS4SG4jLdSDRnJKLMVQHpQxc+/BX0bJMXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764255367; 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=xiK7QL2zGLhfnHCAehnPLHL609RvNF3AsDxnbXuFWNI=; b=FUFlwp679V634ug7xdzAivHEA5/ABKN0vhgODbKw8FfggzUpUfZwRjxTbFtNfNGZT1hffE uLkp0z8oVXJQF6kCBmymsBB915TJ3R0d9O0ZSTm/0mFe1EkvQdB6gElJNLcLFIYK52kIro YQX7HAXUnPBa4DlK+qGA6LP2ofXuCmXA8aRp2L94QPVyfEUV2CpuMZY7/i6fuuT4pqVUVW OGATpVYZEBW4HTw35+zdAiMx5RLWglPt2IbBmx3uhblRRK9TTid66hbI3z6hjGmjXbaWAN L3TO7f1unsyc5+DMg4IF3TT7efKniF3wAXbveMGpnDP0BalVJlnz+Cc5MQHZ6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764255367; a=rsa-sha256; cv=none; b=XDV45YBZVP1Awnm9GO9iW4fUGrMmneHxAZ5q5LjB+pgTuR6S4lday6vDodzBhUtejA7pzH UOAAG5gdr3aR1EP9LlO319DMxGhmZ0yON+DNE1Dm1f0i6oNW1crM8fyBCDWaC7syAp3165 RTZl5fliBs43IKFKBkLSWpYZgcLJmWHTAEhDHNho4r+Lrb+io52qsMIv9VOQbHW1mTEyHV st5hbo5xNuKi9npPgmaTH2pWXBNvk6F0LVHzYxCxzXYOeIMUBJgc7G61vgBAOWWlvGqsRN 7AitRh3WbQyiC9hc8OpxPzLODqTd090LuBCQDSrjfJ8eDAlkX6iQkJNgkSG4Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dHKHq48hxz5fL for ; Thu, 27 Nov 2025 14:56:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 304f1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Nov 2025 14:56:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 96e05e2d1dfc - main - sys/_types.h: define __(u)int(f)ptr_t for CHERI 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96e05e2d1dfc69f67d3099440561530501cc09b5 Auto-Submitted: auto-generated Date: Thu, 27 Nov 2025 14:56:07 +0000 Message-Id: <69286687.304f1.7df44779@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=96e05e2d1dfc69f67d3099440561530501cc09b5 commit 96e05e2d1dfc69f67d3099440561530501cc09b5 Author: Brooks Davis AuthorDate: 2025-11-27 14:54:56 +0000 Commit: Brooks Davis CommitDate: 2025-11-27 14:54:56 +0000 sys/_types.h: define __(u)int(f)ptr_t for CHERI On pure-capability ABIs, uintptr_t and variants are capabilities and defined to the new primative type __uintcap_t and variants. This is required to allow pointers (capabilities) to round trip through uintptr_t as required by the C standard. Reviewed by: kib, markj Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D53819 --- sys/sys/_types.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 3589fcb87a9e..4f5b8e5db273 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -67,7 +67,12 @@ typedef __uint32_t __uint_least32_t; typedef __uint64_t __uint_least64_t; typedef __uint64_t __uintmax_t; -#if __SIZEOF_POINTER__ == 8 +#ifdef __CHERI__ +typedef __intcap_t __intptr_t; +typedef __intcap_t __intfptr_t; +typedef __uintcap_t __uintptr_t; +typedef __uintcap_t __uintfptr_t; +#elif __SIZEOF_POINTER__ == 8 typedef __int64_t __intptr_t; typedef __int64_t __intfptr_t; typedef __uint64_t __uintptr_t;