From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id C6F553852C43; Wed, 23 Nov 2022 14:41:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C6F553852C43 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214472; bh=qImwyd3eKHi0C5OR7cdsNueddUkrgqy4MesdXzg52ms=; h=From:To:Subject:Date:From; b=igdL4zJao8n+1yhBP4or2GoDjrTZY9jhdqkp9zjKqmZ7GcQZ7CjWDcdlmYJCYDIs0 eD5Lvhrr9umHoUY3eyOwzmBQaZQCoyvqsR+JqlPf6zcHlCRo2j/NkiBRaHxsCjvQuX lo4yYVshUYNrcDFTicKh+2kJsS/Ed6OuNc5zFT3A= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: headers: Define {u}intptr_t and {u}intcap_t for CHERI X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 58759a422fe6dd736b56791efce5e665b5a40ad9 X-Git-Newrev: e5b22d23d1bacd467bf3bb3aaad2209b73606dc9 Message-Id: <20221123144112.C6F553852C43@sourceware.org> Date: Wed, 23 Nov 2022 14:41:12 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e5b22d23d1bacd467bf3bb3aaad2209b73606dc9 commit e5b22d23d1bacd467bf3bb3aaad2209b73606dc9 Author: Szabolcs Nagy 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;