From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13824 invoked by alias); 3 May 2013 03:45:33 -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 13797 invoked by uid 89); 3 May 2013 03:45:28 -0000 X-Spam-SWARE-Status: No, score=-4.0 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_EG autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 03 May 2013 03:45:27 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UY6w1-00062n-0y from Sandra_Loosemore@mentor.com ; Thu, 02 May 2013 20:45:25 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 2 May 2013 20:45:24 -0700 Received: from [IPv6:::1] (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Thu, 2 May 2013 20:45:24 -0700 Message-ID: <518332D1.9020709@codesourcery.com> Date: Fri, 03 May 2013 03:45:00 -0000 From: Sandra Loosemore User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: CC: Joel Brobecker , Pedro Alves Subject: Re: [patch 3/4] Nios II gdbserver support, version 2 References: <5174820E.6090500@codesourcery.com> <20130426064547.GQ3525@adacore.com> In-Reply-To: <20130426064547.GQ3525@adacore.com> Content-Type: multipart/mixed; boundary="------------050905020509060704010205" X-Virus-Found: No X-SW-Source: 2013-05/txt/msg00045.txt.bz2 --------------050905020509060704010205 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Content-length: 333 Here is a revised version of the gdbserver parts of the Nios II port. I've tweaked the copyright dates, comments, and formatting similarly to what I did to the GDB-side patches. I also made a few cleanups to the register-handling code to be consistent with the technical changes I made on the GDB side. OK to commit? -Sandra --------------050905020509060704010205 Content-Type: text/x-log; name="gdb2-3.log" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gdb2-3.log" Content-length: 307 2013-05-02 Sandra Loosemore Andrew Jenner gdb/gdbserver/ * Makefile.in (SFILES): Add linux-nios2-low.c. (clean): Add action to delete nios2-linux.c. (nios2-linux.c): New rule. * configure.srv: Add nios2*-*-linux*. * linux-nios2-low.c: New. --------------050905020509060704010205 Content-Type: text/x-patch; name="gdb2-3.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="gdb2-3.patch" Content-length: 8824 Index: gdb/gdbserver/Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/Makefile.in,v retrieving revision 1.150 diff -u -p -r1.150 Makefile.in --- gdb/gdbserver/Makefile.in 22 Apr 2013 16:46:15 -0000 1.150 +++ gdb/gdbserver/Makefile.in 2 May 2013 23:00:10 -0000 @@ -143,6 +143,7 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/ $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \ $(srcdir)/linux-m32r-low.c \ $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \ + $(srcdir)/linux-nios2-low.c \ $(srcdir)/linux-ppc-low.c \ $(srcdir)/linux-s390-low.c \ $(srcdir)/linux-sh-low.c $(srcdir)/linux-sparc-low.c \ @@ -323,6 +324,7 @@ clean: rm -f arm-with-iwmmxt.c rm -f arm-with-vfpv2.c arm-with-vfpv3.c arm-with-neon.c rm -f mips-linux.c mips64-linux.c + rm -f nios2-linux.c rm -f powerpc-32.c powerpc-32l.c powerpc-64l.c powerpc-e500l.c rm -f powerpc-altivec32l.c powerpc-cell32l.c powerpc-vsx32l.c rm -f powerpc-altivec64l.c powerpc-cell64l.c powerpc-vsx64l.c @@ -613,6 +615,8 @@ mips64-linux.c : $(srcdir)/../regformats $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips64-linux.dat mips64-linux.c mips64-dsp-linux.c : $(srcdir)/../regformats/mips64-dsp-linux.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/mips64-dsp-linux.dat mips64-dsp-linux.c +nios2-linux.c : $(srcdir)/../regformats/nios2-linux.dat $(regdat_sh) + $(SHELL) $(regdat_sh) $(srcdir)/../regformats/nios2-linux.dat nios2-linux.c powerpc-32.c : $(srcdir)/../regformats/rs6000/powerpc-32.dat $(regdat_sh) $(SHELL) $(regdat_sh) $(srcdir)/../regformats/rs6000/powerpc-32.dat powerpc-32.c powerpc-32l.c : $(srcdir)/../regformats/rs6000/powerpc-32l.dat $(regdat_sh) Index: gdb/gdbserver/configure.srv =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/configure.srv,v retrieving revision 1.74 diff -u -p -r1.74 configure.srv --- gdb/gdbserver/configure.srv 11 Mar 2013 08:35:11 -0000 1.74 +++ gdb/gdbserver/configure.srv 2 May 2013 23:00:10 -0000 @@ -201,6 +201,15 @@ case "${target}" in srv_linux_usrregs=yes srv_linux_thread_db=yes ;; + nios2*-*-linux*) srv_regobj="nios2-linux.o" + srv_tgtobj="linux-low.o linux-osdata.o linux-nios2-low.o linux-procfs.o" + srv_tgtobj="${srv_tgtobj} linux-ptrace.o" + srv_xmlfiles="nios2-linux.xml" + srv_xmlfiles="${srv_xmlfiles} nios2-cpu.xml" + srv_linux_regsets=yes + srv_linux_usrregs=yes + srv_linux_thread_db=yes + ;; powerpc*-*-linux*) srv_regobj="powerpc-32l.o" srv_regobj="${srv_regobj} powerpc-altivec32l.o" srv_regobj="${srv_regobj} powerpc-cell32l.o" Index: gdb/gdbserver/linux-nios2-low.c =================================================================== RCS file: gdb/gdbserver/linux-nios2-low.c diff -N gdb/gdbserver/linux-nios2-low.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gdb/gdbserver/linux-nios2-low.c 2 May 2013 23:00:10 -0000 @@ -0,0 +1,230 @@ +/* GNU/Linux/Nios II specific low level interface, for the remote server for + GDB. + Copyright (C) 2008-2013 Free Software Foundation, Inc. + + Contributed by Mentor Graphics, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "server.h" +#include "linux-low.h" +#include +#include +#include "gdb_proc_service.h" +#include + +#ifndef PTRACE_GET_THREAD_AREA +#define PTRACE_GET_THREAD_AREA 25 +#endif + +/* The following definition must agree with the number of registers + defined in "struct user_regs" in GLIBC + (ports/sysdeps/unix/sysv/linux/nios2/sys/user.h), and also with + NIOS2_NUM_REGS in GDB proper. */ + +#define nios2_num_regs 49 + +/* Defined in auto-generated file nios2-linux.c. */ + +void init_registers_nios2_linux (void); + +/* This union is used to convert between int and byte buffer + representations of register contents. */ + +union nios2_register +{ + unsigned char buf[4]; + int reg32; +}; + +/* Return the ptrace ``address'' of register REGNO. */ + +static int nios2_regmap[] = { + -1, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, + 48, + 0 +}; + +/* Implement the arch_setup linux_target_ops method. */ + +static void +nios2_arch_setup (void) +{ + init_registers_nios2_linux (); +} + +/* Implement the cannot_fetch_register linux_target_ops method. */ + +static int +nios2_cannot_fetch_register (int regno) +{ + if (nios2_regmap[regno] == -1) + return 1; + + return 0; +} + +/* Implement the cannot_store_register linux_target_ops method. */ + +static int +nios2_cannot_store_register (int regno) +{ + if (nios2_regmap[regno] == -1) + return 1; + + return 0; +} + +/* Implement the get_pc linux_target_ops method. */ + +static CORE_ADDR +nios2_get_pc (struct regcache *regcache) +{ + union nios2_register pc; + collect_register_by_name (regcache, "pc", pc.buf); + return pc.reg32; +} + +/* Implement the set_pc linux_target_ops method. */ + +static void +nios2_set_pc (struct regcache *regcache, CORE_ADDR pc) +{ + union nios2_register newpc; + newpc.reg32 = pc; + supply_register_by_name (regcache, "pc", newpc.buf); +} + +/* Breakpoint support. */ + +static const unsigned int nios2_breakpoint = 0x003b6ffa; +#define nios2_breakpoint_len 4 + +/* Implement the breakpoint_reinsert_addr linux_target_ops method. */ + +static CORE_ADDR +nios2_reinsert_addr (void) +{ + union nios2_register ra; + struct regcache *regcache = get_thread_regcache (current_inferior, 1); + + collect_register_by_name (regcache, "ra", ra.buf); + return ra.reg32; +} + +/* Implement the breakpoint_at linux_target_ops method. */ + +static int +nios2_breakpoint_at (CORE_ADDR where) +{ + unsigned int insn; + + (*the_target->read_memory) (where, (unsigned char *) &insn, 4); + if (insn == nios2_breakpoint) + return 1; + return 0; +} + +/* Fetch the thread-local storage pointer for libthread_db. */ + +ps_err_e +ps_get_thread_area (const struct ps_prochandle *ph, + lwpid_t lwpid, int idx, void **base) +{ + if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0) + return PS_ERR; + + /* IDX is the bias from the thread pointer to the beginning of the + thread descriptor. It has to be subtracted due to implementation + quirks in libthread_db. */ + *base = (void *) ((char *)*base - idx); + + return PS_OK; +} + +#ifdef HAVE_PTRACE_GETREGS + +/* Helper functions to collect/supply a single register REGNO. */ + +static void +nios2_collect_register (struct regcache *regcache, int regno, + union nios2_register *reg) +{ + union nios2_register tmp_reg; + + collect_register (regcache, regno, &tmp_reg.reg32); + reg->reg32 = tmp_reg.reg32; +} + +static void +nios2_supply_register (struct regcache *regcache, int regno, + const union nios2_register *reg) +{ + supply_register (regcache, regno, reg->buf); +} + +/* We have only a single register set on Nios II. */ + +static void +nios2_fill_gregset (struct regcache *regcache, void *buf) +{ + union nios2_register *regset = buf; + int i; + + for (i = 1; i < nios2_num_regs; i++) + nios2_collect_register (regcache, i, regset + i); +} + +static void +nios2_store_gregset (struct regcache *regcache, const void *buf) +{ + const union nios2_register *regset = buf; + int i; + + for (i = 0; i < nios2_num_regs; i++) + nios2_supply_register (regcache, i, regset + i); +} +#endif /* HAVE_PTRACE_GETREGS */ + +struct regset_info target_regsets[] = { +#ifdef HAVE_PTRACE_GETREGS + { PTRACE_GETREGS, PTRACE_SETREGS, 0, nios2_num_regs * 4, GENERAL_REGS, + nios2_fill_gregset, nios2_store_gregset }, +#endif /* HAVE_PTRACE_GETREGS */ + { 0, 0, 0, -1, -1, NULL, NULL } +}; + +struct linux_target_ops the_low_target = { + nios2_arch_setup, + nios2_num_regs, + nios2_regmap, + NULL, + nios2_cannot_fetch_register, + nios2_cannot_store_register, + NULL, + nios2_get_pc, + nios2_set_pc, + (const unsigned char *) &nios2_breakpoint, + nios2_breakpoint_len, + nios2_reinsert_addr, + 0, + nios2_breakpoint_at, +}; --------------050905020509060704010205--