From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10399 invoked by alias); 30 May 2013 12:15:27 -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 10357 invoked by uid 89); 30 May 2013 12:15:26 -0000 X-Spam-SWARE-Status: No, score=-8.0 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; Thu, 30 May 2013 12:15:26 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4UCFOci027062 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 30 May 2013 08:15:24 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4UCFNue011322 for ; Thu, 30 May 2013 08:15:23 -0400 Subject: [PATCH 15/22] [GDBserver] Multi-process + multi-arch: GNU/Linux Xtensa To: gdb-patches@sourceware.org From: Pedro Alves Date: Thu, 30 May 2013 12:15:00 -0000 Message-ID: <20130530121522.15047.96785.stgit@brno.lan> In-Reply-To: <20130530121335.15047.12654.stgit@brno.lan> References: <20130530121335.15047.12654.stgit@brno.lan> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-SW-Source: 2013-05/txt/msg01072.txt.bz2 This adjusts the GNU/Linux TI Xtensa port to new interfaces. Completely untested. 2013-05-30 Pedro Alves * linux-xtensa-low.c (tdesc_xtensa): Declare. (xtensa_fill_gregset, xtensa_store_gregset): Adjust. (target_regsets): Rename to ... (xtensa_regsets): ... this, and make static. (xtensa_regsets_info, xtensa_usrregs_info, regs_info): New globals. (xtensa_arch_setup, xtensa_regs_info): New functions. (the_low_target): Adjust. (initialize_low_arch): New function. --- gdb/gdbserver/linux-xtensa-low.c | 61 ++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 9 deletions(-) diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c index d988a46..6083f33 100644 --- a/gdb/gdbserver/linux-xtensa-low.c +++ b/gdb/gdbserver/linux-xtensa-low.c @@ -22,6 +22,7 @@ /* Defined in auto-generated file reg-xtensa.c. */ void init_registers_xtensa (void); +extern const struct target_desc *tdesc_xtensa; #include #include @@ -40,19 +41,20 @@ static void xtensa_fill_gregset (struct regcache *regcache, void *buf) { elf_greg_t* rset = (elf_greg_t*)buf; + const struct target_desc *tdesc = regcache->tdesc; int ar0_regnum; char *ptr; int i; /* Take care of AR registers. */ - ar0_regnum = find_regno ("ar0"); + ar0_regnum = find_regno (tdesc, "ar0"); ptr = (char*)&rset[R_A0]; for (i = ar0_regnum; i < ar0_regnum + XCHAL_NUM_AREGS; i++) { collect_register (regcache, i, ptr); - ptr += register_size(i); + ptr += register_size (tdesc, i); } /* Loop registers, if hardware has it. */ @@ -74,19 +76,20 @@ static void xtensa_store_gregset (struct regcache *regcache, const void *buf) { const elf_greg_t* rset = (const elf_greg_t*)buf; + const struct target_desc *tdesc = regcache->tdesc; int ar0_regnum; char *ptr; int i; /* Take care of AR registers. */ - ar0_regnum = find_regno ("ar0"); + ar0_regnum = find_regno (tdesc, "ar0"); ptr = (char *)&rset[R_A0]; for (i = ar0_regnum; i < ar0_regnum + XCHAL_NUM_AREGS; i++) { supply_register (regcache, i, ptr); - ptr += register_size(i); + ptr += register_size (tdesc, i); } /* Loop registers, if hardware has it. */ @@ -130,7 +133,7 @@ xtensa_store_xtregset (struct regcache *regcache, const void *buf) } } -struct regset_info target_regsets[] = { +static struct regset_info xtensa_regsets[] = { { PTRACE_GETREGS, PTRACE_SETREGS, 0, sizeof (elf_gregset_t), GENERAL_REGS, xtensa_fill_gregset, xtensa_store_gregset }, @@ -176,11 +179,41 @@ xtensa_breakpoint_at (CORE_ADDR where) xtensa_breakpoint, xtensa_breakpoint_len) == 0; } +static struct regsets_info xtensa_regsets_info = + { + xtensa_regsets, /* regsets */ + 0, /* num_regsets */ + NULL, /* disabled_regsets */ + }; + +static struct usrregs_info xtensa_usrregs_info = + { + xtensa_num_regs, + xtensa_regmap, + }; + +static struct regs_info regs_info = + { + NULL, /* regset_bitmap */ + &xtensa_usrregs_info, + &xtensa_regsets_info + }; + +static void +xtensa_arch_setup (void) +{ + current_process ()->tdesc = tdesc_xtensa; +} + +static const struct regs_info * +xtensa_regs_info (void) +{ + return ®s_info; +} + struct linux_target_ops the_low_target = { - init_registers_xtensa, - 0, - 0, - NULL, + xtensa_arch_setup, + xtensa_regs_info, 0, 0, NULL, /* fetch_register */ @@ -192,3 +225,13 @@ struct linux_target_ops the_low_target = { 0, xtensa_breakpoint_at, }; + + +void +initialize_low_arch (void) +{ + /* Initialize the Linux target descriptions. */ + init_registers_xtensa (); + + initialize_regsets_info (&xtensa_regsets_info); +}