From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7778 invoked by alias); 3 Jun 2013 15:25:39 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 7763 invoked by uid 89); 3 Jun 2013 15:25:39 -0000 X-Spam-SWARE-Status: No, score=-7.7 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS,TW_EG,TW_SR autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Mon, 03 Jun 2013 15:25:38 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r53FPZDu031846 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 3 Jun 2013 11:25:36 -0400 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r53FPYMh010132; Mon, 3 Jun 2013 11:25:34 -0400 Message-ID: <51ACB56D.2040005@redhat.com> Date: Mon, 03 Jun 2013 15:25:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 MIME-Version: 1.0 To: Yao Qi CC: gdb-patches@sourceware.org Subject: Re: [PATCH 14/22] [GDBserver] Multi-process + multi-arch: GNU/Linux TI C6x References: <20130530121335.15047.12654.stgit@brno.lan> <20130530121516.15047.35283.stgit@brno.lan> <51AC5ED8.3040704@codesourcery.com> In-Reply-To: <51AC5ED8.3040704@codesourcery.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-06/txt/msg00016.txt.bz2 On 06/03/2013 10:16 AM, Yao Qi wrote: > > I didn't run the testsuite with this patch, because the board isn't stable. Run a small test and GDBserver behaves correctly. > Thanks. I've adjusted the commit log to mention that. ----- Subject: [PATCH] [GDBserver] Multi-process + multi-arch: GNU/Linux TI C6x This adjusts the GNU/Linux TI C6x port to new interfaces. Smoked tested by Yao Qi. gdb/gdbserver/ * linux-tic6x-low.c (tdesc_tic6x_c64xp_linux) (tdesc_tic6x_c64x_linux, tdesc_tic6x_c62x_linux): Declare. (tic6x_usrregs_info): Forward declare. (tic6x_read_description): New function, based on ... (tic6x_arch_setup): ... this. Reimplement. (target_regsets): Rename to ... (tic6x_regsets): ... this, and make static. (tic6x_regsets_info, tic6x_usrregs_info, regs_info): New globals. (tic6x_regs_info): New function. (the_low_target): Adjust. (initialize_low_arch): New function. --- gdb/gdbserver/linux-tic6x-low.c | 73 ++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c index 93a1e65..2367dea 100644 --- a/gdb/gdbserver/linux-tic6x-low.c +++ b/gdb/gdbserver/linux-tic6x-low.c @@ -38,10 +38,15 @@ /* Defined in auto-generated file tic6x-c64xp-linux.c. */ void init_registers_tic6x_c64xp_linux (void); +extern const struct target_desc *tdesc_tic6x_c64xp_linux; + /* Defined in auto-generated file tic6x-c64x-linux.c. */ void init_registers_tic6x_c64x_linux (void); +extern const struct target_desc *tdesc_tic6x_c64x_linux; + /* Defined in auto-generated file tic62x-c6xp-linux.c. */ void init_registers_tic6x_c62x_linux (void); +extern const struct target_desc *tdesc_tic6x_c62x_linux; union tic6x_register { @@ -167,11 +172,15 @@ extern struct linux_target_ops the_low_target; static int *tic6x_regmap; static unsigned int tic6x_breakpoint; -static void -tic6x_arch_setup (void) +/* Forward definition. */ +static struct usrregs_info tic6x_usrregs_info; + +static const struct target_desc * +tic6x_read_description (void) { register unsigned int csr asm ("B2"); unsigned int cpuid; + const struct target_desc *tdesc; /* Determine the CPU we're running on to find the register order. */ __asm__ ("MVC .S2 CSR,%0" : "=r" (csr) :); @@ -182,29 +191,30 @@ tic6x_arch_setup (void) case 0x02: /* C67x */ tic6x_regmap = tic6x_regmap_c62x; tic6x_breakpoint = 0x0000a122; /* BNOP .S2 0,5 */ - init_registers_tic6x_c62x_linux (); + tdesc = tdesc_tic6x_c62x_linux; break; case 0x03: /* C67x+ */ tic6x_regmap = tic6x_regmap_c64x; tic6x_breakpoint = 0x0000a122; /* BNOP .S2 0,5 */ - init_registers_tic6x_c64x_linux (); + tdesc = tdesc_tic6x_c64x_linux; break; case 0x0c: /* C64x */ tic6x_regmap = tic6x_regmap_c64x; tic6x_breakpoint = 0x0000a122; /* BNOP .S2 0,5 */ - init_registers_tic6x_c64x_linux (); + tdesc = tdesc_tic6x_c64x_linux; break; case 0x10: /* C64x+ */ case 0x14: /* C674x */ case 0x15: /* C66x */ tic6x_regmap = tic6x_regmap_c64xp; tic6x_breakpoint = 0x56454314; /* illegal opcode */ - init_registers_tic6x_c64xp_linux (); + tdesc = tdesc_tic6x_c64xp_linux; break; default: error ("Unknown CPU ID 0x%02x", cpuid); } - the_low_target.regmap = tic6x_regmap; + tic6x_usrregs_info.regmap = tic6x_regmap; + return tdesc; } static int @@ -311,17 +321,47 @@ tic6x_store_gregset (struct regcache *regcache, const void *buf) tic6x_supply_register (regcache, i, regset + tic6x_regmap[i]); } -struct regset_info target_regsets[] = { +static struct regset_info tic6x_regsets[] = { { PTRACE_GETREGS, PTRACE_SETREGS, 0, TIC6X_NUM_REGS * 4, GENERAL_REGS, tic6x_fill_gregset, tic6x_store_gregset }, { 0, 0, 0, -1, -1, NULL, NULL } }; +static void +tic6x_arch_setup (void) +{ + current_process ()->tdesc = tic6x_read_description (); +} + +static struct regsets_info tic6x_regsets_info = + { + tic6x_regsets, /* regsets */ + 0, /* num_regsets */ + NULL, /* disabled_regsets */ + }; + +static struct usrregs_info tic6x_usrregs_info = + { + TIC6X_NUM_REGS, + NULL, /* Set in tic6x_read_description. */ + }; + +static struct regs_info regs_info = + { + NULL, /* regset_bitmap */ + &tic6x_usrregs_info, + &tic6x_regsets_info + }; + +static const struct regs_info * +tic6x_regs_info (void) +{ + return ®s_info; +} + struct linux_target_ops the_low_target = { tic6x_arch_setup, - TIC6X_NUM_REGS, - 0, - NULL, + tic6x_regs_info, tic6x_cannot_fetch_register, tic6x_cannot_store_register, NULL, /* fetch_register */ @@ -333,3 +373,14 @@ struct linux_target_ops the_low_target = { 0, tic6x_breakpoint_at, }; + +void +initialize_low_arch (void) +{ + /* Initialize the Linux target descriptions. */ + init_registers_tic6x_c64xp_linux (); + init_registers_tic6x_c64x_linux (); + init_registers_tic6x_c62x_linux (); + + initialize_regsets_info (&tic6x_regsets_info); +} -- 1.7.11.7