From patchwork Tue Oct 23 11:26:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 29848 Received: (qmail 43709 invoked by alias); 23 Oct 2018 11:26:40 -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 43693 invoked by uid 89); 23 Oct 2018 11:26:39 -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=ensures, 2145, HX-Received:sk:n9-v6mr, sk:get_fra X-HELO: mail-wr1-f68.google.com Received: from mail-wr1-f68.google.com (HELO mail-wr1-f68.google.com) (209.85.221.68) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 23 Oct 2018 11:26:37 +0000 Received: by mail-wr1-f68.google.com with SMTP id u1-v6so1290624wrn.0 for ; Tue, 23 Oct 2018 04:26:37 -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=8eJUyyeXsGItDfihV4ZNVQ/d5esPWyXwnu0xglAZ0kU=; b=I5tqBUOUPiqSK4flcApcq2hfjUG8GcwXblgmKEBxlIJYUmsd79vY9VarNXGy0XTGKa p8LAJZD63E2JwlStoWLBsi/ujm/xIr7Q7DKg7kcNU5NV5LHCuh+z4bnwFUPm7mFmv4ZI /HTtxDpBI/1JeRN7PIP/CyJS+G+YK4uj/XDXUmelXbCLV6W8npgK7AuR33AzIsIvcUlH U6IVFxE1AF0P+yCcAjwX0YFJ1HwQwLFvhOo9FRfuaTpriCb4Pkn29f+Mxne779Ca6Qmd 9v+Gh0WchG0mwONj57lwvr5fr8Ml3MsucvYqVDLA5KDV6LLrVODgsUHcSYNCKcw6kI+A EkuA== Return-Path: Received: from localhost (host86-164-85-193.range86-164.btcentralplus.com. [86.164.85.193]) by smtp.gmail.com with ESMTPSA id c64-v6sm1239923wma.44.2018.10.23.04.26.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Oct 2018 04:26:34 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: jimw@sifive.com, palmer@sifive.com, Andrew Burgess Subject: [PATCH] gdb/riscv: Remove redundant code, and catch more errors when accessing MISA Date: Tue, 23 Oct 2018 12:26:31 +0100 Message-Id: <20181023112631.9722-1-andrew.burgess@embecosm.com> X-IsSubscribed: yes This is a cleanup of a patch I proposed here: https://sourceware.org/ml/gdb-patches/2018-09/msg00749.html I think Jim said he was happy with this, but this is a final chance to review. Thanks, Andrew --- When reading the MISA register, the RISC-V specification says that, if MISA can't be found then a default value of 0 should be assumed. As such, this patch ensures that GDB ignores errors when accessing both the new and old locations for the MISA register. Additionally, this patch removes an unneeded flag parameter which didn't provide any additional functionality beyond checking the MISA for the default value of 0. gdb/ChangeLog: * riscv-tdep.c (riscv_read_misa_reg): Update comment, remove READ_P parameter, catch and ignore register access errors from either the old or new MISA location. (riscv_has_feature): Update call to riscv_read_misa_reg. --- gdb/ChangeLog | 7 +++++++ gdb/riscv-tdep.c | 46 ++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 48ca2accb4a..a3c3e833e93 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -290,34 +290,39 @@ static unsigned int riscv_debug_infcall = 0; static unsigned int riscv_debug_unwinder = 0; -/* Read the MISA register from the target. The register will only be read - once, and the value read will be cached. If the register can't be read - from the target then a default value (0) will be returned. If the - pointer READ_P is not null, then the bool pointed to is updated to - indicate if the value returned was read from the target (true) or is the - default (false). */ +/* Read the MISA register from the target. There are a couple of locations + that the register might be found, these are all tried. If the MISA + register can't be found at all then the default value of 0 is returned, + this is inline with the RISC-V specification. */ static uint32_t -riscv_read_misa_reg (bool *read_p) +riscv_read_misa_reg () { uint32_t value = 0; if (target_has_registers) { + /* Old cores might have MISA located at a different offset. */ + static int misa_regs[] = + { RISCV_CSR_MISA_REGNUM, RISCV_CSR_LEGACY_MISA_REGNUM }; + struct frame_info *frame = get_current_frame (); - TRY - { - value = get_frame_register_unsigned (frame, - RISCV_CSR_MISA_REGNUM); - } - CATCH (ex, RETURN_MASK_ERROR) + for (int i = 0; i < ARRAY_SIZE (misa_regs); ++i) { - /* Old cores might have MISA located at a different offset. */ - value = get_frame_register_unsigned (frame, - RISCV_CSR_LEGACY_MISA_REGNUM); + TRY + { + value = get_frame_register_unsigned (frame, misa_regs[i]); + break; + } + CATCH (ex, RETURN_MASK_ERROR) + { + /* Ignore errors, it is acceptable for a target to not + provide a MISA register, in which case the default value + of 0 should be used. */ + } + END_CATCH } - END_CATCH } return value; @@ -330,13 +335,10 @@ riscv_read_misa_reg (bool *read_p) static bool riscv_has_feature (struct gdbarch *gdbarch, char feature) { - bool have_read_misa = false; - uint32_t misa; - gdb_assert (feature >= 'A' && feature <= 'Z'); - misa = riscv_read_misa_reg (&have_read_misa); - if (!have_read_misa || misa == 0) + uint32_t misa = riscv_read_misa_reg (); + if (misa == 0) misa = gdbarch_tdep (gdbarch)->core_features; return (misa & (1 << (feature - 'A'))) != 0;