On 12/4/2014 5:26 AM, Thomas Monjalon wrote: > There is no standard to check endianness. > So we need to try different checks. > Previous trials were done in testpmd (see commits > 51f694dd40f56 and 64741f237cf29) without full success. > This one is not guaranteed to work everywhere so it could > evolve when exceptions are found. > > If endianness is not detected, there is a fallback on x86 > to little endian. It could be forced before doing detection > but it would add some arch-dependent code in the generic header. > > The option CONFIG_RTE_ARCH_BIG_ENDIAN introduced for IBM Power only > (commit a982ec81d84d53) can be removed. A compile-time check is better. > > Signed-off-by: Thomas Monjalon <thomas.monjalon at 6wind.com> > --- > config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - > .../common/include/arch/ppc_64/rte_byteorder.h | 4 ++-- > .../common/include/arch/x86/rte_byteorder.h | 4 ++++ > .../common/include/generic/rte_byteorder.h | 28 > ++++++++++++++++++++++ > 4 files changed, 34 insertions(+), 3 deletions(-) > > diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc > b/config/defconfig_ppc_64-power8-linuxapp-gcc > index 48018c3..d97a885 100644 > --- a/config/defconfig_ppc_64-power8-linuxapp-gcc > +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc > @@ -34,7 +34,6 @@ CONFIG_RTE_MACHINE="power8" > > CONFIG_RTE_ARCH="ppc_64" > CONFIG_RTE_ARCH_PPC_64=y > -CONFIG_RTE_ARCH_BIG_ENDIAN=y > CONFIG_RTE_ARCH_64=y > > CONFIG_RTE_TOOLCHAIN="gcc" > diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_byteorder.h > b/lib/librte_eal/common/include/arch/ppc_64/rte_byteorder.h > index 1a89051..80436f2 100644 > --- a/lib/librte_eal/common/include/arch/ppc_64/rte_byteorder.h > +++ b/lib/librte_eal/common/include/arch/ppc_64/rte_byteorder.h > @@ -105,7 +105,7 @@ static inline uint64_t rte_arch_bswap64(uint64_t _x) > /* Power 8 have both little endian and big endian mode > * Power 7 only support big endian > */ > -#ifndef RTE_ARCH_BIG_ENDIAN > +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN > > #define rte_cpu_to_le_16(x) (x) > #define rte_cpu_to_le_32(x) (x) > @@ -123,7 +123,7 @@ static inline uint64_t rte_arch_bswap64(uint64_t _x) > #define rte_be_to_cpu_32(x) rte_bswap32(x) > #define rte_be_to_cpu_64(x) rte_bswap64(x) > > -#else > +#else /* RTE_BIG_ENDIAN */ > > #define rte_cpu_to_le_16(x) rte_bswap16(x) > #define rte_cpu_to_le_32(x) rte_bswap32(x) > diff --git a/lib/librte_eal/common/include/arch/x86/rte_byteorder.h > b/lib/librte_eal/common/include/arch/x86/rte_byteorder.h > index 1aa6985..ffdb6ef 100644 > --- a/lib/librte_eal/common/include/arch/x86/rte_byteorder.h > +++ b/lib/librte_eal/common/include/arch/x86/rte_byteorder.h > @@ -40,6 +40,10 @@ extern "C" { > > #include "generic/rte_byteorder.h" > > +#ifndef RTE_BYTE_ORDER > +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN > +#endif > + > /* > * An architecture-optimized byte swap for a 16-bit value. > * > diff --git a/lib/librte_eal/common/include/generic/rte_byteorder.h > b/lib/librte_eal/common/include/generic/rte_byteorder.h > index 9358136..ea23fdf 100644 > --- a/lib/librte_eal/common/include/generic/rte_byteorder.h > +++ b/lib/librte_eal/common/include/generic/rte_byteorder.h > @@ -44,6 +44,34 @@ > */ > > #include <stdint.h> > +#ifdef RTE_EXEC_ENV_BSDAPP > +#include <sys/endian.h> > +#else > +#include <endian.h> > +#endif > + > +/* > + * Compile-time endianness detection > + */ > +#define RTE_BIG_ENDIAN 1 > +#define RTE_LITTLE_ENDIAN 2 > +#if defined __BYTE_ORDER > +#if __BYTE_ORDER == __BIG_ENDIAN > +#define RTE_BYTE_ORDER RTE_BIG_ENDIAN > +#elif __BYTE_ORDER == __LITTLE_ENDIAN > +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN > +#endif /* __BYTE_ORDER */ > +#elif defined __BYTE_ORDER__ > +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ > +#define RTE_BYTE_ORDER RTE_BIG_ENDIAN > +#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ > +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN > +#endif /* __BYTE_ORDER__ */ > +#elif defined __BIG_ENDIAN__ > +#define RTE_BYTE_ORDER RTE_BIG_ENDIAN > +#elif defined __LITTLE_ENDIAN__ > +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN > +#endif
What do you think about : +/* + * Compile-time endianness detection + */ +#define RTE_BIG_ENDIAN 1 +#define RTE_LITTLE_ENDIAN 2 +if defined __BYTE_ORDER__ /* Prefer gcc build-in macros */ +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define RTE_BYTE_ORDER RTE_BIG_ENDIAN +#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN +#endif /* __BYTE_ORDER__ */ +#else +#if defined RTE_EXEC_ENV_BSDAPP +#include <sys/endian.h> +#else +#include <endian.h> +#endif +#if defined __BYTE_ORDER +#if __BYTE_ORDER == __BIG_ENDIAN +#define RTE_BYTE_ORDER RTE_BIG_ENDIAN +#elif __BYTE_ORDER == __LITTLE_ENDIAN +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN +#endif /* __BYTE_ORDER */ +#elif defined __BIG_ENDIAN__ +#define RTE_BYTE_ORDER RTE_BIG_ENDIAN +#elif defined __LITTLE_ENDIAN__ +#define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN +#endif +#endif > > /* > * An internal function to swap bytes in a 16-bit value.