diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-09 14:20:24 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-06-09 14:20:24 +0000 |
| commit | e76f05face9b0db02774161727d82eac678a75ac (patch) | |
| tree | 28ee93479be2a37d8b66aaea458efca35dff8574 /gdb/infrun.c | |
| parent | a433963dd51c3b8ab6b5c2a3f75ec2fe4f564a0b (diff) | |
| download | gdb-e76f05face9b0db02774161727d82eac678a75ac.zip gdb-e76f05face9b0db02774161727d82eac678a75ac.tar.gz gdb-e76f05face9b0db02774161727d82eac678a75ac.tar.bz2 | |
2007-06-09 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (SKIP_TRAMPOLINE_CODE): Replace by
gdbarch_skip_trampoline_code.
* rs6000-tdep.c (rs6000_in_solib_return_trampoline): Likewise (comment).
* objc-lang.c (objc_skip_trampoline)
(objc_submethod_helper_data): Likewise.
* m32c-lang.c (m32c_skip_trampoline_code): Likewise (comment).
* infrun.c (handle_inferior_event): Likewise.
* gnu-v3-abi.c (gnuv3_skip_trampoline): Likewise.
* gdbarch.sh (IN_SOLIB_RETURN_TRAMPOLINE): Replace by
gdbarch_in_solib_return_trampoline.
* rs6000-tdep.c (rs6000_in_solib_return_trampoline): Likewise (comment).
* infrun.c (handle_inferior_event): Likewise.
* hppa-tdep.c (hppa_stub_unwind_sniffer): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 3c64156..7b05504 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2458,7 +2458,7 @@ process_event_stop_test: end of, if we do step into it. */ real_stop_pc = skip_language_trampoline (stop_pc); if (real_stop_pc == 0) - real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); + real_stop_pc = gdbarch_skip_trampoline_code (current_gdbarch, stop_pc); if (real_stop_pc != 0) ecs->stop_func_start = real_stop_pc; @@ -2516,10 +2516,12 @@ process_event_stop_test: /* If we're in the return path from a shared library trampoline, we want to proceed through the trampoline when stepping. */ - if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name)) + if (gdbarch_in_solib_return_trampoline (current_gdbarch, + stop_pc, ecs->stop_func_name)) { /* Determine where this trampoline returns. */ - CORE_ADDR real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); + CORE_ADDR real_stop_pc = gdbarch_skip_trampoline_code + (current_gdbarch, stop_pc); if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: stepped into solib return tramp\n"); |