On Tue, 17 Oct 2017, Djordje Todorovic wrote:
> diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
> index 17ca432..2ee15e9 100644
> --- a/bfd/elf32-mips.c
> +++ b/bfd/elf32-mips.c
> @@ -2373,6 +2373,45 @@ 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,
> + ...)
Formatting: please align the wrapped line to the inside of the opening
parenthesis above, i.e.:
elf32_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
...)
> @@ -2554,6 +2593,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
> #define ELF_COMMONPAGESIZE 0x1000
> #define elf32_bed elf32_tradbed
>
> +#undef elf_backend_write_core_note
> +#define elf_backend_write_core_note elf32_mips_write_core_note
Formatting: please use tabs to align the RHS to column #40 like all the
other such definitions.
> diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
> index d51124b..f3997bd 100644
> --- a/bfd/elf64-mips.c
> +++ b/bfd/elf64-mips.c
> @@ -4248,6 +4248,45 @@ 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,
> + ...)
Formatting.
> @@ -4454,6 +4493,9 @@ const struct elf_size_info mips_elf64_size_info =
> #define ELF_COMMONPAGESIZE 0x1000
> #define elf64_bed elf64_tradbed
>
> +#undef elf_backend_write_core_note
> +#define elf_backend_write_core_note elf64_mips_write_core_note
Formatting.
> diff --git a/bfd/elfn32-mips.c b/bfd/elfn32-mips.c
> index fdae183..d9d2020 100644
> --- a/bfd/elfn32-mips.c
> +++ b/bfd/elfn32-mips.c
> @@ -3630,6 +3630,45 @@ elf_n32_mips_grok_freebsd_prstatus (bfd *abfd, Elf_Internal_Note *note)
> return _bfd_elfcore_make_pseudosection (abfd, ".reg",
> size, note->descpos + offset);
> }
> +
> +/* Write Linux core PRSTATUS note into core file. */
> +
> +static char *
> +elf32_mips_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type,
> + ...)
Formatting.
> @@ -3807,6 +3846,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
> #define ELF_COMMONPAGESIZE 0x1000
> #define elf32_bed elf32_tradbed
>
> +#undef elf_backend_write_core_note
> +#define elf_backend_write_core_note elf32_mips_write_core_note
Formatting.
Maciej
@@ -2373,6 +2373,45 @@ 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. */
@@ -2554,6 +2593,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
#define ELF_COMMONPAGESIZE 0x1000
#define elf32_bed elf32_tradbed
+#undef elf_backend_write_core_note
+#define elf_backend_write_core_note elf32_mips_write_core_note
+
/* Include the target file again for this target. */
#include "elf32-target.h"
@@ -2575,6 +2617,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. */
@@ -4248,6 +4248,45 @@ 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. */
@@ -4454,6 +4493,9 @@ const struct elf_size_info mips_elf64_size_info =
#define ELF_COMMONPAGESIZE 0x1000
#define elf64_bed elf64_tradbed
+#undef elf_backend_write_core_note
+#define elf_backend_write_core_note elf64_mips_write_core_note
+
/* Include the target file again for this target. */
#include "elf64-target.h"
@@ -4476,4 +4518,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"
@@ -3630,6 +3630,45 @@ elf_n32_mips_grok_freebsd_prstatus (bfd *abfd, Elf_Internal_Note *note)
return _bfd_elfcore_make_pseudosection (abfd, ".reg",
size, note->descpos + offset);
}
+
+/* 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[440];
+ 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, 360);
+ memset (data + 432, 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. */
@@ -3807,6 +3846,9 @@ static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap = {
#define ELF_COMMONPAGESIZE 0x1000
#define elf32_bed elf32_tradbed
+#undef elf_backend_write_core_note
+#define elf_backend_write_core_note elf32_mips_write_core_note
+
/* Include the target file again for this target. */
#include "elf32-target.h"
@@ -3829,4 +3871,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"