diff options
| author | Andrew Pinski <apinski@cavium.com> | 2016-07-23 09:56:44 -0700 |
|---|---|---|
| committer | Andrew Pinski <apinski@cavium.com> | 2016-07-23 10:10:32 -0700 |
| commit | 49ecef2a7da2ee9df4ae675f99b70518fbf1bb23 (patch) | |
| tree | fa4538400b464588be1c9c52e3edb0c264067d72 /gdb/nat | |
| parent | 463888ab6be549e8dcc9eac36dc07c1c237e2968 (diff) | |
| download | gdb-49ecef2a7da2ee9df4ae675f99b70518fbf1bb23.zip gdb-49ecef2a7da2ee9df4ae675f99b70518fbf1bb23.tar.gz gdb-49ecef2a7da2ee9df4ae675f99b70518fbf1bb23.tar.bz2 | |
Fix ARMv8.1/v8.2 for hw watchpoint and breakpoint
The problem here is ARMv8.1 (and ARMv8.2) define a
different debug version than ARMv8 (7 and 8 respectively).
This fixes hw watchpoints and breakpoints by checking
for those debug versions too.
Committed as obvious after a test on aarch64-linux-gnu
(on a ThunderX machine which has ARMv8.1 support enabled).
ChangeLog:
* nat/aarch64-linux-hw-point.c
(aarch64_linux_get_debug_reg_capacity): Handle
ARMv8.1 and ARMv8.2 debug versions.
* nat/aarch64-linux-hw-point.h
(AARCH64_DEBUG_ARCH_V8_1): New define.
(AARCH64_DEBUG_ARCH_V8_2): New define.
Signed-off-by: Andrew Pinski <apinski@cavium.com>
Diffstat (limited to 'gdb/nat')
| -rw-r--r-- | gdb/nat/aarch64-linux-hw-point.c | 8 | ||||
| -rw-r--r-- | gdb/nat/aarch64-linux-hw-point.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c index a06a6e6..f9e04d9 100644 --- a/gdb/nat/aarch64-linux-hw-point.c +++ b/gdb/nat/aarch64-linux-hw-point.c @@ -630,7 +630,9 @@ aarch64_linux_get_debug_reg_capacity (int tid) /* Get hardware watchpoint register info. */ if (ptrace (PTRACE_GETREGSET, tid, NT_ARM_HW_WATCH, &iov) == 0 - && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8) + && (AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8 + || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_1 + || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_2)) { aarch64_num_wp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM) @@ -650,7 +652,9 @@ aarch64_linux_get_debug_reg_capacity (int tid) /* Get hardware breakpoint register info. */ if (ptrace (PTRACE_GETREGSET, tid, NT_ARM_HW_BREAK, &iov) == 0 - && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8) + && (AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8 + || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_1 + || AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8_2)) { aarch64_num_bp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM) diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h index acf0a49..16efb7c 100644 --- a/gdb/nat/aarch64-linux-hw-point.h +++ b/gdb/nat/aarch64-linux-hw-point.h @@ -68,6 +68,8 @@ /* Macro for the expected version of the ARMv8-A debug architecture. */ #define AARCH64_DEBUG_ARCH_V8 0x6 +#define AARCH64_DEBUG_ARCH_V8_1 0x7 +#define AARCH64_DEBUG_ARCH_V8_2 0x8 /* ptrace expects control registers to be formatted as follows: |