From patchwork Tue Mar 6 19:30:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 26218 Received: (qmail 28283 invoked by alias); 6 Mar 2018 19:30:45 -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 27652 invoked by uid 89); 6 Mar 2018 19:30:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 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=HX-Received:10.223.166.103 X-HELO: mail-wr0-f196.google.com Received: from mail-wr0-f196.google.com (HELO mail-wr0-f196.google.com) (209.85.128.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 06 Mar 2018 19:30:14 +0000 Received: by mail-wr0-f196.google.com with SMTP id m12so22095025wrm.13 for ; Tue, 06 Mar 2018 11:30:14 -0800 (PST) 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:in-reply-to:references; bh=JJimfyhEk5cnfQJCzV3ziVczNCf1khh9tFjhJT7IYaw=; b=h4gtmnrUoH62g1k9MQkrOmOeM4gBnOaz2BGtCRlozk5oUDmx0BhQ32sbRTOWvoBaO1 qNkAcR4qRaH6cFgauqCdptG30IEZ3DFmm12GpyY3SXDTWYAu7WaCliiVea0I3jDMrBos Z7zAslDsI3BvT705ugkXPWd52IFhV8ciCGXvsXfQIOY9X0x82IawZAguoOkupYGj6Ce2 HgVxbRwHCmD/Nqp4qngGMCMPma5muBBFAwWQa7CsPqhG8ocAdcRH2hHgTnE7NkDLHmut 0DOR+YOJbFLoeX++s13jKPQ+ieU+ZcoqubSgQgSlA0NSEeFGIBh1GjmDwCuaaQfdQhz5 Q29g== X-Gm-Message-State: APf1xPA5zAt3Oq8QetrxjUffI6XsiwolF7imXltipa5XvjlSbXhMorzu 1FVRAvpa6hkrx0wdSDP/xqVN1bLd X-Google-Smtp-Source: AG47ELsAyfkq3tEcb4cvx4e8h8nUwZ6GzaBEP2hLXdQHUruQn1wWrPfuan8qnauZWXoXvSqjIxRE7w== X-Received: by 10.223.166.103 with SMTP id k94mr15821295wrc.237.1520364612512; Tue, 06 Mar 2018 11:30:12 -0800 (PST) Received: from localhost (host86-164-103-156.range86-164.btcentralplus.com. [86.164.103.156]) by smtp.gmail.com with ESMTPSA id f23sm28848156wrf.77.2018.03.06.11.30.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Mar 2018 11:30:11 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Yao Qi , Andrew Burgess Subject: [PATCH 3/3] gdb/riscv: Remove partial target description support Date: Tue, 6 Mar 2018 19:30:02 +0000 Message-Id: <9add17f218409f357d5ed8b831c777ac93f41ec4.1520363647.git.andrew.burgess@embecosm.com> In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes Some parts of the target description support were committed with the initial riscv patch. As target descriptions are not currently supported on riscv this commit removes the two pieces for code that relate to target description support. It is expected that target description support will be added in the future, at which point this, or similar code will be added back. gdb/ChangeLog: * riscv-tdep.c (riscv_register_name): Remove target description support. (riscv_gdbarch_init): Remove target description check. --- gdb/ChangeLog | 6 ++++++ gdb/riscv-tdep.c | 37 ------------------------------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index bc25edfa9f2..11b12279321 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -464,9 +464,6 @@ value_of_riscv_user_reg (struct frame_info *frame, const void *baton) static const char * riscv_register_name (struct gdbarch *gdbarch, int regnum) { - if (tdesc_has_registers (gdbarch_target_desc (gdbarch))) - return tdesc_register_name (gdbarch, regnum); - /* Prefer to use the alias. */ if (regnum >= RISCV_ZERO_REGNUM && regnum <= RISCV_LAST_REGNUM) { @@ -2565,40 +2562,6 @@ riscv_gdbarch_init (struct gdbarch_info info, dwarf2_append_unwinders (gdbarch); frame_unwind_append_unwinder (gdbarch, &riscv_frame_unwind); - /* Check any target description for validity. */ - if (tdesc_has_registers (info.target_desc)) - { - const struct tdesc_feature *feature; - struct tdesc_arch_data *tdesc_data; - int valid_p; - - feature = tdesc_find_feature (info.target_desc, "org.gnu.gdb.riscv.cpu"); - if (feature == NULL) - goto no_tdata; - - tdesc_data = tdesc_data_alloc (); - - valid_p = 1; - for (i = RISCV_ZERO_REGNUM; i <= RISCV_LAST_FP_REGNUM; ++i) - valid_p &= tdesc_numbered_register (feature, tdesc_data, i, - riscv_gdb_reg_names[i]); - for (i = RISCV_FIRST_CSR_REGNUM; i <= RISCV_LAST_CSR_REGNUM; ++i) - { - char buf[20]; - - sprintf (buf, "csr%d", i - RISCV_FIRST_CSR_REGNUM); - valid_p &= tdesc_numbered_register (feature, tdesc_data, i, buf); - } - - valid_p &= tdesc_numbered_register (feature, tdesc_data, i++, "priv"); - - if (!valid_p) - tdesc_data_cleanup (tdesc_data); - else - tdesc_use_registers (gdbarch, info.target_desc, tdesc_data); - } - no_tdata: - for (i = 0; i < ARRAY_SIZE (riscv_register_aliases); ++i) user_reg_add (gdbarch, riscv_register_aliases[i].name, value_of_riscv_user_reg, &riscv_register_aliases[i].regnum);