diff options
author | Ulrich Drepper <drepper@redhat.com> | 2005-10-10 15:49:43 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2005-10-10 15:49:43 +0000 |
commit | a550d3c967af6af9855ab2e4ea0e3e2642ac5e6a (patch) | |
tree | 3b3b4c6de053de03428a60914bb3112085c3f86e /sysdeps | |
parent | e2655518752cec1878796a7e859d11143a0d7d3a (diff) | |
download | glibc-a550d3c967af6af9855ab2e4ea0e3e2642ac5e6a.zip glibc-a550d3c967af6af9855ab2e4ea0e3e2642ac5e6a.tar.gz glibc-a550d3c967af6af9855ab2e4ea0e3e2642ac5e6a.tar.bz2 |
* sysdeps/generic/bits/byteswap.h (__bswap_constant_16): New macro.
(__bswap_16): Use it.
(__bswap_constant_32): New macro.
(__bswap_32): Use it.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/bits/byteswap.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sysdeps/generic/bits/byteswap.h b/sysdeps/generic/bits/byteswap.h index 5f08fed..949ed0b 100644 --- a/sysdeps/generic/bits/byteswap.h +++ b/sysdeps/generic/bits/byteswap.h @@ -25,32 +25,35 @@ #define _BITS_BYTESWAP_H 1 /* Swap bytes in 16 bit value. */ +#define __bswap_constant_16(x) \ + ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) + #ifdef __GNUC__ # define __bswap_16(x) \ (__extension__ \ - ({ unsigned short int __bsx = (x); \ - ((((__bsx) >> 8) & 0xffu) | (((__bsx) & 0xffu) << 8)); })) + ({ unsigned short int __bsx = (x); __bswap_constant_16 (__bsx); })) #else static __inline unsigned short int __bswap_16 (unsigned short int __bsx) { - return ((((__bsx) >> 8) & 0xffu) | (((__bsx) & 0xffu) << 8)); + return __bswap_constant_16 (__bsx); } #endif /* Swap bytes in 32 bit value. */ +#define __bswap_constant_32(x) \ + ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ + (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) + #ifdef __GNUC__ # define __bswap_32(x) \ (__extension__ \ - ({ unsigned int __bsx = (x); \ - ((((__bsx) & 0xff000000u) >> 24) | (((__bsx) & 0x00ff0000u) >> 8) | \ - (((__bsx) & 0x0000ff00u) << 8) | (((__bsx) & 0x000000ffu) << 24)); })) + ({ register unsigned int __bsx = (x); __bswap_constant_32 (__bsx); })) #else static __inline unsigned int __bswap_32 (unsigned int __bsx) { - return ((((__bsx) & 0xff000000u) >> 24) | (((__bsx) & 0x00ff0000u) >> 8) | - (((__bsx) & 0x0000ff00u) << 8) | (((__bsx) & 0x000000ffu) << 24)); + return __bswap_constant_32 (__bsx); } #endif |