@@ -2963,7 +2963,7 @@ struct linux_target_ops the_low_target =
aarch64_set_pc,
NULL, /* breakpoint_kind_from_pc */
aarch64_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0, /* decr_pc_after_break */
aarch64_breakpoint_at,
aarch64_supports_z_point_type,
@@ -1032,7 +1032,7 @@ struct linux_target_ops the_low_target = {
arm_set_pc,
arm_breakpoint_kind_from_pc,
arm_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0,
arm_breakpoint_at,
arm_supports_z_point_type,
@@ -141,7 +141,7 @@ struct linux_target_ops the_low_target = {
bfin_set_pc,
NULL, /* breakpoint_kind_from_pc */
bfin_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
2,
bfin_breakpoint_at,
NULL, /* supports_z_point_type */
@@ -139,7 +139,7 @@ struct linux_target_ops the_low_target = {
cris_set_pc,
NULL, /* breakpoint_kind_from_pc */
cris_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0,
cris_breakpoint_at,
};
@@ -422,7 +422,7 @@ struct linux_target_ops the_low_target = {
cris_set_pc,
NULL, /* breakpoint_kind_from_pc */
cris_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0,
cris_breakpoint_at,
cris_supports_z_point_type,
@@ -281,12 +281,12 @@ can_hardware_single_step (void)
}
/* True if the low target can software single-step. Such targets
- implement the BREAKPOINT_REINSERT_ADDR callback. */
+ implement the GET_NEXT_PCS callback. */
static int
can_software_single_step (void)
{
- return (the_low_target.breakpoint_reinsert_addr != NULL);
+ return (the_low_target.get_next_pcs != NULL);
}
/* True if the low target supports memory breakpoints. If so, we'll
@@ -3957,6 +3957,26 @@ enqueue_pending_signal (struct lwp_info *lwp, int signal, siginfo_t *info)
lwp->pending_signals = p_sig;
}
+/* Install breakpoints for software single stepping. */
+
+static void
+install_software_single_step_breakpoints (struct lwp_info *lwp)
+{
+ int i;
+ CORE_ADDR pc;
+ struct regcache *regcache = get_thread_regcache (current_thread, 1);
+ VEC (CORE_ADDR) *next_pcs = NULL;
+ struct cleanup *old_chain = make_cleanup (VEC_cleanup (CORE_ADDR), &next_pcs);
+
+ pc = get_pc (lwp);
+ next_pcs = (*the_low_target.get_next_pcs) (pc, regcache);
+
+ for (i = 0; VEC_iterate (CORE_ADDR, next_pcs, i, pc); ++i)
+ set_reinsert_breakpoint (pc);
+
+ do_cleanups (old_chain);
+}
+
/* Resume execution of LWP. If STEP is nonzero, single-step it. If
SIGNAL is nonzero, give it that signal. */
@@ -4522,8 +4542,7 @@ start_step_over (struct lwp_info *lwp)
}
else if (can_software_single_step ())
{
- CORE_ADDR raddr = (*the_low_target.breakpoint_reinsert_addr) ();
- set_reinsert_breakpoint (raddr);
+ install_software_single_step_breakpoints (lwp);
step = 0;
}
else
@@ -124,6 +124,8 @@ struct process_info_private
struct lwp_info;
+DEF_VEC_I (CORE_ADDR);
+
struct linux_target_ops
{
/* Architecture-specific setup. */
@@ -153,7 +155,8 @@ struct linux_target_ops
/* See target.h for details. */
const gdb_byte *(*sw_breakpoint_from_kind) (int kind, int *size);
- CORE_ADDR (*breakpoint_reinsert_addr) (void);
+ /* Find the next possible PCs after the current instruction executes. */
+ VEC (CORE_ADDR) *(*get_next_pcs) (CORE_ADDR pc, struct regcache *regcache);
int decr_pc_after_break;
int (*breakpoint_at) (CORE_ADDR pc);
@@ -880,7 +880,7 @@ struct linux_target_ops the_low_target = {
mips_set_pc,
NULL, /* breakpoint_kind_from_pc */
mips_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0,
mips_breakpoint_at,
mips_supports_z_point_type,
@@ -267,7 +267,7 @@ struct linux_target_ops the_low_target =
nios2_set_pc,
NULL, /* breakpoint_kind_from_pc */
nios2_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0,
nios2_breakpoint_at,
};
@@ -320,7 +320,7 @@ struct linux_target_ops the_low_target = {
NULL,
NULL, /* breakpoint_kind_from_pc */
sparc_sw_breakpoint_from_kind,
- NULL, /* breakpoint_reinsert_addr */
+ NULL, /* get_next_pcs */
0,
sparc_breakpoint_at,
NULL, /* supports_z_point_type */