public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: headers: Define {u}intptr_t and {u}intcap_t for CHERI Date: Thu, 27 Oct 2022 13:51:20 +0000 (GMT) [thread overview] Message-ID: <20221027135120.AF4BA385114B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1564a64fbe61c21b6b54ed8eacf8c9f82a41e20b commit 1564a64fbe61c21b6b54ed8eacf8c9f82a41e20b Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Fri Jun 11 12:52:26 2021 +0100 cheri: headers: Define {u}intptr_t and {u}intcap_t for CHERI The CHERI pure capability programming model for C requires special definition of {u}intptr_t. Only the pure capability model is supported for hosted compilation, but for freestanding compilation there is limited support for other (hybrid capability) programming models too, which require new {u}intcap_t type definitions. Diff: --- posix/bits/types.h | 4 ++++ stdlib/stdint.h | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/posix/bits/types.h b/posix/bits/types.h index f912e77a02..e315dfd779 100644 --- a/posix/bits/types.h +++ b/posix/bits/types.h @@ -204,7 +204,11 @@ typedef __off64_t __loff_t; /* Type of file sizes and offsets (LFS). */ typedef char *__caddr_t; /* Duplicates info from stdint.h but this is used in unistd.h. */ +#ifdef __CHERI_PURE_CAPABILITY__ +__STD_TYPE __intcap_t __intptr_t; +#else __STD_TYPE __SWORD_TYPE __intptr_t; +#endif /* Duplicate info from sys/socket.h. */ __STD_TYPE __U32_TYPE __socklen_t; diff --git a/stdlib/stdint.h b/stdlib/stdint.h index 2d666f79fd..b80b6bbac1 100644 --- a/stdlib/stdint.h +++ b/stdlib/stdint.h @@ -84,10 +84,22 @@ typedef unsigned long long int uint_fast64_t; /* Types for `void *' pointers. */ #if __WORDSIZE == 64 # ifndef __intptr_t_defined +# ifdef __CHERI_PURE_CAPABILITY__ +typedef __intcap_t intptr_t; +# else typedef long int intptr_t; +# endif # define __intptr_t_defined # endif +# ifdef __CHERI_PURE_CAPABILITY__ +typedef __uintcap_t uintptr_t; +# else typedef unsigned long int uintptr_t; +# endif +# if defined __CHERI__ && !defined __CHERI_PURE_CAPABILITY__ +typedef __uintcap_t uintcap_t; +typedef __intcap_t intcap_t; +# endif #else # ifndef __intptr_t_defined typedef int intptr_t;
next reply other threads:[~2022-10-27 13:51 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-27 13:51 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-11-23 14:41 Szabolcs Nagy 2022-10-26 15:12 Szabolcs Nagy 2022-08-05 19:30 Szabolcs Nagy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221027135120.AF4BA385114B@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).