aboutsummaryrefslogtreecommitdiff
path: root/gdb/nat
diff options
context:
space:
mode:
authorUlrich Weigand <ulrich.weigand@de.ibm.com>2015-08-27 19:20:29 +0200
committerUlrich Weigand <ulrich.weigand@de.ibm.com>2015-08-27 19:26:31 +0200
commit1db33b5a028820d1eb656bffff727090a5504253 (patch)
tree001b6d43cec72c816c611940b6b6344c1a1d8f8b /gdb/nat
parente0fd7c47bd01e0a6eecf5dec4a4be958f8b3bbc8 (diff)
downloadgdb-1db33b5a028820d1eb656bffff727090a5504253.zip
gdb-1db33b5a028820d1eb656bffff727090a5504253.tar.gz
gdb-1db33b5a028820d1eb656bffff727090a5504253.tar.bz2
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.
Diffstat (limited to 'gdb/nat')
-rw-r--r--gdb/nat/linux-ptrace.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
index 41f668c..8bff908 100644
--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
@@ -135,12 +135,19 @@ struct buffer;
running to a breakpoint and checking what comes out of
siginfo->si_code.
- The generic Linux target code should use GDB_ARCH_TRAP_BRKPT
- instead of TRAP_BRKPT to abstract out this x86 peculiarity. */
+ The ppc kernel does use TRAP_BRKPT for software breakpoints
+ 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__
-# 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
-# define GDB_ARCH_TRAP_BRKPT TRAP_BRKPT
+# define GDB_ARCH_IS_TRAP_BRKPT(X) ((X) == TRAP_BRKPT)
#endif
#ifndef TRAP_HWBKPT