From af1b22f3004774f8c5c570abe7fab629026032f7 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 21 Jul 2015 16:33:41 +0100 Subject: [PATCH] Move aarch64_linux_get_debug_reg_capacity to nat/aarch64-linux-hw-point.c There are also some duplication on getting HW watchpoint/breakpoint registers info between GDB and GDBserver. This patch moves them to nat/aarch64-linux-hw-point.c. Note that ENABLE_NLS is not defined in GDBserver, so it should be OK to use _( markup. gdb: 2015-07-21 Yao Qi * aarch64-linux-nat.c (aarch64_linux_get_debug_reg_capacity): Move it to nat/aarch64-linux-hw-point.c. (aarch64_linux_child_post_startup_inferior): Update. * nat/aarch64-linux-hw-point.c (aarch64_linux_get_debug_reg_capacity): New function. * nat/aarch64-linux-hw-point.h (aarch64_linux_get_debug_reg_capacity): Declare it. gdb/gdbserver: 2015-07-21 Yao Qi * linux-aarch64-low.c (aarch64_arch_setup): Remove code and call aarch64_linux_get_debug_reg_capacity. --- gdb/ChangeLog | 10 ++++++ gdb/aarch64-linux-nat.c | 57 +------------------------------ gdb/gdbserver/ChangeLog | 5 +++ gdb/gdbserver/linux-aarch64-low.c | 48 +------------------------- gdb/nat/aarch64-linux-hw-point.c | 53 ++++++++++++++++++++++++++++ gdb/nat/aarch64-linux-hw-point.h | 2 ++ 6 files changed, 72 insertions(+), 103 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b71b640e4c5..69a086b86f1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2015-07-21 Yao Qi + + * aarch64-linux-nat.c (aarch64_linux_get_debug_reg_capacity): + Move it to nat/aarch64-linux-hw-point.c. + (aarch64_linux_child_post_startup_inferior): Update. + * nat/aarch64-linux-hw-point.c (aarch64_linux_get_debug_reg_capacity): + New function. + * nat/aarch64-linux-hw-point.h (aarch64_linux_get_debug_reg_capacity): + Declare it. + 2015-07-21 Markus Metzger * common/btrace-common.c (btrace_data_append): Change case label. diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 34e8fba33b4..1c962b68d37 100644 --- a/gdb/aarch64-linux-nat.c +++ b/gdb/aarch64-linux-nat.c @@ -634,61 +634,6 @@ ps_get_thread_area (const struct ps_prochandle *ph, } -/* Get the hardware debug register capacity information from the - inferior represented by PTID. */ - -static void -aarch64_linux_get_debug_reg_capacity (ptid_t ptid) -{ - int tid; - struct iovec iov; - struct user_hwdebug_state dreg_state; - - tid = ptid_get_pid (ptid); - iov.iov_base = &dreg_state; - iov.iov_len = sizeof (dreg_state); - - /* 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_num_wp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); - if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM) - { - warning (_("Unexpected number of hardware watchpoint registers" - " reported by ptrace, got %d, expected %d."), - aarch64_num_wp_regs, AARCH64_HWP_MAX_NUM); - aarch64_num_wp_regs = AARCH64_HWP_MAX_NUM; - } - } - else - { - warning (_("Unable to determine the number of hardware watchpoints" - " available.")); - aarch64_num_wp_regs = 0; - } - - /* 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_num_bp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); - if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM) - { - warning (_("Unexpected number of hardware breakpoint registers" - " reported by ptrace, got %d, expected %d."), - aarch64_num_bp_regs, AARCH64_HBP_MAX_NUM); - aarch64_num_bp_regs = AARCH64_HBP_MAX_NUM; - } - } - else - { - warning (_("Unable to determine the number of hardware breakpoints" - " available.")); - aarch64_num_bp_regs = 0; - } -} - static void (*super_post_startup_inferior) (struct target_ops *self, ptid_t ptid); @@ -699,7 +644,7 @@ aarch64_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid) { aarch64_forget_process (ptid_get_pid (ptid)); - aarch64_linux_get_debug_reg_capacity (ptid); + aarch64_linux_get_debug_reg_capacity (ptid_get_pid (ptid)); super_post_startup_inferior (self, ptid); } diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index e0e19d77258..927a477dadd 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-07-21 Yao Qi + + * linux-aarch64-low.c (aarch64_arch_setup): Remove code and call + aarch64_linux_get_debug_reg_capacity. + 2015-07-17 Yao Qi * Makefile.in (aarch64-linux-hw-point.o): New rule. diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index d29672e013a..79eb44c8121 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -587,55 +587,9 @@ aarch64_linux_prepare_to_resume (struct lwp_info *lwp) static void aarch64_arch_setup (void) { - int pid; - struct iovec iov; - struct user_hwdebug_state dreg_state; - current_process ()->tdesc = tdesc_aarch64; - pid = lwpid_of (current_thread); - iov.iov_base = &dreg_state; - iov.iov_len = sizeof (dreg_state); - - /* Get hardware watchpoint register info. */ - if (ptrace (PTRACE_GETREGSET, pid, NT_ARM_HW_WATCH, &iov) == 0 - && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8) - { - aarch64_num_wp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); - if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM) - { - warning ("Unexpected number of hardware watchpoint registers reported" - " by ptrace, got %d, expected %d.", - aarch64_num_wp_regs, AARCH64_HWP_MAX_NUM); - aarch64_num_wp_regs = AARCH64_HWP_MAX_NUM; - } - } - else - { - warning ("Unable to determine the number of hardware watchpoints" - " available."); - aarch64_num_wp_regs = 0; - } - - /* Get hardware breakpoint register info. */ - if (ptrace (PTRACE_GETREGSET, pid, NT_ARM_HW_BREAK, &iov) == 0 - && AARCH64_DEBUG_ARCH (dreg_state.dbg_info) == AARCH64_DEBUG_ARCH_V8) - { - aarch64_num_bp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); - if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM) - { - warning ("Unexpected number of hardware breakpoint registers reported" - " by ptrace, got %d, expected %d.", - aarch64_num_bp_regs, AARCH64_HBP_MAX_NUM); - aarch64_num_bp_regs = AARCH64_HBP_MAX_NUM; - } - } - else - { - warning ("Unable to determine the number of hardware breakpoints" - " available."); - aarch64_num_bp_regs = 0; - } + aarch64_linux_get_debug_reg_capacity (lwpid_of (current_thread)); } static struct regset_info aarch64_regsets[] = diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c index f58e0c5ff36..1d9664ea1c0 100644 --- a/gdb/nat/aarch64-linux-hw-point.c +++ b/gdb/nat/aarch64-linux-hw-point.c @@ -504,3 +504,56 @@ aarch64_show_debug_reg_state (struct aarch64_debug_reg_state *state, i, core_addr_to_string_nz (state->dr_addr_wp[i]), state->dr_ctrl_wp[i], state->dr_ref_count_wp[i]); } + +/* Get the hardware debug register capacity information from the + process represented by TID. */ + +void +aarch64_linux_get_debug_reg_capacity (int tid) +{ + struct iovec iov; + struct user_hwdebug_state dreg_state; + + iov.iov_base = &dreg_state; + iov.iov_len = sizeof (dreg_state); + + /* 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_num_wp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); + if (aarch64_num_wp_regs > AARCH64_HWP_MAX_NUM) + { + warning (_("Unexpected number of hardware watchpoint registers" + " reported by ptrace, got %d, expected %d."), + aarch64_num_wp_regs, AARCH64_HWP_MAX_NUM); + aarch64_num_wp_regs = AARCH64_HWP_MAX_NUM; + } + } + else + { + warning (_("Unable to determine the number of hardware watchpoints" + " available.")); + aarch64_num_wp_regs = 0; + } + + /* 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_num_bp_regs = AARCH64_DEBUG_NUM_SLOTS (dreg_state.dbg_info); + if (aarch64_num_bp_regs > AARCH64_HBP_MAX_NUM) + { + warning (_("Unexpected number of hardware breakpoint registers" + " reported by ptrace, got %d, expected %d."), + aarch64_num_bp_regs, AARCH64_HBP_MAX_NUM); + aarch64_num_bp_regs = AARCH64_HBP_MAX_NUM; + } + } + else + { + warning (_("Unable to determine the number of hardware breakpoints" + " available.")); + aarch64_num_bp_regs = 0; + } +} diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h index 1d81a08bfba..a430a8fcb8d 100644 --- a/gdb/nat/aarch64-linux-hw-point.h +++ b/gdb/nat/aarch64-linux-hw-point.h @@ -181,4 +181,6 @@ void aarch64_show_debug_reg_state (struct aarch64_debug_reg_state *state, const char *func, CORE_ADDR addr, int len, enum target_hw_bp_type type); +void aarch64_linux_get_debug_reg_capacity (int tid); + #endif /* AARCH64_LINUX_HW_POINT_H */ -- 2.30.2