From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 8GvcNVSRCGCIZAAAWB0awg (envelope-from ) for ; Wed, 20 Jan 2021 15:23:48 -0500 Received: by simark.ca (Postfix, from userid 112) id CAD051EF82; Wed, 20 Jan 2021 15:23:48 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E25761EF7C for ; Wed, 20 Jan 2021 15:23:47 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1AD053971C10; Wed, 20 Jan 2021 20:23:36 +0000 (GMT) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by sourceware.org (Postfix) with ESMTPS id 506243971823 for ; Wed, 20 Jan 2021 20:23:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 506243971823 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-x434.google.com with SMTP id a12so24293017wrv.8 for ; Wed, 20 Jan 2021 12:23:32 -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=LuwmKjotPB9kvJyCLi3VyymZeJvo0W4S3R0M2BQej7w=; b=gsK/LlS6xHgsY46EY3lZ2GjzS81u0bFIyMvVJm61lj8aTGE7xxJRRJ3L8Oc7pNr1WR 8lRj0g83mW80j9OB6hnvdKmUSFtidDIoe81TBbgSUwNX6xZr2urCk8yGK4CrAGkGx9Yj QngkNygfw9u44fSAm042RNedouSur4DjDgbUSLLkTEjlHslDB2PSqwgBKjVLXqDL7h3Q WYvIyWur4fvNEi20lN2ZfQyYD+ejGOncA+f6We3FlHdqGt4kzu2qUFxjdWVYBf6W3Ouq r/RdUayZKutZnvY8F83bPOvahCaZiWn8+ITnpUuVTL3WslRQ5OgZ/wAz1W60GRNPG/7d wCFA== 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=LuwmKjotPB9kvJyCLi3VyymZeJvo0W4S3R0M2BQej7w=; b=mPmddNpBcE8522UZzU6hBL7Wgu65qBzOX8HEH3i4prxR1LCrQBoqGbyB5r60h7gdZ+ T/BMQLyHKTULnZRNPQhUBhYwourZXytS463siKCzG5+CdKReXS7cfcRLUW+OsPc6fi2C RoDeZR+XJXe4KnfG2uHnmzgLINTkSjj1CeCs0FsmW/+irGMh6aXsFU1DmbrTTfETNySr +QciPsmHXDL9s6hLpdQiL/tnJ8niVuoGeY4L/Xj0rdVwdvu7fpjxHC7gffrGXQpCbhef NM7t+J4DD0K531DsvCh2yJb8TQh3HFiNl0dUxM0gwpmpLn3vUj4mZqsGfqhFkfVDeW7S z41g== X-Gm-Message-State: AOAM532ZeoWxF8Km22WCEd/hY//ssPKn01KnD1BGkrf4nDjFtzbDmGe4 79sMav4YfA6Mbp5AwcHAHbpcOpcrIpnI1w== X-Google-Smtp-Source: ABdhPJwTA/YQpnuZbw3pQlMyGJO6RqjBoJPCe5WN06uCLzEmatwDESlfKPdt0+ZsFXoN7jtkY4YhIg== X-Received: by 2002:a5d:5049:: with SMTP id h9mr11360246wrt.404.1611174211247; Wed, 20 Jan 2021 12:23:31 -0800 (PST) Received: from localhost (host86-180-62-229.range86-180.btcentralplus.com. [86.180.62.229]) by smtp.gmail.com with ESMTPSA id l5sm5738449wrv.44.2021.01.20.12.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Jan 2021 12:23:30 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org, binutils@sourceware.org Subject: [PATCHv2 8/9] gdb/riscv: write CSRs into baremetal core dumps Date: Wed, 20 Jan 2021 20:23:14 +0000 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Cc: Fredrik Hederstierna Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Use the current target description to include CSRs into the RISC-V baremetal core dumps. Every CSR declared in the current target description will be included in the core dump. If a CSR fails to read then the value 0 will be placed into the core dump instead. It will be critical for users that they have the same target description in use when loading the core file as was in use when writing the core file. This should be fine if the user allows the target description to be written into the core file. In more detail, this commit adds a NT_RISCV_CSR note type. The contents of this section is a series of either 4-byte (on RV32 targets), or 8-byte (on RV64 targets) regions. Every CSR that is mentioned in the current target description is written into one of these regions in the order that the registers appear in the target description. As a consequence it is critical that the exact same target description, including the same register order, is in use when the CSRs are loaded from the core file. gdb/ChangeLog: * riscv-non-tdep.c (riscv_csrset): New static global. (riscv_update_csrmap): New function. (riscv_iterate_over_regset_sections): Process CSRs. --- gdb/ChangeLog | 7 +++++ gdb/riscv-none-tdep.c | 60 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/gdb/riscv-none-tdep.c b/gdb/riscv-none-tdep.c index e06ee0981fe..2392c132e69 100644 --- a/gdb/riscv-none-tdep.c +++ b/gdb/riscv-none-tdep.c @@ -24,6 +24,8 @@ #include "elf-bfd.h" #include "regset.h" #include "none-tdep.h" +#include "user-regs.h" +#include "target-descriptions.h" /* Define the general register mapping. This follows the same format as the RISC-V linux corefile. The linux kernel puts the PC at offset 0, @@ -62,6 +64,42 @@ static const struct regset riscv_fregset = riscv_fregmap, riscv_supply_regset, regcache_collect_regset }; +/* Define the CSR regset, this is not constant as the regmap field is + updated dynamically based on the current target description. */ + +static struct regset riscv_csrset = +{ + nullptr, regcache_supply_regset, regcache_collect_regset +}; + +/* Update the regmap field of RISCV_CSRSET based on the CSRs available in + the current target description. */ + +static void +riscv_update_csrmap (struct gdbarch *gdbarch, + const struct tdesc_feature *feature_csr) +{ + int i = 0; + + /* Release any previously defined map. */ + delete[] ((struct regcache_map_entry *) riscv_csrset.regmap); + + /* Now create a register map for every csr found in the target + description. */ + struct regcache_map_entry *riscv_csrmap + = new struct regcache_map_entry[feature_csr->registers.size() + 1]; + for (auto &csr : feature_csr->registers) + { + int regnum = user_reg_map_name_to_regnum (gdbarch, csr->name.c_str(), + csr->name.length()); + riscv_csrmap[i++] = {1, regnum, 0}; + } + + /* Mark the end of the array. */ + riscv_csrmap[i] = {0}; + riscv_csrset.regmap = riscv_csrmap; +} + /* Implement the "iterate_over_regset_sections" gdbarch method. */ static void @@ -81,6 +119,28 @@ riscv_iterate_over_regset_sections (struct gdbarch *gdbarch, + register_size (gdbarch, RISCV_CSR_FCSR_REGNUM)); cb (".reg2", sz, sz, &riscv_fregset, NULL, cb_data); } + + /* Read or write the CSRs. The set of CSRs is defined by the current + target description. The user is responsible for ensuring that the + same target description is in use when reading the core file as was + in use when writing the core file. */ + const struct target_desc *tdesc = gdbarch_target_desc (gdbarch); + + /* Do not dump/load any CSRs if there is no target description or the target + description does not contain any CSRs. */ + if (tdesc != nullptr) + { + const struct tdesc_feature *feature_csr + = tdesc_find_feature (tdesc, riscv_feature_name_csr); + if (feature_csr != nullptr && feature_csr->registers.size () > 0) + { + riscv_update_csrmap (gdbarch, feature_csr); + cb (".reg-riscv-csr", + (feature_csr->registers.size() * riscv_isa_xlen (gdbarch)), + (feature_csr->registers.size() * riscv_isa_xlen (gdbarch)), + &riscv_csrset, NULL, cb_data); + } + } } /* Initialize RISC-V bare-metal ABI info. */ -- 2.25.4