diff options
author | Antoine Tremblay <antoine.tremblay@ericsson.com> | 2015-12-18 11:33:58 -0500 |
---|---|---|
committer | Antoine Tremblay <antoine.tremblay@ericsson.com> | 2015-12-18 11:33:58 -0500 |
commit | fa5308bdcc4967861d1277b45205c2623b154a64 (patch) | |
tree | ef7f8c9ae03a5754106957d4f75946d9ac48cb80 /gdb/gdbserver/linux-low.c | |
parent | c9f203207d418f72217f4bc0997acd809a0479ce (diff) | |
download | gdb-fa5308bdcc4967861d1277b45205c2623b154a64.zip gdb-fa5308bdcc4967861d1277b45205c2623b154a64.tar.gz gdb-fa5308bdcc4967861d1277b45205c2623b154a64.tar.bz2 |
Replace breakpoint_reinsert_addr by get_next_pcs operation in GDBServer
This patch in preparation for software single step support on ARM. It refactors
breakpoint_reinsert_addr into get_next_pcs so that multiple location can be
returned.
When software single stepping there can be multiple possible next addresses
because we're stepping over a conditional branch instruction, for example.
The operation get_next_pcs handles that by returning a vector of all the
possible next addresses.
Software breakpoints are installed at each location returned.
No regressions, tested on ubuntu 14.04 ARMv7 and x86.
With gdbserver-{native,extended} / { -marm -mthumb }
gdb/gdbserver/ChangeLog:
* linux-aarch64-low.c (the_low_targets): Rename
breakpoint_reinsert_addr to get_next_pcs.
* linux-arm-low.c (the_low_targets): Likewise.
* linux-bfin-low.c (the_low_targets): Likewise.
* linux-cris-low.c (the_low_targets): Likewise.
* linux-crisv32-low.c (the_low_targets): Likewise.
* linux-low.c (can_software_single_step): Likewise.
(install_software_single_step_breakpoints): New function.
(start_step_over): Use install_software_single_step_breakpoints.
* linux-low.h: New CORE_ADDR vector.
(struct linux_target_ops) Rename breakpoint_reinsert_addr to
get_next_pcs.
* linux-mips-low.c (the_low_targets): Likewise.
* linux-nios2-low.c (the_low_targets): Likewise.
* linux-sparc-low.c (the_low_targets): Likewise.
Diffstat (limited to 'gdb/gdbserver/linux-low.c')
-rw-r--r-- | gdb/gdbserver/linux-low.c | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index edff916..d48fdbf 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -282,12 +282,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 @@ -3960,6 +3960,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. */ @@ -4525,8 +4545,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 |