mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-07-17 18:43:25 +08:00
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 <yao.qi@linaro.org> * 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 <yao.qi@linaro.org> * linux-aarch64-low.c (aarch64_arch_setup): Remove code and call aarch64_linux_get_debug_reg_capacity.
This commit is contained in:
@ -1,3 +1,13 @@
|
|||||||
|
2015-07-21 Yao Qi <yao.qi@linaro.org>
|
||||||
|
|
||||||
|
* 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 <markus.t.metzger@intel.com>
|
2015-07-21 Markus Metzger <markus.t.metzger@intel.com>
|
||||||
|
|
||||||
* common/btrace-common.c (btrace_data_append): Change case label.
|
* common/btrace-common.c (btrace_data_append): Change case label.
|
||||||
|
@ -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,
|
static void (*super_post_startup_inferior) (struct target_ops *self,
|
||||||
ptid_t ptid);
|
ptid_t ptid);
|
||||||
|
|
||||||
@ -699,7 +644,7 @@ aarch64_linux_child_post_startup_inferior (struct target_ops *self,
|
|||||||
ptid_t ptid)
|
ptid_t ptid)
|
||||||
{
|
{
|
||||||
aarch64_forget_process (ptid_get_pid (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);
|
super_post_startup_inferior (self, ptid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
2015-07-21 Yao Qi <yao.qi@linaro.org>
|
||||||
|
|
||||||
|
* linux-aarch64-low.c (aarch64_arch_setup): Remove code and call
|
||||||
|
aarch64_linux_get_debug_reg_capacity.
|
||||||
|
|
||||||
2015-07-17 Yao Qi <yao.qi@linaro.org>
|
2015-07-17 Yao Qi <yao.qi@linaro.org>
|
||||||
|
|
||||||
* Makefile.in (aarch64-linux-hw-point.o): New rule.
|
* Makefile.in (aarch64-linux-hw-point.o): New rule.
|
||||||
|
@ -587,55 +587,9 @@ aarch64_linux_prepare_to_resume (struct lwp_info *lwp)
|
|||||||
static void
|
static void
|
||||||
aarch64_arch_setup (void)
|
aarch64_arch_setup (void)
|
||||||
{
|
{
|
||||||
int pid;
|
|
||||||
struct iovec iov;
|
|
||||||
struct user_hwdebug_state dreg_state;
|
|
||||||
|
|
||||||
current_process ()->tdesc = tdesc_aarch64;
|
current_process ()->tdesc = tdesc_aarch64;
|
||||||
|
|
||||||
pid = lwpid_of (current_thread);
|
aarch64_linux_get_debug_reg_capacity (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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct regset_info aarch64_regsets[] =
|
static struct regset_info aarch64_regsets[] =
|
||||||
|
@ -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]),
|
i, core_addr_to_string_nz (state->dr_addr_wp[i]),
|
||||||
state->dr_ctrl_wp[i], state->dr_ref_count_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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -181,4 +181,6 @@ void aarch64_show_debug_reg_state (struct aarch64_debug_reg_state *state,
|
|||||||
const char *func, CORE_ADDR addr,
|
const char *func, CORE_ADDR addr,
|
||||||
int len, enum target_hw_bp_type type);
|
int len, enum target_hw_bp_type type);
|
||||||
|
|
||||||
|
void aarch64_linux_get_debug_reg_capacity (int tid);
|
||||||
|
|
||||||
#endif /* AARCH64_LINUX_HW_POINT_H */
|
#endif /* AARCH64_LINUX_HW_POINT_H */
|
||||||
|
Reference in New Issue
Block a user