forked from Imagelibrary/binutils-gdb
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.
This commit is contained in:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user