|
 |
0b42f8 |
commit 49ecef2a7da2ee9df4ae675f99b70518fbf1bb23
|
|
|
0b42f8 |
Author: Andrew Pinski <apinski@cavium.com>
|
|
|
0b42f8 |
Date: Sat Jul 23 09:56:44 2016 -0700
|
|
|
0b42f8 |
|
|
|
0b42f8 |
Fix ARMv8.1/v8.2 for hw watchpoint and breakpoint
|
|
|
0b42f8 |
|
|
|
0b42f8 |
The problem here is ARMv8.1 (and ARMv8.2) define a
|
|
|
0b42f8 |
different debug version than ARMv8 (7 and 8 respectively).
|
|
|
0b42f8 |
This fixes hw watchpoints and breakpoints by checking
|
|
|
0b42f8 |
for those debug versions too.
|
|
|
0b42f8 |
|
|
|
0b42f8 |
Committed as obvious after a test on aarch64-linux-gnu
|
|
|
0b42f8 |
(on a ThunderX machine which has ARMv8.1 support enabled).
|
|
|
0b42f8 |
|
|
|
0b42f8 |
ChangeLog:
|
|
|
0b42f8 |
* nat/aarch64-linux-hw-point.c
|
|
|
0b42f8 |
(aarch64_linux_get_debug_reg_capacity): Handle
|
|
|
0b42f8 |
ARMv8.1 and ARMv8.2 debug versions.
|
|
|
0b42f8 |
* nat/aarch64-linux-hw-point.h
|
|
|
0b42f8 |
(AARCH64_DEBUG_ARCH_V8_1): New define.
|
|
|
0b42f8 |
(AARCH64_DEBUG_ARCH_V8_2): New define.
|
|
|
0b42f8 |
|
|
|
0b42f8 |
Signed-off-by: Andrew Pinski <apinski@cavium.com>
|
|
|
0b42f8 |
|
|
|
0b42f8 |
### a/gdb/ChangeLog
|
|
|
0b42f8 |
### b/gdb/ChangeLog
|
|
|
0b42f8 |
## -1,3 +1,12 @@
|
|
|
0b42f8 |
+2016-07-23 Andrew Pinski <apinski@cavium.com>
|
|
|
0b42f8 |
+
|
|
|
0b42f8 |
+ * nat/aarch64-linux-hw-point.c
|
|
|
0b42f8 |
+ (aarch64_linux_get_debug_reg_capacity): Handle
|
|
|
0b42f8 |
+ ARMv8.1 and ARMv8.2 debug versions.
|
|
|
0b42f8 |
+ * nat/aarch64-linux-hw-point.h
|
|
|
0b42f8 |
+ (AARCH64_DEBUG_ARCH_V8_1): New define.
|
|
|
0b42f8 |
+ (AARCH64_DEBUG_ARCH_V8_2): New define.
|
|
|
0b42f8 |
+
|
|
|
0b42f8 |
2016-06-30 Руслан Ижбулатов <lrn1986@gmail.com>
|
|
|
0b42f8 |
|
|
|
0b42f8 |
PR gdb/14529
|
|
|
0b42f8 |
Index: gdb-7.6.1/gdb/aarch64-linux-nat.c
|
|
|
0b42f8 |
===================================================================
|
|
|
0b42f8 |
--- gdb-7.6.1.orig/gdb/aarch64-linux-nat.c 2016-08-03 23:00:09.338705164 +0200
|
|
|
0b42f8 |
+++ gdb-7.6.1/gdb/aarch64-linux-nat.c 2016-08-03 23:00:55.016092435 +0200
|
|
|
0b42f8 |
@@ -110,6 +110,8 @@
|
|
|
0b42f8 |
|
|
|
0b42f8 |
/* Macro for the expected version of the ARMv8-A debug architecture. */
|
|
|
0b42f8 |
#define AARCH64_DEBUG_ARCH_V8 0x6
|
|
|
0b42f8 |
+#define AARCH64_DEBUG_ARCH_V8_1 0x7
|
|
|
0b42f8 |
+#define AARCH64_DEBUG_ARCH_V8_2 0x8
|
|
|
0b42f8 |
|
|
|
0b42f8 |
/* Number of hardware breakpoints/watchpoints the target supports.
|
|
|
0b42f8 |
They are initialized with values obtained via the ptrace calls
|
|
|
0b42f8 |
@@ -789,7 +791,9 @@
|
|
|
0b42f8 |
|
|
|
0b42f8 |
/* Get hardware watchpoint register info. */
|
|
|
0b42f8 |
if (ptrace (PTRACE_GETREGSET, tid, NT_ARM_HW_WATCH, &iov) == 0
|
|
|
0b42f8 |
- && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8)
|
|
|
0b42f8 |
+ && (AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_1
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_2))
|
|
|
0b42f8 |
{
|
|
|
0b42f8 |
aarch64_num_wp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info);
|
|
|
0b42f8 |
if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM)
|
|
|
0b42f8 |
@@ -809,7 +813,9 @@
|
|
|
0b42f8 |
|
|
|
0b42f8 |
/* Get hardware breakpoint register info. */
|
|
|
0b42f8 |
if (ptrace (PTRACE_GETREGSET, tid, NT_ARM_HW_BREAK, &iov) == 0
|
|
|
0b42f8 |
- && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8)
|
|
|
0b42f8 |
+ && (AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_1
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_2))
|
|
|
0b42f8 |
{
|
|
|
0b42f8 |
aarch64_num_bp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info);
|
|
|
0b42f8 |
if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM)
|
|
|
0b42f8 |
Index: gdb-7.6.1/gdb/gdbserver/linux-aarch64-low.c
|
|
|
0b42f8 |
===================================================================
|
|
|
0b42f8 |
--- gdb-7.6.1.orig/gdb/gdbserver/linux-aarch64-low.c 2016-08-03 23:00:08.117694812 +0200
|
|
|
0b42f8 |
+++ gdb-7.6.1/gdb/gdbserver/linux-aarch64-low.c 2016-08-03 23:02:00.471647393 +0200
|
|
|
0b42f8 |
@@ -1187,6 +1187,8 @@
|
|
|
0b42f8 |
#define AARCH64_DEBUG_NUM_SLOTS(x) ((x) & 0xff)
|
|
|
0b42f8 |
#define AARCH64_DEBUG_ARCH(x) (((x) >> 8) & 0xff)
|
|
|
0b42f8 |
#define AARCH64_DEBUG_ARCH_V8 0x6
|
|
|
0b42f8 |
+#define AARCH64_DEBUG_ARCH_V8_1 0x7
|
|
|
0b42f8 |
+#define AARCH64_DEBUG_ARCH_V8_2 0x8
|
|
|
0b42f8 |
|
|
|
0b42f8 |
static void
|
|
|
0b42f8 |
aarch64_arch_setup (void)
|
|
|
0b42f8 |
@@ -1203,7 +1205,9 @@
|
|
|
0b42f8 |
|
|
|
0b42f8 |
/* Get hardware watchpoint register info. */
|
|
|
0b42f8 |
if (ptrace (PTRACE_GETREGSET, pid, NT_ARM_HW_WATCH, &iov) == 0
|
|
|
0b42f8 |
- && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8)
|
|
|
0b42f8 |
+ && (AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_1
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_2))
|
|
|
0b42f8 |
{
|
|
|
0b42f8 |
aarch64_num_wp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info);
|
|
|
0b42f8 |
if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM)
|
|
|
0b42f8 |
@@ -1223,7 +1227,9 @@
|
|
|
0b42f8 |
|
|
|
0b42f8 |
/* Get hardware breakpoint register info. */
|
|
|
0b42f8 |
if (ptrace (PTRACE_GETREGSET, pid, NT_ARM_HW_BREAK, &iov) == 0
|
|
|
0b42f8 |
- && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8)
|
|
|
0b42f8 |
+ && (AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_1
|
|
|
0b42f8 |
+ || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_2))
|
|
|
0b42f8 |
{
|
|
|
0b42f8 |
aarch64_num_bp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info);
|
|
|
0b42f8 |
if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM)
|