From 10ad5a5975306e2ed9ba7f98a116536d606444b3 Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Mon, 29 Jun 2015 23:53:05 -0400 Subject: [PATCH 1/2] Add BSWAP64() byte-swapping macro This includes detection of __builtin_bswap64() built-in availability, which is preferred. BSWAP64() can be used to convert big-endian unsigned integers to little-endian unsigned integers, and vice-versa. BSWAP32() is moved to c.h, alongside the new BSWAP64() macro. --- config/c-compiler.m4 | 18 ++++++++++++++++++ configure | 24 ++++++++++++++++++++++++ configure.in | 1 + src/include/c.h | 23 +++++++++++++++++++++++ src/include/pg_config.h.in | 3 +++ src/include/pg_config.h.win32 | 3 +++ src/include/port/pg_crc32c.h | 10 ---------- 7 files changed, 72 insertions(+), 10 deletions(-) diff --git a/config/c-compiler.m4 b/config/c-compiler.m4 index 050bfa5..f1b7045 100644 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@ -248,6 +248,24 @@ fi])# PGAC_C_BUILTIN_BSWAP32 +# PGAC_C_BUILTIN_BSWAP64 +# ------------------------- +# Check if the C compiler understands __builtin_bswap64(), +# and define HAVE__BUILTIN_BSWAP64 if so. +AC_DEFUN([PGAC_C_BUILTIN_BSWAP64], +[AC_CACHE_CHECK(for __builtin_bswap64, pgac_cv__builtin_bswap64, +[AC_COMPILE_IFELSE([AC_LANG_SOURCE( +[static unsigned long int x = __builtin_bswap64(0xaabbccdd);] +)], +[pgac_cv__builtin_bswap64=yes], +[pgac_cv__builtin_bswap64=no])]) +if test x"$pgac_cv__builtin_bswap64" = xyes ; then +AC_DEFINE(HAVE__BUILTIN_BSWAP64, 1, + [Define to 1 if your compiler understands __builtin_bswap64.]) +fi])# PGAC_C_BUILTIN_BSWAP64 + + + # PGAC_C_BUILTIN_CONSTANT_P # ------------------------- # Check if the C compiler understands __builtin_constant_p(), diff --git a/configure b/configure index 0407c4f..b921d63 100755 --- a/configure +++ b/configure @@ -10481,6 +10481,30 @@ if test x"$pgac_cv__builtin_bswap32" = xyes ; then $as_echo "#define HAVE__BUILTIN_BSWAP32 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap64" >&5 +$as_echo_n "checking for __builtin_bswap64... " >&6; } +if ${pgac_cv__builtin_bswap64+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +static unsigned long int x = __builtin_bswap64(0xaabbccdd); + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + pgac_cv__builtin_bswap64=yes +else + pgac_cv__builtin_bswap64=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_bswap64" >&5 +$as_echo "$pgac_cv__builtin_bswap64" >&6; } +if test x"$pgac_cv__builtin_bswap64" = xyes ; then + +$as_echo "#define HAVE__BUILTIN_BSWAP64 1" >>confdefs.h + +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_constant_p" >&5 $as_echo_n "checking for __builtin_constant_p... " >&6; } if ${pgac_cv__builtin_constant_p+:} false; then : diff --git a/configure.in b/configure.in index 1de41a2..77cb477 100644 --- a/configure.in +++ b/configure.in @@ -1237,6 +1237,7 @@ PGAC_C_FUNCNAME_SUPPORT PGAC_C_STATIC_ASSERT PGAC_C_TYPES_COMPATIBLE PGAC_C_BUILTIN_BSWAP32 +PGAC_C_BUILTIN_BSWAP64 PGAC_C_BUILTIN_CONSTANT_P PGAC_C_BUILTIN_UNREACHABLE PGAC_C_VA_ARGS diff --git a/src/include/c.h b/src/include/c.h index 92c5202..9874e39 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -963,6 +963,29 @@ typedef NameData *Name; #define STATUS_FOUND (1) #define STATUS_WAITING (2) +/* byte swapping macros */ +#ifdef HAVE__BUILTIN_BSWAP32 +#define BSWAP32(x) __builtin_bswap32(x) +#else +#define BSWAP32(x) (((x << 24) & 0xff000000) | \ + ((x << 8) & 0x00ff0000) | \ + ((x >> 8) & 0x0000ff00) | \ + ((x >> 24) & 0x000000ff)) +#endif /* HAVE__BUILTIN_BSWAP32 */ + +#ifdef HAVE__BUILTIN_BSWAP64 +#define BSWAP64(x) __builtin_bswap64(x) +#else +#define BSWAP64(x) (StaticAssertExpr(sizeof(x) == 8, "argument not 8 bytes"), \ + ( (x << 56) & 0xff00000000000000UL ) | \ + ( (x << 40) & 0x00ff000000000000UL ) | \ + ( (x << 24) & 0x0000ff0000000000UL ) | \ + ( (x << 8) & 0x000000ff00000000UL ) | \ + ( (x >> 8) & 0x00000000ff000000UL ) | \ + ( (x >> 24) & 0x0000000000ff0000UL ) | \ + ( (x >> 40) & 0x000000000000ff00UL ) | \ + ( (x >> 56) & 0x00000000000000ffUL )) +#endif /* HAVE__BUILTIN_BSWAP64 */ /* * Append PG_USED_FOR_ASSERTS_ONLY to definitions of variables that are only diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 5688f75..90c0e5f 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -666,6 +666,9 @@ /* Define to 1 if your compiler understands __builtin_bswap32. */ #undef HAVE__BUILTIN_BSWAP32 +/* Define to 1 if your compiler understands __builtin_bswap64. */ +#undef HAVE__BUILTIN_BSWAP64 + /* Define to 1 if your compiler understands __builtin_constant_p. */ #undef HAVE__BUILTIN_CONSTANT_P diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 22bbb91..4d484d1 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -520,6 +520,9 @@ /* Define to 1 if your compiler understands __builtin_bswap32. */ /* #undef HAVE__BUILTIN_BSWAP32 */ +/* Define to 1 if your compiler understands __builtin_bswap64. */ +/* #undef HAVE__BUILTIN_BSWAP64 */ + /* Define to 1 if your compiler understands __builtin_constant_p. */ /* #undef HAVE__BUILTIN_CONSTANT_P */ diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h index c925c56..e5389aa 100644 --- a/src/include/port/pg_crc32c.h +++ b/src/include/port/pg_crc32c.h @@ -71,16 +71,6 @@ extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len) #define COMP_CRC32C(crc, data, len) \ ((crc) = pg_comp_crc32c_sb8((crc), (data), (len))) #ifdef WORDS_BIGENDIAN - -#ifdef HAVE__BUILTIN_BSWAP32 -#define BSWAP32(x) __builtin_bswap32(x) -#else -#define BSWAP32(x) (((x << 24) & 0xff000000) | \ - ((x << 8) & 0x00ff0000) | \ - ((x >> 8) & 0x0000ff00) | \ - ((x >> 24) & 0x000000ff)) -#endif - #define FIN_CRC32C(crc) ((crc) = BSWAP32(crc) ^ 0xFFFFFFFF) #else #define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF) -- 1.9.1