From nobody Thu Nov 27 14:56:08 2025 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 4dHKHs3tcsz6JZm2 for ; Thu, 27 Nov 2025 14:56:09 +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 4dHKHs0ZHgz3nWZ for ; Thu, 27 Nov 2025 14:56:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764255369; 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=TKeFeJ8AbqQdrQTgP1a8gf7+0cnZFBQAJf1hRmd9Myc=; b=EoH3jv1CSMaCgav40lE+GM5dnwDnJ7VEpYjTep1B7N2WEHzNksc+6Vf/sO3VLqiyiKKC+4 Fjqb7L1Ggqm4FjOG6j3+OWBNaxKJZmgGYO/rgnbBtkm2Sxf+60lm6T0JGJVCS8fJa6ce04 JkDMXbPuhOraQ1zGh/bl6QmRoEZSPWBFdMpotYBIjq5on5io1QPZBgzsqSdFczu20A6ugI 9xtScZ1GwJ+mjvKz5KhqvrrP/I2kVoaFrbYWPz02u5f24GmL5wrS4eFG+iMHDYFLTjIliz L4by8lMDPPItjPvWNeqkn1LY7HANphSrHBCflw0hSFSqWfTPay/r68McxjeGNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764255369; 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=TKeFeJ8AbqQdrQTgP1a8gf7+0cnZFBQAJf1hRmd9Myc=; b=mewXRJLDPFqqoJoj0XUAV55dfCabRmCb44jzyRhA91/o2toZjHZLpegqedSnBYuT4601s5 0RRM0/n3Y9DWtvYO5PnvHXvWLvorivE2rodj80eFbtkp6DTi/6/XQWSB//3DGx+75QGfHk jicOq+evVk7JLk1qCQ2rLOaOInS0Zeh99Si+rZpgDoYChHQbJ/VxfXhd9xfBKbU0/425+r 6ih0tRNrT05gl/+8n0birDtv5wisD65fRUilN3HMdGFJk8eVJOqX3f7mBOC787gOYpOWKr xWdQ1rzl2O32Gcb5e5d3b6eqHJa4KSqUDVwiw+Ae3YCb/WtV2qDmXgLnDtSgEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764255369; a=rsa-sha256; cv=none; b=pg/5W0f4yg/hIVUpP6iwCctOw1f3L8CzlwYcyTOJthwhhDymrXnBgajEsVmsRy9h5icT/J 44qgf8Bcd2rj3hsXqn7P1P+JET4wpSKqDeyFkT2dt28HKSbKoHan6oHCFhFsExPYELpMVd tnG+0kDovMoBCxblt9g4JSlFQZQz43hURJ2qp2DY5k7X1lUJZ1WpOXz1Q8qlLrOtgbj4GF nvf5vMWFq9Dc3dlnxycnDcsm1mfwSNbwgVj0P+fNyeeV+npPD0fQFsAtFalP42w7xbccpL wi2UTkn+F0YMFZnM4MqNUCCYph4b5UB6sNP0vsK4UIpr2cKwxskGGyQO7cRS7A== 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 4dHKHr4xTjz5cJ for ; Thu, 27 Nov 2025 14:56:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30746 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Nov 2025 14:56:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 85ab981a8e4e - main - sys/_types.h: define fallback __(u)intcap_t 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 85ab981a8e4e1a7a078dbf553cb20cb2e58aeff9 Auto-Submitted: auto-generated Date: Thu, 27 Nov 2025 14:56:08 +0000 Message-Id: <69286688.30746.14c84aea@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=85ab981a8e4e1a7a078dbf553cb20cb2e58aeff9 commit 85ab981a8e4e1a7a078dbf553cb20cb2e58aeff9 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 fallback __(u)intcap_t __intcap_t and __uintcap_t are new primative types in CHERI-aware ABIs that are used to define (u)intptr_t. To allow coexistance of integer pointers and hybrid code, define them to __(u)intptr_t when they are not otherwise available. Reviewed by: kib, markj Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D53820 --- sys/sys/_types.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 4f5b8e5db273..e4d14da3c11e 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -155,6 +155,17 @@ typedef int __cpulevel_t; /* level parameter for cpuset. */ typedef int __cpusetid_t; /* cpuset identifier. */ typedef __int64_t __daddr_t; /* bwrite(3), FIOBMAP2, etc */ +#if !__has_feature(capabilities) +/* + * On non-CHERI systems, define __(u)intcap_t to __(u)intptr_t so that + * hybrid-C code which needs to be explicitly aware of capabilities can + * use it. These types may be present in some third-party code and + * should not generally be used in FreeBSD code. + */ +typedef __intptr_t __intcap_t; +typedef __uintptr_t __uintcap_t; +#endif + /* * Unusual type definitions. */