Re: [PATCH v2][CRISv32] Add support for threaded debugging

Ricard Wanderlof
2013-09-06T08:40:32Z

On Tue, 3 Sep 2013, Pedro Alves wrote:

> On 09/03/2013 03:18 PM, Ricard Wanderlof wrote:
>
>>
>> 2013-09-03 Ricard Wanderlof <ricardw@axis.com>
>>
>> * cris-tdep.c:
>> (cris_gdbarch_init): Add call to
>> get_gdbarch_fetch_tls_load_module_address.
>
> Spurious ':' / wrong formatting:
>
> * cris-tdep.c (cris_gdbarch_init): Add call to
> get_gdbarch_fetch_tls_load_module_address.
>
>>
>> gdbserver
>>
>> * linux-crisv32-low.c: PTRACE_GET_THREAD_AREA: New macro.
>> (ps_get_thread_area): New function.
>
> Wrong formatting:
>
> * linux-crisv32-low.c (PTRACE_GET_THREAD_AREA): New macro.
> (ps_get_thread_area): New function.
>
> OK with those changes.

Committed now.

/Ricard

Add support for threaded debugging for CRISv32.

2013-09-06 Ricard Wanderlof <ricardw@axis.com>

* cris-tdep.c (cris_gdbarch_init): Add call to
get_gdbarch_fetch_tls_load_module_address.

gdbserver

* linux-crisv32-low.c (PTRACE_GET_THREAD_AREA): New macro.
(ps_get_thread_area): New function.

diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 1b0e3cd..ef2746d 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -4137,6 +4137,11 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
set_gdbarch_single_step_through_delay
(gdbarch, crisv32_single_step_through_delay);

+ /* FIXME: Ricard W/2013-09-03: Linux-specific stuff like this
+ should really go in (a new) cris-linux-tdep.c. */
+ set_gdbarch_fetch_tls_load_module_address (gdbarch,
+ svr4_fetch_objfile_link_map);
+
break;

default:
diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
index 2849d02..84cb7ff 100644
--- a/gdb/gdbserver/linux-crisv32-low.c
+++ b/gdb/gdbserver/linux-crisv32-low.c
@@ -27,6 +27,10 @@ extern const struct target_desc *tdesc_crisv32;
/* CRISv32 */
#define cris_num_regs 49

+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 25
+#endif
+
/* Note: Ignoring USP (having the stack pointer in two locations causes trouble
without any significant gain). */

@@ -339,6 +343,20 @@ cris_stopped_data_address (void)
return eda;
}

+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 void
cris_fill_gregset (struct regcache *regcache, void *buf)
{