diff options
| author | Dylan Baker <[email protected]> | 2018-09-06 15:13:22 -0700 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-11-05 16:39:55 +0000 |
| commit | f9f60da813e69aacf541d25a24622c896f15ba98 (patch) | |
| tree | ce1ba60e57b85a9ea16cfe12efcf3e1ab994d596 /src | |
| parent | 37e54736a7bab3397e316ae4493c2e3d4aebfa5e (diff) | |
util/u_endian: set PIPE_ARCH_*_ENDIAN to 1
This will allow it to be used as a drop in replacement for
_mesa_little_endian in a number of cases.
v2: - Always define PIPE_ARCH_LITTLE_ENDIAN and PIPE_ARCH_BIG_ENDIAN,
define the one that reflects the host system to 1 and the other to 0
- replace all uses of #ifdef, #ifndef, and #if defined() with #if
and #if ! with PIPE_ARCH_*_ENDIAN
Reviewed-by: Eric Engestrom <[email protected]>
Diffstat (limited to 'src')
41 files changed, 100 insertions, 104 deletions
diff --git a/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h b/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h index 103887742bc..a388f4fbac4 100644 --- a/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h +++ b/src/amd/addrlib/src/chip/gfx10/gfx10_gb_reg.h @@ -39,9 +39,9 @@ // #include "util/u_endian.h" -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN #define LITTLEENDIAN_CPU -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN #define BIGENDIAN_CPU #endif diff --git a/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h b/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h index ff4934745c9..3ba49e48435 100644 --- a/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h +++ b/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h @@ -39,9 +39,9 @@ // #include "util/u_endian.h" -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN #define LITTLEENDIAN_CPU -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN #define BIGENDIAN_CPU #endif diff --git a/src/amd/addrlib/src/chip/r800/si_gb_reg.h b/src/amd/addrlib/src/chip/r800/si_gb_reg.h index be6c1873605..3fd69843a3a 100644 --- a/src/amd/addrlib/src/chip/r800/si_gb_reg.h +++ b/src/amd/addrlib/src/chip/r800/si_gb_reg.h @@ -40,9 +40,9 @@ // #include "util/u_endian.h" -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN #define LITTLEENDIAN_CPU -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN #define BIGENDIAN_CPU #endif diff --git a/src/amd/vulkan/vk_format_table.py b/src/amd/vulkan/vk_format_table.py index 420c3f96abc..2993b593cc4 100644 --- a/src/amd/vulkan/vk_format_table.py +++ b/src/amd/vulkan/vk_format_table.py @@ -80,7 +80,7 @@ def print_channels(format, func): if format.nr_channels() <= 1: func(format.le_channels, format.le_swizzles) else: - print('#ifdef PIPE_ARCH_BIG_ENDIAN') + print('#if PIPE_ARCH_BIG_ENDIAN') func(format.be_channels, format.be_swizzles) print('#else') func(format.le_channels, format.le_swizzles) diff --git a/src/freedreno/vulkan/vk_format_table.py b/src/freedreno/vulkan/vk_format_table.py index 604aac8fa75..7fb685e9cc4 100644 --- a/src/freedreno/vulkan/vk_format_table.py +++ b/src/freedreno/vulkan/vk_format_table.py @@ -80,7 +80,7 @@ def print_channels(format, func): if format.nr_channels() <= 1: func(format.le_channels, format.le_swizzles) else: - print('#ifdef PIPE_ARCH_BIG_ENDIAN') + print('#if PIPE_ARCH_BIG_ENDIAN') func(format.be_channels, format.be_swizzles) print('#else') func(format.le_channels, format.le_swizzles) diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index c15722cc3e7..689da73d55d 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -926,7 +926,7 @@ static LLVMValueRef adjust_mask(struct gallivm_state *gallivm, LLVMValueRef mask) { -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN LLVMBuilderRef builder = gallivm->builder; LLVMValueRef vertex_id; LLVMValueRef clipmask; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c index 1f21fa03007..4de75006bf4 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_soa.c @@ -367,7 +367,7 @@ lp_build_rgba8_to_fi32_soa(struct gallivm_state *gallivm, /* Decode the input vector components */ for (chan = 0; chan < 4; ++chan) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN unsigned start = chan*8; #else unsigned start = (3-chan)*8; @@ -654,7 +654,7 @@ lp_build_fetch_rgba_soa(struct gallivm_state *gallivm, unsigned blockbits = type.width; unsigned vec_nr; -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN vec_nr = (format_desc->block.bits - (chan_desc.shift + chan_desc.size)) / type.width; #else vec_nr = chan_desc.shift / type.width; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c b/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c index d6d7552986e..5adf2815034 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c @@ -104,7 +104,7 @@ uyvy_to_yuv_soa(struct gallivm_state *gallivm, #endif { LLVMValueRef shift; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN shift = LLVMBuildMul(builder, i, lp_build_const_int_vec(gallivm, type, 16), ""); shift = LLVMBuildAdd(builder, shift, lp_build_const_int_vec(gallivm, type, 8), ""); #else @@ -114,7 +114,7 @@ uyvy_to_yuv_soa(struct gallivm_state *gallivm, *y = LLVMBuildLShr(builder, packed, shift, ""); } -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN *u = packed; *v = LLVMBuildLShr(builder, packed, lp_build_const_int_vec(gallivm, type, 16), ""); #else @@ -187,7 +187,7 @@ yuyv_to_yuv_soa(struct gallivm_state *gallivm, #endif { LLVMValueRef shift; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN shift = LLVMBuildMul(builder, i, lp_build_const_int_vec(gallivm, type, 16), ""); #else shift = LLVMBuildMul(builder, i, lp_build_const_int_vec(gallivm, type, -16), ""); @@ -196,7 +196,7 @@ yuyv_to_yuv_soa(struct gallivm_state *gallivm, *y = LLVMBuildLShr(builder, packed, shift, ""); } -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN *u = LLVMBuildLShr(builder, packed, lp_build_const_int_vec(gallivm, type, 8), ""); *v = LLVMBuildLShr(builder, packed, lp_build_const_int_vec(gallivm, type, 24), ""); #else @@ -334,7 +334,7 @@ rgb_to_rgba_aos(struct gallivm_state *gallivm, * Make a 4 x unorm8 vector */ -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN r = r; g = LLVMBuildShl(builder, g, lp_build_const_int_vec(gallivm, type, 8), ""); b = LLVMBuildShl(builder, b, lp_build_const_int_vec(gallivm, type, 16), ""); diff --git a/src/gallium/auxiliary/gallivm/lp_bld_gather.c b/src/gallium/auxiliary/gallivm/lp_bld_gather.c index 21c906bd9f8..782d1d907fd 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_gather.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_gather.c @@ -141,7 +141,7 @@ lp_build_gather_elem(struct gallivm_state *gallivm, if (src_width < dst_width) { res = LLVMBuildZExt(gallivm->builder, res, dst_elem_type, ""); if (vector_justify) { -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN res = LLVMBuildShl(gallivm->builder, res, LLVMConstInt(dst_elem_type, dst_width - src_width, 0), ""); #endif @@ -234,7 +234,7 @@ lp_build_gather_elem_vec(struct gallivm_state *gallivm, */ res = LLVMBuildZExt(gallivm->builder, res, dst_elem_type, ""); -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN if (vector_justify) { res = LLVMBuildShl(gallivm->builder, res, LLVMConstInt(dst_elem_type, @@ -553,7 +553,7 @@ lp_build_gather(struct gallivm_state *gallivm, if (vec_zext) { res = LLVMBuildZExt(gallivm->builder, res, res_t, ""); if (vector_justify) { -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN unsigned sv = dst_type.width - src_width; res = LLVMBuildShl(gallivm->builder, res, lp_build_const_int_vec(gallivm, res_type, sv), ""); diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c index beffbc552a2..32d6074b994 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c @@ -369,7 +369,7 @@ init_gallivm_state(struct gallivm_state *gallivm, const char *name, const unsigned pointer_size = 8 * sizeof(void *); char layout[512]; snprintf(layout, sizeof layout, "%c-p:%u:%u:%u-i64:64:64-a0:0:%u-s0:%u:%u", -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN 'e', // little endian #else 'E', // big endian diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp index 67ae1fa1e93..b47baa8b32d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp @@ -456,7 +456,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, * when not using MCJIT so no instructions are generated which the old JIT * can't handle. Not entirely sure if we really need to do anything yet. */ -#if defined(PIPE_ARCH_LITTLE_ENDIAN) && defined(PIPE_ARCH_PPC_64) +#if PIPE_ARCH_LITTLE_ENDIAN && defined(PIPE_ARCH_PPC_64) /* * Versions of LLVM prior to 4.0 lacked a table entry for "POWER8NVL", * resulting in (big-endian) "generic" being returned on diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.c b/src/gallium/auxiliary/gallivm/lp_bld_pack.c index b8b53a7d6eb..614d582a396 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_pack.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.c @@ -166,7 +166,7 @@ lp_build_const_pack_shuffle(struct gallivm_state *gallivm, unsigned n) assert(n <= LP_MAX_VECTOR_LENGTH); for(i = 0; i < n; ++i) -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN elems[i] = lp_build_const_int32(gallivm, 2*i); #else elems[i] = lp_build_const_int32(gallivm, 2*i+1); @@ -429,7 +429,7 @@ lp_build_unpack2(struct gallivm_state *gallivm, msb = lp_build_zero(gallivm, src_type); /* Interleave bits */ -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN *dst_lo = lp_build_interleave2(gallivm, src_type, src, msb, 0); *dst_hi = lp_build_interleave2(gallivm, src_type, src, msb, 1); @@ -483,7 +483,7 @@ lp_build_unpack2_native(struct gallivm_state *gallivm, msb = lp_build_zero(gallivm, src_type); /* Interleave bits */ -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN if (src_type.length * src_type.width == 256 && util_cpu_caps.has_avx2) { *dst_lo = lp_build_interleave2_half(gallivm, src_type, src, msb, 0); *dst_hi = lp_build_interleave2_half(gallivm, src_type, src, msb, 1); @@ -606,7 +606,7 @@ lp_build_pack2(struct gallivm_state *gallivm, } else { intrinsic = "llvm.ppc.altivec.vpkuwus"; } -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN swap_intrinsic_operands = TRUE; #endif } @@ -617,7 +617,7 @@ lp_build_pack2(struct gallivm_state *gallivm, intrinsic = "llvm.x86.sse2.packsswb.128"; } else if (util_cpu_caps.has_altivec) { intrinsic = "llvm.ppc.altivec.vpkshss"; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN swap_intrinsic_operands = TRUE; #endif } @@ -626,7 +626,7 @@ lp_build_pack2(struct gallivm_state *gallivm, intrinsic = "llvm.x86.sse2.packuswb.128"; } else if (util_cpu_caps.has_altivec) { intrinsic = "llvm.ppc.altivec.vpkshus"; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN swap_intrinsic_operands = TRUE; #endif } diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c index ad3a9e4a4ca..ada7af44f01 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c @@ -602,7 +602,7 @@ lp_build_sample_fetch_image_linear(struct lp_build_sample_context *bld, r_fpart = LLVMBuildBitCast(builder, r_fpart, u8n_vec_type, ""); for (j = 0; j < u8n.type.length; j += 4) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN unsigned subindex = 0; #else unsigned subindex = 3; diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c index 5a97c48ef85..03194288d44 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c @@ -222,7 +222,7 @@ lp_build_swizzle_scalar_aos(struct lp_build_context *bld, * XX XX XX XX if shift right (shift == -1) * */ -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN shift = channel == 0 ? 1 : -1; #else shift = channel == 0 ? -1 : 1; @@ -293,7 +293,7 @@ lp_build_swizzle_scalar_aos(struct lp_build_context *bld, int shift = shifts[channel][i]; /* See endianness diagram above */ -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN shift = -shift; #endif @@ -519,7 +519,7 @@ lp_build_swizzle_aos(struct lp_build_context *bld, for (chan = 0; chan < 4; ++chan) { if (swizzles[chan] < 4) { /* We need to move channel swizzles[chan] into channel chan */ -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN if (swizzles[chan] - chan == -shift) { mask |= ((1ULL << type.width) - 1) << (swizzles[chan] * type.width); } diff --git a/src/gallium/auxiliary/util/u_format_pack.py b/src/gallium/auxiliary/util/u_format_pack.py index f563ef1f930..ffa28b230ff 100644 --- a/src/gallium/auxiliary/util/u_format_pack.py +++ b/src/gallium/auxiliary/util/u_format_pack.py @@ -70,7 +70,7 @@ def print_channels(format, func): format.le_swizzles == format.be_swizzles): func(format.le_channels, format.le_swizzles) else: - print('#ifdef PIPE_ARCH_BIG_ENDIAN') + print('#if PIPE_ARCH_BIG_ENDIAN') func(format.be_channels, format.be_swizzles) print('#else') func(format.le_channels, format.le_swizzles) diff --git a/src/gallium/auxiliary/util/u_pwr8.h b/src/gallium/auxiliary/util/u_pwr8.h index ffd9f923142..3dc3611a954 100644 --- a/src/gallium/auxiliary/util/u_pwr8.h +++ b/src/gallium/auxiliary/util/u_pwr8.h @@ -32,7 +32,7 @@ #ifndef U_PWR8_H_ #define U_PWR8_H_ -#if defined(_ARCH_PWR8) && defined(PIPE_ARCH_LITTLE_ENDIAN) +#if defined(_ARCH_PWR8) && PIPE_ARCH_LITTLE_ENDIAN #define VECTOR_ALIGN_16 __attribute__ ((__aligned__ (16))) @@ -53,7 +53,7 @@ vec_set_epi32 (int i3, int i2, int i1, int i0) { __m128i_union vdst; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN vdst.i[0] = i0; vdst.i[1] = i1; vdst.i[2] = i2; @@ -78,7 +78,7 @@ static inline __m128i vec_unpacklo_epi32 (__m128i even, __m128i odd) { static const __m128i perm_mask = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN { 0, 1, 2, 3, 16, 17, 18, 19, 4, 5, 6, 7, 20, 21, 22, 23}; #else {24, 25, 26, 27, 8, 9, 10, 11, 28, 29, 30, 31, 12, 13, 14, 15}; @@ -91,7 +91,7 @@ static inline __m128i vec_unpackhi_epi32 (__m128i even, __m128i odd) { static const __m128i perm_mask = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN { 8, 9, 10, 11, 24, 25, 26, 27, 12, 13, 14, 15, 28, 29, 30, 31}; #else {16, 17, 18, 19, 0, 1, 2, 3, 20, 21, 22, 23, 4, 5, 6, 7}; @@ -104,7 +104,7 @@ static inline __m128i vec_unpacklo_epi64 (__m128i even, __m128i odd) { static const __m128i perm_mask = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN { 0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23}; #else {24, 25, 26, 27, 28, 29, 30, 31, 8, 9, 10, 11, 12, 13, 14, 15}; @@ -117,7 +117,7 @@ static inline __m128i vec_unpackhi_epi64 (__m128i even, __m128i odd) { static const __m128i perm_mask = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN { 8, 9, 10, 11, 12, 13, 14, 15, 24, 25, 26, 27, 28, 29, 30, 31}; #else {16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7}; @@ -236,7 +236,7 @@ vec_loadu_si128 (const uint32_t* src) { __m128i_union vsrc; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN vsrc.m128ui = *((vector unsigned int *) src); @@ -280,7 +280,7 @@ vec_movemask_epi8 (__m128i vsrc) vtemp.m128i = vec_vgbbd(vsrc); -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN result = vtemp.ub[15] << 8 | vtemp.ub[7]; #else result = vtemp.ub[0] << 8 | vtemp.ub[8]; @@ -292,7 +292,7 @@ vec_movemask_epi8 (__m128i vsrc) static inline __m128i vec_packs_epi16 (__m128i a, __m128i b) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN return (__m128i) vec_packs ((vector signed short) a, (vector signed short) b); #else @@ -304,7 +304,7 @@ vec_packs_epi16 (__m128i a, __m128i b) static inline __m128i vec_packs_epi32 (__m128i a, __m128i b) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN return (__m128i) vec_packs ((vector signed int) a, (vector signed int) b); #else return (__m128i) vec_packs ((vector signed int) b, (vector signed int) a); diff --git a/src/gallium/auxiliary/vl/vl_vlc.h b/src/gallium/auxiliary/vl/vl_vlc.h index dd7b0918ae2..f5ea6f8fcc2 100644 --- a/src/gallium/auxiliary/vl/vl_vlc.h +++ b/src/gallium/auxiliary/vl/vl_vlc.h @@ -151,7 +151,7 @@ vl_vlc_fillbits(struct vl_vlc *vlc) /* enough bytes in buffer, read in a whole dword */ uint64_t value = *(const uint32_t*)vlc->data; -#ifndef PIPE_ARCH_BIG_ENDIAN +#if !PIPE_ARCH_BIG_ENDIAN value = util_bswap32(value); #endif diff --git a/src/gallium/drivers/llvmpipe/lp_rast_tri.c b/src/gallium/drivers/llvmpipe/lp_rast_tri.c index f4a2f0268f0..f50afabf723 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast_tri.c +++ b/src/gallium/drivers/llvmpipe/lp_rast_tri.c @@ -436,7 +436,7 @@ lp_rast_triangle_32_3_4(struct lp_rasterizer_task *task, #else -#if defined(_ARCH_PWR8) && defined(PIPE_ARCH_LITTLE_ENDIAN) +#if defined(_ARCH_PWR8) && PIPE_ARCH_LITTLE_ENDIAN #include <altivec.h> #include "util/u_pwr8.h" @@ -556,7 +556,7 @@ lp_rast_triangle_32_3_16(struct lp_rasterizer_task *task, __m128i vshuf_mask1; __m128i vshuf_mask2; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN vshuf_mask0 = (__m128i) vec_splats((unsigned int) 0x03020100); vshuf_mask1 = (__m128i) vec_splats((unsigned int) 0x07060504); vshuf_mask2 = (__m128i) vec_splats((unsigned int) 0x0B0A0908); @@ -687,7 +687,7 @@ lp_rast_triangle_32_3_4(struct lp_rasterizer_task *task, #if defined PIPE_ARCH_SSE #define BUILD_MASKS(c, cdiff, dcdx, dcdy, omask, pmask) build_masks_sse((int)c, (int)cdiff, dcdx, dcdy, omask, pmask) #define BUILD_MASK_LINEAR(c, dcdx, dcdy) build_mask_linear_sse((int)c, dcdx, dcdy) -#elif (defined(_ARCH_PWR8) && defined(PIPE_ARCH_LITTLE_ENDIAN)) +#elif (defined(_ARCH_PWR8) && PIPE_ARCH_LITTLE_ENDIAN) #define BUILD_MASKS(c, cdiff, dcdx, dcdy, omask, pmask) build_masks_ppc((int)c, (int)cdiff, dcdx, dcdy, omask, pmask) #define BUILD_MASK_LINEAR(c, dcdx, dcdy) build_mask_linear_ppc((int)c, dcdx, dcdy) #else diff --git a/src/gallium/drivers/llvmpipe/lp_setup_tri.c b/src/gallium/drivers/llvmpipe/lp_setup_tri.c index 0fa3443d519..18771cb05ba 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup_tri.c +++ b/src/gallium/drivers/llvmpipe/lp_setup_tri.c @@ -46,7 +46,7 @@ #if defined(PIPE_ARCH_SSE) #include <emmintrin.h> -#elif defined(_ARCH_PWR8) && defined(PIPE_ARCH_LITTLE_ENDIAN) +#elif defined(_ARCH_PWR8) && PIPE_ARCH_LITTLE_ENDIAN #include <altivec.h> #include "util/u_pwr8.h" #endif @@ -489,7 +489,7 @@ do_triangle_ccw(struct lp_setup_context *setup, eo = _mm_shuffle_epi32(eo, _MM_SHUFFLE(0,0,0,2)); plane[2].eo = (uint32_t)_mm_cvtsi128_si32(eo); } else -#elif defined(_ARCH_PWR8) && defined(PIPE_ARCH_LITTLE_ENDIAN) +#elif defined(_ARCH_PWR8) && PIPE_ARCH_LITTLE_ENDIAN /* * XXX this code is effectively disabled for all practical purposes, * as the allowed fb size is tiny if FIXED_ORDER is 8. @@ -513,7 +513,7 @@ do_triangle_ccw(struct lp_setup_context *setup, __m128i zero = vec_splats((unsigned char) 0); PIPE_ALIGN_VAR(16) int32_t temp_vec[4]; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN vshuf_mask.i[0] = 0x07060504; vshuf_mask.i[1] = 0x0B0A0908; vshuf_mask.i[2] = 0x03020100; diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index 20d46f8af90..7a19d4eddab 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -1399,7 +1399,7 @@ convert_to_blend_type(struct gallivm_state *gallivm, for (j = 0; j < src_fmt->nr_channels; ++j) { unsigned mask = 0; unsigned sa = src_fmt->channel[j].shift; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN unsigned from_lsb = j; #else unsigned from_lsb = src_fmt->nr_channels - j - 1; @@ -1581,7 +1581,7 @@ convert_from_blend_type(struct gallivm_state *gallivm, for (j = 0; j < src_fmt->nr_channels; ++j) { unsigned mask = 0; unsigned sa = src_fmt->channel[j].shift; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN unsigned from_lsb = j; #else unsigned from_lsb = src_fmt->nr_channels - j - 1; diff --git a/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c b/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c index 073b2a34670..3692d4a665c 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_fragprog.c @@ -41,7 +41,7 @@ nv30_fragprog_upload(struct nv30_context *nv30) if (unlikely(!fp->buffer)) fp->buffer = pipe_buffer_create(pipe->screen, 0, 0, fp->insn_len * 4); -#ifndef PIPE_ARCH_BIG_ENDIAN +#if !PIPE_ARCH_BIG_ENDIAN pipe_buffer_write(pipe, fp->buffer, 0, fp->insn_len * 4, fp->insn); #else { diff --git a/src/gallium/drivers/nouveau/nv30/nv30_vbo.c b/src/gallium/drivers/nouveau/nv30/nv30_vbo.c index bb0a8a0b1d5..595db095d91 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_vbo.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_vbo.c @@ -192,7 +192,7 @@ nv30_vbo_validate(struct nv30_context *nv30) if (!nv30->vertex || nv30->draw_flags) return; -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN if (1) { /* Figure out where the buffers are getting messed up */ #else if (unlikely(vertex->need_conversion)) { diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index 437df48826a..7ac65019467 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1157,7 +1157,7 @@ static void* r300_create_rs_state(struct pipe_context* pipe, rs->rs_draw.offset_tri = 0; rs->rs_draw.offset_clamp = 0; -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN vap_control_status = R300_VC_NO_SWAP; #else vap_control_status = R300_VC_32BIT_SWAP; diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h index 1ae0493db2c..1fbfeb7971a 100644 --- a/src/gallium/drivers/r600/r600_pipe_common.h +++ b/src/gallium/drivers/r600/r600_pipe_common.h @@ -118,7 +118,7 @@ enum r600_coherency { R600_COHERENCY_CB_META, }; -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN #define R600_BIG_ENDIAN 1 #else #define R600_BIG_ENDIAN 0 diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 4b9b15bc0cd..48fdb5bca37 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -1771,7 +1771,7 @@ void evergreen_do_fast_color_clear(struct r600_common_context *rctx, int i; /* This function is broken in BE, so just disable this path for now */ -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN return; #endif diff --git a/src/gallium/drivers/radeonsi/si_clear.c b/src/gallium/drivers/radeonsi/si_clear.c index 68a0eeb36b4..18729470456 100644 --- a/src/gallium/drivers/radeonsi/si_clear.c +++ b/src/gallium/drivers/radeonsi/si_clear.c @@ -400,7 +400,7 @@ static void si_do_fast_color_clear(struct si_context *sctx, int i; /* This function is broken in BE, so just disable this path for now */ -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN return; #endif diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 62183834416..2606052f378 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -32,7 +32,7 @@ #include "util/u_idalloc.h" #include "util/u_threaded_context.h" -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN #define SI_BIG_ENDIAN 1 #else #define SI_BIG_ENDIAN 0 @@ -760,7 +760,7 @@ struct si_shader_ctx_state { */ union si_vgt_param_key { struct { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN unsigned prim:4; unsigned uses_instancing:1; unsigned multi_instances_smaller_than_primgroup:1; @@ -795,7 +795,7 @@ union si_vgt_param_key { */ union si_vgt_stages_key { struct { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN unsigned tess:1; unsigned gs:1; unsigned ngg:1; /* gfx10+ */ diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h index 5c51ad41842..2c1698d0e9c 100644 --- a/src/gallium/include/pipe/p_config.h +++ b/src/gallium/include/pipe/p_config.h @@ -127,19 +127,6 @@ */ #include "util/u_endian.h" -#if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN) - -#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64) -#define PIPE_ARCH_LITTLE_ENDIAN -#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) -#define PIPE_ARCH_BIG_ENDIAN -#endif - -#endif - -#if !defined(PIPE_ARCH_LITTLE_ENDIAN) && !defined(PIPE_ARCH_BIG_ENDIAN) -#error Unknown Endianness -#endif /* * Auto-detect the operating system family. diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 2ddb31acbdc..05dd92c0da7 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -929,9 +929,9 @@ enum pipe_endian { PIPE_ENDIAN_LITTLE = 0, PIPE_ENDIAN_BIG = 1, -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN PIPE_ENDIAN_NATIVE = PIPE_ENDIAN_LITTLE -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN PIPE_ENDIAN_NATIVE = PIPE_ENDIAN_BIG #endif }; diff --git a/src/gallium/include/pipe/p_format.h b/src/gallium/include/pipe/p_format.h index 2da480d6dce..273abf85941 100644 --- a/src/gallium/include/pipe/p_format.h +++ b/src/gallium/include/pipe/p_format.h @@ -431,7 +431,7 @@ enum pipe_format { PIPE_FORMAT_COUNT }; -#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#if PIPE_ARCH_LITTLE_ENDIAN #define PIPE_FORMAT_RGBA8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM #define PIPE_FORMAT_RGBX8888_UNORM PIPE_FORMAT_R8G8B8X8_UNORM #define PIPE_FORMAT_BGRA8888_UNORM PIPE_FORMAT_B8G8R8A8_UNORM @@ -460,7 +460,7 @@ enum pipe_format { #define PIPE_FORMAT_GR1616_UNORM PIPE_FORMAT_G16R16_UNORM #define PIPE_FORMAT_RG1616_SNORM PIPE_FORMAT_R16G16_SNORM #define PIPE_FORMAT_GR1616_SNORM PIPE_FORMAT_G16R16_SNORM -#elif defined(PIPE_ARCH_BIG_ENDIAN) +#elif PIPE_ARCH_BIG_ENDIAN #define PIPE_FORMAT_ABGR8888_UNORM PIPE_FORMAT_R8G8B8A8_UNORM #define PIPE_FORMAT_XBGR8888_UNORM PIPE_FORMAT_R8G8B8X8_UNORM #define PIPE_FORMAT_ARGB8888_UNORM PIPE_FORMAT_B8G8R8A8_UNORM diff --git a/src/mapi/entry.c b/src/mapi/entry.c index b5126ade4cb..0105820b06b 100644 --- a/src/mapi/entry.c +++ b/src/mapi/entry.c @@ -53,7 +53,7 @@ # endif #elif defined(USE_X86_64_ASM) && defined(__GNUC__) && defined(USE_ELF_TLS) # include "entry_x86-64_tls.h" -#elif defined(USE_PPC64LE_ASM) && defined(__GNUC__) && defined(PIPE_ARCH_LITTLE_ENDIAN) +#elif defined(USE_PPC64LE_ASM) && defined(__GNUC__) && PIPE_ARCH_LITTLE_ENDIAN # ifdef USE_ELF_TLS # include "entry_ppc64le_tls.h" # else diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 749b9a36fb5..3fb376c24f0 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -932,7 +932,7 @@ static const struct { .image_format = __DRI_IMAGE_FORMAT_R8, .mesa_format = MESA_FORMAT_L_UNORM8, }, -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN { .image_format = __DRI_IMAGE_FORMAT_GR88, .mesa_format = MESA_FORMAT_RG_UNORM8, @@ -958,7 +958,7 @@ static const struct { .image_format = __DRI_IMAGE_FORMAT_R16, .mesa_format = MESA_FORMAT_L_UNORM16, }, -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN { .image_format = __DRI_IMAGE_FORMAT_GR1616, .mesa_format = MESA_FORMAT_RG_UNORM16, diff --git a/src/mesa/drivers/dri/r200/r200_blit.c b/src/mesa/drivers/dri/r200/r200_blit.c index 6b5988bdb67..20e8d8a58ae 100644 --- a/src/mesa/drivers/dri/r200/r200_blit.c +++ b/src/mesa/drivers/dri/r200/r200_blit.c @@ -43,7 +43,7 @@ unsigned r200_check_blit(mesa_format mesa_format, uint32_t dst_pitch) { /* XXX others? */ switch (mesa_format) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN case MESA_FORMAT_B8G8R8A8_UNORM: case MESA_FORMAT_B8G8R8X8_UNORM: case MESA_FORMAT_B5G6R5_UNORM: @@ -121,7 +121,7 @@ static void inline emit_tx_setup(struct r200_context *r200, assert(height <= 2048); assert(offset % 32 == 0); -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN txformat |= tx_table_le[src_mesa_format].format; #else txformat |= tx_table_be[src_mesa_format].format; @@ -170,7 +170,7 @@ static void inline emit_tx_setup(struct r200_context *r200, break; case MESA_FORMAT_A8B8G8R8_UNORM: case MESA_FORMAT_R8G8B8A8_UNORM: -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN if (dst_mesa_format == MESA_FORMAT_A8B8G8R8_UNORM) { #else if (dst_mesa_format == MESA_FORMAT_R8G8B8A8_UNORM) { diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index df36ca68980..4bbe2c45563 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -1308,7 +1308,7 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t) if (!t->image_override) { if (VALID_FORMAT(firstImage->TexFormat)) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN const struct tx_table *table = tx_table_le; #else const struct tx_table *table = tx_table_be; diff --git a/src/mesa/drivers/dri/radeon/radeon_blit.c b/src/mesa/drivers/dri/radeon/radeon_blit.c index a72be9435ab..816d624b885 100644 --- a/src/mesa/drivers/dri/radeon/radeon_blit.c +++ b/src/mesa/drivers/dri/radeon/radeon_blit.c @@ -43,7 +43,7 @@ unsigned r100_check_blit(mesa_format mesa_format, uint32_t dst_pitch) { /* XXX others? */ switch (mesa_format) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN case MESA_FORMAT_B8G8R8A8_UNORM: case MESA_FORMAT_B8G8R8X8_UNORM: case MESA_FORMAT_B5G6R5_UNORM: diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 9e7887de769..2469982ae13 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -697,21 +697,21 @@ radeonCreateBuffer( __DRIscreen *driScrnPriv, if (mesaVis->redBits == 5) rgbFormat = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN MESA_FORMAT_B5G6R5_UNORM; #else MESA_FORMAT_R5G6B5_UNORM; #endif else if (mesaVis->alphaBits == 0) rgbFormat = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN MESA_FORMAT_B8G8R8X8_UNORM; #else MESA_FORMAT_X8R8G8B8_UNORM; #endif else rgbFormat = -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN MESA_FORMAT_B8G8R8A8_UNORM; #else MESA_FORMAT_A8R8G8B8_UNORM; diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 2888c1eba84..c8f1b07d31c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -602,7 +602,7 @@ mesa_format _radeon_texformat_argb1555 = MESA_FORMAT_NONE; static void radeonInitTextureFormats(void) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN _radeon_texformat_rgba8888 = MESA_FORMAT_A8B8G8R8_UNORM; _radeon_texformat_argb8888 = MESA_FORMAT_B8G8R8A8_UNORM; _radeon_texformat_rgb565 = MESA_FORMAT_B5G6R5_UNORM; diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index f5595ae020d..38a78c7eb39 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -455,7 +455,7 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, */ if (osmesa->format == OSMESA_RGBA) { if (osmesa->DataType == GL_UNSIGNED_BYTE) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN rb->Format = MESA_FORMAT_R8G8B8A8_UNORM; #else rb->Format = MESA_FORMAT_A8B8G8R8_UNORM; @@ -470,7 +470,7 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, } else if (osmesa->format == OSMESA_BGRA) { if (osmesa->DataType == GL_UNSIGNED_BYTE) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN rb->Format = MESA_FORMAT_B8G8R8A8_UNORM; #else rb->Format = MESA_FORMAT_A8R8G8B8_UNORM; @@ -487,7 +487,7 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, } else if (osmesa->format == OSMESA_ARGB) { if (osmesa->DataType == GL_UNSIGNED_BYTE) { -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN rb->Format = MESA_FORMAT_A8R8G8B8_UNORM; #else rb->Format = MESA_FORMAT_B8G8R8A8_UNORM; diff --git a/src/util/sha1/sha1.c b/src/util/sha1/sha1.c index f36a77c2026..78b3da31d0e 100644 --- a/src/util/sha1/sha1.c +++ b/src/util/sha1/sha1.c @@ -25,7 +25,7 @@ * blk0() and blk() perform the initial expand. * I got the idea of expanding during the round function from SSLeay */ -#ifdef PIPE_ARCH_LITTLE_ENDIAN +#if PIPE_ARCH_LITTLE_ENDIAN # define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ |(rol(block->l[i],8)&0x00FF00FF)) #else diff --git a/src/util/u_endian.h b/src/util/u_endian.h index 7ec51380ffa..07f8d8cfc85 100644 --- a/src/util/u_endian.h +++ b/src/util/u_endian.h @@ -31,27 +31,33 @@ #include <endian.h> #if __BYTE_ORDER == __LITTLE_ENDIAN -# define PIPE_ARCH_LITTLE_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 1 +# define PIPE_ARCH_BIG_ENDIAN 0 #elif __BYTE_ORDER == __BIG_ENDIAN -# define PIPE_ARCH_BIG_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 0 +# define PIPE_ARCH_BIG_ENDIAN 1 #endif #elif defined(__APPLE__) #include <machine/endian.h> #if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN -# define PIPE_ARCH_LITTLE_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 1 +# define PIPE_ARCH_BIG_ENDIAN 0 #elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN -# define PIPE_ARCH_BIG_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 0 +# define PIPE_ARCH_BIG_ENDIAN 1 #endif #elif defined(__sun) #include <sys/isa_defs.h> #if defined(_LITTLE_ENDIAN) -# define PIPE_ARCH_LITTLE_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 1 +# define PIPE_ARCH_BIG_ENDIAN 0 #elif defined(_BIG_ENDIAN) -# define PIPE_ARCH_BIG_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 0 +# define PIPE_ARCH_BIG_ENDIAN 1 #endif #elif defined(__OpenBSD__) || defined(__NetBSD__) || \ @@ -60,14 +66,17 @@ #include <machine/endian.h> #if _BYTE_ORDER == _LITTLE_ENDIAN -# define PIPE_ARCH_LITTLE_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 1 +# define PIPE_ARCH_BIG_ENDIAN 0 #elif _BYTE_ORDER == _BIG_ENDIAN -# define PIPE_ARCH_BIG_ENDIAN +# define PIPE_ARCH_LITTLE_ENDIAN 0 +# define PIPE_ARCH_BIG_ENDIAN 1 #endif #elif defined(_WIN32) -#define PIPE_ARCH_LITTLE_ENDIAN +#define PIPE_ARCH_LITTLE_ENDIAN 1 +#define PIPE_ARCH_BIG_ENDIAN 0 #endif diff --git a/src/util/u_math.h b/src/util/u_math.h index 7b779c79ca7..4c3aafe80ab 100644 --- a/src/util/u_math.h +++ b/src/util/u_math.h @@ -569,7 +569,7 @@ util_bitreverse(unsigned n) * Convert from little endian to CPU byte order. */ -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN #define util_le64_to_cpu(x) util_bswap64(x) #define util_le32_to_cpu(x) util_bswap32(x) #define util_le16_to_cpu(x) util_bswap16(x) @@ -627,7 +627,7 @@ util_bswap16(uint16_t n) static inline void* util_memcpy_cpu_to_le32(void * restrict dest, const void * restrict src, size_t n) { -#ifdef PIPE_ARCH_BIG_ENDIAN +#if PIPE_ARCH_BIG_ENDIAN size_t i, e; assert(n % 4 == 0); |