From patchwork Tue Oct 23 12:32:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 29850 Received: (qmail 84074 invoked by alias); 23 Oct 2018 12:32:32 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 83142 invoked by uid 89); 23 Oct 2018 12:32:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=PUSHED, H*r:sk:d10-v6s X-HELO: mail-wr1-f43.google.com Received: from mail-wr1-f43.google.com (HELO mail-wr1-f43.google.com) (209.85.221.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 23 Oct 2018 12:32:30 +0000 Received: by mail-wr1-f43.google.com with SMTP id d10-v6so1513146wrs.5 for ; Tue, 23 Oct 2018 05:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id; bh=QhYXKSM7RfuoYusG9csE28BdLfype5dSecjuwIJIomM=; b=F7OrxFNO2+BL7dAUKTjXvHAkQSZuGI772IzZ0PRA6T2Sl5TW3jTmrO5h6OwGHQko81 lbO0iK8MVfVbFNv/PRyLs4CT9hT3t6svjfV2h/2oBb/tr/irNch0VxzmgIFP9HZhAHEr /XvExU4fIVny+2ze28gnbp7jSkgslW/ki8M3znu1W3IemGV5MdE7dG/0TCyD8el6SKEd bWWycShbg4La4ckY3stzKay5GCimh45vnk7GNhoDdrfieKJovFIvs8doTKcHadpiqlTi 2cp6CEQ2sg0jknVLA+GFzx9RwOz3xk2klsEpL3otosG++ILqv/li+p5mzC7pbi0wHxND SP5Q== Return-Path: Received: from localhost (host86-164-85-193.range86-164.btcentralplus.com. [86.164.85.193]) by smtp.gmail.com with ESMTPSA id j6-v6sm1825690wmd.29.2018.10.23.05.32.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Oct 2018 05:32:27 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: palmer@sifive.com, Andrew Burgess Subject: [PUSHED] gdb/riscv: Give user-friendly names for CSRs Date: Tue, 23 Oct 2018 13:32:23 +0100 Message-Id: <20181023123223.701-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes The recent commit: commit 0dbfcfffe9abbc5198bce95eb8c66b6bc9b364be Date: Tue Oct 16 22:40:09 2018 +0100 gdb/riscv: Fix register access for register aliases broke the CSR names for RISC-V, now all of the CSRs have names like, csr0, csr1, csr2, etc. This commit restores the previous user-friendly names. gdb/ChangeLog: * riscv-tdep.c (riscv_register_name): Use the user-friendly names for CSRs. --- gdb/ChangeLog | 5 +++++ gdb/riscv-tdep.c | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 48ca2accb4a..f02420dfe52 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -482,11 +482,22 @@ riscv_register_name (struct gdbarch *gdbarch, int regnum) if (regnum >= RISCV_FIRST_CSR_REGNUM && regnum <= RISCV_LAST_CSR_REGNUM) { - static char buf[20]; +#define DECLARE_CSR(NAME,VALUE) \ + case RISCV_ ## VALUE ## _REGNUM: return # NAME; - xsnprintf (buf, sizeof (buf), "csr%d", - regnum - RISCV_FIRST_CSR_REGNUM); - return buf; + switch (regnum) + { + #include "opcode/riscv-opc.h" + default: + { + static char buf[20]; + + xsnprintf (buf, sizeof (buf), "csr%d", + regnum - RISCV_FIRST_CSR_REGNUM); + return buf; + } + } +#undef DECLARE_CSR } if (regnum == RISCV_PRIV_REGNUM)