From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 6F2C3396D811 for ; Wed, 2 Dec 2020 17:39:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6F2C3396D811 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x42b.google.com with SMTP id k14so4963673wrn.1 for ; Wed, 02 Dec 2020 09:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5xycx2HquI7rDFJ2E00ONW7cZdaWizHFD1yTutIk0IU=; b=LaDDCeMYARdA2xfMBXP1tAB5y3ePycXqgb4lPV/PUV2ypZFqy34G45GKGb8OPQchV4 /6DBK/iTjDCqWcivJZuYQ+mP3anoeiQVvWyLOhY034s+aL7ez9S5KyhCcKj5YXy0khIK 0uOCpQwCTGZAieX+5bMoOQkbg9a8VH2Jr/1RHh1USXqYp1U85lGpC8pM21zoIaREdpi1 sQTrtagClg/VGvBGLcHYlc51Ib3YPnbJrY7arCz7hHCug2k0z1ODBc/DKnXgiMIEBCyr HO9aHflw01p8BoHHvzjJPPmRNqj/w7+3asWU4YUSILvW9lR+Gru6UHlnFPKO2WG6Anix wzPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5xycx2HquI7rDFJ2E00ONW7cZdaWizHFD1yTutIk0IU=; b=axhXnHUCWddlqqAk4B+pJd8599XQr/Nn5zJTzgpcgK5CQAU93tJr33cBSmyV8GKMfN mf1Q/oUioJuj50Flp5ngL3PStSWYnVGM3Tc/e3QJ0Sjpyv9Y4MnsIrzRKCwi4rX9CezD kWDdI8HQ2fN2gBaa+Op1yeEhBVol/F8QuXG4ewEE0gc0Xh3iHF2ZW/Yreo0VKe1O8dlA HFXCuDtH3VWBh3+l3pIKc+5YdDIWUIdfpqrYXy7ULKF7EdpgEEIRHU9Dh2Zb+E0XYslB ZWysH9j13F8Lg8AQJFAeWVTmk96H2nIvYmiqlmm+qddYX4+a0+Tl5NXMX3GXTV8Nh3w8 6PUQ== X-Gm-Message-State: AOAM533meR8HBXoNCnByfYdHkUl7WlMg8MUn8pOitOjuPa3JRbtgziud /0mf5ceRWGEumL0kDNfErd2xyf+iQKBZGg== X-Google-Smtp-Source: ABdhPJwZXHBOfsWE9gGVNr+a69mWdiAQhKdSRypO74RRSTg36ION7v/soL8PfNsM86dGblBAHK0Vzg== X-Received: by 2002:a5d:5222:: with SMTP id i2mr4940514wra.247.1606930783603; Wed, 02 Dec 2020 09:39:43 -0800 (PST) Received: from localhost (host109-154-20-215.range109-154.btcentralplus.com. [109.154.20.215]) by smtp.gmail.com with ESMTPSA id x10sm2990713wro.0.2020.12.02.09.39.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Dec 2020 09:39:43 -0800 (PST) From: Andrew Burgess To: binutils@sourceware.org, gdb-patches@sourceware.org Subject: [PATCH 6/8] bfd/binutils: add support for RISC-V CSRs in core files Date: Wed, 2 Dec 2020 17:39:30 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2020 17:39:48 -0000 Adds support for including RISC-V control and status registers into core files. bfd/ChangeLog: * 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'. binutils/ChangeLog: * readelf.c (get_note_type): Handle NT_RISCV_CSR. include/ChangeLog: * elf/common.h (NT_RISCV_CSR): Define. --- bfd/ChangeLog | 9 +++++++++ bfd/elf-bfd.h | 2 ++ bfd/elf.c | 31 +++++++++++++++++++++++++++---- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 2 ++ include/ChangeLog | 5 +++++ include/elf/common.h | 2 ++ 7 files changed, 52 insertions(+), 4 deletions(-) diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index 5ef69ab5b13..7de09c269f9 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -2796,6 +2796,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 bea5ab12773..62036db4c69 100644 --- a/bfd/elf.c +++ b/bfd/elf.c @@ -9909,6 +9909,12 @@ elfcore_grok_arc_v2 (bfd *abfd, Elf_Internal_Note *note) return elfcore_make_note_pseudosection (abfd, ".reg-arc-v2", note); } +static bfd_boolean +elfcore_grok_riscv_csr (bfd *abfd, Elf_Internal_Note *note) +{ + return elfcore_make_note_pseudosection (abfd, ".reg-riscv-csr", note); +} + static bfd_boolean elfcore_grok_gdb_tdesc (bfd *abfd, Elf_Internal_Note *note) { @@ -10575,6 +10581,9 @@ elfcore_grok_note (bfd *abfd, Elf_Internal_Note *note) case NT_GDB_TDESC: return elfcore_grok_gdb_tdesc (abfd, note); + case NT_RISCV_CSR: + return elfcore_grok_riscv_csr (abfd, note); + case NT_PRPSINFO: case NT_PSINFO: if (bed->elf_backend_grok_psinfo) @@ -11956,12 +11965,24 @@ elfcore_write_arc_v2 (bfd *abfd, note_name, NT_ARC_V2, arc_v2, size); } +char * +elfcore_write_riscv_csr (bfd *abfd, + char *buf, + int *bufsiz, + const void *csrs, + int size) +{ + const char *note_name = "CORE"; + return elfcore_write_note (abfd, buf, bufsiz, + note_name, NT_RISCV_CSR, csrs, size); +} + char * elfcore_write_gdb_tdesc (bfd *abfd, - char *buf, - int *bufsiz, - const void *tdesc, - int size) + char *buf, + int *bufsiz, + const void *tdesc, + int size) { const char *note_name = "CORE"; return elfcore_write_note (abfd, buf, bufsiz, @@ -12054,6 +12075,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/readelf.c b/binutils/readelf.c index 5b3871d3e5f..4706d40f7ce 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -18324,6 +18324,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/elf/common.h b/include/elf/common.h index 1dbf0b11983..54d5d989a39 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -663,6 +663,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 0x501 /* 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. */ -- 2.25.4