Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use predefined byte order macros #316

Merged
merged 1 commit into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions include/arch/arm-imx/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef _LIBPHOENIX_ARCH_ARM_IMX_ARCH_H_
#define _LIBPHOENIX_ARCH_ARM_IMX_ARCH_H_

#define __BYTE_ORDER __LITTLE_ENDIAN

#define __ARCH_STDINT <arch/arm-imx/stdint.h>
#define __ARCH_LIMITS <arch/arm-imx/limits.h>
#define __ARCH_SYS_TYPES <arch/arm-imx/types.h>
Expand Down
2 changes: 0 additions & 2 deletions include/arch/armv7/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef _LIBPHOENIX_ARCH_ARMV7_ARCH_H_
#define _LIBPHOENIX_ARCH_ARMV7_ARCH_H_

#define __BYTE_ORDER __LITTLE_ENDIAN

#define __ARCH_STDINT <arch/armv7/stdint.h>
#define __ARCH_LIMITS <arch/armv7/limits.h>
#define __ARCH_SYS_TYPES <arch/armv7/types.h>
Expand Down
2 changes: 0 additions & 2 deletions include/arch/ia32/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef _LIBPHOENIX_ARCH_IA32_ARCH_H_
#define _LIBPHOENIX_ARCH_IA32_ARCH_H_

#define __BYTE_ORDER __LITTLE_ENDIAN

#define __ARCH_STDINT <arch/ia32/stdint.h>
#define __ARCH_LIMITS <arch/ia32/limits.h>
#define __ARCH_SYS_TYPES <arch/ia32/types.h>
Expand Down
2 changes: 0 additions & 2 deletions include/arch/riscv64/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef _LIBPHOENIX_ARCH_RISCV64_ARCH_H_
#define _LIBPHOENIX_ARCH_RISCV64_ARCH_H_

#define __BYTE_ORDER __LITTLE_ENDIAN

#define __ARCH_STDINT <arch/riscv64/stdint.h>
#define __ARCH_LIMITS <arch/riscv64/limits.h>
#define __ARCH_SYS_TYPES <arch/riscv64/types.h>
Expand Down
2 changes: 0 additions & 2 deletions include/arch/sparcv8leon3/arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
#ifndef _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_
#define _LIBPHOENIX_ARCH_SPARCV8LEON3_ARCH_H_

#define __BYTE_ORDER __BIG_ENDIAN

#define __ARCH_STDINT <arch/sparcv8leon3/stdint.h>
#define __ARCH_LIMITS <arch/sparcv8leon3/limits.h>
#define __ARCH_SYS_TYPES <arch/sparcv8leon3/types.h>
Expand Down
16 changes: 9 additions & 7 deletions include/endian.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,24 @@
extern "C" {
#endif


#define __LITTLE_ENDIAN 0
#define __BIG_ENDIAN 1
#define __BYTE_ORDER __BYTE_ORDER__
#define __LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
#define __BIG_ENDIAN __ORDER_BIG_ENDIAN__

#include <arch.h>

#define __CPP_CONCAT1(x, y) x ## y
#define __CPP_CONCAT(x, y) __CPP_CONCAT1(x, y)
#define __CPP_CONCAT1(x, y) x##y
#define __CPP_CONCAT(x, y) __CPP_CONCAT1(x, y)


#if __BYTE_ORDER == __LITTLE_ENDIAN
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define __swap_le__(b) __CPP_CONCAT(__CPP_CONCAT(uint, b), _t)
#define __swap_be__(b) __CPP_CONCAT(__builtin_bswap, b)
#else
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define __swap_le__(b) __CPP_CONCAT(__builtin_bswap, b)
#define __swap_be__(b) __CPP_CONCAT(__CPP_CONCAT(uint, b), _t)
#else
#error "Unsupported byte order"
#endif


Expand Down
6 changes: 4 additions & 2 deletions math/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@

typedef union {
struct {
#if __BYTE_ORDER == __LITTLE_ENDIAN
#if __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
uint64_t mantisa:52;
uint16_t exponent:11;
uint8_t sign:1;
#else
#elif __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
uint8_t sign:1;
uint16_t exponent:11;
uint64_t mantisa:52;
#else
#error "Unsupported byte order"
#endif
} i;
double d;
Expand Down
Loading