Attachment 209378 Details for Bug 242053 – Replace problematic inline functions with macros

[patch] Replace problematic inline functions with macros

patch-libctf_swap.h (text/plain), 1.60 KB, created by Matthieu Volat on 2019-11-24 08:59:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Volat

Created: 2019-11-24 08:59:37 UTC

Size: 1.60 KB

patch

obsolete

>--- libctf/swap.h.orig	2019-11-24 09:47:52.876069000 +0100
>+++ libctf/swap.h	2019-11-24 09:49:56.273103000 +0100
>@@ -28,39 +28,24 @@
> #else
> 
> /* Provide our own versions of the byteswap functions.  */
>-inline uint16_t
>-bswap_16 (uint16_t v)
>-{
>-  return ((v >> 8) & 0xff) | ((v & 0xff) << 8);
>-}
>+#define bswap_16(v) ((v >> 8) & 0xff) | ((v & 0xff) << 8)
> 
>-inline uint32_t
>-bswap_32 (uint32_t v)
>-{
>-  return (  ((v & 0xff000000) >> 24)
>-	  | ((v & 0x00ff0000) >>  8)
>-	  | ((v & 0x0000ff00) <<  8)
>-	  | ((v & 0x000000ff) << 24));
>-}
>+#define bswap_32(v) (  ((v & 0xff000000) >> 24) \
>+      | ((v & 0x00ff0000) >>  8) \
>+      | ((v & 0x0000ff00) <<  8) \
>+      | ((v & 0x000000ff) << 24))
> 
>-inline uint64_t
>-bswap_identity_64 (uint64_t v)
>-{
>-  return v;
>-}
>+#define bswap_identity_64(v) (v)
> 
>-inline uint64_t
>-bswap_64 (uint64_t v)
>-{
>-  return (  ((v & 0xff00000000000000ULL) >> 56)
>-	  | ((v & 0x00ff000000000000ULL) >> 40)
>-	  | ((v & 0x0000ff0000000000ULL) >> 24)
>-	  | ((v & 0x000000ff00000000ULL) >>  8)
>-	  | ((v & 0x00000000ff000000ULL) <<  8)
>-	  | ((v & 0x0000000000ff0000ULL) << 24)
>-	  | ((v & 0x000000000000ff00ULL) << 40)
>-	  | ((v & 0x00000000000000ffULL) << 56));
>-}
>+#define bswap_64(v) (  ((v & 0xff00000000000000ULL) >> 56) \
>+	  | ((v & 0x00ff000000000000ULL) >> 40) \
>+	  | ((v & 0x0000ff0000000000ULL) >> 24) \
>+	  | ((v & 0x000000ff00000000ULL) >>  8) \
>+	  | ((v & 0x00000000ff000000ULL) <<  8) \
>+	  | ((v & 0x0000000000ff0000ULL) << 24) \
>+	  | ((v & 0x000000000000ff00ULL) << 40) \
>+	  | ((v & 0x00000000000000ffULL) << 56))
>+
> #endif /* !defined(HAVE_BYTESWAP_H) */
> 
> #endif /* !defined(_CTF_SWAP_H) */

Actions: View | Diff

Attachments on bug 242053: 209338 | 209378 | 209997