Re: [PATCH] Add support for Tilera TILE-Gx processor (part 3/3: gdbserver)

[Jeff Kenton <jkenton@tilera.com>]

[-- Attachment #1: Type: text/plain, Size: 959 bytes --]

On 05/25/2012 02:18 PM, Pedro Alves wrote:
> On 05/24/2012 08:30 PM, Jeff Kenton wrote:
>
>> diff -r -u -N /home/packages/gdb-7.4x/gdb/gdbserver/linux-tile-low.c ./gdb/gdbserver/linux-tile-low.c
>> --- /home/packages/gdb-7.4x/gdb/gdbserver/linux-tile-low.c	1969-12-31 19:00:00.000000000 -0500
>> +++ ./gdb/gdbserver/linux-tile-low.c	2012-05-24 13:43:30.025286000 -0400
>> @@ -0,0 +1,164 @@
>> +
>> +
>
> Two spurious empty lines here.  Please remove them.

Done.

>
>> +/* GNU/Linux/TILE-Gx specific low level interface, GDBserver.
>
>
>> --- /home/packages/gdb-7.4x/gdb/gdbserver/linux-tile-low.c	1969-12-31 19:00:00.000000000 -0500
>> +++ ./gdb/gdbserver/linux-tile-low.c	2012-05-24 13:43:30.025286000 -0400
>> +#include "gdb_proc_service.h"
> ...
>> +linux-tile-low.o: linux-tile-low.c $(linux_low_h) $(server_h)
> This now needs to depend on $(gdb_proc_service_h) too.

Done.

>
> Otherwise looks fine.
>

Updated patch attached.

Thanks.

--jeff kenton


[-- Attachment #2: patch_3 --]
[-- Type: text/plain, Size: 6538 bytes --]


    gdb/gdbserver/
    * Makefile.in: Add tilegx dependencies.
    * configure.srv: Add tilegx dependencies.
    * linux-tile-low.c: New file.

diff -r -u -N /home/packages/gdb-7.4x/gdb/gdbserver/configure.srv ./gdb/gdbserver/configure.srv
--- /home/packages/gdb-7.4x/gdb/gdbserver/configure.srv	2012-03-13 11:00:37.000000000 -0400
+++ ./gdb/gdbserver/configure.srv	2012-05-29 09:35:10.102123000 -0400
@@ -311,6 +311,12 @@
 			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
 			srv_linux_regsets=yes
 			;;
+  tilegx-*-linux*)	srv_regobj=reg-tilegx.o
+			srv_tgtobj="linux-low.o linux-tile-low.o linux-osdata.o linux-procfs.o"
+			srv_tgtobj="${srv_tgtobj} linux-ptrace.o"
+			srv_linux_regsets=yes
+			srv_linux_thread_db=yes
+			;;
   *)			echo "Error: target not supported by gdbserver."
 			exit 1
 			;;
diff -r -u -N /home/packages/gdb-7.4x/gdb/gdbserver/linux-tile-low.c ./gdb/gdbserver/linux-tile-low.c
--- /home/packages/gdb-7.4x/gdb/gdbserver/linux-tile-low.c	1969-12-31 19:00:00.000000000 -0500
+++ ./gdb/gdbserver/linux-tile-low.c	2012-05-29 09:35:10.138123000 -0400
@@ -0,0 +1,162 @@
+/* GNU/Linux/TILE-Gx specific low level interface, GDBserver.
+
+   Copyright (C) 2012 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 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 <http://www.gnu.org/licenses/>.  */
+
+#include "server.h"
+#include "linux-low.h"
+
+#include <sys/ptrace.h>
+#include "gdb_proc_service.h"
+
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 25
+#endif
+
+/* Defined in auto-generated file reg-tile.c.  */
+void init_registers_tile (void);
+
+#define tile_num_regs 65
+
+static int tile_regmap[] =
+{
+   0,  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, 49, 50, 51, 52, 53, 54, 55,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  56
+};
+
+/* 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;
+}
+
+static int
+tile_cannot_fetch_register (int regno)
+{
+  if (regno >= 0 && regno < 56)
+    return 0;
+  else if (regno == 64)
+    return 0;
+  else
+    return 1;
+}
+
+static int
+tile_cannot_store_register (int regno)
+{
+  if (regno >= 0 && regno < 56)
+    return 0;
+  else if (regno == 64)
+    return 0;
+  else
+    return 1;
+}
+
+static CORE_ADDR
+tile_get_pc (struct regcache *regcache)
+{
+  unsigned long pc;
+
+  collect_register_by_name (regcache, "pc", &pc);
+  return pc;
+}
+
+static void
+tile_set_pc (struct regcache *regcache, CORE_ADDR pc)
+{
+  unsigned long newpc = pc;
+
+  supply_register_by_name (regcache, "pc", &newpc);
+}
+
+static uint64_t tile_breakpoint = 0x400b3cae70166000ULL;
+#define tile_breakpoint_len 8
+
+static int
+tile_breakpoint_at (CORE_ADDR where)
+{
+  uint64_t insn;
+
+  (*the_target->read_memory) (where, (unsigned char *) &insn, 8);
+  if (insn == tile_breakpoint)
+    return 1;
+
+  /* If necessary, recognize more trap instructions here.  GDB only uses the
+     one.  */
+  return 0;
+}
+
+static void
+tile_fill_gregset (struct regcache *regcache, void *buf)
+{
+  int i;
+
+  for (i = 0; i < tile_num_regs; i++)
+    if (tile_regmap[i] != -1)
+      collect_register (regcache, i, ((unsigned int *) buf) + tile_regmap[i]);
+}
+
+static void
+tile_store_gregset (struct regcache *regcache, const void *buf)
+{
+  int i;
+
+  for (i = 0; i < tile_num_regs; i++)
+    if (tile_regmap[i] != -1)
+      supply_register (regcache, i, ((unsigned long *) buf) + tile_regmap[i]);
+}
+
+struct regset_info target_regsets[] = {
+  { PTRACE_GETREGS, PTRACE_SETREGS, 0, tile_num_regs * 4,
+    GENERAL_REGS, tile_fill_gregset, tile_store_gregset },
+  { 0, 0, 0, -1, -1, NULL, NULL }
+};
+
+struct linux_target_ops the_low_target = {
+  init_registers_tile,
+  tile_num_regs,
+  tile_regmap,
+  NULL,
+  tile_cannot_fetch_register,
+  tile_cannot_store_register,
+  NULL,
+  tile_get_pc,
+  tile_set_pc,
+  (const unsigned char *) &tile_breakpoint,
+  tile_breakpoint_len,
+  NULL,
+  0,
+  tile_breakpoint_at,
+};
diff -r -u -N /home/packages/gdb-7.4x/gdb/gdbserver/Makefile.in ./gdb/gdbserver/Makefile.in
--- /home/packages/gdb-7.4x/gdb/gdbserver/Makefile.in	2012-03-13 11:00:37.000000000 -0400
+++ ./gdb/gdbserver/Makefile.in	2012-05-29 09:35:10.083121000 -0400
@@ -120,6 +120,7 @@
 	$(srcdir)/linux-sh-low.c $(srcdir)/linux-sparc-low.c \
 	$(srcdir)/linux-x86-low.c \
 	$(srcdir)/linux-xtensa-low.c \
+	$(srcdir)/linux-tile-low.c \
 	$(srcdir)/win32-arm-low.c $(srcdir)/win32-i386-low.c \
 	$(srcdir)/win32-low.c $(srcdir)/wincecompat.c \
 	$(srcdir)/hostio.c $(srcdir)/hostio-errno.c \
@@ -479,6 +480,8 @@
 linux-x86-low.o: linux-x86-low.c $(linux_low_h) $(server_h) \
 	$(gdb_proc_service_h) $(i386_low_h) $(agent_h)
 linux-xtensa-low.o: linux-xtensa-low.c xtensa-xtregs.c $(linux_low_h) $(server_h)
+linux-tile-low.o: linux-tile-low.c $(linux_low_h) $(server_h) \
+	$(gdb_proc_service_h)
 
 lynx-low.o: lynx-low.c $(server_h) $(target_h) $(lynx_low_h)
 lynx-ppc-low.o: lynx-ppc-low.c $(server_h) $(lynx_low_h)
@@ -670,4 +673,7 @@
 reg-xtensa.o : reg-xtensa.c $(regdef_h)
 reg-xtensa.c : $(srcdir)/../regformats/reg-xtensa.dat $(regdat_sh)
 	$(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-xtensa.dat reg-xtensa.c
+reg-tilegx.o : reg-tilegx.c $(regdef_h)
+reg-tilegx.c : $(srcdir)/../regformats/reg-tilegx.dat $(regdat_sh)
+	$(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-tilegx.dat reg-tilegx.c
 # This is the end of "Makefile.in".