luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 20:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use __builtin_bswap* for GUINT*_SWAP_LE_BE if building with GCC

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=531901
This commit is contained in:
Sebastian Dröge 2012-03-17 23:28:48 -04:00 committed by Matthias Clasen
parent e2b47ae9e0
commit 57878d6042
2 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
glib/gtypes.h
View File

@ -181,6 +181,12 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
/* Arch specific stuff for speed /* Arch specific stuff for speed
*/ */
#if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__) #if defined (__GNUC__) && (__GNUC__ >= 2) && defined (__OPTIMIZE__)
# if __GNUC__ >= 4 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 3
# define GUINT32_SWAP_LE_BE(val) ((guint32) __builtin_bswap32 ((gint32) val))
# define GUINT64_SWAP_LE_BE(val) ((guint64) __builtin_bswap64 ((gint64) val))
# endif
# if defined (__i386__) # if defined (__i386__)
# define GUINT16_SWAP_LE_BE_IA32(val) \ # define GUINT16_SWAP_LE_BE_IA32(val) \
(G_GNUC_EXTENSION \ (G_GNUC_EXTENSION \
@ -236,8 +242,12 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
__r.__ll; })) __r.__ll; }))
/* Possibly just use the constant version and let gcc figure it out? */ /* Possibly just use the constant version and let gcc figure it out? */
# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val)) # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA32 (val))
# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val)) # ifndef GUINT32_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA32 (val))
# endif
# ifndef GUINT64_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA32 (val))
# endif
# elif defined (__ia64__) # elif defined (__ia64__)
# define GUINT16_SWAP_LE_BE_IA64(val) \ # define GUINT16_SWAP_LE_BE_IA64(val) \
(G_GNUC_EXTENSION \ (G_GNUC_EXTENSION \
@ -272,8 +282,12 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
: "r" (__x)); \ : "r" (__x)); \
__v; })) __v; }))
# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA64 (val)) # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_IA64 (val))
# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val)) # ifndef GUINT32_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_IA64 (val))
# endif
# ifndef GUINT64_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_IA64 (val))
# endif
# elif defined (__x86_64__) # elif defined (__x86_64__)
# define GUINT32_SWAP_LE_BE_X86_64(val) \ # define GUINT32_SWAP_LE_BE_X86_64(val) \
(G_GNUC_EXTENSION \ (G_GNUC_EXTENSION \
@ -297,12 +311,20 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
__v; })) __v; }))
/* gcc seems to figure out optimal code for this on its own */ /* gcc seems to figure out optimal code for this on its own */
# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val)) # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val)) # ifndef GUINT32_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_X86_64 (val))
# endif
# ifndef GUINT64_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_X86_64 (val))
# endif
# else /* generic gcc */ # else /* generic gcc */
# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val)) # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))
# define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val)) # ifndef GUINT32_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val)) # define GUINT32_SWAP_LE_BE(val) (GUINT32_SWAP_LE_BE_CONSTANT (val))
# endif
# ifndef GUINT64_SWAP_LE_BE
# define GUINT64_SWAP_LE_BE(val) (GUINT64_SWAP_LE_BE_CONSTANT (val))
# endif
# endif # endif
#else /* generic */ #else /* generic */
# define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val)) # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_CONSTANT (val))

24
glib/tests/utils.c
View File

@ -207,6 +207,29 @@ test_bits (void)
} }
} }
static void
test_swap (void)
{
guint16 a16, b16;
guint32 a32, b32;
guint64 a64, b64;
a16 = 0xaabb;
b16 = 0xbbaa;
g_assert_cmpint (GUINT16_SWAP_LE_BE (a16), ==, b16);
a32 = 0xaaaabbbb;
b32 = 0xbbbbaaaa;
g_assert_cmpint (GUINT32_SWAP_LE_BE (a32), ==, b32);
a64 = 0xaaaaaaaabbbbbbbb;
b64 = 0xbbbbbbbbaaaaaaaa;
g_assert_cmpint (GUINT64_SWAP_LE_BE (a64), ==, b64);
}
static void static void
test_find_program (void) test_find_program (void)
{ {
@ -319,6 +342,7 @@ main (int argc,
g_test_add_func ("/utils/appname", test_appname); g_test_add_func ("/utils/appname", test_appname);
g_test_add_func ("/utils/tmpdir", test_tmpdir); g_test_add_func ("/utils/tmpdir", test_tmpdir);
g_test_add_func ("/utils/bits", test_bits); g_test_add_func ("/utils/bits", test_bits);
g_test_add_func ("/utils/swap", test_swap);
g_test_add_func ("/utils/find-program", test_find_program); g_test_add_func ("/utils/find-program", test_find_program);
g_test_add_func ("/utils/debug", test_debug); g_test_add_func ("/utils/debug", test_debug);
g_test_add_func ("/utils/codeset", test_codeset); g_test_add_func ("/utils/codeset", test_codeset);