Github/littlefs
1
Fork 0
Code Actions Activity

Renamed LFS_NO_INTRINSICS -> LFS_NO_BUILTINS

Browse Source 
To better match compiler terminology.

Also because it's easier to spell :), and you really don't want an easy
to typo define...
This commit is contained in:
Christopher Haster
2024-05-20 13:27:29 -05:00
parent b49a6a38a2
commit 6874a56dcb
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs_util.h
+15 -15
View File
@@ -96,7 +96,7 @@ extern "C"
#ifndef LFS_ASSERT #ifndef LFS_ASSERT
#ifndef LFS_NO_ASSERT #ifndef LFS_NO_ASSERT
#define LFS_ASSERT(test) assert(test) #define LFS_ASSERT(test) assert(test)
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
#define LFS_ASSERT(test) ((test) ? (void)0 : __builtin_unreachable()) #define LFS_ASSERT(test) ((test) ? (void)0 : __builtin_unreachable())
#else #else
#define LFS_ASSERT(test) #define LFS_ASSERT(test)
@@ -106,7 +106,7 @@ extern "C"
#ifndef LFS_UNREACHABLE #ifndef LFS_UNREACHABLE
#ifndef LFS_NO_ASSERT #ifndef LFS_NO_ASSERT
#define LFS_UNREACHABLE() LFS_ASSERT(false) #define LFS_UNREACHABLE() LFS_ASSERT(false)
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
#define LFS_UNREACHABLE() __builtin_unreachable() #define LFS_UNREACHABLE() __builtin_unreachable()
#else #else
#define LFS_UNREACHABLE() #define LFS_UNREACHABLE()
@@ -140,7 +140,7 @@ extern "C"
// Builtin functions, these may be replaced by more efficient // Builtin functions, these may be replaced by more efficient
// toolchain-specific implementations. LFS_NO_INTRINSICS falls back to a more // toolchain-specific implementations. LFS_NO_BUILTINS falls back to a more
// expensive basic C implementation for debugging purposes // expensive basic C implementation for debugging purposes
// Compile time min/max // Compile time min/max
@@ -238,7 +238,7 @@ static inline uint32_t lfs_npw2(uint32_t a) {
return a; return a;
} }
#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM)) #if !defined(LFS_NO_BUILTINS) && (defined(__GNUC__) || defined(__CC_ARM))
return 32 - __builtin_clz(a-1); return 32 - __builtin_clz(a-1);
#else #else
uint32_t r = 0; uint32_t r = 0;
@@ -261,7 +261,7 @@ static inline uint32_t lfs_nlog2(uint32_t a) {
// Count the number of trailing binary zeros in a // Count the number of trailing binary zeros in a
// lfs_ctz(0) may be undefined // lfs_ctz(0) may be undefined
static inline uint32_t lfs_ctz(uint32_t a) { static inline uint32_t lfs_ctz(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && defined(__GNUC__) #if !defined(LFS_NO_BUILTINS) && defined(__GNUC__)
return __builtin_ctz(a); return __builtin_ctz(a);
#else #else
return lfs_npw2((a & -a) + 1) - 1; return lfs_npw2((a & -a) + 1) - 1;
@@ -270,7 +270,7 @@ static inline uint32_t lfs_ctz(uint32_t a) {
// Count the number of binary ones in a // Count the number of binary ones in a
static inline uint32_t lfs_popc(uint32_t a) { static inline uint32_t lfs_popc(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM)) #if !defined(LFS_NO_BUILTINS) && (defined(__GNUC__) || defined(__CC_ARM))
return __builtin_popcount(a); return __builtin_popcount(a);
#else #else
a = a - ((a >> 1) & 0x55555555); a = a - ((a >> 1) & 0x55555555);
@@ -281,7 +281,7 @@ static inline uint32_t lfs_popc(uint32_t a) {
// Returns true if there is an odd number of binary ones in a // Returns true if there is an odd number of binary ones in a
static inline bool lfs_parity(uint32_t a) { static inline bool lfs_parity(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && (defined(__GNUC__) || defined(__CC_ARM)) #if !defined(LFS_NO_BUILTINS) && (defined(__GNUC__) || defined(__CC_ARM))
return __builtin_parity(a); return __builtin_parity(a);
#else #else
return lfs_popc(a) & 1; return lfs_popc(a) & 1;
@@ -296,9 +296,9 @@ static inline int lfs_scmp(uint32_t a, uint32_t b) {
// Convert between 32-bit little-endian and native order // Convert between 32-bit little-endian and native order
static inline uint32_t lfs_fromle32(uint32_t a) { static inline uint32_t lfs_fromle32(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && defined(LFS_LITTLE_ENDIAN) #if !defined(LFS_NO_BUILTINS) && defined(LFS_LITTLE_ENDIAN)
return a; return a;
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
return __builtin_bswap32(a); return __builtin_bswap32(a);
#else #else
return (((uint8_t*)&a)[0] << 0) | return (((uint8_t*)&a)[0] << 0) |
@@ -314,9 +314,9 @@ static inline uint32_t lfs_tole32(uint32_t a) {
// Convert between 32-bit big-endian and native order // Convert between 32-bit big-endian and native order
static inline uint32_t lfs_frombe32(uint32_t a) { static inline uint32_t lfs_frombe32(uint32_t a) {
#if !defined(LFS_NO_INTRINSICS) && defined(LFS_LITTLE_ENDIAN) #if !defined(LFS_NO_BUILTINS) && defined(LFS_LITTLE_ENDIAN)
return __builtin_bswap32(a); return __builtin_bswap32(a);
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
return a; return a;
#else #else
return (((uint8_t*)&a)[0] << 24) | return (((uint8_t*)&a)[0] << 24) |
@@ -366,7 +366,7 @@ ssize_t lfs_fromleb128(uint32_t *word, const void *buffer, size_t size);
// Compare n bytes of memory // Compare n bytes of memory
#if !defined(LFS_NO_STRINGH) #if !defined(LFS_NO_STRINGH)
#define lfs_memcmp memcmp #define lfs_memcmp memcmp
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
#define lfs_memcmp __builtin_memcmp #define lfs_memcmp __builtin_memcmp
#else #else
static inline int lfs_memcmp(const void *a, const void *b, size_t size) { static inline int lfs_memcmp(const void *a, const void *b, size_t size) {
@@ -385,7 +385,7 @@ static inline int lfs_memcmp(const void *a, const void *b, size_t size) {
// Copy n bytes from src to dst, src and dst must not overlap // Copy n bytes from src to dst, src and dst must not overlap
#if !defined(LFS_NO_STRINGH) #if !defined(LFS_NO_STRINGH)
#define lfs_memcpy memcpy #define lfs_memcpy memcpy
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
#define lfs_memcpy __builtin_memcpy #define lfs_memcpy __builtin_memcpy
#else #else
static inline void *lfs_memcpy( static inline void *lfs_memcpy(
@@ -403,7 +403,7 @@ static inline void *lfs_memcpy(
// Copy n bytes from src to dst, src and dst may overlap // Copy n bytes from src to dst, src and dst may overlap
#if !defined(LFS_NO_STRINGH) #if !defined(LFS_NO_STRINGH)
#define lfs_memmove memmove #define lfs_memmove memmove
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
#define lfs_memmove __builtin_memmove #define lfs_memmove __builtin_memmove
#else #else
static inline void *lfs_memmove(void *dst, const void *src, size_t size) { static inline void *lfs_memmove(void *dst, const void *src, size_t size) {
@@ -426,7 +426,7 @@ static inline void *lfs_memmove(void *dst, const void *src, size_t size) {
// Set n bytes to c // Set n bytes to c
#if !defined(LFS_NO_STRINGH) #if !defined(LFS_NO_STRINGH)
#define lfs_memset memset #define lfs_memset memset
#elif !defined(LFS_NO_INTRINSICS) #elif !defined(LFS_NO_BUILTINS)
#define lfs_memset __builtin_memset #define lfs_memset __builtin_memset
#else #else
static inline void *lfs_memset(void *dst, int c, size_t size) { static inline void *lfs_memset(void *dst, int c, size_t size) {