From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6741 invoked by alias); 14 Jan 2005 09:54:04 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 6363 invoked from network); 14 Jan 2005 09:53:36 -0000 Received: from unknown (HELO miranda.se.axis.com) (193.13.178.2) by sourceware.org with SMTP; 14 Jan 2005 09:53:36 -0000 Received: from [10.92.19.1] (ironmaiden.se.axis.com [10.92.19.1]) by miranda.se.axis.com (8.12.9/8.12.9/Debian-5local0.1) with ESMTP id j0E9rZKm028281 for ; Fri, 14 Jan 2005 10:53:35 +0100 Message-ID: <41E7969F.3010009@axis.com> Date: Fri, 14 Jan 2005 09:54:00 -0000 From: Orjan Friberg Organization: Axis Communications User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.3) Gecko/20040913 MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [gdbserver/rfa] CRIS/CRISv32 gdbserver support (part 2) Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2005-01/txt/msg00152.txt.bz2 As promised, here is part 2 which contains the actual gdbserver code for CRIS/CRISv32. Ok to commit? 2005-01-15 Orjan Friberg * linux-cris-low.c: New file with support for CRIS and CRISv32 targets. * Makefile.in (SFILES): Add linux-cris-low.c. (clean): Add reg-cris-c and reg-crisv32.c. Add linux-cris-low.o, reg-cris.o, reg-cris.c, reg-crisv32.o, and reg-crisv32.c to make rules. * configure.srv: Add cris-*-linux* and crisv32-*-linux* to list of recognized targets. New file linux-cris-low.c: /* GNU/Linux/CRIS specific low level interface, for the remote server for GDB. Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, 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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "server.h" #include "linux-low.h" #include #ifdef __arch_v32 /* CRISv32 */ #define cris_num_regs 49 /* Note: Ignoring USP (having the stack pointer in two locations causes trouble without any significant gain). */ /* Locations need to match . */ static int cris_regmap[] = { 1*4, 2*4, 3*4, 4*4, 5*4, 6*4, 7*4, 8*4, 9*4, 10*4, 11*4, 12*4, 13*4, 14*4, 24*4, 15*4, -1, -1, -1, 16*4, -1, 22*4, 23*4, 17*4, -1, -1, 21*4, 20*4, -1, 19*4, -1, 18*4, 25*4, 26*4, -1, -1, 29*4, 30*4, 31*4, 32*4, 33*4, 34*4, 35*4, 36*4, 37*4, 38*4, 39*4, 40*4, -1 }; #else /* CRISv10 */ #define cris_num_regs 32 /* Locations need to match . */ static int cris_regmap[] = { 15*4, 14*4, 13*4, 12*4, 11*4, 10*4, 9*4, 8*4, 7*4, 6*4, 5*4, 4*4, 3*4, 2*4, 23*4, 19*4, -1, -1, -1, -1, -1, 17*4, -1, 16*4, -1, -1, -1, 18*4, -1, 17*4, -1, -1 }; #endif /* __arch_v32 */ static int cris_cannot_store_register (int regno) { if (cris_regmap[regno] == -1) return 1; return (regno >= cris_num_regs); } static int cris_cannot_fetch_register (int regno) { if (cris_regmap[regno] == -1) return 1; return (regno >= cris_num_regs); } extern int debug_threads; static CORE_ADDR cris_get_pc () { unsigned long pc; collect_register_by_name ("pc", &pc); if (debug_threads) fprintf (stderr, "stop pc is %08lx\n", pc); return pc; } static void cris_set_pc (CORE_ADDR pc) { unsigned long newpc = pc; supply_register_by_name ("pc", &newpc); } static const unsigned long cris_breakpoint = 0xe938; #define cris_breakpoint_len 2 static int cris_breakpoint_at (CORE_ADDR where) { unsigned long insn; (*the_target->read_memory) (where, (char *) &insn, 4); if (insn == cris_breakpoint) return 1; /* If necessary, recognize more trap instructions here. GDB only uses the one. */ return 0; } /* We only place breakpoints in empty marker functions, and thread locking is outside of the function. So rather than importing software single-step, we can just run until exit. */ static CORE_ADDR cris_reinsert_addr () { unsigned long pc; collect_register_by_name ("srp", &pc); return pc; } #ifdef __arch_v32 void cris_write_data_breakpoint (int bp, unsigned long start, unsigned long end) { switch (bp) { case 0: supply_register_by_name("s3", &start); supply_register_by_name("s4", &end); break; case 1: supply_register_by_name("s5", &start); supply_register_by_name("s6", &end); break; case 2: supply_register_by_name("s7", &start); supply_register_by_name("s8", &end); break; case 3: supply_register_by_name("s9", &start); supply_register_by_name("s10", &end); break; case 4: supply_register_by_name("s11", &start); supply_register_by_name("s12", &end); break; case 5: supply_register_by_name("s13", &start); supply_register_by_name("s14", &end); break; } } int cris_insert_watchpoint(char type, CORE_ADDR addr, int len) { int bp; unsigned long bp_ctrl; unsigned long start, end; unsigned long ccs; /* Breakpoint/watchpoint types (GDB terminology): 0 = memory breakpoint for instructions (not supported; done via memory write instead) 1 = hardware breakpoint for instructions (not supported) 2 = write watchpoint (supported) 3 = read watchpoint (supported) 4 = access watchpoint (supported). */ if (type < '2' || type > '4') { /* Unsupported. */ return 1; } /* Read watchpoints are set as access watchpoints, because of GDB's inability to deal with pure read watchpoints. */ if (type == '3') type = '4'; /* Get the configuration register. */ collect_register_by_name("s0", &bp_ctrl); /* The watchpoint allocation scheme is the simplest possible. For example, if a region is watched for read and a write watch is requested, a new watchpoint will be used. Also, if a watch for a region that is already covered by one or more existing watchpoints, a new watchpoint will be used. */ /* First, find a free data watchpoint. */ for (bp = 0; bp < 6; bp++) { /* Each data watchpoint's control registers occupy 2 bits (hence the 3), starting at bit 2 for D0 (hence the 2) with 4 bits between for each watchpoint (yes, the 4). */ if (!(bp_ctrl & (0x3 << (2 + (bp * 4))))) { break; } } if (bp > 5) { /* We're out of watchpoints. */ return -1; } /* Configure the control register first. */ if (type == '3' || type == '4') { /* Trigger on read. */ bp_ctrl |= (1 << (2 + bp * 4)); } if (type == '2' || type == '4') { /* Trigger on write. */ bp_ctrl |= (2 << (2 + bp * 4)); } /* Setup the configuration register. */ supply_register_by_name("s0", &bp_ctrl); /* Setup the range. */ start = addr; end = addr + len - 1; /* Configure the watchpoint register. */ cris_write_data_breakpoint (bp, start, end); collect_register_by_name("ccs", &ccs); /* Set the S1 flag to enable watchpoints. */ ccs |= (1 << 19); supply_register_by_name("ccs", &ccs); return 0; } int cris_remove_watchpoint(char type, CORE_ADDR addr, int len) { int bp; unsigned long bp_ctrl; unsigned long start, end; /* Breakpoint/watchpoint types: 0 = memory breakpoint for instructions (not supported; done via memory write instead) 1 = hardware breakpoint for instructions (not supported) 2 = write watchpoint (supported) 3 = read watchpoint (supported) 4 = access watchpoint (supported). */ if (type < '2' || type > '4') { return -1; } /* Read watchpoints are set as access watchpoints, because of GDB's inability to deal with pure read watchpoints. */ if (type == '3') type = '4'; /* Get the configuration register. */ collect_register_by_name("s0", &bp_ctrl); /* Try to find a watchpoint that is configured for the specified range, then check that read/write also matches. */ /* Ugly pointer arithmetic, since I cannot rely on a single switch (addr) as there may be several watchpoints with the same start address for example. */ unsigned long bp_d_regs[12]; /* Get all range registers to simplify search. */ collect_register_by_name("s3", &bp_d_regs[0]); collect_register_by_name("s4", &bp_d_regs[1]); collect_register_by_name("s5", &bp_d_regs[2]); collect_register_by_name("s6", &bp_d_regs[3]); collect_register_by_name("s7", &bp_d_regs[4]); collect_register_by_name("s8", &bp_d_regs[5]); collect_register_by_name("s9", &bp_d_regs[6]); collect_register_by_name("s10", &bp_d_regs[7]); collect_register_by_name("s11", &bp_d_regs[8]); collect_register_by_name("s12", &bp_d_regs[9]); collect_register_by_name("s13", &bp_d_regs[10]); collect_register_by_name("s14", &bp_d_regs[11]); for (bp = 0; bp < 6; bp++) { if (bp_d_regs[bp * 2] == addr && bp_d_regs[bp * 2 + 1] == (addr + len - 1)) { /* Matching range. */ int bitpos = 2 + bp * 4; int rw_bits; /* Read/write bits for this BP. */ rw_bits = (bp_ctrl & (0x3 << bitpos)) >> bitpos; if ((type == '3' && rw_bits == 0x1) || (type == '2' && rw_bits == 0x2) || (type == '4' && rw_bits == 0x3)) { /* Read/write matched. */ break; } } } if (bp > 5) { /* No watchpoint matched. */ return -1; } /* Found a matching watchpoint. Now, deconfigure it by both disabling read/write in bp_ctrl and zeroing its start/end addresses. */ bp_ctrl &= ~(3 << (2 + (bp * 4))); /* Setup the configuration register. */ supply_register_by_name("s0", &bp_ctrl); start = end = 0; /* Configure the watchpoint register. */ cris_write_data_breakpoint (bp, start, end); /* Note that we don't clear the S1 flag here. It's done when continuing. */ return 0; } int cris_stopped_by_watchpoint () { unsigned long exs; collect_register_by_name ("exs", &exs); return (((exs & 0xff00) >> 8) == 0xc); } CORE_ADDR cris_stopped_data_address () { unsigned long eda; collect_register_by_name ("eda", &eda); /* FIXME: Possibly adjust to match watched range. */ return eda; } #endif /* __arch_v32 */ #ifdef __arch_v32 static void cris_fill_gregset (void *buf) { int i; for (i = 0; i < cris_num_regs; i++) if (cris_regmap[i] != -1) collect_register (i, ((char *) buf) + cris_regmap[i]); } static void cris_store_gregset (const void *buf) { int i; for (i = 0; i < cris_num_regs; i++) if (cris_regmap[i] != -1) supply_register (i, ((char *) buf) + cris_regmap[i]); } typedef unsigned long elf_gregset_t[cris_num_regs]; struct regset_info target_regsets[] = { { PTRACE_GETREGS, PTRACE_SETREGS, sizeof (elf_gregset_t), GENERAL_REGS, cris_fill_gregset, cris_store_gregset }, { 0, 0, -1, -1, NULL, NULL } }; #endif /* __arch_v32 */ struct linux_target_ops the_low_target = { cris_num_regs, cris_regmap, cris_cannot_fetch_register, cris_cannot_store_register, cris_get_pc, cris_set_pc, (const char *) &cris_breakpoint, cris_breakpoint_len, cris_reinsert_addr, 0, cris_breakpoint_at, #ifdef __arch_v32 cris_insert_watchpoint, cris_remove_watchpoint, cris_stopped_by_watchpoint, cris_stopped_data_address, #else 0, 0, 0, 0, #endif /* __arch_v32 */ }; Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/Makefile.in,v retrieving revision 1.27 diff -u -p -r1.27 Makefile.in --- Makefile.in 16 Oct 2004 16:18:54 -0000 1.27 +++ Makefile.in 13 Jan 2005 16:31:45 -0000 @@ -118,8 +118,8 @@ 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-i386-low.c \ - $(srcdir)/i387-fp.c \ + $(srcdir)/linux-arm-low.c $(srcdir)/linux-cris-low.c \ + $(srcdir)/linux-i386-low.c $(srcdir)/i387-fp.c \ $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \ $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \ $(srcdir)/linux-ppc-low.c $(srcdir)/linux-s390-low.c \ @@ -200,6 +200,7 @@ clean: rm -f gdbserver gdbreplay core make.log rm -f reg-arm.c reg-i386.c reg-ia64.c reg-m68k.c reg-mips.c rm -f reg-ppc.c reg-sh.c reg-x86-64.c reg-i386-linux.c + rm -f reg-cris.c reg-crisv32.c maintainer-clean realclean distclean: clean rm -f nm.h tm.h xm.h config.status config.h stamp-h config.log @@ -261,6 +262,7 @@ linux-low.o: linux-low.c $(linux_low_h) $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< @USE_THREAD_DB@ linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) +linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h) linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) linux-ia64-low.o: linux-ia64-low.c $(linux_low_h) $(server_h) linux-mips-low.o: linux-mips-low.c $(linux_low_h) $(server_h) @@ -272,6 +274,12 @@ linux-x86-64-low.o: linux-x86-64-low.c $ 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-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 +reg-crisv32.o : reg-crisv32.c $(regdef_h) +reg-crisv32.c : $(srcdir)/../regformats/reg-crisv32.dat $(regdat_sh) + sh $(regdat_sh) $(srcdir)/../regformats/reg-crisv32.dat reg-crisv32.c reg-i386.o : reg-i386.c $(regdef_h) reg-i386.c : $(srcdir)/../regformats/reg-i386.dat $(regdat_sh) sh $(regdat_sh) $(srcdir)/../regformats/reg-i386.dat reg-i386.c Index: configure.srv =================================================================== RCS file: /cvs/src/src/gdb/gdbserver/configure.srv,v retrieving revision 1.8 diff -u -p -r1.8 configure.srv --- configure.srv 21 Nov 2004 03:09:39 -0000 1.8 +++ configure.srv 13 Jan 2005 16:31:45 -0000 @@ -23,6 +23,17 @@ case "${target}" in srv_linux_usrregs=yes srv_linux_thread_db=yes ;; + crisv32-*-linux*) srv_regobj=reg-crisv32.o + srv_tgtobj="linux-low.o linux-cris-low.o" + srv_linux_usrregs=yes + srv_linux_regsets=yes + srv_linux_thread_db=yes + ;; + cris-*-linux*) srv_regobj=reg-cris.o + srv_tgtobj="linux-low.o linux-cris-low.o" + srv_linux_usrregs=yes + srv_linux_thread_db=yes + ;; i[34567]86-*-linux*) srv_regobj=reg-i386-linux.o srv_tgtobj="linux-low.o linux-i386-low.o i387-fp.o" srv_linux_usrregs=yes -- Orjan Friberg Axis Communications