Detect SW breakpoints in Cell/B.E. combined debugging
The Linux target and gdbserver now check the siginfo si_code reported on a SIGTRAP to detect whether the trap indicates a software breakpoint was hit. Unfortunately, on Cell/B.E., the kernel uses an si_code value of TRAP_BRKPT when a SW breakpoint was hit in PowerPC code, but a si_code value of SI_KERNEL when a SW breakpoint was hit in SPU code. This patch updates Linux target and gdbserver to accept both si_code values to indicate SW breakpoint on PowerPC. ChangeLog: * nat/linux-ptrace.h (GDB_ARCH_TRAP_BRKPT): Replace by ... (GDB_ARCH_IS_TRAP_BRKPT): ... this. Add __powerpc__ case. * linux-nat.c (check_stopped_by_breakpoint): Use GDB_ARCH_IS_TRAP_BRKPT instead of GDB_ARCH_TRAP_BRKPT. gdbserver/ChangeLog: * linux-low.c (check_stopped_by_breakpoint): Use GDB_ARCH_IS_TRAP_BRKPT instead of GDB_ARCH_TRAP_BRKPT.
This commit is contained in:
parent
e0fd7c47bd
commit
1db33b5a02
|
@ -1,3 +1,10 @@
|
||||||
|
2015-08-08 Ulrich Weigand <uweigand@de.ibm.com>
|
||||||
|
|
||||||
|
* nat/linux-ptrace.h (GDB_ARCH_TRAP_BRKPT): Replace by ...
|
||||||
|
(GDB_ARCH_IS_TRAP_BRKPT): ... this. Add __powerpc__ case.
|
||||||
|
* linux-nat.c (check_stopped_by_breakpoint): Use
|
||||||
|
GDB_ARCH_IS_TRAP_BRKPT instead of GDB_ARCH_TRAP_BRKPT.
|
||||||
|
|
||||||
2015-08-08 Ulrich Weigand <uweigand@de.ibm.com>
|
2015-08-08 Ulrich Weigand <uweigand@de.ibm.com>
|
||||||
|
|
||||||
* linux-thread-db.c (thread_db_get_thread_local_address): If the
|
* linux-thread-db.c (thread_db_get_thread_local_address): If the
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2015-08-27 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
|
||||||
|
|
||||||
|
* linux-low.c (check_stopped_by_breakpoint): Use
|
||||||
|
GDB_ARCH_IS_TRAP_BRKPT instead of GDB_ARCH_TRAP_BRKPT.
|
||||||
|
|
||||||
2015-08-27 Pedro Alves <palves@redhat.com>
|
2015-08-27 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
* proc-service.c (ps_pdwrite): Return PS_ERR/PS_OK explicily.
|
* proc-service.c (ps_pdwrite): Return PS_ERR/PS_OK explicily.
|
||||||
|
|
|
@ -651,7 +651,7 @@ check_stopped_by_breakpoint (struct lwp_info *lwp)
|
||||||
{
|
{
|
||||||
if (siginfo.si_signo == SIGTRAP)
|
if (siginfo.si_signo == SIGTRAP)
|
||||||
{
|
{
|
||||||
if (siginfo.si_code == GDB_ARCH_TRAP_BRKPT)
|
if (GDB_ARCH_IS_TRAP_BRKPT (siginfo.si_code))
|
||||||
{
|
{
|
||||||
if (debug_threads)
|
if (debug_threads)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2801,7 +2801,7 @@ check_stopped_by_breakpoint (struct lwp_info *lp)
|
||||||
{
|
{
|
||||||
if (siginfo.si_signo == SIGTRAP)
|
if (siginfo.si_signo == SIGTRAP)
|
||||||
{
|
{
|
||||||
if (siginfo.si_code == GDB_ARCH_TRAP_BRKPT)
|
if (GDB_ARCH_IS_TRAP_BRKPT (siginfo.si_code))
|
||||||
{
|
{
|
||||||
if (debug_linux_nat)
|
if (debug_linux_nat)
|
||||||
fprintf_unfiltered (gdb_stdlog,
|
fprintf_unfiltered (gdb_stdlog,
|
||||||
|
|
|
@ -135,12 +135,19 @@ struct buffer;
|
||||||
running to a breakpoint and checking what comes out of
|
running to a breakpoint and checking what comes out of
|
||||||
siginfo->si_code.
|
siginfo->si_code.
|
||||||
|
|
||||||
The generic Linux target code should use GDB_ARCH_TRAP_BRKPT
|
The ppc kernel does use TRAP_BRKPT for software breakpoints
|
||||||
instead of TRAP_BRKPT to abstract out this x86 peculiarity. */
|
in PowerPC code, but it uses SI_KERNEL for software breakpoints
|
||||||
|
in SPU code on a Cell/B.E. However, SI_KERNEL is never seen
|
||||||
|
on a SIGTRAP for any other reason.
|
||||||
|
|
||||||
|
The generic Linux target code should use GDB_ARCH_IS_TRAP_BRKPT
|
||||||
|
instead of TRAP_BRKPT to abstract out these peculiarities. */
|
||||||
#if defined __i386__ || defined __x86_64__
|
#if defined __i386__ || defined __x86_64__
|
||||||
# define GDB_ARCH_TRAP_BRKPT SI_KERNEL
|
# define GDB_ARCH_IS_TRAP_BRKPT(X) ((X) == SI_KERNEL)
|
||||||
|
#elif defined __powerpc__
|
||||||
|
# define GDB_ARCH_IS_TRAP_BRKPT(X) ((X) == SI_KERNEL || (X) == TRAP_BRKPT)
|
||||||
#else
|
#else
|
||||||
# define GDB_ARCH_TRAP_BRKPT TRAP_BRKPT
|
# define GDB_ARCH_IS_TRAP_BRKPT(X) ((X) == TRAP_BRKPT)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef TRAP_HWBKPT
|
#ifndef TRAP_HWBKPT
|
||||||
|
|
Loading…
Reference in New Issue