OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdbserver/linux-low: turn 'get_thread_area' into a method 

gdbserver/ChangeLog:
2020-04-02  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	Turn the 'get_thread_area' linux target op into a method of
	process_stratum_target.

	* linux-low.h (struct linux_target_ops): Remove the op.
	(class linux_process_target) <stuck_in_jump_pad>
	<linux_fast_tracepoint_collecting>
	<low_get_thread_area>: Declare.
	* linux-low.cc (supports_fast_tracepoints): Remove.
	(linux_fast_tracepoint_collecting): Turn into...
	(linux_process_target::linux_fast_tracepoint_collecting): ...this.
	(linux_process_target::low_get_thread_area): Define.
	(stuck_in_jump_pad_callback): Turn into...
	(linux_process_target::stuck_in_jump_pad): ...this.

	Update the caller below.

	(linux_process_target::stabilize_threads)

	* linux-x86-low.cc (class x86_target) <low_get_thread_area>:
	Declare.
	(x86_get_thread_area): Turn into...
	(x86_target::low_get_thread_area): ...this.
	(the_low_target): Remove the op field.
	* linux-aarch64-low.cc (class aarch64_target) <low_get_thread_area>:
	Declare.
	(aarch64_get_thread_area): Turn into...
	(aarch64_target::low_get_thread_area): ...this.
	(the_low_target): Remove the op field.
	* linux-ppc-low.cc (class ppc_target) <low_get_thread_area>:
	Declare.
	(ppc_get_thread_area): Turn into...
	(ppc_target::low_get_thread_area): ...this.
	(the_low_target): Remove the op field.
	* linux-s390-low.cc (class s390_target) <low_get_thread_area>:
	Declare.
	(s390_get_thread_area): Turn into...
	(s390_target::low_get_thread_area): ...this.
	(the_low_target): Remove the op field.
	* linux-arm-low.cc (the_low_target): Remove the op field.
	* linux-bfin-low.cc (the_low_target): Ditto.
	* linux-crisv32-low.cc (the_low_target): Ditto.
	* linux-m32r-low.cc (the_low_target): Ditto.
	* linux-m68k-low.cc (the_low_target): Ditto.
	* linux-sh-low.cc (the_low_target): Ditto.
	* linux-tic6x-low.cc (the_low_target): Ditto.
	* linux-tile-low.cc (the_low_target): Ditto.
	* linux-xtensa-low.cc (the_low_target): Ditto.
This commit is contained in:
Tankut Baris Aktemur 2020-04-02 15:11:30 +02:00
parent 47f70aa768
commit 13e567af27
16 changed files with 103 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gdbserver/ChangeLog
View File

@ -1,3 +1,53 @@
2020-04-02 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Turn the 'get_thread_area' linux target op into a method of
process_stratum_target.
* linux-low.h (struct linux_target_ops): Remove the op.
(class linux_process_target) <stuck_in_jump_pad>
<linux_fast_tracepoint_collecting>
<low_get_thread_area>: Declare.
* linux-low.cc (supports_fast_tracepoints): Remove.
(linux_fast_tracepoint_collecting): Turn into...
(linux_process_target::linux_fast_tracepoint_collecting): ...this.
(linux_process_target::low_get_thread_area): Define.
(stuck_in_jump_pad_callback): Turn into...
(linux_process_target::stuck_in_jump_pad): ...this.
Update the caller below.
(linux_process_target::stabilize_threads)
* linux-x86-low.cc (class x86_target) <low_get_thread_area>:
Declare.
(x86_get_thread_area): Turn into...
(x86_target::low_get_thread_area): ...this.
(the_low_target): Remove the op field.
* linux-aarch64-low.cc (class aarch64_target) <low_get_thread_area>:
Declare.
(aarch64_get_thread_area): Turn into...
(aarch64_target::low_get_thread_area): ...this.
(the_low_target): Remove the op field.
* linux-ppc-low.cc (class ppc_target) <low_get_thread_area>:
Declare.
(ppc_get_thread_area): Turn into...
(ppc_target::low_get_thread_area): ...this.
(the_low_target): Remove the op field.
* linux-s390-low.cc (class s390_target) <low_get_thread_area>:
Declare.
(s390_get_thread_area): Turn into...
(s390_target::low_get_thread_area): ...this.
(the_low_target): Remove the op field.
* linux-arm-low.cc (the_low_target): Remove the op field.
* linux-bfin-low.cc (the_low_target): Ditto.
* linux-crisv32-low.cc (the_low_target): Ditto.
* linux-m32r-low.cc (the_low_target): Ditto.
* linux-m68k-low.cc (the_low_target): Ditto.
* linux-sh-low.cc (the_low_target): Ditto.
* linux-tic6x-low.cc (the_low_target): Ditto.
* linux-tile-low.cc (the_low_target): Ditto.
* linux-xtensa-low.cc (the_low_target): Ditto.
2020-04-02 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
Remote the 'supports_tracepoints' linux target op and let the

9
gdbserver/linux-aarch64-low.cc
View File

@ -107,6 +107,8 @@ protected:
void low_new_fork (process_info *parent, process_info *child) override;
void low_prepare_to_resume (lwp_info *lwp) override;
int low_get_thread_area (int lwpid, CORE_ADDR *addrp) override;
};
/* The singleton target ops object. */
@ -731,10 +733,10 @@ aarch64_target::supports_tracepoints ()
}
}
/* Implementation of linux_target_ops method "get_thread_area". */
/* Implementation of linux target ops method "low_get_thread_area". */
static int
aarch64_get_thread_area (int lwpid, CORE_ADDR *addrp)
int
aarch64_target::low_get_thread_area (int lwpid, CORE_ADDR *addrp)
{
struct iovec iovec;
uint64_t reg;
@ -3149,7 +3151,6 @@ aarch64_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
aarch64_get_thread_area,
aarch64_install_fast_tracepoint_jump_pad,
aarch64_emit_ops,
aarch64_get_min_fast_tracepoint_insn_len,

1
gdbserver/linux-arm-low.cc
View File

@ -1117,7 +1117,6 @@ arm_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

1
gdbserver/linux-bfin-low.cc
View File

@ -171,7 +171,6 @@ bfin_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

1
gdbserver/linux-crisv32-low.cc
View File

@ -468,7 +468,6 @@ crisv32_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

50
gdbserver/linux-low.cc
View File

@ -322,16 +322,6 @@ linux_process_target::low_decr_pc_after_break ()
return 0;
}
/* Returns true if this target can support fast tracepoints. This
does not mean that the in-process agent has been loaded in the
inferior. */
static int
supports_fast_tracepoints (void)
{
return the_low_target.install_fast_tracepoint_jump_pad != NULL;
}
/* True if LWP is stopped in its stepping range. */
static int
@ -1997,29 +1987,29 @@ handle_tracepoints (struct lwp_info *lwp)
return 0;
}
/* Convenience wrapper. Returns information about LWP's fast tracepoint
collection status. */
static fast_tpoint_collect_result
linux_fast_tracepoint_collecting (struct lwp_info *lwp,
struct fast_tpoint_collect_status *status)
fast_tpoint_collect_result
linux_process_target::linux_fast_tracepoint_collecting
(lwp_info *lwp, fast_tpoint_collect_status *status)
{
CORE_ADDR thread_area;
struct thread_info *thread = get_lwp_thread (lwp);
if (the_low_target.get_thread_area == NULL)
return fast_tpoint_collect_result::not_collecting;
/* Get the thread area address. This is used to recognize which
thread is which when tracing with the in-process agent library.
We don't read anything from the address, and treat it as opaque;
it's the address itself that we assume is unique per-thread. */
if ((*the_low_target.get_thread_area) (lwpid_of (thread), &thread_area) == -1)
if (low_get_thread_area (lwpid_of (thread), &thread_area) == -1)
return fast_tpoint_collect_result::not_collecting;
return fast_tracepoint_collecting (thread_area, lwp->stop_pc, status);
}
int
linux_process_target::low_get_thread_area (int lwpid, CORE_ADDR *addrp)
{
return -1;
}
bool
linux_process_target::maybe_move_out_of_jump_pad (lwp_info *lwp, int *wstat)
{
@ -2834,7 +2824,6 @@ unsuspend_all_lwps (struct lwp_info *except)
});
}
static bool stuck_in_jump_pad_callback (thread_info *thread);
static bool lwp_running (thread_info *thread);
/* Stabilize threads (move out of jump pads).
@ -2870,7 +2859,10 @@ static bool lwp_running (thread_info *thread);
void
linux_process_target::stabilize_threads ()
{
thread_info *thread_stuck = find_thread (stuck_in_jump_pad_callback);
thread_info *thread_stuck = find_thread ([this] (thread_info *thread)
{
return stuck_in_jump_pad (thread);
});
if (thread_stuck != NULL)
{
@ -2926,7 +2918,10 @@ linux_process_target::stabilize_threads ()
if (debug_threads)
{
thread_stuck = find_thread (stuck_in_jump_pad_callback);
thread_stuck = find_thread ([this] (thread_info *thread)
{
return stuck_in_jump_pad (thread);
});
if (thread_stuck != NULL)
debug_printf ("couldn't stabilize, LWP %ld got stuck in jump pad\n",
@ -3949,13 +3944,8 @@ linux_process_target::wait_for_sigstop ()
}
}
/* Returns true if THREAD is stopped in a jump pad, and we can't
move it out, because we need to report the stop event to GDB. For
example, if the user puts a breakpoint in the jump pad, it's
because she wants to debug it. */
static bool
stuck_in_jump_pad_callback (thread_info *thread)
bool
linux_process_target::stuck_in_jump_pad (thread_info *thread)
{
struct lwp_info *lwp = get_thread_lwp (thread);

19
gdbserver/linux-low.h
View File

@ -131,10 +131,6 @@ struct lwp_info;
struct linux_target_ops
{
/* Fill ADDRP with the thread area address of LWPID. Returns 0 on
success, -1 on failure. */
int (*get_thread_area) (int lwpid, CORE_ADDR *addrp);
/* Install a fast tracepoint jump pad. See target.h for
comments. */
int (*install_fast_tracepoint_jump_pad) (CORE_ADDR tpoint, CORE_ADDR tpaddr,
@ -624,6 +620,17 @@ private: /* Back to private. */
ptid_t filter_exit_event (lwp_info *event_child,
target_waitstatus *ourstatus);
/* Returns true if THREAD is stopped in a jump pad, and we can't
move it out, because we need to report the stop event to GDB. For
example, if the user puts a breakpoint in the jump pad, it's
because she wants to debug it. */
bool stuck_in_jump_pad (thread_info *thread);
/* Convenience wrapper. Returns information about LWP's fast tracepoint
collection status. */
fast_tpoint_collect_result linux_fast_tracepoint_collecting
(lwp_info *lwp, fast_tpoint_collect_status *status);
protected:
/* The architecture-specific "low" methods are listed below. */
@ -710,6 +717,10 @@ protected:
/* Hook to call prior to resuming a thread. */
virtual void low_prepare_to_resume (lwp_info *lwp);
/* Fill ADDRP with the thread area address of LWPID. Returns 0 on
success, -1 on failure. */
virtual int low_get_thread_area (int lwpid, CORE_ADDR *addrp);
/* How many bytes the PC should be decremented after a break. */
virtual int low_decr_pc_after_break ();
};

1
gdbserver/linux-m32r-low.cc
View File

@ -161,7 +161,6 @@ m32r_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

1
gdbserver/linux-m68k-low.cc
View File

@ -265,7 +265,6 @@ m68k_supports_hardware_single_step (void)
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

7
gdbserver/linux-ppc-low.cc
View File

@ -86,6 +86,8 @@ protected:
int low_remove_point (raw_bkpt_type type, CORE_ADDR addr,
int size, raw_breakpoint *bp) override;
int low_get_thread_area (int lwpid, CORE_ADDR *addrp) override;
};
/* The singleton target ops object. */
@ -1040,8 +1042,8 @@ ppc_target::supports_tracepoints ()
don't read anything from the address, and treat it as opaque; it's
the address itself that we assume is unique per-thread. */
static int
ppc_get_thread_area (int lwpid, CORE_ADDR *addr)
int
ppc_target::low_get_thread_area (int lwpid, CORE_ADDR *addr)
{
struct lwp_info *lwp = find_lwp_pid (ptid_t (lwpid));
struct thread_info *thr = get_lwp_thread (lwp);
@ -3431,7 +3433,6 @@ ppc_get_ipa_tdesc_idx (void)
}
struct linux_target_ops the_low_target = {
ppc_get_thread_area,
ppc_install_fast_tracepoint_jump_pad,
ppc_emit_ops,
ppc_get_min_fast_tracepoint_insn_len,

9
gdbserver/linux-s390-low.cc
View File

@ -88,6 +88,8 @@ protected:
int low_decr_pc_after_break () override;
bool low_breakpoint_at (CORE_ADDR pc) override;
int low_get_thread_area (int lwpid, CORE_ADDR *addrp) override;
};
/* The singleton target ops object. */
@ -780,10 +782,10 @@ s390_target::supports_tracepoints ()
return true;
}
/* Implementation of linux_target_ops method "get_thread_area". */
/* Implementation of linux target ops method "low_get_thread_area". */
static int
s390_get_thread_area (int lwpid, CORE_ADDR *addrp)
int
s390_target::low_get_thread_area (int lwpid, CORE_ADDR *addrp)
{
CORE_ADDR res = ptrace (PTRACE_PEEKUSER, lwpid, (long) PT_ACR0, (long) 0);
#ifdef __s390x__
@ -2847,7 +2849,6 @@ s390_emit_ops (void)
}
struct linux_target_ops the_low_target = {
s390_get_thread_area,
s390_install_fast_tracepoint_jump_pad,
s390_emit_ops,
s390_get_min_fast_tracepoint_insn_len,

1
gdbserver/linux-sh-low.cc
View File

@ -192,7 +192,6 @@ sh_target::low_arch_setup ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

1
gdbserver/linux-tic6x-low.cc
View File

@ -423,7 +423,6 @@ tic6x_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

1
gdbserver/linux-tile-low.cc
View File

@ -224,7 +224,6 @@ tile_supports_hardware_single_step (void)
struct linux_target_ops the_low_target =
{
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */

7
gdbserver/linux-x86-low.cc
View File

@ -158,6 +158,8 @@ protected:
void low_prepare_to_resume (lwp_info *lwp) override;
int low_get_thread_area (int lwpid, CORE_ADDR *addrp) override;
private:
/* Update all the target description of all processes; a new GDB
@ -311,8 +313,8 @@ ps_get_thread_area (struct ps_prochandle *ph,
don't read anything from the address, and treat it as opaque; it's
the address itself that we assume is unique per-thread. */
static int
x86_get_thread_area (int lwpid, CORE_ADDR *addr)
int
x86_target::low_get_thread_area (int lwpid, CORE_ADDR *addr)
{
#ifdef __x86_64__
int use_64bit = is_64bit_tdesc ();
@ -2969,7 +2971,6 @@ x86_get_ipa_tdesc_idx (void)
struct linux_target_ops the_low_target =
{
x86_get_thread_area,
x86_install_fast_tracepoint_jump_pad,
x86_emit_ops,
x86_get_min_fast_tracepoint_insn_len,

1
gdbserver/linux-xtensa-low.cc
View File

@ -329,7 +329,6 @@ xtensa_target::get_regs_info ()
}
struct linux_target_ops the_low_target = {
NULL, /* get_thread_area */
NULL, /* install_fast_tracepoint_jump_pad */
NULL, /* emit_ops */
NULL, /* get_min_fast_tracepoint_insn_len */