Patchwork [2/4] BFD: Write Linux core PRSTATUS note into MIPS core file

login
register
mail settings
Submitter Djordje Todorovic
Date Oct. 6, 2017, 11:03 a.m.
Message ID <0ec921e4-ac26-6cd1-58ee-0d0732df0a87@rt-rk.com>
Download mbox | patch
Permalink /patch/23371/
State New
Headers show

Comments

Djordje Todorovic - Oct. 6, 2017, 11:03 a.m.
Please notice that I have added additional check when defining backend function for writing Linux core PRSTATUS note, because I had issue when try to build it, because definition 
of that macro was already defined in "elf32-target.h" as NULL.

 From 7661c4065f3fd95cd4f7e3976d0f56a2247f3bf0 Mon Sep 17 00:00:00 2001
From: Djordje Todorovic <djordje.todorovic@rt-rk.com>
Date: Wed, 4 Oct 2017 14:34:10 +0200
Subject: [PATCH 2/4] BFD: Write Linux core PRSTATUS note into MIPS core file

On MIPS o32, n32 and n64 platforms information such as PID was not
correctly written into core file from GDB.

bfd/ChangeLog:

	* bfd/elf32-mips.c (elf32_mips_write_core_note): New
	function.
	(elf_backend_write_core_note): New macro.
	* bfd/elf64-mips.c (elf64_mips_write_core_note): New
	function.
	(elf_backend_write_core_note): New macro.
	* bfd/elfn32-mips.c (elf32_mips_write_core_note): New
	function.
	(elf_backend_write_core_note): New macro.
---
  bfd/elf32-mips.c  | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
  bfd/elf64-mips.c  | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
  bfd/elfn32-mips.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 153 insertions(+)
Maciej W. Rozycki - Oct. 12, 2017, 10:33 p.m.
On Fri, 6 Oct 2017, Djordje Todorovic wrote:

> Please notice that I have added additional check when defining backend
> function for writing Linux core PRSTATUS note, because I had issue when try to
> build it, because definition of that macro was already defined in
> "elf32-target.h" as NULL.

 Ack.

> bfd/ChangeLog:
> 
> 	* bfd/elf32-mips.c (elf32_mips_write_core_note): New
> 	function.
> 	(elf_backend_write_core_note): New macro.
> 	* bfd/elf64-mips.c (elf64_mips_write_core_note): New
> 	function.
> 	(elf_backend_write_core_note): New macro.
> 	* bfd/elfn32-mips.c (elf32_mips_write_core_note): New
> 	function.
> 	(elf_backend_write_core_note): New macro.

 Please drop `bfd/' from file names; ChangeLog entries are relative to the 
directory the file itself is in.  Also "New function." fits in a single 
line here either way.

> diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
> index 8c1a68eb..48a2083 100644
> --- a/bfd/elf32-mips.c
> +++ b/bfd/elf32-mips.c
> @@ -2373,6 +2373,48 @@ elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note
> *note)
> 
>    return TRUE;
>  }
> +
> +/* Write Linux core PRSTATUS note into core file. */

 Two spaces after a full stop please.

> +
> +static char *
> +elf32_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
> +			      ...)
> +{
> +  switch (note_type)
> +    {
> +    default:
> +      return NULL;
> +
> +    case NT_PRPSINFO:
> +      {
> +	BFD_FAIL ();
> +	return NULL;
> +      }

 No need for a block here.

> +
> +    case NT_PRSTATUS:
> +      {
> +	char data[256];
> +	va_list ap;
> +	long pid;
> +	int cursig;
> +	const void *greg;
> +
> +	va_start (ap, note_type);
> +	memset (data, 0, 72);
> +	pid = va_arg (ap, long);
> +	bfd_put_32 (abfd, pid, data + 24);
> +	cursig = va_arg (ap, int);
> +	bfd_put_16 (abfd, cursig, data + 12);
> +	greg = va_arg (ap, const void *);
> +	memcpy (data + 72, greg, 180);
> +	memset (data + 252, 0, 4);
> +	va_end (ap);
> +	return elfcore_write_note (abfd, buf, bufsiz,
> +				   "CORE", note_type, data, sizeof (data));
> +      }
> +    }
> +}
> +
>  

 Extraneous new line.

> @@ -2555,6 +2597,13 @@ static const struct ecoff_debug_swap
> mips_elf32_ecoff_debug_swap = {
>  #define ELF_COMMONPAGESIZE		0x1000
>  #define elf32_bed			elf32_tradbed
> 
> +#ifdef elf_backend_write_core_note
> +#undef elf_backend_write_core_note
> +#define elf_backend_write_core_note elf32_mips_write_core_note
> +#else
> +#define elf_backend_write_core_note elf32_mips_write_core_note
> +#endif

 Just #undef it unconditionally.

> diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
> index 84f2a3f..354e4cb 100644
> --- a/bfd/elf64-mips.c
> +++ b/bfd/elf64-mips.c
> @@ -4248,6 +4248,48 @@ elf64_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note
> *note)
> 
>    return TRUE;
>  }
> +
> +/* Write Linux core PRSTATUS note into core file. */

 Two spaces after a full stop please.

> +
> +static char *
> +elf64_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
> +			      ...)
> +{
> +  switch (note_type)
> +    {
> +    default:
> +      return NULL;
> +
> +    case NT_PRPSINFO:
> +      {
> +	BFD_FAIL ();
> +	return NULL;
> +      }

 No need for a block here.

> +
> +    case NT_PRSTATUS:
> +      {
> +	char data[480];
> +	va_list ap;
> +	long pid;
> +	int cursig;
> +	const void *greg;
> +
> +	va_start (ap, note_type);
> +	memset (data, 0, 112);
> +	pid = va_arg (ap, long);
> +	bfd_put_32 (abfd, pid, data + 32);
> +	cursig = va_arg (ap, int);
> +	bfd_put_16 (abfd, cursig, data + 12);
> +	greg = va_arg (ap, const void *);
> +	memcpy (data + 112, greg, 360);
> +	memset (data + 472, 0, 8);
> +	va_end (ap);
> +	return elfcore_write_note (abfd, buf, bufsiz,
> +				   "CORE", note_type, data, sizeof (data));
> +      }
> +    }
> +}
> +
>  

 Extraneous new line.

> @@ -4455,6 +4497,13 @@ const struct elf_size_info mips_elf64_size_info =
>  #define ELF_COMMONPAGESIZE		0x1000
>  #define elf64_bed			elf64_tradbed
> 
> +#ifdef elf_backend_write_core_note
> +#undef elf_backend_write_core_note
> +#define elf_backend_write_core_note elf64_mips_write_core_note
> +#else
> +#define elf_backend_write_core_note elf64_mips_write_core_note
> +#endif

 Just #undef it unconditionally.

> diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
> index dce7ba1..5287da3 100644
> --- a/bfd/elfn32-mips.c
> +++ b/bfd/elfn32-mips.c
> @@ -3578,6 +3578,48 @@ elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note
> *note)
> 
>    return TRUE;
>  }
> +
> +/* Write Linux core PRSTATUS note into core file. */

 Two spaces after a full stop please.

> +
> +static char *
> +elf32_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
> +			      ...)
> +{
> +  switch (note_type)
> +    {
> +    default:
> +      return NULL;
> +
> +    case NT_PRPSINFO:
> +      {
> +	BFD_FAIL ();
> +	return NULL;
> +      }

 No need for a block here.

> +
> +    case NT_PRSTATUS:
> +      {
> +	char data[448];

 Not 440?

> +	va_list ap;
> +	long pid;
> +	int cursig;
> +	const void *greg;
> +
> +	va_start (ap, note_type);
> +	memset (data, 0, 80);
> +	pid = va_arg (ap, long);
> +	bfd_put_32 (abfd, pid, data + 32);

 Not 24?

> +	cursig = va_arg (ap, int);
> +	bfd_put_16 (abfd, cursig, data + 12);
> +	greg = va_arg (ap, const void *);
> +	memcpy (data + 80, greg, 360);

 Not 72?

> +	memset (data + 440, 0, 8);

 Not 432?

> +	va_end (ap);
> +	return elfcore_write_note (abfd, buf, bufsiz,
> +				   "CORE", note_type, data, sizeof (data));
> +      }
> +    }
> +}
> +
>  

 Extraneous new line.

> @@ -3753,6 +3795,13 @@ static const struct ecoff_debug_swap
> mips_elf32_ecoff_debug_swap = {
>  #define ELF_COMMONPAGESIZE		0x1000
>  #define elf32_bed			elf32_tradbed
> 
> +#ifdef elf_backend_write_core_note
> +#undef elf_backend_write_core_note
> +#define elf_backend_write_core_note elf32_mips_write_core_note
> +#else
> +#define elf_backend_write_core_note elf32_mips_write_core_note
> +#endif

 Just #undef it unconditionally.

  Maciej

Patch

diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 8c1a68eb..48a2083 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -2373,6 +2373,48 @@  elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)

    return TRUE;
  }
+
+/* Write Linux core PRSTATUS note into core file. */
+
+static char *
+elf32_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
+			      ...)
+{
+  switch (note_type)
+    {
+    default:
+      return NULL;
+
+    case NT_PRPSINFO:
+      {
+	BFD_FAIL ();
+	return NULL;
+      }
+
+    case NT_PRSTATUS:
+      {
+	char data[256];
+	va_list ap;
+	long pid;
+	int cursig;
+	const void *greg;
+
+	va_start (ap, note_type);
+	memset (data, 0, 72);
+	pid = va_arg (ap, long);
+	bfd_put_32 (abfd, pid, data + 24);
+	cursig = va_arg (ap, int);
+	bfd_put_16 (abfd, cursig, data + 12);
+	greg = va_arg (ap, const void *);
+	memcpy (data + 72, greg, 180);
+	memset (data + 252, 0, 4);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+    }
+}
+
  
  /* Depending on the target vector we generate some version of Irix
     executables or "normal" MIPS ELF ABI executables.  */
@@ -2555,6 +2597,13 @@  static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
  #define ELF_COMMONPAGESIZE		0x1000
  #define elf32_bed			elf32_tradbed

+#ifdef elf_backend_write_core_note
+#undef elf_backend_write_core_note
+#define elf_backend_write_core_note elf32_mips_write_core_note
+#else
+#define elf_backend_write_core_note elf32_mips_write_core_note
+#endif
+
  /* Include the target file again for this target.  */
  #include "elf32-target.h"

@@ -2576,6 +2625,8 @@  static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
  #undef	elf32_bed
  #define elf32_bed				elf32_fbsd_tradbed

+#undef elf_backend_write_core_note
+
  #include "elf32-target.h"
  /* Implement elf_backend_final_write_processing for VxWorks.  */

diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
index 84f2a3f..354e4cb 100644
--- a/bfd/elf64-mips.c
+++ b/bfd/elf64-mips.c
@@ -4248,6 +4248,48 @@  elf64_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)

    return TRUE;
  }
+
+/* Write Linux core PRSTATUS note into core file. */
+
+static char *
+elf64_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
+			      ...)
+{
+  switch (note_type)
+    {
+    default:
+      return NULL;
+
+    case NT_PRPSINFO:
+      {
+	BFD_FAIL ();
+	return NULL;
+      }
+
+    case NT_PRSTATUS:
+      {
+	char data[480];
+	va_list ap;
+	long pid;
+	int cursig;
+	const void *greg;
+
+	va_start (ap, note_type);
+	memset (data, 0, 112);
+	pid = va_arg (ap, long);
+	bfd_put_32 (abfd, pid, data + 32);
+	cursig = va_arg (ap, int);
+	bfd_put_16 (abfd, cursig, data + 12);
+	greg = va_arg (ap, const void *);
+	memcpy (data + 112, greg, 360);
+	memset (data + 472, 0, 8);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+    }
+}
+
  
  /* ECOFF swapping routines.  These are used when dealing with the
     .mdebug section, which is in the ECOFF debugging format.  */
@@ -4455,6 +4497,13 @@  const struct elf_size_info mips_elf64_size_info =
  #define ELF_COMMONPAGESIZE		0x1000
  #define elf64_bed			elf64_tradbed

+#ifdef elf_backend_write_core_note
+#undef elf_backend_write_core_note
+#define elf_backend_write_core_note elf64_mips_write_core_note
+#else
+#define elf_backend_write_core_note elf64_mips_write_core_note
+#endif
+
  /* Include the target file again for this target.  */
  #include "elf64-target.h"

@@ -4477,4 +4526,6 @@  const struct elf_size_info mips_elf64_size_info =
  #undef	elf64_bed
  #define elf64_bed				elf64_fbsd_tradbed

+#undef elf64_mips_write_core_note
+
  #include "elf64-target.h"
diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
index dce7ba1..5287da3 100644
--- a/bfd/elfn32-mips.c
+++ b/bfd/elfn32-mips.c
@@ -3578,6 +3578,48 @@  elf32_mips_grok_psinfo (bfd *abfd, Elf_Internal_Note *note)

    return TRUE;
  }
+
+/* Write Linux core PRSTATUS note into core file. */
+
+static char *
+elf32_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
+			      ...)
+{
+  switch (note_type)
+    {
+    default:
+      return NULL;
+
+    case NT_PRPSINFO:
+      {
+	BFD_FAIL ();
+	return NULL;
+      }
+
+    case NT_PRSTATUS:
+      {
+	char data[448];
+	va_list ap;
+	long pid;
+	int cursig;
+	const void *greg;
+
+	va_start (ap, note_type);
+	memset (data, 0, 80);
+	pid = va_arg (ap, long);
+	bfd_put_32 (abfd, pid, data + 32);
+	cursig = va_arg (ap, int);
+	bfd_put_16 (abfd, cursig, data + 12);
+	greg = va_arg (ap, const void *);
+	memcpy (data + 80, greg, 360);
+	memset (data + 440, 0, 8);
+	va_end (ap);
+	return elfcore_write_note (abfd, buf, bufsiz,
+				   "CORE", note_type, data, sizeof (data));
+      }
+    }
+}
+
  
  /* Depending on the target vector we generate some version of Irix
     executables or "normal" MIPS ELF ABI executables.  */
@@ -3753,6 +3795,13 @@  static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
  #define ELF_COMMONPAGESIZE		0x1000
  #define elf32_bed			elf32_tradbed

+#ifdef elf_backend_write_core_note
+#undef elf_backend_write_core_note
+#define elf_backend_write_core_note elf32_mips_write_core_note
+#else
+#define elf_backend_write_core_note elf32_mips_write_core_note
+#endif
+
  /* Include the target file again for this target.  */
  #include "elf32-target.h"

@@ -3775,4 +3824,6 @@  static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
  #undef	elf32_bed
  #define elf32_bed				elf32_fbsd_tradbed

+#undef elf_backend_write_core_note
+
  #include "elf32-target.h"