From 8d90fb3e4a5d02df75584016563ef84901967b9f Mon Sep 17 00:00:00 2001 From: Kimplul Date: Fri, 7 Jan 2022 20:24:34 +0200 Subject: Merged bits.h and bytes.h --- common/bits.c | 32 +++++++++++++++++++++++++++++ common/bytes.c | 32 ----------------------------- common/elf.c | 2 +- include/apos/bits.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ include/apos/bytes.h | 57 ---------------------------------------------------- include/libfdt_env.h | 2 +- 6 files changed, 87 insertions(+), 91 deletions(-) create mode 100644 common/bits.c delete mode 100644 common/bytes.c delete mode 100644 include/apos/bytes.h diff --git a/common/bits.c b/common/bits.c new file mode 100644 index 0000000..ca99ed2 --- /dev/null +++ b/common/bits.c @@ -0,0 +1,32 @@ +#include +#include +#include +#include + +#undef __bswap16 +__weak uint16_t __bswap16(uint16_t u) +{ + return (u & 0xff00) >> 8 | (u & 0x00ff) << 8; +} + +#undef __bswap32 +__weak uint32_t __bswap32(uint32_t u) +{ + return (u & 0xff000000) >> 24 | + (u & 0x00ff0000) >> 8 | + (u & 0x0000ff00) << 8 | + (u & 0x000000ff) << 24; +} + +#undef __bswap64 +__weak uint64_t __bswap64(uint64_t u) +{ + return (u & 0xff00000000000000ULL) >> 56 | + (u & 0x00ff000000000000ULL) >> 40 | + (u & 0x0000ff0000000000ULL) >> 24 | + (u & 0x000000ff00000000ULL) >> 8 | + (u & 0x00000000ff000000ULL) << 8 | + (u & 0x0000000000ff0000ULL) << 24 | + (u & 0x000000000000ff00ULL) << 40 | + (u & 0x00000000000000ffULL) << 56; +} diff --git a/common/bytes.c b/common/bytes.c deleted file mode 100644 index a5b3c4a..0000000 --- a/common/bytes.c +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include -#include -#include - -#undef __bswap16 -__weak uint16_t __bswap16(uint16_t u) -{ - return (u & 0xff00) >> 8 | (u & 0x00ff) << 8; -} - -#undef __bswap32 -__weak uint32_t __bswap32(uint32_t u) -{ - return (u & 0xff000000) >> 24 | - (u & 0x00ff0000) >> 8 | - (u & 0x0000ff00) << 8 | - (u & 0x000000ff) << 24; -} - -#undef __bswap64 -__weak uint64_t __bswap64(uint64_t u) -{ - return (u & 0xff00000000000000ULL) >> 56 | - (u & 0x00ff000000000000ULL) >> 40 | - (u & 0x0000ff0000000000ULL) >> 24 | - (u & 0x000000ff00000000ULL) >> 8 | - (u & 0x00000000ff000000ULL) << 8 | - (u & 0x0000000000ff0000ULL) << 24 | - (u & 0x000000000000ff00ULL) << 40 | - (u & 0x00000000000000ffULL) << 56; -} diff --git a/common/elf.c b/common/elf.c index 6b7b6dd..9ce357d 100644 --- a/common/elf.c +++ b/common/elf.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include static uint8_t __elf_to_uvflags(uint8_t elf_flags) diff --git a/include/apos/bits.h b/include/apos/bits.h index 79523db..1e1106a 100644 --- a/include/apos/bits.h +++ b/include/apos/bits.h @@ -1,6 +1,9 @@ #ifndef APOS_BITS_H #define APOS_BITS_H +#include +#include + #define __is_set(x, y) ((x) & (y)) #define __set_bit(x, y) ((x) |= (y)) #define __clear_bit(x, y) ((x) &= ~(y)) @@ -9,4 +12,54 @@ #define __set_nbit(x, y) (__set_bit((x), 1 << (y))) #define __clear_nbit(x, y) (__clear_bit((x), 1 << (y))) +uint16_t __bswap16(uint16_t u); +uint32_t __bswap32(uint32_t u); +uint64_t __bswap64(uint64_t u); + +#if __has_builtin(__builtin_bswap16) +#define __bswap16(x) __builtin_bswap16(x) +#endif + +#if __has_builtin(__builtin_bswap32) +#define __bswap32(x) __builtin_bswap32(x) +#endif + +#if __has_builtin(__builtin_bswap64) +#define __bswap64(x) __builtin_bswap64(x) +#endif + +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define be16_to_cpu(x) __bswap16(x) +#define be32_to_cpu(x) __bswap32(x) +#define be64_to_cpu(x) __bswap64(x) + +#define cpu_to_be16(x) __bswap16(x) +#define cpu_to_be32(x) __bswap32(x) +#define cpu_to_be64(x) __bswap64(x) + +#define le16_to_cpu(x) (x) +#define le32_to_cpu(x) (x) +#define le64_to_cpu(x) (x) + +#define cpu_to_le16(x) (x) +#define cpu_to_le32(x) (x) +#define cpu_to_le64(x) (x) +#else +#define be16_to_cpu(x) (x) +#define be32_to_cpu(x) (x) +#define be64_to_cpu(x) (x) + +#define cpu_to_be16(x) (x) +#define cpu_to_be32(x) (x) +#define cpu_to_be64(x) (x) + +#define le16_to_cpu(x) __bswap16(x) +#define le32_to_cpu(x) __bswap32(x) +#define le64_to_cpu(x) __bswap64(x) + +#define cpu_to_le16(x) __bswap16(x) +#define cpu_to_le32(x) __bswap32(x) +#define cpu_to_le64(x) __bswap64(x) +#endif + #endif /* APOS_BITS_H */ diff --git a/include/apos/bytes.h b/include/apos/bytes.h deleted file mode 100644 index 37fe084..0000000 --- a/include/apos/bytes.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef APOS_BYTES_H -#define APOS_BYTES_H - -#include -#include - -uint16_t __bswap16(uint16_t u); -uint32_t __bswap32(uint32_t u); -uint64_t __bswap64(uint64_t u); - -#if __has_builtin(__builtin_bswap16) -#define __bswap16(x) __builtin_bswap16(x) -#endif - -#if __has_builtin(__builtin_bswap32) -#define __bswap32(x) __builtin_bswap32(x) -#endif - -#if __has_builtin(__builtin_bswap64) -#define __bswap64(x) __builtin_bswap64(x) -#endif - -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -#define be16_to_cpu(x) __bswap16(x) -#define be32_to_cpu(x) __bswap32(x) -#define be64_to_cpu(x) __bswap64(x) - -#define cpu_to_be16(x) __bswap16(x) -#define cpu_to_be32(x) __bswap32(x) -#define cpu_to_be64(x) __bswap64(x) - -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le64_to_cpu(x) (x) - -#define cpu_to_le16(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le64(x) (x) -#else -#define be16_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define be64_to_cpu(x) (x) - -#define cpu_to_be16(x) (x) -#define cpu_to_be32(x) (x) -#define cpu_to_be64(x) (x) - -#define le16_to_cpu(x) __bswap16(x) -#define le32_to_cpu(x) __bswap32(x) -#define le64_to_cpu(x) __bswap64(x) - -#define cpu_to_le16(x) __bswap16(x) -#define cpu_to_le32(x) __bswap32(x) -#define cpu_to_le64(x) __bswap64(x) -#endif - -#endif /* APOS_BYTES_H */ diff --git a/include/libfdt_env.h b/include/libfdt_env.h index 96da42e..0e8909c 100644 --- a/include/libfdt_env.h +++ b/include/libfdt_env.h @@ -4,7 +4,7 @@ #include #include -#include +#include typedef int16_t fdt16_t; typedef int32_t fdt32_t; -- cgit v1.3