forked from Imagelibrary/binutils-gdb
gdbarch software_single_step returns VEC (CORE_ADDR) *
This patch changes gdbarch method software_single_step to return a vector of addresses on which GDB should insert breakpoints, and don't insert breakpoints. Instead, the caller of gdbarch_software_single_step inserts breakpoints if the returned vector is not NULL. gdb: 2016-11-08 Yao Qi <yao.qi@linaro.org> * aarch64-tdep.c (aarch64_software_single_step): Return VEC (CORE_ADDR) *. Return NULL instead of 0. Don't call insert_single_step_breakpoint. * alpha-tdep.c (alpha_deal_with_atomic_sequence): Likewise. (alpha_software_single_step): Likewise. * alpha-tdep.h (alpha_software_single_step): Update declaration. * arm-linux-tdep.c (arm_linux_software_single_step): Return VEC (CORE_ADDR) *. Return NULL instead of 0. * arm-tdep.c (arm_software_single_step): Return NULL instead of 0. * arm-tdep.h (arm_software_single_step): Update declaration. * breakpoint.c (insert_single_step_breakpoints): New function. * breakpoint.h (insert_single_step_breakpoints): Declare. * cris-tdep.c (cris_software_single_step): Return VEC (CORE_ADDR) *. Don't call insert_single_step_breakpoint. * gdbarch.sh (software_single_step): Change it to return VEC (CORE_ADDR) *. * gdbarch.c, gdbarch.h: Regenerated. * infrun.c (maybe_software_singlestep): Adjust. * mips-tdep.c (mips_deal_with_atomic_sequence): Return VEC (CORE_ADDR) *. Don't call insert_single_step_breakpoint. (micromips_deal_with_atomic_sequence): Likewise. (deal_with_atomic_sequence): Likewise. (mips_software_single_step): Likewise. * mips-tdep.h (mips_software_single_step): Update declaration. * moxie-tdep.c (moxie_software_single_step): Likewise. * nios2-tdep.c (nios2_software_single_step): Likewise. * ppc-tdep.h (ppc_deal_with_atomic_sequence): Update declaration. * record-full.c (record_full_resume): Adjust. (record_full_wait_1): Likewise. * rs6000-aix-tdep.c (rs6000_software_single_step): Return VEC (CORE_ADDR) *. Don't call insert_single_step_breakpoint. * rs6000-tdep.c (ppc_deal_with_atomic_sequence): Return VEC (CORE_ADDR) *. Don't call insert_single_step_breakpoint. * s390-linux-tdep.c (s390_software_single_step): Likewise. * sparc-tdep.c (sparc_software_single_step): Likewise. * spu-tdep.c (spu_software_single_step): Likewise. * tic6x-tdep.c (tic6x_software_single_step): Likewise.
This commit is contained in:
@@ -1599,7 +1599,7 @@ sparc_step_trap (struct frame_info *frame, unsigned long insn)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
static VEC (CORE_ADDR) *
|
||||
sparc_software_single_step (struct frame_info *frame)
|
||||
{
|
||||
struct gdbarch *arch = get_frame_arch (frame);
|
||||
@@ -1608,6 +1608,7 @@ sparc_software_single_step (struct frame_info *frame)
|
||||
CORE_ADDR npc, nnpc;
|
||||
|
||||
CORE_ADDR pc, orig_npc;
|
||||
VEC (CORE_ADDR) *next_pcs = NULL;
|
||||
|
||||
pc = get_frame_register_unsigned (frame, tdep->pc_regnum);
|
||||
orig_npc = npc = get_frame_register_unsigned (frame, tdep->npc_regnum);
|
||||
@@ -1615,10 +1616,10 @@ sparc_software_single_step (struct frame_info *frame)
|
||||
/* Analyze the instruction at PC. */
|
||||
nnpc = sparc_analyze_control_transfer (frame, pc, &npc);
|
||||
if (npc != 0)
|
||||
insert_single_step_breakpoint (arch, aspace, npc);
|
||||
VEC_safe_push (CORE_ADDR, next_pcs, npc);
|
||||
|
||||
if (nnpc != 0)
|
||||
insert_single_step_breakpoint (arch, aspace, nnpc);
|
||||
VEC_safe_push (CORE_ADDR, next_pcs, nnpc);
|
||||
|
||||
/* Assert that we have set at least one breakpoint, and that
|
||||
they're not set at the same spot - unless we're going
|
||||
@@ -1626,7 +1627,7 @@ sparc_software_single_step (struct frame_info *frame)
|
||||
gdb_assert (npc != 0 || nnpc != 0 || orig_npc == 0);
|
||||
gdb_assert (nnpc != npc || orig_npc == 0);
|
||||
|
||||
return 1;
|
||||
return next_pcs;
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
Reference in New Issue
Block a user