From c574441c2a79d2bf29560ff146112cf85d6f36b1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 7 Feb 2011 00:49:12 -0500 Subject: gdb: add support for Blackfin gdbserver This requires removing "deprecated" markings from gdb-6.6, but this isn't that big of a deal. That is the last version with Blackfin support at the moment and we're in the process of getting mainlined. [Peter: only mark as undeprecated on bfin] Acked-by: Thomas Petazzoni Signed-off-by: Mike Frysinger Signed-off-by: Peter Korsgaard --- toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch | 238 +++++++++++++++++++++++++ toolchain/gdb/Config.in | 8 +- 2 files changed, 243 insertions(+), 3 deletions(-) create mode 100644 toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch (limited to 'toolchain') diff --git a/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch b/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch new file mode 100644 index 000000000..65c4b908d --- /dev/null +++ b/toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch @@ -0,0 +1,238 @@ +--- gdb-6.6/gdb/gdbserver/configure.srv ++++ gdb-6.6/gdb/gdbserver/configure.srv +@@ -23,6 +23,11 @@ case "${target}" in + srv_linux_usrregs=yes + srv_linux_thread_db=yes + ;; ++ bfin-*-*) srv_regobj=reg-bfin.o ++ srv_tgtobj="linux-low.o linux-bfin-low.o" ++ srv_linux_usrregs=yes ++ srv_linux_thread_db=yes ++ ;; + crisv32-*-linux*) srv_regobj=reg-crisv32.o + srv_tgtobj="linux-low.o linux-crisv32-low.o" + srv_linux_regsets=yes +--- gdb-6.6/gdb/gdbserver/linux-bfin-low.c ++++ gdb-6.6/gdb/gdbserver/linux-bfin-low.c +@@ -0,0 +1,101 @@ ++/* GNU/Linux/BFIN specific low level interface, for the remote server for GDB. ++ ++ Copyright (C) 2005 Free Software Foundation, Inc. ++ Contributed by Analog Devices. ++ ++ 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 2 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, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ Boston, MA 02110-1301, USA. */ ++ ++#include "server.h" ++#include "linux-low.h" ++#include ++ ++static int bfin_regmap[] = ++{ ++ PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7, ++ PT_P0, PT_P1, PT_P2, PT_P3, PT_P4, PT_P5, PT_USP, PT_FP, ++ PT_I0, PT_I1, PT_I2, PT_I3, PT_M0, PT_M1, PT_M2, PT_M3, ++ PT_B0, PT_B1, PT_B2, PT_B3, PT_L0, PT_L1, PT_L2, PT_L3, ++ PT_A0X, PT_A0W, PT_A1X, PT_A1W, PT_ASTAT, PT_RETS, ++ PT_LC0, PT_LT0, PT_LB0, PT_LC1, PT_LT1, PT_LB1, ++ -1 /* PT_CYCLES */, -1 /* PT_CYCLES2 */, ++ -1 /* PT_USP */, PT_SEQSTAT, PT_SYSCFG, PT_PC, PT_RETX, PT_RETN, PT_RETE, ++ PT_PC, -1 /* PT_CC */, PT_TEXT_ADDR, PT_TEXT_END_ADDR, PT_DATA_ADDR, ++ PT_FDPIC_EXEC, PT_FDPIC_INTERP, ++ PT_IPEND ++}; ++ ++#define bfin_num_regs (sizeof(bfin_regmap) / sizeof(bfin_regmap[0])) ++ ++static int ++bfin_cannot_store_register (int regno) ++{ ++ return (regno >= bfin_num_regs); ++} ++ ++static int ++bfin_cannot_fetch_register (int regno) ++{ ++ return (regno >= bfin_num_regs); ++} ++ ++static CORE_ADDR ++bfin_get_pc () ++{ ++ unsigned long pc; ++ collect_register_by_name ("pc", &pc); ++ return pc; ++} ++ ++static void ++bfin_set_pc (CORE_ADDR pc) ++{ ++ unsigned long newpc = pc; ++ supply_register_by_name ("pc", &newpc); ++} ++ ++#define bfin_breakpoint_len 2 ++static const unsigned char bfin_breakpoint[bfin_breakpoint_len]={0xa1, 0x00}; ++ ++static int ++bfin_breakpoint_at (CORE_ADDR where) ++{ ++ unsigned char insn[bfin_breakpoint_len]; ++ ++ read_inferior_memory(where, insn, bfin_breakpoint_len); ++ if (insn[0] == bfin_breakpoint[0] ++ && insn[1] == bfin_breakpoint[1]) ++ return 1; ++ ++ /* If necessary, recognize more trap instructions here. GDB only uses the ++ one. */ ++ return 0; ++} ++ ++struct linux_target_ops the_low_target = { ++ bfin_num_regs, ++ bfin_regmap, ++ bfin_cannot_fetch_register, ++ bfin_cannot_store_register, ++ bfin_get_pc, ++ bfin_set_pc, ++ bfin_breakpoint, ++ bfin_breakpoint_len, ++ 0, ++ 2, ++ bfin_breakpoint_at, ++}; +--- gdb-6.6/gdb/gdbserver/linux-low.c ++++ gdb-6.6/gdb/gdbserver/linux-low.c +@@ -1592,6 +1592,10 @@ linux_stopped_data_address (void) + #define PT_TEXT_ADDR 49*4 + #define PT_DATA_ADDR 50*4 + #define PT_TEXT_END_ADDR 51*4 ++#elif defined(BFIN) ++#define PT_TEXT_ADDR 220 ++#define PT_TEXT_END_ADDR 224 ++#define PT_DATA_ADDR 228 + #endif + + /* Under uClinux, programs are loaded at non-zero offsets, which we need +--- gdb-6.6/gdb/gdbserver/Makefile.in ++++ gdb-6.6/gdb/gdbserver/Makefile.in +@@ -119,9 +119,9 @@ SFILES= $(srcdir)/gdbreplay.c $(srcdir)/ + $(srcdir)/mem-break.c $(srcdir)/proc-service.c $(srcdir)/regcache.c \ + $(srcdir)/remote-utils.c $(srcdir)/server.c $(srcdir)/target.c \ + $(srcdir)/thread-db.c $(srcdir)/utils.c \ +- $(srcdir)/linux-arm-low.c $(srcdir)/linux-cris-low.c \ +- $(srcdir)/linux-crisv32-low.c $(srcdir)/linux-i386-low.c \ +- $(srcdir)/i387-fp.c \ ++ $(srcdir)/linux-arm-low.c $(srcdir)/linux-bfin-low.c \ ++ $(srcdir)/linux-cris-low.c $(srcdir)/linux-crisv32-low.c \ ++ $(srcdir)/linux-i386-low.c $(srcdir)/i387-fp.c \ + $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \ + $(srcdir)/linux-m32r-low.c \ + $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \ +@@ -207,6 +207,7 @@ clean: + rm -f reg-arm.c reg-i386.c reg-ia64.c reg-m32r.c reg-m68k.c reg-mips.c + rm -f reg-ppc.c reg-sh.c reg-spu.c reg-x86-64.c reg-i386-linux.c + rm -f reg-cris.c reg-crisv32.c reg-x86-64-linux.c ++ rm -f reg-bfin.c + + maintainer-clean realclean distclean: clean + rm -f nm.h tm.h xm.h config.status config.h stamp-h config.log +@@ -272,6 +273,7 @@ linux-low.o: linux-low.c $(linux_low_h) + + linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) \ + $(gdb_proc_service_h) ++linux-bfin-low.o: linux-bfin-low.c $(linux_low_h) $(server_h) + linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h) + linux-crisv32-low.o: linux-crisv32-low.c $(linux_low_h) $(server_h) + linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) \ +@@ -294,6 +297,9 @@ spu-low.o: spu-low.c $(server_h) + reg-arm.o : reg-arm.c $(regdef_h) + reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh) + sh $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c ++reg-bfin.o : reg-bfin.c $(regdef_h) ++reg-bfin.c : $(srcdir)/../regformats/reg-bfin.dat $(regdat_sh) ++ sh $(regdat_sh) $(srcdir)/../regformats/reg-bfin.dat reg-bfin.c + reg-cris.o : reg-cris.c $(regdef_h) + reg-cris.c : $(srcdir)/../regformats/reg-cris.dat $(regdat_sh) + sh $(regdat_sh) $(srcdir)/../regformats/reg-cris.dat reg-cris.c +--- gdb-6.6/gdb/regformats/reg-bfin.dat ++++ gdb-6.6/gdb/regformats/reg-bfin.dat +@@ -0,0 +1,63 @@ ++name:bfin ++expedite:pc,sp,fp ++32:r0 ++32:r1 ++32:r2 ++32:r3 ++32:r4 ++32:r5 ++32:r6 ++32:r7 ++32:p0 ++32:p1 ++32:p2 ++32:p3 ++32:p4 ++32:p5 ++32:sp ++32:fp ++32:i0 ++32:i1 ++32:i2 ++32:i3 ++32:m0 ++32:m1 ++32:m2 ++32:m3 ++32:b0 ++32:b1 ++32:b2 ++32:b3 ++32:l0 ++32:l1 ++32:l2 ++32:l3 ++32:a0x ++32:a0w ++32:a1x ++32:a1w ++32:astat ++32:rets ++32:lc0 ++32:lt0 ++32:lb0 ++32:lc1 ++32:lt1 ++32:lb1 ++32:cycles ++32:cycles2 ++32:usp ++32:seqstat ++32:syscfg ++32:reti ++32:retx ++32:retn ++32:rete ++32:pc ++32:cc ++32:text_addr ++32:text_end_addr ++32:data_addr ++32:fdpic_exec ++32:fdpic_interp ++32:ipend diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in index b45de9a70..8295f798b 100644 --- a/toolchain/gdb/Config.in +++ b/toolchain/gdb/Config.in @@ -35,10 +35,10 @@ choice config BR2_GDB_VERSION_6_6 bool "gdb 6.6" depends on !BR2_avr32 - depends on BR2_DEPRECATED + depends on BR2_DEPRECATED || BR2_bfin config BR2_GDB_VERSION_6_7_1 - depends on !BR2_avr32 + depends on !(BR2_avr32 || BR2_bfin) bool "gdb 6.7.1" config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 @@ -47,14 +47,16 @@ choice config BR2_GDB_VERSION_6_8 bool "gdb 6.8" - depends on !BR2_avr32 + depends on !(BR2_avr32 || BR2_bfin) config BR2_GDB_VERSION_7_0_1 bool "gdb 7.0.1" + depends on !BR2_bfin select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE config BR2_GDB_VERSION_7_1 bool "gdb 7.1" + depends on !BR2_bfin select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE endchoice -- cgit v1.2.3