From 01d16d821f4218ce0db9257013d0ad9b339cabe6 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 2 Mar 2015 16:25:53 +0000 Subject: [PATCH] [libc] Rewrite byte-swapping code Signed-off-by: Michael Brown --- src/arch/i386/include/bits/endian.h | 8 -- src/arch/x86/include/bits/endian.h | 8 ++ src/arch/x86_64/include/bits/endian.h | 6 - src/drivers/net/eepro.c | 6 +- src/include/big_bswap.h | 35 ------ src/include/byteswap.h | 173 +++++++++++++++++++------- src/include/endian.h | 31 ++--- src/include/little_bswap.h | 37 ------ src/net/80211/wpa_tkip.c | 2 +- 9 files changed, 154 insertions(+), 152 deletions(-) delete mode 100644 src/arch/i386/include/bits/endian.h create mode 100644 src/arch/x86/include/bits/endian.h delete mode 100644 src/arch/x86_64/include/bits/endian.h delete mode 100644 src/include/big_bswap.h delete mode 100644 src/include/little_bswap.h diff --git a/src/arch/i386/include/bits/endian.h b/src/arch/i386/include/bits/endian.h deleted file mode 100644 index 84188542..00000000 --- a/src/arch/i386/include/bits/endian.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef ETHERBOOT_BITS_ENDIAN_H -#define ETHERBOOT_BITS_ENDIAN_H - -FILE_LICENCE ( GPL2_OR_LATER ); - -#define __BYTE_ORDER __LITTLE_ENDIAN - -#endif /* ETHERBOOT_BITS_ENDIAN_H */ diff --git a/src/arch/x86/include/bits/endian.h b/src/arch/x86/include/bits/endian.h new file mode 100644 index 00000000..85718cfd --- /dev/null +++ b/src/arch/x86/include/bits/endian.h @@ -0,0 +1,8 @@ +#ifndef _BITS_ENDIAN_H +#define _BITS_ENDIAN_H + +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif /* _BITS_ENDIAN_H */ diff --git a/src/arch/x86_64/include/bits/endian.h b/src/arch/x86_64/include/bits/endian.h deleted file mode 100644 index 413e702d..00000000 --- a/src/arch/x86_64/include/bits/endian.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef ETHERBOOT_BITS_ENDIAN_H -#define ETHERBOOT_BITS_ENDIAN_H - -#define __BYTE_ORDER __LITTLE_ENDIAN - -#endif /* ETHERBOOT_BITS_ENDIAN_H */ diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c index 5c3ea642..97b4c406 100644 --- a/src/drivers/net/eepro.c +++ b/src/drivers/net/eepro.c @@ -601,9 +601,9 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) { l_eepro = 0; name = "Intel 82595-based LAN card"; } - station_addr.saddr[0] = swap16(station_addr.saddr[0]); - station_addr.saddr[1] = swap16(station_addr.saddr[1]); - station_addr.saddr[2] = swap16(station_addr.saddr[2]); + station_addr.saddr[0] = bswap_16(station_addr.saddr[0]); + station_addr.saddr[1] = bswap_16(station_addr.saddr[1]); + station_addr.saddr[2] = bswap_16(station_addr.saddr[2]); for (i = 0; i < ETH_ALEN; i++) { nic->node_addr[i] = station_addr.caddr[i]; } diff --git a/src/include/big_bswap.h b/src/include/big_bswap.h deleted file mode 100644 index 6c375a57..00000000 --- a/src/include/big_bswap.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef ETHERBOOT_BIG_BSWAP_H -#define ETHERBOOT_BIG_BSWAP_H - -#define htonll(x) (x) -#define ntohll(x) (x) -#define ntohl(x) (x) -#define htonl(x) (x) -#define ntohs(x) (x) -#define htons(x) (x) -#define cpu_to_le64(x) __bswap_64(x) -#define cpu_to_le32(x) __bswap_32(x) -#define cpu_to_le16(x) __bswap_16(x) -#define cpu_to_be64(x) (x) -#define cpu_to_be32(x) (x) -#define cpu_to_be16(x) (x) -#define le64_to_cpu(x) __bswap_64(x) -#define le32_to_cpu(x) __bswap_32(x) -#define le16_to_cpu(x) __bswap_16(x) -#define be64_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define be16_to_cpu(x) (x) -#define cpu_to_le64s(x) __bswap_64s(x) -#define cpu_to_le32s(x) __bswap_32s(x) -#define cpu_to_le16s(x) __bswap_16s(x) -#define cpu_to_be64s(x) do {} while (0) -#define cpu_to_be32s(x) do {} while (0) -#define cpu_to_be16s(x) do {} while (0) -#define le64_to_cpus(x) __bswap_64s(x) -#define le32_to_cpus(x) __bswap_32s(x) -#define le16_to_cpus(x) __bswap_16s(x) -#define be64_to_cpus(x) do {} while (0) -#define be32_to_cpus(x) do {} while (0) -#define be16_to_cpus(x) do {} while (0) - -#endif /* ETHERBOOT_BIG_BSWAP_H */ diff --git a/src/include/byteswap.h b/src/include/byteswap.h index 466759cf..d1028c57 100644 --- a/src/include/byteswap.h +++ b/src/include/byteswap.h @@ -1,59 +1,138 @@ -#ifndef ETHERBOOT_BYTESWAP_H -#define ETHERBOOT_BYTESWAP_H +#ifndef BYTESWAP_H +#define BYTESWAP_H -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); -#include "endian.h" -#include "bits/byteswap.h" +#include +#include +#include -#define __bswap_constant_16(x) \ - ((uint16_t)((((uint16_t)(x) & 0x00ff) << 8) | \ - (((uint16_t)(x) & 0xff00) >> 8))) +/** + * Byte-swap a 16-bit constant + * + * @v value Constant value + * @ret swapped Byte-swapped value + */ +#define __bswap_constant_16( value ) \ + ( ( ( (value) & 0x00ff ) << 8 ) | \ + ( ( (value) & 0xff00 ) >> 8 ) ) -#define __bswap_constant_32(x) \ - ((uint32_t)((((uint32_t)(x) & 0x000000ffU) << 24) | \ - (((uint32_t)(x) & 0x0000ff00U) << 8) | \ - (((uint32_t)(x) & 0x00ff0000U) >> 8) | \ - (((uint32_t)(x) & 0xff000000U) >> 24))) +/** + * Byte-swap a 32-bit constant + * + * @v value Constant value + * @ret swapped Byte-swapped value + */ +#define __bswap_constant_32( value ) \ + ( ( ( (value) & 0x000000ffUL ) << 24 ) | \ + ( ( (value) & 0x0000ff00UL ) << 8 ) | \ + ( ( (value) & 0x00ff0000UL ) >> 8 ) | \ + ( ( (value) & 0xff000000UL ) >> 24 ) ) -#define __bswap_constant_64(x) \ - ((uint64_t)((((uint64_t)(x) & 0x00000000000000ffULL) << 56) | \ - (((uint64_t)(x) & 0x000000000000ff00ULL) << 40) | \ - (((uint64_t)(x) & 0x0000000000ff0000ULL) << 24) | \ - (((uint64_t)(x) & 0x00000000ff000000ULL) << 8) | \ - (((uint64_t)(x) & 0x000000ff00000000ULL) >> 8) | \ - (((uint64_t)(x) & 0x0000ff0000000000ULL) >> 24) | \ - (((uint64_t)(x) & 0x00ff000000000000ULL) >> 40) | \ - (((uint64_t)(x) & 0xff00000000000000ULL) >> 56))) +/** + * Byte-swap a 64-bit constant + * + * @v value Constant value + * @ret swapped Byte-swapped value + */ +#define __bswap_constant_64( value ) \ + ( ( ( (value) & 0x00000000000000ffULL ) << 56 ) | \ + ( ( (value) & 0x000000000000ff00ULL ) << 40 ) | \ + ( ( (value) & 0x0000000000ff0000ULL ) << 24 ) | \ + ( ( (value) & 0x00000000ff000000ULL ) << 8 ) | \ + ( ( (value) & 0x000000ff00000000ULL ) >> 8 ) | \ + ( ( (value) & 0x0000ff0000000000ULL ) >> 24 ) | \ + ( ( (value) & 0x00ff000000000000ULL ) >> 40 ) | \ + ( ( (value) & 0xff00000000000000ULL ) >> 56 ) ) -#define __bswap_16(x) \ - ((uint16_t)(__builtin_constant_p(x) ? \ - __bswap_constant_16(x) : \ - __bswap_variable_16(x))) +/** + * Byte-swap a 16-bit value + * + * @v value Value + * @ret swapped Byte-swapped value + */ +#define __bswap_16( value ) \ + ( __builtin_constant_p (value) ? \ + ( ( uint16_t ) __bswap_constant_16 ( ( uint16_t ) (value) ) ) \ + : __bswap_variable_16 (value) ) +#define bswap_16( value ) __bswap_16 (value) -#define __bswap_32(x) \ - ((uint32_t)(__builtin_constant_p(x) ? \ - __bswap_constant_32(x) : \ - __bswap_variable_32(x))) +/** + * Byte-swap a 32-bit value + * + * @v value Value + * @ret swapped Byte-swapped value + */ +#define __bswap_32( value ) \ + ( __builtin_constant_p (value) ? \ + ( ( uint32_t ) __bswap_constant_32 ( ( uint32_t ) (value) ) ) \ + : __bswap_variable_32 (value) ) +#define bswap_32( value ) __bswap_32 (value) -#define __bswap_64(x) \ - ((uint64_t)(__builtin_constant_p(x) ? \ - __bswap_constant_64(x) : \ - __bswap_variable_64(x))) +/** + * Byte-swap a 64-bit value + * + * @v value Value + * @ret swapped Byte-swapped value + */ +#define __bswap_64( value ) \ + ( __builtin_constant_p (value) ? \ + ( ( uint64_t ) __bswap_constant_64 ( ( uint64_t ) (value) ) ) \ + : __bswap_variable_64 (value) ) +#define bswap_64( value ) __bswap_64 (value) #if __BYTE_ORDER == __LITTLE_ENDIAN -#include "little_bswap.h" -#endif -#if __BYTE_ORDER == __BIG_ENDIAN -#include "big_bswap.h" +#define __cpu_to_leNN( bits, value ) (value) +#define __cpu_to_beNN( bits, value ) __bswap_ ## bits (value) +#define __leNN_to_cpu( bits, value ) (value) +#define __beNN_to_cpu( bits, value ) __bswap_ ## bits (value) +#define __cpu_to_leNNs( bits, ptr ) do { } while ( 0 ) +#define __cpu_to_beNNs( bits, ptr ) __bswap_ ## bits ## s (ptr) +#define __leNN_to_cpus( bits, ptr ) do { } while ( 0 ) +#define __beNN_to_cpus( bits, ptr ) __bswap_ ## bits ## s (ptr) #endif -/* Make routines available to all */ -#define swap64(x) __bswap_64(x) -#define swap32(x) __bswap_32(x) -#define swap16(x) __bswap_16(x) -#define bswap_64(x) __bswap_64(x) -#define bswap_32(x) __bswap_32(x) -#define bswap_16(x) __bswap_16(x) - -#endif /* ETHERBOOT_BYTESWAP_H */ +#if __BYTE_ORDER == __BIG_ENDIAN +#define __cpu_to_leNN( bits, value ) __bswap_ ## bits (value) +#define __cpu_to_beNN( bits, value ) (value) +#define __leNN_to_cpu( bits, value ) __bswap_ ## bits (value) +#define __beNN_to_cpu( bits, value ) (value) +#define __cpu_to_leNNs( bits, ptr ) __bswap_ ## bits ## s (ptr) +#define __cpu_to_beNNs( bits, ptr ) do { } while ( 0 ) +#define __leNN_to_cpus( bits, ptr ) __bswap_ ## bits ## s (ptr) +#define __beNN_to_cpus( bits, ptr ) do { } while ( 0 ) +#endif + +#define cpu_to_le16( value ) __cpu_to_leNN ( 16, value ) +#define cpu_to_le32( value ) __cpu_to_leNN ( 32, value ) +#define cpu_to_le64( value ) __cpu_to_leNN ( 64, value ) +#define cpu_to_be16( value ) __cpu_to_beNN ( 16, value ) +#define cpu_to_be32( value ) __cpu_to_beNN ( 32, value ) +#define cpu_to_be64( value ) __cpu_to_beNN ( 64, value ) +#define le16_to_cpu( value ) __leNN_to_cpu ( 16, value ) +#define le32_to_cpu( value ) __leNN_to_cpu ( 32, value ) +#define le64_to_cpu( value ) __leNN_to_cpu ( 64, value ) +#define be16_to_cpu( value ) __beNN_to_cpu ( 16, value ) +#define be32_to_cpu( value ) __beNN_to_cpu ( 32, value ) +#define be64_to_cpu( value ) __beNN_to_cpu ( 64, value ) +#define cpu_to_le16s( ptr ) __cpu_to_leNNs ( 16, ptr ) +#define cpu_to_le32s( ptr ) __cpu_to_leNNs ( 32, ptr ) +#define cpu_to_le64s( ptr ) __cpu_to_leNNs ( 64, ptr ) +#define cpu_to_be16s( ptr ) __cpu_to_beNNs ( 16, ptr ) +#define cpu_to_be32s( ptr ) __cpu_to_beNNs ( 32, ptr ) +#define cpu_to_be64s( ptr ) __cpu_to_beNNs ( 64, ptr ) +#define le16_to_cpus( ptr ) __leNN_to_cpus ( 16, ptr ) +#define le32_to_cpus( ptr ) __leNN_to_cpus ( 32, ptr ) +#define le64_to_cpus( ptr ) __leNN_to_cpus ( 64, ptr ) +#define be16_to_cpus( ptr ) __beNN_to_cpus ( 16, ptr ) +#define be32_to_cpus( ptr ) __beNN_to_cpus ( 32, ptr ) +#define be64_to_cpus( ptr ) __beNN_to_cpus ( 64, ptr ) + +#define htonll( value ) cpu_to_be64 (value) +#define ntohll( value ) be64_to_cpu (value) +#define htonl( value ) cpu_to_be32 (value) +#define ntohl( value ) be32_to_cpu (value) +#define htons( value ) cpu_to_be16 (value) +#define ntohs( value ) be16_to_cpu (value) + +#endif /* BYTESWAP_H */ diff --git a/src/include/endian.h b/src/include/endian.h index 9682cf9b..79c3163e 100644 --- a/src/include/endian.h +++ b/src/include/endian.h @@ -1,21 +1,22 @@ -#ifndef ETHERBOOT_ENDIAN_H -#define ETHERBOOT_ENDIAN_H +#ifndef _ENDIAN_H +#define _ENDIAN_H -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); -/* Definitions for byte order, according to significance of bytes, - from low addresses to high addresses. The value is what you get by - putting '4' in the most significant byte, '3' in the second most - significant byte, '2' in the second least significant byte, and '1' - in the least significant byte, and then writing down one digit for - each byte, starting with the byte at the lowest address at the left, - and proceeding to the byte with the highest address at the right. */ +/** Constant representing little-endian byte order + * + * Little-endian systems should define BYTE_ORDER as LITTLE_ENDIAN. + * This constant is intended to be used only at compile time. + */ +#define __LITTLE_ENDIAN 0x44332211UL -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __PDP_ENDIAN 3412 +/** Constant representing big-endian byte order + * + * Big-endian systems should define BYTE_ORDER as BIG_ENDIAN. + * This constant is intended to be used only at compile time. + */ +#define __BIG_ENDIAN 0x11223344UL #include "bits/endian.h" - -#endif /* ETHERBOOT_ENDIAN_H */ +#endif /* _ENDIAN_H */ diff --git a/src/include/little_bswap.h b/src/include/little_bswap.h deleted file mode 100644 index 92dd26ba..00000000 --- a/src/include/little_bswap.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ETHERBOOT_LITTLE_BSWAP_H -#define ETHERBOOT_LITTLE_BSWAP_H - -FILE_LICENCE ( GPL2_OR_LATER ); - -#define htonll(x) __bswap_64(x) -#define ntohll(x) __bswap_64(x) -#define ntohl(x) __bswap_32(x) -#define htonl(x) __bswap_32(x) -#define ntohs(x) __bswap_16(x) -#define htons(x) __bswap_16(x) -#define cpu_to_le64(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le16(x) (x) -#define cpu_to_be64(x) __bswap_64(x) -#define cpu_to_be32(x) __bswap_32(x) -#define cpu_to_be16(x) __bswap_16(x) -#define le64_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le16_to_cpu(x) (x) -#define be64_to_cpu(x) __bswap_64(x) -#define be32_to_cpu(x) __bswap_32(x) -#define be16_to_cpu(x) __bswap_16(x) -#define cpu_to_le64s(x) do {} while (0) -#define cpu_to_le32s(x) do {} while (0) -#define cpu_to_le16s(x) do {} while (0) -#define cpu_to_be64s(x) __bswap_64s(x) -#define cpu_to_be32s(x) __bswap_32s(x) -#define cpu_to_be16s(x) __bswap_16s(x) -#define le64_to_cpus(x) do {} while (0) -#define le32_to_cpus(x) do {} while (0) -#define le16_to_cpus(x) do {} while (0) -#define be64_to_cpus(x) __bswap_64s(x) -#define be32_to_cpus(x) __bswap_32s(x) -#define be16_to_cpus(x) __bswap_16s(x) - -#endif /* ETHERBOOT_LITTLE_BSWAP_H */ diff --git a/src/net/80211/wpa_tkip.c b/src/net/80211/wpa_tkip.c index fa3e0763..3b1934b5 100644 --- a/src/net/80211/wpa_tkip.c +++ b/src/net/80211/wpa_tkip.c @@ -136,7 +136,7 @@ static const u16 Sbox[256] = { */ static inline u16 S ( u16 v ) { - return Sbox[v & 0xFF] ^ swap16 ( Sbox[v >> 8] ); + return Sbox[v & 0xFF] ^ bswap_16 ( Sbox[v >> 8] ); } /**