diff options
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/elf-bfd.h | 2 | ||||
| -rw-r--r-- | bfd/elf.c | 35 | ||||
| -rw-r--r-- | binutils/ChangeLog | 5 | ||||
| -rw-r--r-- | binutils/readelf.c | 2 | ||||
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/elf/common.h | 2 |
7 files changed, 60 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9e7f90e1625..dac602b9076 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,15 @@ 2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> Andrew Burgess <andrew.burgess@embecosm.com> + * elf-bfd.h (elfcore_write_riscv_csr): Declare. + * elf.c (elfcore_grok_riscv_csr): New function. + (elfcore_grok_note): Handle NT_RISCV_CSR. + (elfcore_write_riscv_csr): New function. + (elfcore_write_register_note): Handle '.reg-riscv-csr'. + +2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> + Andrew Burgess <andrew.burgess@embecosm.com> + * elfnn-riscv.c (PRPSINFO_PR_FNAME_LENGTH): Define. (PRPSINFO_PR_PSARGS_LENGTH): Define. (riscv_write_core_note): New function. diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 69e18036a49..c40030bdca6 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -2798,6 +2798,8 @@ extern char *elfcore_write_aarch_pauth (bfd *, char *, int *, const void *, int); extern char *elfcore_write_arc_v2 (bfd *, char *, int *, const void *, int); +extern char *elfcore_write_riscv_csr + (bfd *, char *, int *, const void *, int); extern char *elfcore_write_gdb_tdesc (bfd *, char *, int *, const void *, int); extern char *elfcore_write_lwpstatus diff --git a/bfd/elf.c b/bfd/elf.c index 2d66e9b999f..553fa65a118 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -9912,6 +9912,15 @@ elfcore_grok_arc_v2 (bfd *abfd, Elf_Internal_Note *note) return elfcore_make_note_pseudosection (abfd, ".reg-arc-v2", note); } +/* Convert NOTE into a bfd_section called ".reg-riscv-csr". Return TRUE if + successful otherwise, return FALSE. */ + +static bfd_boolean +elfcore_grok_riscv_csr (bfd *abfd, Elf_Internal_Note *note) +{ + return elfcore_make_note_pseudosection (abfd, ".reg-riscv-csr", note); +} + /* Convert NOTE into a bfd_section called ".gdb-tdesc". Return TRUE if successful otherwise, return FALSE. */ @@ -10586,6 +10595,13 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note) else return TRUE; + case NT_RISCV_CSR: + if (note->namesz == 4 + && strcmp (note->namedata, "GDB") == 0) + return elfcore_grok_riscv_csr (abfd, note); + else + return TRUE; + case NT_PRPSINFO: case NT_PSINFO: if (bed->elf_backend_grok_psinfo) @@ -11967,6 +11983,23 @@ elfcore_write_arc_v2 (bfd *abfd, note_name, NT_ARC_V2, arc_v2, size); } +/* Write the buffer of csr values in CSRS (length SIZE) into the note + buffer BUF and update *BUFSIZ. ABFD is the bfd the note is being + written into. Return a pointer to the new start of the note buffer, to + replace BUF which may no longer be valid. */ + +char * +elfcore_write_riscv_csr (bfd *abfd, + char *buf, + int *bufsiz, + const void *csrs, + int size) +{ + const char *note_name = "GDB"; + return elfcore_write_note (abfd, buf, bufsiz, + note_name, NT_RISCV_CSR, csrs, size); +} + /* Write the target description (a string) pointed to by TDESC, length SIZE, into the note buffer BUF, and update *BUFSIZ. ABFD is the bfd the note is being written into. Return a pointer to the new start of the @@ -12070,6 +12103,8 @@ elfcore_write_register_note (bfd *abfd, return elfcore_write_arc_v2 (abfd, buf, bufsiz, data, size); if (strcmp (section, ".gdb-tdesc") == 0) return elfcore_write_gdb_tdesc (abfd, buf, bufsiz, data, size); + if (strcmp (section, ".reg-riscv-csr") == 0) + return elfcore_write_riscv_csr (abfd, buf, bufsiz, data, size); return NULL; } diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 80b6ea6a4c7..b5a9b56954c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,6 +1,11 @@ 2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> Andrew Burgess <andrew.burgess@embecosm.com> + * readelf.c (get_note_type): Handle NT_RISCV_CSR. + +2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> + Andrew Burgess <andrew.burgess@embecosm.com> + * readelf.c (get_note_type): Handle NT_GDB_TDESC. 2021-03-05 Nick Clifton <nickc@redhat.com> diff --git a/binutils/readelf.c b/binutils/readelf.c index fe58ebf6ac4..1994eebd910 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -18577,6 +18577,8 @@ get_note_type (Filedata * filedata, unsigned e_type) return _("NT_ARM_HW_WATCH (AArch hardware watchpoint registers)"); case NT_ARC_V2: return _("NT_ARC_V2 (ARC HS accumulator/extra registers)"); + case NT_RISCV_CSR: + return _("NT_RISCV_CSR (RISC-V control and status registers)"); case NT_PSTATUS: return _("NT_PSTATUS (pstatus structure)"); case NT_FPREGS: diff --git a/include/ChangeLog b/include/ChangeLog index 08c45673be6..0a6e4b6f535 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,6 +1,11 @@ 2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> Andrew Burgess <andrew.burgess@embecosm.com> + * elf/common.h (NT_RISCV_CSR): Define. + +2021-03-05 Craig Blackmore <craig.blackmore@embecosm.com> + Andrew Burgess <andrew.burgess@embecosm.com> + * elf/common.h (NT_GDB_TDESC): Define. 2021-03-03 Alan Modra <amodra@gmail.com> diff --git a/include/elf/common.h b/include/elf/common.h index e6e9c278faa..4cb3748e4fd 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -674,6 +674,8 @@ /* note name must be "LINUX". */ #define NT_ARC_V2 0x600 /* ARC HS accumulator/extra registers. */ /* note name must be "LINUX". */ +#define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ + /* note name must be "CORE". */ #define NT_SIGINFO 0x53494749 /* Fields of siginfo_t. */ #define NT_FILE 0x46494c45 /* Description of mapped files. */ |