From af1b22f3004774f8c5c570abe7fab629026032f7 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 21 Jul 2015 16:33:41 +0100 Subject: 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/aarch64-linux-nat.c | 57 +------------------------------------------------ 1 file changed, 1 insertion(+), 56 deletions(-) (limited to 'gdb/aarch64-linux-nat.c') diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c index 34e8fba..1c962b6 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); } -- cgit v1.1