walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fcint: add casts to allow building with stricter compilers 

When targeting CHERI, casts between pointers and integers must use
(u)intptr_t. uintptr_t values contains pointer bounds (and additional
metadata), whereas other integer types do not. This change also adds a
cast to FcOffsetToPtr() to silence a compiler warning that triggers if
the compiler cannot statically infer which side of an arithmetic operation
is the pointer operand and which one is the offset/mask.
This commit is contained in:
Alex Richardson 2021-07-12 15:06:32 +01:00 committed by Akira TAGOH
parent 3a7ad1b49f
commit ab4761ff87
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fcint.h
View File

@ -152,16 +152,16 @@ FC_ASSERT_STATIC (sizeof (FcRef) == sizeof (int));
#define FcIsEncodedOffset(p) ((((intptr_t) (p)) & 1) != 0) #define FcIsEncodedOffset(p) ((((intptr_t) (p)) & 1) != 0)
/* Encode offset in a pointer of type t */ /* Encode offset in a pointer of type t */
#define FcOffsetEncode(o,t) ((t *) ((o) | 1)) #define FcOffsetEncode(o,t) ((t *) (intptr_t) ((o) | 1))
/* Decode a pointer into an offset */ /* Decode a pointer into an offset */
#define FcOffsetDecode(p) (((intptr_t) (p)) & ~1) #define FcOffsetDecode(p) (((intptr_t) (p)) & ~1)
/* Compute pointer offset */ /* Compute pointer offset */
#define FcPtrToOffset(b,p) ((intptr_t) (p) - (intptr_t) (b)) #define FcPtrToOffset(b,p) ((ptrdiff_t) ((intptr_t) (p) - (intptr_t) (b)))
/* Given base address, offset and type, return a pointer */ /* Given base address, offset and type, return a pointer */
#define FcOffsetToPtr(b,o,t) ((t *) ((intptr_t) (b) + (o))) #define FcOffsetToPtr(b,o,t) ((t *) ((intptr_t) (b) + (ptrdiff_t) (o)))
/* Given base address, encoded offset and type, return a pointer */ /* Given base address, encoded offset and type, return a pointer */
#define FcEncodedOffsetToPtr(b,p,t) FcOffsetToPtr(b,FcOffsetDecode(p),t) #define FcEncodedOffsetToPtr(b,p,t) FcOffsetToPtr(b,FcOffsetDecode(p),t)