Convert macros in elf-linux-core.h to inline functions

Besides changing some macros into inline functions, this removes
redundant memsets and uses bfd_put_* rather than H_PUT_*.

	* elf-linux-core.h (swap_linux_prpsinfo32_out): New function.
	(swap_linux_prpsinfo64_out): New function.
	(LINUX_PRPSINFO32_SWAP_FIELDS): Delete.
	(LINUX_PRPSINFO64_SWAP_FIELDS): Delete.
	* elf.c (elfcore_write_linux_prpsinfo32): Adjust.  Don't memset.
	(elfcore_write_linux_prpsinfo64): Likewise.
	* elf32-ppc.c (swap_ppc_linux_prpsinfo32_out): New function.
	(PPC_LINUX_PRPSINFO32_SWAP_FIELDS): Delete.
	(elfcore_write_ppc_linux_prpsinfo32): Adjust.  Don't memset.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d06be40961273e9cfc53126f41c8ce6559157fa7..dcf21ce0208815d2800a60e1d4692942c45c1f90 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-21  Alan Modra  <amodra@gmail.com>
+
+       * elf-linux-core.h (swap_linux_prpsinfo32_out): New function.
+       (swap_linux_prpsinfo64_out): New function.
+       (LINUX_PRPSINFO32_SWAP_FIELDS): Delete.
+       (LINUX_PRPSINFO64_SWAP_FIELDS): Delete.
+       * elf.c (elfcore_write_linux_prpsinfo32): Adjust.  Don't memset.
+       (elfcore_write_linux_prpsinfo64): Likewise.
+       * elf32-ppc.c (swap_ppc_linux_prpsinfo32_out): New function.
+       (PPC_LINUX_PRPSINFO32_SWAP_FIELDS): Delete.
+       (elfcore_write_ppc_linux_prpsinfo32): Adjust.  Don't memset.
+
 2016-01-21  Alan Modra  <amodra@gmail.com>
 
        * elf-linux-core.h: Rename from elf-linux-psinfo.h.

diff --git a/bfd/elf-linux-core.h b/bfd/elf-linux-core.h
index ceb88bd291ecd86dac0402e9a2f5ec2105cdfd27..48fd5aeb559af61836cc5926abc6321557f79624 100644 (file)
--- a/bfd/elf-linux-core.h
+++ b/bfd/elf-linux-core.h
@@ -18,8 +18,8 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#ifndef ELF_LINUX_PSINFO_H
-#define ELF_LINUX_PSINFO_H
+#ifndef ELF_LINUX_CORE_H
+#define ELF_LINUX_CORE_H
 
 /* The PRPSINFO structures defined below are used by most
    architectures, although some of them define their own versions
@@ -49,30 +49,28 @@ struct elf_external_linux_prpsinfo32
     char pr_psargs[80];                        /* Initial part of arg list.  */
   };
 
-/* Helper macro to swap (properly handling endianess) things from the
-   `elf_internal_linux_prpsinfo' structure to the
-   `elf_external_linux_prpsinfo32' structure.
-
-   Note that FROM should be a pointer, and TO should be the explicit
-   type.  */
-
-#define LINUX_PRPSINFO32_SWAP_FIELDS(abfd, from, to)                   \
-  do                                                                   \
-    {                                                                  \
-      H_PUT_8 (abfd, from->pr_state, &to.pr_state);                    \
-      H_PUT_8 (abfd, from->pr_sname, &to.pr_sname);                    \
-      H_PUT_8 (abfd, from->pr_zomb, &to.pr_zomb);                      \
-      H_PUT_8 (abfd, from->pr_nice, &to.pr_nice);                      \
-      H_PUT_32 (abfd, from->pr_flag, to.pr_flag);                      \
-      H_PUT_16 (abfd, from->pr_uid, to.pr_uid);                                \
-      H_PUT_16 (abfd, from->pr_gid, to.pr_gid);                                \
-      H_PUT_32 (abfd, from->pr_pid, to.pr_pid);                                \
-      H_PUT_32 (abfd, from->pr_ppid, to.pr_ppid);                      \
-      H_PUT_32 (abfd, from->pr_pgrp, to.pr_pgrp);                      \
-      H_PUT_32 (abfd, from->pr_sid, to.pr_sid);                                \
-      strncpy (to.pr_fname, from->pr_fname, sizeof (to.pr_fname));     \
-      strncpy (to.pr_psargs, from->pr_psargs, sizeof (to.pr_psargs));  \
-    } while (0)
+/* Helper function to copy an elf_internal_linux_prpsinfo in host
+   endian to an elf_external_linux_prpsinfo32 in target endian.  */
+
+static inline void
+swap_linux_prpsinfo32_out (bfd *obfd,
+                          const struct elf_internal_linux_prpsinfo *from,
+                          struct elf_external_linux_prpsinfo32 *to)
+{
+  bfd_put_8 (obfd, from->pr_state, &to->pr_state);
+  bfd_put_8 (obfd, from->pr_sname, &to->pr_sname);
+  bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb);
+  bfd_put_8 (obfd, from->pr_nice, &to->pr_nice);
+  bfd_put_32 (obfd, from->pr_flag, to->pr_flag);
+  bfd_put_16 (obfd, from->pr_uid, to->pr_uid);
+  bfd_put_16 (obfd, from->pr_gid, to->pr_gid);
+  bfd_put_32 (obfd, from->pr_pid, to->pr_pid);
+  bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid);
+  bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp);
+  bfd_put_32 (obfd, from->pr_sid, to->pr_sid);
+  strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname));
+  strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs));
+}
 
 /* External 64-bit structure for PRPSINFO.  This structure is
    ABI-defined, thus we choose to use char arrays here in order to
@@ -99,29 +97,27 @@ struct elf_external_linux_prpsinfo64
     char pr_psargs[80];                        /* Initial part of arg list.  */
   };
 
-/* Helper macro to swap (properly handling endianess) things from the
-   `elf_internal_linux_prpsinfo' structure to the
-   `elf_external_linux_prpsinfo64' structure.
-
-   Note that FROM should be a pointer, and TO should be the explicit
-   type.  */
-
-#define LINUX_PRPSINFO64_SWAP_FIELDS(abfd, from, to)                   \
-  do                                                                   \
-    {                                                                  \
-      H_PUT_8 (abfd, from->pr_state, &to.pr_state);                    \
-      H_PUT_8 (abfd, from->pr_sname, &to.pr_sname);                    \
-      H_PUT_8 (abfd, from->pr_zomb, &to.pr_zomb);                      \
-      H_PUT_8 (abfd, from->pr_nice, &to.pr_nice);                      \
-      H_PUT_64 (abfd, from->pr_flag, to.pr_flag);                      \
-      H_PUT_32 (abfd, from->pr_uid, to.pr_uid);                                \
-      H_PUT_32 (abfd, from->pr_gid, to.pr_gid);                                \
-      H_PUT_32 (abfd, from->pr_pid, to.pr_pid);                                \
-      H_PUT_32 (abfd, from->pr_ppid, to.pr_ppid);                      \
-      H_PUT_32 (abfd, from->pr_pgrp, to.pr_pgrp);                      \
-      H_PUT_32 (abfd, from->pr_sid, to.pr_sid);                                \
-      strncpy (to.pr_fname, from->pr_fname, sizeof (to.pr_fname));     \
-      strncpy (to.pr_psargs, from->pr_psargs, sizeof (to.pr_psargs));  \
-    } while (0)
+/* Helper function to copy an elf_internal_linux_prpsinfo in host
+   endian to an elf_external_linux_prpsinfo64 in target endian.  */
+
+static inline void
+swap_linux_prpsinfo64_out (bfd *obfd,
+                          const struct elf_internal_linux_prpsinfo *from,
+                          struct elf_external_linux_prpsinfo64 *to)
+{
+  bfd_put_8 (obfd, from->pr_state, &to->pr_state);
+  bfd_put_8 (obfd, from->pr_sname, &to->pr_sname);
+  bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb);
+  bfd_put_8 (obfd, from->pr_nice, &to->pr_nice);
+  bfd_put_64 (obfd, from->pr_flag, to->pr_flag);
+  bfd_put_32 (obfd, from->pr_uid, to->pr_uid);
+  bfd_put_32 (obfd, from->pr_gid, to->pr_gid);
+  bfd_put_32 (obfd, from->pr_pid, to->pr_pid);
+  bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid);
+  bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp);
+  bfd_put_32 (obfd, from->pr_sid, to->pr_sid);
+  strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname));
+  strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs));
+}
 
 #endif

diff --git a/bfd/elf.c b/bfd/elf.c
index dba5a0f000227c8206bef61f2b0f28a529f6dd01..74c2f2d33a46057fb1551a5f50190cf001ff1779 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -9791,9 +9791,7 @@ elfcore_write_linux_prpsinfo32
 {
   struct elf_external_linux_prpsinfo32 data;
 
-  memset (&data, 0, sizeof (data));
-  LINUX_PRPSINFO32_SWAP_FIELDS (abfd, prpsinfo, data);
-
+  swap_linux_prpsinfo32_out (abfd, prpsinfo, &data);
   return elfcore_write_note (abfd, buf, bufsiz, "CORE", NT_PRPSINFO,
                             &data, sizeof (data));
 }
@@ -9805,9 +9803,7 @@ elfcore_write_linux_prpsinfo64
 {
   struct elf_external_linux_prpsinfo64 data;
 
-  memset (&data, 0, sizeof (data));
-  LINUX_PRPSINFO64_SWAP_FIELDS (abfd, prpsinfo, data);
-
+  swap_linux_prpsinfo64_out (abfd, prpsinfo, &data);
   return elfcore_write_note (abfd, buf, bufsiz,
                             "CORE", NT_PRPSINFO, &data, sizeof (data));
 }

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index c2f2b7005430bc4da55e7feafb1e9cf647ab6ef6..369a5e6f401743dfa7312e1be399ca571564bb44 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -1818,30 +1818,28 @@ struct elf_external_ppc_linux_prpsinfo32
     char pr_psargs[80];                        /* Initial part of arg list.  */
   };
 
-/* Helper macro to swap (properly handling endianess) things from the
-   `elf_internal_prpsinfo' structure to the `elf_external_ppc_prpsinfo32'
-   structure.
-
-   Note that FROM should be a pointer, and TO should be the explicit type.  */
-
-#define PPC_LINUX_PRPSINFO32_SWAP_FIELDS(abfd, from, to)             \
-  do                                                                 \
-    {                                                                \
-      H_PUT_8 (abfd, from->pr_state, &to.pr_state);                  \
-      H_PUT_8 (abfd, from->pr_sname, &to.pr_sname);                  \
-      H_PUT_8 (abfd, from->pr_zomb, &to.pr_zomb);                    \
-      H_PUT_8 (abfd, from->pr_nice, &to.pr_nice);                    \
-      H_PUT_32 (abfd, from->pr_flag, to.pr_flag);                    \
-      H_PUT_32 (abfd, from->pr_uid, to.pr_uid);                              \
-      H_PUT_32 (abfd, from->pr_gid, to.pr_gid);                              \
-      H_PUT_32 (abfd, from->pr_pid, to.pr_pid);                              \
-      H_PUT_32 (abfd, from->pr_ppid, to.pr_ppid);                    \
-      H_PUT_32 (abfd, from->pr_pgrp, to.pr_pgrp);                    \
-      H_PUT_32 (abfd, from->pr_sid, to.pr_sid);                              \
-      strncpy (to.pr_fname, from->pr_fname, sizeof (to.pr_fname));    \
-      strncpy (to.pr_psargs, from->pr_psargs, sizeof (to.pr_psargs)); \
-    } while (0)
+/* Helper function to copy an elf_internal_linux_prpsinfo in host
+   endian to an elf_external_ppc_linux_prpsinfo32 in target endian.  */
 
+static inline void
+swap_ppc_linux_prpsinfo32_out (bfd *obfd,
+                              const struct elf_internal_linux_prpsinfo *from,
+                              struct elf_external_ppc_linux_prpsinfo32 *to)
+{
+  bfd_put_8 (obfd, from->pr_state, &to->pr_state);
+  bfd_put_8 (obfd, from->pr_sname, &to->pr_sname);
+  bfd_put_8 (obfd, from->pr_zomb, &to->pr_zomb);
+  bfd_put_8 (obfd, from->pr_nice, &to->pr_nice);
+  bfd_put_32 (obfd, from->pr_flag, to->pr_flag);
+  bfd_put_32 (obfd, from->pr_uid, to->pr_uid);
+  bfd_put_32 (obfd, from->pr_gid, to->pr_gid);
+  bfd_put_32 (obfd, from->pr_pid, to->pr_pid);
+  bfd_put_32 (obfd, from->pr_ppid, to->pr_ppid);
+  bfd_put_32 (obfd, from->pr_pgrp, to->pr_pgrp);
+  bfd_put_32 (obfd, from->pr_sid, to->pr_sid);
+  strncpy (to->pr_fname, from->pr_fname, sizeof (to->pr_fname));
+  strncpy (to->pr_psargs, from->pr_psargs, sizeof (to->pr_psargs));
+}
 \f
 /* Initialize the ppc_elf_howto_table, so that linear accesses can be done.  */
 
@@ -2296,14 +2294,15 @@ ppc_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)
 }
 
 char *
-elfcore_write_ppc_linux_prpsinfo32 (bfd *abfd, char *buf, int *bufsiz,
-                                     const struct elf_internal_linux_prpsinfo *prpsinfo)
+elfcore_write_ppc_linux_prpsinfo32
+  (bfd *abfd,
+   char *buf,
+   int *bufsiz,
+   const struct elf_internal_linux_prpsinfo *prpsinfo)
 {
   struct elf_external_ppc_linux_prpsinfo32 data;
 
-  memset (&data, 0, sizeof (data));
-  PPC_LINUX_PRPSINFO32_SWAP_FIELDS (abfd, prpsinfo, data);
-
+  swap_ppc_linux_prpsinfo32_out (abfd, prpsinfo, &data);
   return elfcore_write_note (abfd, buf, bufsiz,
                             "CORE", NT_PRPSINFO, &data, sizeof (data));
 }