From patchwork Mon Jun 12 08:41:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 20916 Received: (qmail 69469 invoked by alias); 12 Jun 2017 08:42:03 -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 69024 invoked by uid 89); 12 Jun 2017 08:42:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-27.6 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=3811, H*Ad:U*macro, H*r:sk:static. X-HELO: mail-it0-f53.google.com Received: from mail-it0-f53.google.com (HELO mail-it0-f53.google.com) (209.85.214.53) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 12 Jun 2017 08:41:58 +0000 Received: by mail-it0-f53.google.com with SMTP id m47so17651329iti.0 for ; Mon, 12 Jun 2017 01:42:02 -0700 (PDT) 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; bh=f2WcxARwWDi5BxnXY9omWV+gtqaBLOc3iNgZbNMsqPg=; b=mbge0JLRwyTNuJlQUgt6DLJMryMyflG1NNrL3HJe3tDN6kqWUkBLtSE9hcFZuUOJQB ZMa+aWmA6IPVF0ihzjqJUem68hE7KfeOSAUctskMkzNIDoHaO7d53laUpNsNOCHOnsF1 CsqSq0w5nJ0QBdnyrVphXQU1hHd0Z3bj7GL1JMovKT/PybO62kkyoLI+JC8YhR+a+T2F TTvdsiz1y4je77RqeA6RvwXbe5km/7cRvh7Maa1/GddET8MC6fhUGYpxq9IUxqFVNW+C TQMfSc6ZSMseCLZgbdF98Pa7N9SitmoZg4sMggVluMPD/U51R74ob7o+tN33E5kdWvQ8 T8QA== X-Gm-Message-State: AODbwcAoEB42yxQLrY6gAMpSSbFizW0Ed04zJ4DqcuGfszAMLJUwcmjw N/vOwFC6DXpwuOXI X-Received: by 10.36.227.6 with SMTP id d6mr11119494ith.79.1497256920755; Mon, 12 Jun 2017 01:42:00 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id u4sm5280289itu.1.2017.06.12.01.41.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Jun 2017 01:42:00 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Cc: macro@imgtec.com Subject: [PATCH 01/25] Move initialize_tdesc_mips* calls from mips-linux-nat.c to mips-linux-tdep.c Date: Mon, 12 Jun 2017 09:41:32 +0100 Message-Id: <1497256916-4958-2-git-send-email-yao.qi@linaro.org> In-Reply-To: <1497256916-4958-1-git-send-email-yao.qi@linaro.org> References: <1497256916-4958-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes All target descriptions except mips initialization are called in -tdep.c, instead of -nat.c, so this patch moves mips target descriptions initialization to -tdep.c. Secondly, I want to change the target descriptions from pre-generated to dynamical creation, so I want to test that these pre-generated target descriptions equal to these dynamically created ones. Move target descriptions initialization to -tdep.c files so we can test them in any hosts (if they are still -nat.c, we can only test them on mips-linux host.). gdb: 2017-05-09 Yao Qi * mips-linux-nat.c: Move include features/mips*-linux.c to mips-linux-tdep.c. (_initialize_mips_linux_nat): Move initialize_tdesc_mips* calls to mips-linux-tdep.c. * mips-linux-tdep.c: Include features/mips*-linux.c (_initialize_mips_linux_tdep): Call initialize_tdesc_mips* functions. * mips-linux-tdep.h (tdesc_mips_linux): Declare. (tdesc_mips_dsp_linux, tdesc_mips64_linux): Declare. (tdesc_mips64_dsp_linux): Declare. --- gdb/mips-linux-nat.c | 11 ----------- gdb/mips-linux-tdep.c | 11 +++++++++++ gdb/mips-linux-tdep.h | 6 ++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c index 8041d84..1fd3365 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -38,11 +38,6 @@ #include "nat/mips-linux-watch.h" -#include "features/mips-linux.c" -#include "features/mips-dsp-linux.c" -#include "features/mips64-linux.c" -#include "features/mips64-dsp-linux.c" - #ifndef PTRACE_GET_THREAD_AREA #define PTRACE_GET_THREAD_AREA 25 #endif @@ -803,10 +798,4 @@ triggers a breakpoint or watchpoint."), linux_nat_add_target (t); linux_nat_set_new_thread (t, mips_linux_new_thread); - - /* Initialize the standard target descriptions. */ - initialize_tdesc_mips_linux (); - initialize_tdesc_mips_dsp_linux (); - initialize_tdesc_mips64_linux (); - initialize_tdesc_mips64_dsp_linux (); } diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index ccfdcdf..f144a2e 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -40,6 +40,11 @@ #include "xml-syscall.h" #include "gdb_signals.h" +#include "features/mips-linux.c" +#include "features/mips-dsp-linux.c" +#include "features/mips64-linux.c" +#include "features/mips64-dsp-linux.c" + static struct target_so_ops mips_svr4_so_ops; /* This enum represents the signals' numbers on the MIPS @@ -1739,4 +1744,10 @@ _initialize_mips_linux_tdep (void) GDB_OSABI_LINUX, mips_linux_init_abi); } + + /* Initialize the standard target descriptions. */ + initialize_tdesc_mips_linux (); + initialize_tdesc_mips_dsp_linux (); + initialize_tdesc_mips64_linux (); + initialize_tdesc_mips64_dsp_linux (); } diff --git a/gdb/mips-linux-tdep.h b/gdb/mips-linux-tdep.h index 407b577..cca4798 100644 --- a/gdb/mips-linux-tdep.h +++ b/gdb/mips-linux-tdep.h @@ -105,3 +105,9 @@ enum { /* Return 1 if MIPS_RESTART_REGNUM is usable. */ int mips_linux_restart_reg_p (struct gdbarch *gdbarch); + +/* Target descriptions. */ +extern struct target_desc *tdesc_mips_linux; +extern struct target_desc *tdesc_mips64_linux; +extern struct target_desc *tdesc_mips_dsp_linux; +extern struct target_desc *tdesc_mips64_dsp_linux;